Merge pull request #8 from markxoe/development

Version 0.13.3

android/app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "org.toastbrot.ichbineinebienemobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 27
-        versionName "0.13.2"
+        versionCode 28
+        versionName "0.13.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

ios/App/App.xcodeproj/project.pbxproj

@@ -353,12 +353,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 22;
 				DEVELOPMENT_TEAM = 7BZBLBDUSX;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.13.2;
+				MARKETING_VERSION = 0.13.3;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = org.toastbrot.ichbineinebienemobile;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -375,12 +375,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 22;
 				DEVELOPMENT_TEAM = 7BZBLBDUSX;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.13.2;
+				MARKETING_VERSION = 0.13.3;
 				PRODUCT_BUNDLE_IDENTIFIER = org.toastbrot.ichbineinebienemobile;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = USE_PUSH;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ichbineinebiene-mobile",
-  "version": "0.13.2",
+  "version": "0.13.3",
   "private": true,
   "dependencies": {
     "@capacitor-community/firebase-analytics": "^0.2.0",

readme.md

@@ -31,6 +31,10 @@ Mark Oude Elberink
 
 ## Changelog
 
+### [0.13.3] More Infinity :recycle:
+
+- Bug fixes
+
 ### [0.13.2] More Infinity :recycle:
 
 - Bug fixes

src/other/release-notes.json

@@ -1,4 +1,4 @@
 {
-  "header": "Version 0.13.2",
-  "message": "0.13.2 More Infinity<br/>Bug fixes"
+  "header": "Version 0.13.3",
+  "message": "0.13.3 More Infinity<br/>Bug fixes"
 }

src/pages/Settings.tsx

@@ -110,6 +110,35 @@ const PageSettings: React.FC = () => {
     });
   };
 
+  const advancedSettingsActivate = (event: any) => {
+    const cancel = () => {
+      generateToast("Zurzeit Deaktiviert", 5000, true);
+      event.detail.complete();
+    };
+    fetch(
+      (process.env.react_app_apiurl ??
+        "https://api.ichbineinebiene.toastbrot.org") +
+        "/api/v1/settings/get/advancedActivated"
+    )
+      .then((r) => r.json())
+      .then((r) => {
+        if (r.result.content === "yes") {
+          Firebase.logEvent({
+            name: "SettingsAdvancedActivated",
+            params: {},
+          }).catch(() => {});
+          uploadEvent(state, { type: "AdvancedActivated" });
+          setTimeout(() => {
+            setAdvancedSettings(true);
+            event.detail.complete();
+          }, 2000);
+        } else {
+          cancel();
+        }
+      })
+      .catch(() => cancel());
+  };
+
   return (
     <IonPage>
       <IonHeader translucent>
@@ -125,15 +154,7 @@ const PageSettings: React.FC = () => {
           slot="fixed"
           pullMin={200}
           onIonRefresh={(event) => {
-            Firebase.logEvent({
-              name: "SettingsAdvancedActivated",
-              params: {},
-            }).catch(() => {});
-            uploadEvent(state, { type: "AdvancedActivated" });
-            setTimeout(() => {
-              setAdvancedSettings(true);
-              event.detail.complete();
-            }, 5000);
+            advancedSettingsActivate(event);
           }}>
           <IonRefresherContent
             pullingIcon={flashOutline}

src/store/Loader-Saver.tsx

@@ -10,6 +10,7 @@ import { generateToast } from "../globals";
 const Firebase = Plugins.FirebaseAnalytics as FirebaseAnalyticsPlugin;
 
 export const LoaderAndSaver: React.FC = ({ children }) => {
+  const { dispatch, state } = React.useContext(AppContext);
   useEffect(() => {
     if (!state.dataLoadedFromMemory)
       Storage.get({ key: StoreKeyPrefix + "state" }).then(async (result) => {
@@ -47,7 +48,6 @@ export const LoaderAndSaver: React.FC = ({ children }) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-  const { dispatch, state } = React.useContext(AppContext);
   useEffect(() => {
     if (state.dataLoadedFromMemory) saveState(state, dispatch);
   }, [state, dispatch]);