Merge pull request #38 from markxoe/development

0.15.1

android/app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "org.toastbrot.ichbineinebienemobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 33
-        versionName "0.15.0"
+        versionCode 34
+        versionName "0.15.1"
         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 = 27;
+				CURRENT_PROJECT_VERSION = 28;
 				DEVELOPMENT_TEAM = 7BZBLBDUSX;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.15.0;
+				MARKETING_VERSION = 0.15.1;
 				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 = 27;
+				CURRENT_PROJECT_VERSION = 28;
 				DEVELOPMENT_TEAM = 7BZBLBDUSX;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.15.0;
+				MARKETING_VERSION = 0.15.1;
 				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.15.0",
+  "version": "0.15.1",
   "private": true,
   "dependencies": {
     "@capacitor-community/firebase-analytics": "^0.2.0",

readme.md

@@ -5,7 +5,7 @@
 ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/markxoe/ich-bin-eine-biene-mobile?style=flat-square)
 ![GitHub package.json dynamic](https://img.shields.io/github/package-json/version/markxoe/ich-bin-eine-biene-mobile?style=flat-square)
 
-## ~~NEU -~~ Discord Server
+## Discord Server
 
 [![Neu: Discord Server](https://img.shields.io/badge/NEU-DISCORD%20SERVER-orange?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/fh3sVAtrB9)
 
@@ -37,6 +37,10 @@ Mark Oude Elberink
 
 ## Changelog
 
+### [0.15.1] Caves and Cliffs :mountain:
+
+- Drachen bugfix
+
 ### [0.15.0] Caves and Cliffs :mountain:
 
 - :sparkles:Drachen:sparkles: :dragon:

src/other/release-notes.json

@@ -1,4 +1,4 @@
 {
-  "header": "Version 0.15.0",
-  "message": "0.15.0: Caves and Cliffs, Drachen *Juhu*"
+  "header": "Version 0.15.1",
+  "message": "0.15.1: Caves and Cliffs, Bug Fix"
 }

src/pages/Home.tsx

@@ -413,13 +413,27 @@ const Home: React.FC = () => {
             ))}
           </IonRow>
           <IonRow className="ion-justify-content-center">
-            {Array(state.biene.dragons)
+            {Array(
+              Math.min(
+                state.biene.dragons,
+                state.settingMaxNumberDisplayedDragons
+              )
+            )
               .fill(0)
               .map(() => (
                 <IonCol size="auto" onClick={() => setRunningConfetti(true)}>
                   <img src={dragon} width="54" alt="Drache" />
                 </IonCol>
               ))}
+            <IonCol
+              size="auto"
+              hidden={
+                state.biene.dragons <= state.settingMaxNumberDisplayedDragons
+              }>
+              <IonChip color="success">
+                + {state.biene.dragons - state.settingMaxNumberDisplayedDragons}
+              </IonChip>
+            </IonCol>
           </IonRow>
           <IonRow className="ion-justify-content-center">
             {/* This part shows the informations */}

src/pages/Settings.tsx

@@ -40,6 +40,7 @@ import { AppContext } from "../store/State";
 import {
   ActionSetState,
   ActionSettingSetMaxDisplayBiene,
+  ActionSettingSetMaxDisplayDragon,
   ActionSettingSetStoreConfettiDeactivated,
   ActionSettingsSetClickButtonForBee,
   ActionSettingsSetNewUI,
@@ -290,6 +291,27 @@ const PageSettings: React.FC = () => {
           </IonRange>
         </IonItem>
 
+        <IonItemDivider>Anzahl der maximal angezeigten Drachen</IonItemDivider>
+        <IonItem>
+          <IonRange
+            onIonChange={(e) => {
+              dispatch(
+                ActionSettingSetMaxDisplayDragon(
+                  parseInt(e.detail.value as any) ?? 10
+                )
+              );
+            }}
+            value={state.settingMaxNumberDisplayedDragons}
+            min={5}
+            snaps={true}
+            step={5}
+            pin={true}
+            max={100}>
+            <IonText slot="start">5</IonText>
+            <IonText slot="end">100</IonText>
+          </IonRange>
+        </IonItem>
+
         <IonItemDivider>Info</IonItemDivider>
         <IonItem>
           <IonLabel>Entwickler</IonLabel>

src/store/Actions.tsx

@@ -107,6 +107,13 @@ export const ActionSettingSetMaxDisplayBiene = (
   payload: newNumber,
 });
 
+export const ActionSettingSetMaxDisplayDragon = (
+  newNumber: number
+): actionType => ({
+  type: "settingSetMaxDisplayDragon",
+  payload: newNumber,
+});
+
 /**
  * Setzt die Einstellung für die Deaktivierung des Konfettis
  * @param newBool

src/store/State.tsx

@@ -26,6 +26,7 @@ const initialState: stateType = {
   },
   statisticsRotations: 0,
   settingMaxNumberDisplayedBees: 20,
+  settingMaxNumberDisplayedDragons: 10,
   userUUID: "",
   userName: "",
   userImage: "",
@@ -140,6 +141,13 @@ let reducer = (state: stateType, action: actionType): stateType => {
       };
     }
 
+    case "settingSetMaxDisplayDragon": {
+      return {
+        ...state,
+        settingMaxNumberDisplayedDragons: action.payload,
+      };
+    }
+
     case "setUserUUID": {
       return {
         ...state,

src/store/types.tsx

@@ -20,6 +20,7 @@ export interface stateType {
   };
   statisticsRotations: number;
   settingMaxNumberDisplayedBees: number;
+  settingMaxNumberDisplayedDragons: number;
   userUUID: string;
   userName: string;
   userImage: string;