Skip to content

Commit 821cbeb

Browse files
authored
Merge pull request #1152 from Iscle/master
Organize activities and receivers into folders, fix deprecations, optimize list views and more!
2 parents d162ab9 + 159797a commit 821cbeb

File tree

104 files changed

+1529
-1453
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+1529
-1453
lines changed

app/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ android {
1010
targetSdkVersion 29
1111
versionCode 257
1212
versionName "2.5.1"
13+
vectorDrawables.useSupportLibrary true
1314
}
1415
buildTypes {
1516
release {
@@ -33,4 +34,6 @@ dependencies {
3334
implementation 'androidx.appcompat:appcompat:1.1.0'
3435
implementation 'androidx.browser:browser:1.2.0'
3536
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
37+
implementation 'com.squareup.okhttp3:okhttp:4.3.1'
38+
implementation 'androidx.preference:preference:1.1.0'
3639
}

app/src/main/AndroidManifest.xml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
android:usesCleartextTraffic="true"
2323
tools:ignore="GoogleAppIndexingWarning">
2424
<activity
25-
android:name=".MainActivity"
25+
android:name=".activity.MainActivity"
2626
android:label="@string/title_activity_main"
2727
android:launchMode="singleTop" />
2828

2929
<activity-alias
3030
android:name=".Launcher"
31-
android:targetActivity=".MainActivity">
31+
android:targetActivity=".activity.MainActivity">
3232
<intent-filter>
3333
<action android:name="android.intent.action.MAIN" />
3434

@@ -37,56 +37,56 @@
3737
</activity-alias>
3838

3939
<activity
40-
android:name=".SettingsActivity"
40+
android:name=".activity.SettingsActivity"
4141
android:label="@string/title_activity_settings"
42-
android:parentActivityName=".MainActivity">
42+
android:parentActivityName=".activity.MainActivity">
4343
<meta-data
4444
android:name="android.support.PARENT_ACTIVITY"
45-
android:value=".MainActivity" />
45+
android:value=".activity.MainActivity" />
4646
</activity>
4747
<activity
48-
android:name=".PropertiesActivity"
48+
android:name=".activity.PropertiesActivity"
4949
android:label="@string/title_activity_properties">
5050
<meta-data
5151
android:name="android.support.PARENT_ACTIVITY"
52-
android:value=".MainActivity" />
52+
android:value=".activity.MainActivity" />
5353
</activity>
5454
<activity
55-
android:name=".AboutActivity"
55+
android:name=".activity.AboutActivity"
5656
android:label="@string/title_activity_about"
57-
android:parentActivityName=".MainActivity">
57+
android:parentActivityName=".activity.MainActivity">
5858
<meta-data
5959
android:name="android.support.PARENT_ACTIVITY"
60-
android:value=".MainActivity" />
60+
android:value=".activity.MainActivity" />
6161
</activity>
6262
<activity
63-
android:name=".ProfilesActivity"
63+
android:name=".activity.ProfilesActivity"
6464
android:label="@string/title_activity_profiles"
65-
android:parentActivityName=".MainActivity">
65+
android:parentActivityName=".activity.MainActivity">
6666
<meta-data
6767
android:name="android.support.PARENT_ACTIVITY"
68-
android:value=".MainActivity" />
68+
android:value=".activity.MainActivity" />
6969
</activity>
7070
<activity
71-
android:name=".MountsActivity"
71+
android:name=".activity.MountsActivity"
7272
android:label="@string/title_activity_mounts"
73-
android:parentActivityName=".PropertiesActivity">
73+
android:parentActivityName=".activity.PropertiesActivity">
7474
<meta-data
7575
android:name="android.support.PARENT_ACTIVITY"
76-
android:value=".PropertiesActivity" />
76+
android:value=".activity.PropertiesActivity" />
7777
</activity>
7878
<activity
79-
android:name=".RepositoryActivity"
79+
android:name=".activity.RepositoryActivity"
8080
android:label="@string/title_activity_repository"
81-
android:parentActivityName=".MainActivity">
81+
android:parentActivityName=".activity.MainActivity">
8282
<meta-data
8383
android:name="android.support.PARENT_ACTIVITY"
84-
android:value=".MainActivity" />
84+
android:value=".activity.MainActivity" />
8585
</activity>
86-
<activity android:name=".FullscreenActivity" />
86+
<activity android:name=".activity.FullscreenActivity" />
8787

8888
<receiver
89-
android:name=".BootReceiver"
89+
android:name=".receiver.BootReceiver"
9090
android:enabled="false"
9191
android:exported="false">
9292
<intent-filter>
@@ -95,20 +95,20 @@
9595
</intent-filter>
9696
</receiver>
9797
<receiver
98-
android:name=".ActionReceiver"
98+
android:name=".receiver.ActionReceiver"
9999
android:enabled="true"
100100
android:exported="false">
101101
<intent-filter>
102102
<action android:name="ru.meefik.linuxdeploy.BROADCAST_ACTION" />
103103
</intent-filter>
104104
</receiver>
105105
<receiver
106-
android:name=".PowerReceiver"
106+
android:name=".receiver.PowerReceiver"
107107
android:enabled="false"
108108
android:exported="false">
109109
</receiver>
110110
<receiver
111-
android:name=".NetworkReceiver"
111+
android:name=".receiver.NetworkReceiver"
112112
android:enabled="false"
113113
android:exported="false">
114114
</receiver>

app/src/main/java/ru/meefik/linuxdeploy/AppCompatPreferenceActivity.java

Lines changed: 0 additions & 134 deletions
This file was deleted.

0 commit comments

Comments
 (0)