Merge pull request #50 from HarryDeKat/master

Multiuser + andere oplossingen
netlob · Jan 6, 2023 · 885fcc7 · 885fcc7
2 parents 4a02127 + c69da02
commit 885fcc7
Show file tree

Hide file tree

Showing 1,052 changed files with 70,908 additions and 56,053 deletions.
diff --git a/app/Magiscore/GoogleService-Info.plist b/app/Magiscore/GoogleService-Info.plist
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CLIENT_ID</key>
+	<string>216773507184-9lcppl3hbmgua65vvppuigp8n3kc4sp2.apps.googleusercontent.com</string>
+	<key>REVERSED_CLIENT_ID</key>
+	<string>com.googleusercontent.apps.216773507184-9lcppl3hbmgua65vvppuigp8n3kc4sp2</string>
+	<key>API_KEY</key>
+	<string>AIzaSyA7eoxFBUJj0NpXzBVOb6RjqcMfBWcfhMQ</string>
+	<key>GCM_SENDER_ID</key>
+	<string>216773507184</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>dev.netlob.magiscore</string>
+	<key>PROJECT_ID</key>
+	<string>magiscore-android</string>
+	<key>STORAGE_BUCKET</key>
+	<string>magiscore-android.appspot.com</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:216773507184:ios:70b2b4a826830cdf515cb5</string>
+	<key>DATABASE_URL</key>
+	<string>https://magiscore-android.firebaseio.com</string>
+</dict>
+</plist>
diff --git a/app/Magiscore/build.json b/app/Magiscore/build.json
@@ -1,7 +1,7 @@
 {
     "android": {
         "release": {
-            "keystore": "./platforms/android/app/build/outputs/apk/magiscore.keystore",
+            "keystore": "/Users/sjoerdbolten/Documents/Projects/magbot-stat/app/Magiscore/magiscore.keystore",
             "storePassword": "MagBot123",
             "alias": "magiscore",
             "password": "MagBot123",

diff --git a/app/Magiscore/config.xml b/app/Magiscore/config.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="app.netlob.magiscore" version="1.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="app.netlob.magiscore" version="1.7.5" xmlns="http://www.w3.org/ns/widgets"
+    xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name short="Gemairo">Gemairo - Stats voor Magister</name>
     <description>
         Shi daggoetje geswiped
@@ -18,18 +19,31 @@
     <allow-intent href="http://*/*" />
     <allow-intent href="https://*/*" />
     <allow-intent href="mailto:*" />
-    <preference name="android-targetSdkVersion" value="30" />
+    <preference name="android-targetSdkVersion" value="31" />
+    <preference name="AndroidPersistentFileLocation" value="Internal" />
+    <preference name="iosPersistentFileLocation" value="Library" />
     <platform name="android">
+        <preference name="AndroidXEnabled" value="true" />
         <allow-intent href="m6loapp://oauth2redirect/*" />
         <preference name="LoadingDialog" value="Oeps,Er ging iets fout..." />
         <preference name="Orientation" value="portrait" />
-        <preference name="android-targetSdkVersion" value="30" />
-        <icon src="res/new/res/icon/android/ldpi.png" density="ldpi" />
-        <icon src="res/new/res/icon/android/mdpi.png" density="mdpi" />
-        <icon src="res/new/res/icon/android/hdpi.png" density="hdpi" />
-        <icon src="res/new/res/icon/android/xhdpi.png" density="xhdpi" />
-        <icon src="res/new/res/icon/android/xxhdpi.png" density="xxhdpi" />
-        <icon src="res/new/res/icon/android/xxxhdpi.png" density="xxxhdpi" />
+        <preference name="android-targetSdkVersion" value="31" />
+        <icon background="res/new/res/icon/android/mdpi-back.png" density="mdpi"
+            foreground="res/new/res/icon/android/mdpi-front.png"
+            src="res/new/res/icon/android/mdpi.png" />
+        <icon background="res/new/res/icon/android/hdpi-back.png" density="hdpi"
+            foreground="res/new/res/icon/android/hdpi-front.png"
+            src="res/new/res/icon/android/hdpi.png" />
+        <icon background="res/new/res/icon/android/xhdpi-back.png" density="xhdpi"
+            foreground="res/new/res/icon/android/xhdpi-front.png"
+            src="res/new/res/icon/android/xhdpi.png" />
+        <icon background="res/new/res/icon/android/xxhdpi-back.png" density="xxhdpi"
+            foreground="res/new/res/icon/android/xxhdpi-front.png"
+            src="res/new/res/icon/android/xxhdpi.png" />
+        <icon background="res/new/res/icon/android/xxxhdpi-back.png" density="xxxhdpi"
+            foreground="res/new/res/icon/android/xxxhdpi-front.png"
+            src="res/new/res/icon/android/xxxhdpi.png" />
+        <icon density="ldpi" src="res/new/res/icon/android/ldpi.png" />
         <splash src="res/new/res/screen/android/splash-port-ldpi.png" density="port-ldpi" />
         <splash src="res/new/res/screen/android/splash-port-mdpi.png" density="port-mdpi" />
         <splash src="res/new/res/screen/android/splash-port-hdpi.png" density="port-hdpi" />
@@ -38,12 +52,15 @@
         <splash src="res/new/res/screen/android/splash-port-xxxhdpi.png" density="port-xxxhdpi" />
     </platform>
     <platform name="ios">
-        <preference name="UseSwiftLanguageVersion" value="4.2" />
+        <resource-file src="GoogleService-Info.plist" />
+        <preference name="deployment-target" value="12.0" />
+        <preference name="SwiftVersion" value="5.3" />
         <preference name="Orientation" value="portrait" />
         <preference name="DisallowOverscroll" value="true" />
         <allow-intent href="m6loapp://oauth2redirect/*" />
         <!-- <icon src="res/ios/[email protected]" width="180" height="180" />
-        <splash src="res/ios/Default-736h.png" width="1242" height="2208" /> -->
+        <splash
+        src="res/ios/Default-736h.png" width="1242" height="2208" /> -->
         <edit-config file="*-Info.plist" mode="merge" target="UIUserInterfaceStyle">
             <string>Light</string>
         </edit-config>

diff --git a/app/Magiscore/google-services.json b/app/Magiscore/google-services.json
@@ -30,6 +30,51 @@
             {
               "client_id": "216773507184-o2v61pbcbs3qti3b7o4aak7qg7amd0b6.apps.googleusercontent.com",
               "client_type": 3
+            },
+            {
+              "client_id": "216773507184-9lcppl3hbmgua65vvppuigp8n3kc4sp2.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "dev.netlob.magiscore",
+                "app_store_id": "1529746917"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:216773507184:android:1407207794254a37515cb5",
+        "android_client_info": {
+          "package_name": "dev.netlob.magiscore"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "216773507184-o2v61pbcbs3qti3b7o4aak7qg7amd0b6.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDc__BBAwDvFAvfDr6WVV66qci1lzDU8tI"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "216773507184-o2v61pbcbs3qti3b7o4aak7qg7amd0b6.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "216773507184-9lcppl3hbmgua65vvppuigp8n3kc4sp2.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "dev.netlob.magiscore",
+                "app_store_id": "1529746917"
+              }
             }
           ]
         }