Merge pull request #22 from markxoe/development

0.13.5
markxoe · Jan 23, 2021 · d19080c · d19080c
2 parents 2d3a4c9 + db337f5
commit d19080c
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 12 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "org.toastbrot.ichbineinebienemobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 29
-        versionName "0.13.4"
+        versionCode 30
+        versionName "0.13.5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/ios/App/App.xcodeproj/project.pbxproj b/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 = 23;
+				CURRENT_PROJECT_VERSION = 24;
 				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.4;
+				MARKETING_VERSION = 0.13.5;
 				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 = 23;
+				CURRENT_PROJECT_VERSION = 24;
 				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.4;
+				MARKETING_VERSION = 0.13.5;
 				PRODUCT_BUNDLE_IDENTIFIER = org.toastbrot.ichbineinebienemobile;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = USE_PUSH;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ichbineinebiene-mobile",
-  "version": "0.13.4",
+  "version": "0.13.5",
   "private": true,
   "dependencies": {
     "@capacitor-community/firebase-analytics": "^0.2.0",

diff --git a/readme.md b/readme.md
@@ -31,6 +31,10 @@ Mark Oude Elberink
 
 ## Changelog
 
+### [0.13.5] More Infinity :recycle:
+
+- Profil Name / Bild Richtlinien
+
 ### [0.13.4] More Infinity :recycle:
 
 - Bug Fix, so groß wie eine Wespe

diff --git a/src/globals.tsx b/src/globals.tsx
@@ -1,6 +1,10 @@
 import { stateType } from "./store/types";
 import Axios from "axios";
+import packagejs from "../package.json"
 import calculateHeader from "./functions/calculateauthorization";
+import { getPlatforms } from "@ionic/react";
+
+
 
 export const rotateSpeedLevel = {
   max: 3,
@@ -182,6 +186,8 @@ export const uploadData = (state: stateType) => {
             process.env.react_app_usersapisecret ?? "verysecretalternative",
             data.additionalBeeLength
           ),
+          version: packagejs.version,
+          platforms: getPlatforms().join(" ")
         },
       }
     )

diff --git a/src/other/release-notes.json b/src/other/release-notes.json
@@ -1,4 +1,4 @@
 {
-  "header": "Version 0.13.4",
-  "message": "0.13.4 Fixing a Big Bug, so groß wie eine Wespe"
+  "header": "Version 0.13.5",
+  "message": "0.13.5 Neue Namens & Profil Richtlinien"
 }
diff --git a/src/pages/Profile.tsx b/src/pages/Profile.tsx
@@ -12,9 +12,14 @@ import {
   IonPage,
   IonTitle,
   IonToolbar,
+  IonCard,
+  IonCardHeader,
+  IonCardTitle,
+  IonCardSubtitle,
+  IonCardContent,
 } from "@ionic/react";
 import React, { useContext, useEffect } from "react";
-import { uploadData } from "../globals";
+import { uploadData, generateToast } from "../globals";
 import { AppContext } from "../store/State";
 import { CameraResultType, Plugins } from "@capacitor/core";
 import avatar from "../res/avatar.svg";
@@ -121,7 +126,44 @@ const PageProfile: React.FC = () => {
           </IonButton>
         </IonItem>
         <IonItemDivider>Erweitere Infos</IonItemDivider>
-        <IonItem>Deine ID: {state.userUUID}</IonItem>
+        <IonItem
+          onClick={() => {
+            Plugins.Clipboard.write({ string: state.userUUID });
+            generateToast("ID Kopiert", 1000, true);
+          }}>
+          Deine ID: {state.userUUID}
+        </IonItem>
+        <IonCard>
+          <IonCardHeader>
+            <IonCardTitle>Namensregeln</IonCardTitle>
+            <IonCardSubtitle>
+              Verstoß kann zu dauerhaftem Bann führen
+            </IonCardSubtitle>
+          </IonCardHeader>
+          <IonCardContent>
+            <ul>
+              <li>Keine Werbung für sich/andere</li>
+              <li>Kein Name der als unangemessen empfunden werden könnte</li>
+              <li>Nichts anstößiges</li>
+              <li>Nichts ultra langweiliges</li>
+            </ul>
+          </IonCardContent>
+        </IonCard>
+        <IonCard>
+          <IonCardHeader>
+            <IonCardTitle>Bildregeln</IonCardTitle>
+            <IonCardSubtitle>
+              Verstoß kann zu dauerhaftem Bann führen
+            </IonCardSubtitle>
+          </IonCardHeader>
+          <IonCardContent>
+            <ul>
+              <li>Keine Anstößigen Inhalte</li>
+              <li>Keine Bilder, die als unangemessen empfunden werden können</li>
+              <li>Der Rest erklärt sich von selber</li>
+            </ul>
+          </IonCardContent>
+        </IonCard>
       </IonContent>
     </IonPage>
   );