Bimba.git

commit 83bcaa9d97d8bc31b5162f68a9c2d004970759a5

Author: Adam <git@apiote.xyz>

android 12 features: monochrome launcher icon and predictive back

 app/build.gradle | 1 
 app/src/main/AndroidManifest.xml | 7 ++---
 app/src/main/res/drawable/ic_launcher_foreground_mono.xml | 10 +++++++++
 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 1 
 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml | 1 


diff --git a/app/build.gradle b/app/build.gradle
index b9de17b37f52e0d4b6c39c17b1f19a31b03728ba..6ed1422eee5732f94cf10786d5e87d43ca0fd765 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,6 +57,7 @@     implementation 'com.google.openlocationcode:openlocationcode:1.0.4'
     implementation 'org.osmdroid:osmdroid-android:6.1.14'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
     implementation 'org.yaml:snakeyaml:2.0'
+    implementation "androidx.activity:activity:1.7.1"
     implementation project(path: ':fruchtfleisch')
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'




diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ba54cbb104e4c1c2a15a22f4172846243d9d6206..55a2f5220bd858e19613245ad39b19cd4ed555ce 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,13 +11,14 @@ 	 		android:name="xyz.apiote.bimba.czwek.Bimba"
 		android:allowBackup="true"
 		android:dataExtractionRules="@xml/data_extraction_rules"
+		android:enableOnBackInvokedCallback="true"
 		android:fullBackupContent="@xml/backup_rules"
 		android:icon="@mipmap/ic_launcher"
 		android:label="@string/app_name"
 		android:roundIcon="@mipmap/ic_launcher_round"
 		android:supportsRtl="true"
 		android:theme="@style/Theme.Bimba.Style"
-		tool:targetApi="31">
+		tool:targetApi="33">
 		<activity
 			android:name="xyz.apiote.bimba.czwek.settings.ServerChooserActivity"
 			android:exported="false">
@@ -25,9 +26,7 @@ 			 				android:name="android.app.lib_name"
 				android:value="" />
 		</activity>
-		<activity
-			android:name="xyz.apiote.bimba.czwek.onboarding.OnboardingActivity">
-		</activity>
+		<activity android:name="xyz.apiote.bimba.czwek.onboarding.OnboardingActivity" />
 		<activity
 			android:name="xyz.apiote.bimba.czwek.settings.feeds.FeedChooserActivity"
 			android:exported="false" />




diff --git a/app/src/main/res/drawable/ic_launcher_foreground_mono.xml b/app/src/main/res/drawable/ic_launcher_foreground_mono.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2b71c168983b2e58670ab9aac6ece8be2c5dc10b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_foreground_mono.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="80dp"
+    android:height="80dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m 231.56,138.87028 c -1.68,0 -3.04,1.36 -3.04,3.04 0,1.68 1.36,3.04 3.04,3.04 h 16.49 c 0.0287,0.18603 0.0787,0.37668 0.15,0.56 l 6.18,17.2 h -15.7 c -33.12,0 -59.92,26.88 -59.92,59.92 v 86.4 c 0,10.56 8.55999,19.2 19.2,19.2 h 8.09 l -20.25,39.44 c -1.12,2.16 0.48,4.48 3.44,5.2 3.04,0.8 6.32,-0.32 7.36,-2.4 l 21.69,-42.24 h 75.26 l 21.69,42.24 c 1.04,2.08 4.4,3.2 7.36,2.4 2.96,-0.72 4.56,-3.04 3.44,-5.2 l -20.25,-39.44 h 8.09 c 10.64,0 19.28,-8.64 19.36,-19.2 v -86.4 c 0,-33.12 -26.88,-59.92 -59.92,-59.92 h -12.43 l -6.38,-17.76 h 25.85 c 1.68,0 3.04,-1.36 3.04,-3.04 0,-1.68 -1.36,-3.04 -3.04,-3.04 z m 12.24,35.28 h 24.24 c 2.56,0 4.56,2.08 4.56,4.56 0,2.48 -2.08,4.56 -4.56,4.56 H 243.8 c -2.56,0 -4.56,-2.08 -4.56,-4.56 0,-2.56 2.08,-4.56 4.56,-4.56 z m -24.56,21.12 h 73.36 c 13.52,0 24.48,10.96 24.48,24.48 v 27.92 c -0.08,4.56 -3.68,8.16 -8.16,8.16 h -106 c -4.48,0 -8.16,-3.6 -8.16,-8.16 v -27.92 c 0,-13.52 10.96,-24.48 24.48,-24.48 z m 84.16,85.28 a 11.84,11.84 0 0 1 11.84,11.84 11.84,11.84 0 0 1 -23.68,0 11.84,11.84 0 0 1 11.84,-11.84 z m -93.51,0.08 a 11.84,11.84 0 0 1 10.47,11.76 11.84,11.84 0 0 1 -23.68,0 11.84,11.84 0 0 1 9.78,-11.66 11.84,11.84 0 0 1 3.43,-0.1 z"
+      android:strokeWidth="1"/>
+</vector>




diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 7353dbd1fd82487df2d06121f85f7994728f1070..b3d0bc57c5d13dc7dd966884fb4ef9a513ee35f8 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,4 +2,5 @@ 
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground_mono"/>
 </adaptive-icon>
\ No newline at end of file




diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 7353dbd1fd82487df2d06121f85f7994728f1070..b3d0bc57c5d13dc7dd966884fb4ef9a513ee35f8 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -2,4 +2,5 @@ 
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground_mono"/>
 </adaptive-icon>
\ No newline at end of file