y0zhyck/vtosters
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/vtl-remaster' into vtl-remaster

Browse Source
This commit is contained in:
gdlbo
2022-06-19 02:06:52 +03:00
parent c651074d91 d33e382b49
commit a186fd35be
11 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ru/vtosters/lite/ui/fragments/ActivityFragment.java
+3 -3
View File
@@ -8,8 +8,8 @@ import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
public class ActivityFragment extends MaterialPreferenceToolbarFragment {
@Override
public void b(Bundle bundle) {
super.b(bundle);
a(R.xml.preferences_activity);
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
addPreferencesFromResource(R.xml.preferences_activity);
}
}
app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java
+3 -3
View File
@@ -12,9 +12,9 @@ import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
public class FeedFragment extends MaterialPreferenceToolbarFragment {
@Override
public void b(Bundle bundle) {
super.b(bundle);
a(R.xml.preferences_feed);
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
addPreferencesFromResource(R.xml.preferences_feed);
prefs();
}
app/src/main/java/ru/vtosters/lite/ui/fragments/InstallGMSFragment.java
+3 -3
View File
@@ -8,8 +8,8 @@ import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
public class InstallGMSFragment extends MaterialPreferenceToolbarFragment {
@Override
public void b(Bundle bundle) {
super.b(bundle);
a(R.xml.preferences_gms);
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
addPreferencesFromResource(R.xml.preferences_gms);
}
}
app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java
+3 -3
View File
@@ -10,9 +10,9 @@ import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
@Override
public void b(Bundle bundle) {
super.b(bundle);
a(R.xml.preferences_interface);
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
addPreferencesFromResource(R.xml.preferences_interface);
prefs();
}
app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java
+3 -3
View File
@@ -14,9 +14,9 @@ import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
public class MessagesFragment extends MaterialPreferenceToolbarFragment {
@Override
public void b(Bundle bundle) {
super.b(bundle);
a(R.xml.preferences_messages);
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
addPreferencesFromResource(R.xml.preferences_messages);
prefs();
}
app/src/main/java/ru/vtosters/lite/ui/fragments/MusicFragment.java
+3 -3
View File
@@ -7,8 +7,8 @@ import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
public class MusicFragment extends MaterialPreferenceToolbarFragment {
@Override
public void b(Bundle bundle) {
super.b(bundle);
a(R.xml.preferences_music);
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
addPreferencesFromResource(R.xml.preferences_music);
}
}
app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java
+3 -3
View File
@@ -33,9 +33,9 @@ import ru.vtosters.lite.ui.fragments.OtherFragment.a;
public class OtherFragment extends MaterialPreferenceToolbarFragment {
@Override
public void b(Bundle bundle) {
super.b(bundle);
a(R.xml.preferences_other);
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
addPreferencesFromResource(R.xml.preferences_other);
prefs();
}
app/src/main/java/ru/vtosters/lite/ui/fragments/ProxySettingsFragment.java
+3 -3
View File
@@ -7,8 +7,8 @@ import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
public class ProxySettingsFragment extends MaterialPreferenceToolbarFragment {
@Override
public void b(Bundle bundle) {
super.b(bundle);
a(R.xml.preferences_proxy);
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
addPreferencesFromResource(R.xml.preferences_proxy);
}
}
app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java
+3 -3
View File
@@ -14,9 +14,9 @@ import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
public class ThemesFragment extends MaterialPreferenceToolbarFragment {
@Override
public void b(Bundle bundle) {
super.b(bundle);
a(R.xml.preferences_themes);
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
addPreferencesFromResource(R.xml.preferences_themes);
prefs();
}
app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java
+3 -3
View File
@@ -63,8 +63,8 @@ import ru.vtosters.lite.utils.SSFS;
public class VTSettings extends MaterialPreferenceToolbarFragment {
@Override
public void b(Bundle bundle) {
super.b(bundle);
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
String keyVKAccount = getCurrentAccount().getString("key_vk_account", "");
String avatarUrl = withRegex(keyVKAccount, ".*\"photo\":\\{.*?:\"(.*?)\"\\}.*", "https://vk.com/images/camera_200.png").replace("\\/", "/");
@@ -86,7 +86,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
String about = "Commit: " + getBuildNumber();
int vtosterXml = getIdentifier("empty", "xml");
this.a(vtosterXml);
this.addPreferencesFromResource(vtosterXml);
if (vkme()) {
PreferencesUtil.addPreferenceDrawable(this, "", name, id, drawableFromUrl(avatarUrl), preference -> {
app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersPreferencesFragment.java
+2 -2
View File
@@ -15,8 +15,8 @@ import ru.vtosters.lite.ui.PreferencesUtil;
public class StickersPreferencesFragment extends MaterialPreferenceToolbarFragment {
@Override
public void b(Bundle bundle) {
super.b(bundle);
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
int vtosterXml = getIdentifier("empty", "xml");
this.a(vtosterXml);