Merge pull request #1152 from Iscle/master

Organize activities and receivers into folders, fix deprecations, optimize list views and more!
meefik · Jan 19, 2020 · 821cbeb · 821cbeb
2 parents d162ab9 + 159797a
commit 821cbeb
Show file tree

Hide file tree

Showing 104 changed files with 1,529 additions and 1,453 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,6 +10,7 @@ android {
         targetSdkVersion 29
         versionCode 257
         versionName "2.5.1"
+        vectorDrawables.useSupportLibrary true
     }
     buildTypes {
         release {
@@ -33,4 +34,6 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.browser:browser:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'com.squareup.okhttp3:okhttp:4.3.1'
+    implementation 'androidx.preference:preference:1.1.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -22,13 +22,13 @@
         android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning">
         <activity
-            android:name=".MainActivity"
+            android:name=".activity.MainActivity"
             android:label="@string/title_activity_main"
             android:launchMode="singleTop" />
 
         <activity-alias
             android:name=".Launcher"
-            android:targetActivity=".MainActivity">
+            android:targetActivity=".activity.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -37,56 +37,56 @@
         </activity-alias>
 
         <activity
-            android:name=".SettingsActivity"
+            android:name=".activity.SettingsActivity"
             android:label="@string/title_activity_settings"
-            android:parentActivityName=".MainActivity">
+            android:parentActivityName=".activity.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".MainActivity" />
+                android:value=".activity.MainActivity" />
         </activity>
         <activity
-            android:name=".PropertiesActivity"
+            android:name=".activity.PropertiesActivity"
             android:label="@string/title_activity_properties">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".MainActivity" />
+                android:value=".activity.MainActivity" />
         </activity>
         <activity
-            android:name=".AboutActivity"
+            android:name=".activity.AboutActivity"
             android:label="@string/title_activity_about"
-            android:parentActivityName=".MainActivity">
+            android:parentActivityName=".activity.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".MainActivity" />
+                android:value=".activity.MainActivity" />
         </activity>
         <activity
-            android:name=".ProfilesActivity"
+            android:name=".activity.ProfilesActivity"
             android:label="@string/title_activity_profiles"
-            android:parentActivityName=".MainActivity">
+            android:parentActivityName=".activity.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".MainActivity" />
+                android:value=".activity.MainActivity" />
         </activity>
         <activity
-            android:name=".MountsActivity"
+            android:name=".activity.MountsActivity"
             android:label="@string/title_activity_mounts"
-            android:parentActivityName=".PropertiesActivity">
+            android:parentActivityName=".activity.PropertiesActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".PropertiesActivity" />
+                android:value=".activity.PropertiesActivity" />
         </activity>
         <activity
-            android:name=".RepositoryActivity"
+            android:name=".activity.RepositoryActivity"
             android:label="@string/title_activity_repository"
-            android:parentActivityName=".MainActivity">
+            android:parentActivityName=".activity.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".MainActivity" />
+                android:value=".activity.MainActivity" />
         </activity>
-        <activity android:name=".FullscreenActivity" />
+        <activity android:name=".activity.FullscreenActivity" />
 
         <receiver
-            android:name=".BootReceiver"
+            android:name=".receiver.BootReceiver"
             android:enabled="false"
             android:exported="false">
             <intent-filter>
@@ -95,20 +95,20 @@
             </intent-filter>
         </receiver>
         <receiver
-            android:name=".ActionReceiver"
+            android:name=".receiver.ActionReceiver"
             android:enabled="true"
             android:exported="false">
             <intent-filter>
                 <action android:name="ru.meefik.linuxdeploy.BROADCAST_ACTION" />
             </intent-filter>
         </receiver>
         <receiver
-            android:name=".PowerReceiver"
+            android:name=".receiver.PowerReceiver"
             android:enabled="false"
             android:exported="false">
         </receiver>
         <receiver
-            android:name=".NetworkReceiver"
+            android:name=".receiver.NetworkReceiver"
             android:enabled="false"
             android:exported="false">
         </receiver>

diff --git a/app/src/main/java/ru/meefik/linuxdeploy/AppCompatPreferenceActivity.java b/app/src/main/java/ru/meefik/linuxdeploy/AppCompatPreferenceActivity.java