Upgrade to newest Android with some adjustments

TobiasBielefeld · Jun 9, 2024 · b4c6917 · b4c6917
1 parent a83e83c
commit b4c6917
Show file tree

Hide file tree

Showing 98 changed files with 2,393 additions and 1,371 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,36 +1,63 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.3"
+    compileSdk 34
+
     defaultConfig {
-        buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L"
+        multiDexEnabled true
         applicationId "de.tobiasbielefeld.searchbar"
-        minSdkVersion 14
-        targetSdkVersion 26
-        versionCode 10
-        versionName "1.2"
+        minSdkVersion 21
+        targetSdkVersion 34
+        versionCode 11
+        versionName "2.0"
+
         vectorDrawables.useSupportLibrary = true
+        buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L"
+    }
+
+    androidResources {
+        generateLocaleConfig true
     }
+
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-
-            lintOptions {
-                disable 'MissingTranslation'
-            }
         }
+    }
 
 
+    compileOptions {
+        encoding = 'UTF-8'
+        sourceCompatibility "17"
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    namespace 'de.tobiasbielefeld.searchbar'
+    lint {
+        abortOnError false
+        disable 'MissingTranslation'
+    }
+    buildFeatures {
+        buildConfig true
+        viewBinding true
     }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:26.1.0'
-    compile 'com.android.support:support-v4:26.1.0'
-    compile 'com.android.support:cardview-v7:26.1.0'
-    compile 'com.astuetz:pagerslidingtabstrip:1.0.1'
-    compile 'com.android.support:support-vector-drawable:26.1.0'
+    api 'com.google.android.material:material:1.12.0'
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'androidx.preference:preference:1.2.1'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'com.android.support:multidex:1.0.3'
+    implementation 'com.github.yukuku:ambilwarna:2.0.1'
+    implementation 'androidx.core:core:1.13.1'
+    implementation 'androidx.gridlayout:gridlayout:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.navigation:navigation-fragment:2.7.7'
+    implementation 'androidx.navigation:navigation-ui:2.7.7'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.7.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
-# in /home/tobias/.Programme/AndroidSDK/tools/proguard/proguard-android.txt
+# in C:/Users/$USER/AppData/Local/Android/Sdk/tools/proguard/proguard-android.txt
 # You can edit the include path and order by changing the proguardFiles
 # directive in build.gradle.
 #
@@ -16,10 +16,5 @@
 #   public *;
 #}
 
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
+-keep public class * extends androidx.preference.Preference
+-keep public class * extends androidx.preference.PreferenceFragmentCompat
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -7,16 +7,16 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:name="de.tobiasbielefeld.searchbar.MainApplication"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppThemeNoActionBarNoDrawer">
 
         <activity
             android:name=".ui.MainActivity"
             android:launchMode="singleTask"
-            android:windowSoftInputMode="stateVisible">
+            android:windowSoftInputMode="stateVisible"
+            android:screenOrientation="behind"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
@@ -30,27 +30,20 @@
                 android:resource="@mipmap/ic_launcher" />
         </activity>
 
-        <!--<activity-alias-->
-                 <!--android:name=".ui.MainActivityAlias"-->
-                 <!--android:enabled="true"-->
-                 <!--android:targetActivity=".ui.MainActivity" >-->
-                 <!--<intent-filter>-->
-                     <!--<action android:name="android.intent.action.MAIN" />-->
-
-                     <!--<category android:name="android.intent.category.LAUNCHER" />-->
-                 <!--</intent-filter>-->
-         <!--</activity-alias>-->
-
         <activity
+            android:screenOrientation="behind"
+            android:theme="@style/AppThemeNoActionBarNoDrawer"
             android:name=".ui.about.AboutActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/activity_about" />
 
         <activity
+            android:screenOrientation="behind"
+            android:theme="@style/AppThemeNoActionBarNoDrawer"
             android:name=".ui.settings.Settings"
             android:label="@string/activity_settings" />
 
-        <receiver android:name=".classes.CustomWidgetProvider">
+        <receiver android:name=".classes.CustomWidgetProvider"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -60,7 +53,8 @@
                 android:resource="@xml/widget_infos" />
         </receiver>
 
-        <receiver android:name=".classes.CustomWidgetProvider2">
+        <receiver android:name=".classes.CustomWidgetProvider2"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -70,7 +64,8 @@
                 android:resource="@xml/widget_infos2" />
         </receiver>
 
-        <receiver android:name=".classes.CustomWidgetProvider3">
+        <receiver android:name=".classes.CustomWidgetProvider3"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -79,6 +74,15 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/widget_infos3" />
         </receiver>
+
+        <service
+            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
+            android:enabled="false"
+            android:exported="false">
+            <meta-data
+                android:name="autoStoreLocales"
+                android:value="true" />
+        </service>
     </application>
 
 </manifest>
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
diff --git a/app/src/main/java/de/tobiasbielefeld/searchbar/MainApplication.java b/app/src/main/java/de/tobiasbielefeld/searchbar/MainApplication.java