Merge pull request #98 from kolplattformen/fix/android-1.1.1

Fix/android 1.1.1
kolplattformen · Feb 14, 2021 · dd5dc03 · dd5dc03 · vercel · Feb 14, 2021
2 parents ec49130 + a0e7dae
commit dd5dc03
Show file tree

Hide file tree

Showing 21 changed files with 14 additions and 4 deletions.
diff --git a/packages/app/android/app/build.gradle b/packages/app/android/app/build.gradle
@@ -132,8 +132,8 @@ android {
         applicationId "org.skolplattformen.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 100
-        versionName "1.0.0"
+        versionCode 111
+        versionName "1.1.1"
     }
     splits {
         abi {
@@ -160,6 +160,7 @@ android {
     buildTypes {
         debug {
             signingConfig signingConfigs.debug
+            applicationIdSuffix ".debug"
         }
         release {
             // Caution! In production, you need to generate your own keystore file.

diff --git a/packages/app/android/app/src/main/AndroidManifest.xml b/packages/app/android/app/src/main/AndroidManifest.xml
@@ -7,7 +7,6 @@
       android:name=".MainApplication"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
-      android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
       android:theme="@style/AppTheme">
       <activity
@@ -19,6 +18,7 @@
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />
+            <category android:name="android.intent.category.DEFAULT" />
         </intent-filter>
       </activity>
       <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />

diff --git a/packages/app/android/app/src/main/ic_launcher-playstore.png b/packages/app/android/app/src/main/ic_launcher-playstore.png
diff --git a/packages/app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/packages/app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
diff --git a/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/packages/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/packages/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/packages/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/packages/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/packages/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/packages/app/android/app/src/main/res/values/ic_launcher_background.xml b/packages/app/android/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
diff --git a/packages/app/android/app/src/main/res/values/strings.xml b/packages/app/android/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">app</string>
+    <string name="app_name">Öppna Skolplattformen</string>
 </resources>