Merge pull request #24 from markxoe/development

Version 0.14.0

android/app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "org.toastbrot.ichbineinebienemobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 30
-        versionName "0.13.5"
+        versionCode 31
+        versionName "0.14.0"
         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 = 24;
+				CURRENT_PROJECT_VERSION = 25;
 				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.5;
+				MARKETING_VERSION = 0.14.0;
 				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 = 24;
+				CURRENT_PROJECT_VERSION = 25;
 				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.5;
+				MARKETING_VERSION = 0.14.0;
 				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.5",
+  "version": "0.14.0",
   "private": true,
   "dependencies": {
     "@capacitor-community/firebase-analytics": "^0.2.0",

readme.md

@@ -31,6 +31,12 @@ Mark Oude Elberink
 
 ## Changelog
 
+### [0.14.0] Chicken Cats :rooster: :cat:
+
+- Warnung vor Bann
+- Freiwillige Preiserhöhung
+- Multiplieranzeige ist jetzt im Store genauso wie auf Home
+
 ### [0.13.5] More Infinity :recycle:
 
 - Profil Name / Bild Richtlinien

src/functions/api.ts

@@ -0,0 +1,28 @@
+/* TODO: Adding Functions from ../globals.ts */
+
+import { stateType } from "../store/types";
+import axios from "axios";
+
+const getBaseURL = () => {
+  return (
+    process.env.react_app_apiurl ?? "https://api.ichbineinebiene.toastbrot.org"
+  );
+};
+
+export const APIgetWarning = async (
+  state: stateType
+): Promise<string | boolean> => {
+  return (
+    (await axios
+      .get(getBaseURL() + "/api/v1/users2/warning/" + state.userUUID)
+      .then((r) => {
+        const result: { status: string; result?: string } = r.data;
+        if (result.status === "ok" && result) {
+          return result.result;
+        } else {
+          return false;
+        }
+      })
+      .catch(() => false)) ?? false
+  );
+};

src/globals.tsx

@@ -1,11 +1,9 @@
 import { stateType } from "./store/types";
 import Axios from "axios";
-import packagejs from "../package.json"
+import packagejs from "../package.json";
 import calculateHeader from "./functions/calculateauthorization";
 import { getPlatforms } from "@ionic/react";
 
-
-
 export const rotateSpeedLevel = {
   max: 3,
   levels: [
@@ -31,7 +29,8 @@ export const getAdditionalBeePrice = (state: stateType): number => {
         state.biene.additionalBienen.length +
           state.biene.multiplierLevel +
           state.biene.autoRotatingBees.length
-      )
+      ) *
+      (state.settings.multiplyPrices ? 10.0 : 1.0)
   );
 };
 export const getMultiplierPrice = (state: stateType): number => {
@@ -187,7 +186,7 @@ export const uploadData = (state: stateType) => {
             data.additionalBeeLength
           ),
           version: packagejs.version,
-          platforms: getPlatforms().join(" ")
+          platforms: getPlatforms().join(" "),
         },
       }
     )

src/other/release-notes.json

@@ -1,4 +1,4 @@
 {
-  "header": "Version 0.13.5",
-  "message": "0.13.5 Neue Namens & Profil Richtlinien"
+  "header": "Version 0.14.0",
+  "message": "0.14.0: Chicken Cats, Neues: Verwarnungen, Freiwillige Preissteigerung"
 }

src/pages/Home.tsx

@@ -61,6 +61,7 @@ import { FirebaseAnalyticsPlugin } from "@capacitor-community/firebase-analytics
 import { KeepAwakePlugin } from "@capacitor-community/keep-awake";
 import { v4, validate } from "uuid";
 import axios from "axios";
+import { APIgetWarning } from "../functions/api";
 const Firebase = Plugins.FirebaseAnalytics as FirebaseAnalyticsPlugin;
 const KeepAwake = Plugins.KeepAwake as KeepAwakePlugin;
 
@@ -76,6 +77,8 @@ const Home: React.FC = () => {
 
   const [disabled, setDisabled] = useState<boolean>(false);
 
+  const [warning, setWarning] = useState<boolean | string>(false);
+
   useIonViewWillEnter(async () => {
     PushNotifications.requestPermission()
       .then((result) => {
@@ -132,7 +135,6 @@ const Home: React.FC = () => {
       Firebase.setUserId({ userId: _uuid }).catch(() => {});
       dispatch({ type: "setUserUUID", payload: _uuid });
 
-
       axios
         .get(
           (process.env.react_app_apiurl ??
@@ -159,7 +161,11 @@ const Home: React.FC = () => {
             document.body.appendChild(el);
             el.present();
           }
-        });
+        })
+        .catch(() => {});
+      APIgetWarning(state).then((r) => {
+        setWarning(r);
+      });
     });
 
     await Storage.get({ key: StoreKeyPrefix + "lastKnownVersion" }).then(
@@ -464,6 +470,12 @@ const Home: React.FC = () => {
             </IonCol>
           </IonRow>
         </IonGrid>
+        <IonItem color="warning" hidden={warning === false}>
+          <p>
+            {warning}. Schreibe ggf. eine E-Mail an{" "}
+            <a href="mailto:ban@ichbineinebiene.org">ban@ichbineinebiene.org</a>
+          </p>
+        </IonItem>
 
         <IonFab
           hidden={!state.settings.clickButtonForBee}

src/pages/Settings.tsx

@@ -44,6 +44,7 @@ import {
   ActionSettingsSetClickButtonForBee,
   ActionSettingsSetNewUI,
   ActionSettingSetNameAtHomePosition,
+  ActionSetMultiplyPrices,
 } from "../store/Actions";
 
 import { Plugins, Storage } from "@capacitor/core";
@@ -187,6 +188,15 @@ const PageSettings: React.FC = () => {
         </IonItem>
         <IonItemDivider>Allgemein</IonItemDivider>
 
+        <IonItem>
+          <IonLabel>Höhere Preise</IonLabel>
+          <IonToggle
+            checked={state.settings.multiplyPrices}
+            onIonChange={(e) => {
+              dispatch(ActionSetMultiplyPrices(e.detail.checked));
+            }}
+          />
+        </IonItem>
         <IonItem>
           <IonLabel>Neues User Interface</IonLabel>
           <IonToggle

src/pages/Store.tsx

@@ -22,6 +22,9 @@ import {
   IonToast,
   IonToolbar,
   useIonViewDidEnter,
+  IonItem,
+  IonToggle,
+  IonLabel,
 } from "@ionic/react";
 import { AppContext } from "../store/State";
 import {
@@ -43,6 +46,7 @@ import {
   ActionMultiplierIncrease,
   ActionRotateSpeedLevelIncrease,
   ActionSetState,
+  ActionSetMultiplyPrices,
 } from "../store/Actions";
 import { RefresherEventDetail } from "@ionic/core";
 import { flashOutline } from "ionicons/icons";
@@ -358,7 +362,9 @@ const StorePage: React.FC = () => {
               </IonRow>
               <IonRow>
                 <IonCol>
-                  <h2>Deine Multiplier: {state.biene.multiplierLevel}/∞</h2>
+                  <h2>
+                    Dein Multiplier: x {state.biene.multiplierLevel + 1}/∞
+                  </h2>
                 </IonCol>
               </IonRow>
             </IonGrid>
@@ -442,6 +448,16 @@ const StorePage: React.FC = () => {
           </IonCardContent>
         </IonCard>
 
+        <IonItem>
+          <IonLabel>Höhere Preise</IonLabel>
+          <IonToggle
+            checked={state.settings.multiplyPrices}
+            onIonChange={(e) => {
+              dispatch(ActionSetMultiplyPrices(e.detail.checked));
+            }}
+          />
+        </IonItem>
+
         <IonToast
           isOpen={showThx}
           translucent

src/store/Actions.tsx

@@ -132,3 +132,8 @@ export const ActionAddGoldenBiene = (): actionType => ({
 export const ActionResetManyThings = (): actionType => ({
   type: "resetManyThings",
 });
+
+export const ActionSetMultiplyPrices = (activated: boolean): actionType => ({
+  type: "setMultiplyPrices",
+  payload: activated,
+});

src/store/State.tsx

@@ -21,6 +21,7 @@ const initialState: stateType = {
     newUI: true,
     deactivateStoreConfetti: false,
     nameathomeposition: nameAtHomePositions.top,
+    multiplyPrices: false,
   },
   statisticsRotations: 0,
   settingMaxNumberDisplayedBees: 20,
@@ -205,6 +206,16 @@ let reducer = (state: stateType, action: actionType): stateType => {
         },
       };
     }
+
+    case "setMultiplyPrices": {
+      return {
+        ...state,
+        settings: {
+          ...state.settings,
+          multiplyPrices: action.payload,
+        },
+      };
+    }
   }
 
   return state;

src/store/types.tsx

@@ -15,6 +15,7 @@ export interface stateType {
     newUI: boolean;
     deactivateStoreConfetti: boolean;
     nameathomeposition: nameAtHomePositions;
+    multiplyPrices: boolean;
   };
   statisticsRotations: number;
   settingMaxNumberDisplayedBees: number;