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

some settings logic reworked

Browse Source
This commit is contained in:
gdlbo
2022-07-28 02:24:38 +03:00
parent c44aea13d6
commit 32b3a035a8
7 changed files with 51 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ru/vtosters/lite/music/Scrobbler.java
+1 -1
View File
@@ -28,7 +28,7 @@ public class Scrobbler{
private static final String keysecret = "d982180eed13275bb948e41cf225f88f";
private static final String url = "https://ws.audioscrobbler.com/2.0/";
private static final NetClient client = new NetClient.Builder().build();
private static ArrayList<String> scrobbled = new ArrayList<>();
private static final ArrayList<String> scrobbled = new ArrayList<>();
public static void scrobbleTrack(long duration, String artist, String title, String uid){
var string = getDefaultPrefs().getString("sessionKey", null);
app/src/main/java/ru/vtosters/lite/ui/fragments/ActivityFragment.java
+10
View File
@@ -1,9 +1,12 @@
package ru.vtosters.lite.ui.fragments;
import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
import static ru.vtosters.lite.utils.Preferences.offline;
import android.os.Bundle;
import androidx.preference.Preference;
import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
public class ActivityFragment extends MaterialPreferenceToolbarFragment {
@@ -11,5 +14,12 @@ public class ActivityFragment extends MaterialPreferenceToolbarFragment {
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
addPreferencesFromResource(getIdentifier("preferences_activity", "xml"));
findPreference("setoffline").setEnabled(offline());
}
@Override
public boolean onPreferenceTreeClick(Preference preference) {
findPreference("setoffline").setEnabled(offline());
return super.onPreferenceTreeClick(preference);
}
}
app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java
+24
View File
@@ -8,6 +8,7 @@ import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer;
import static ru.vtosters.lite.utils.Preferences.offline;
import static ru.vtosters.lite.utils.ThemesUtils.getAccentColor;
import static ru.vtosters.lite.utils.ThemesUtils.getAlertStyle;
import static ru.vtosters.lite.utils.ThemesUtils.getSTextAttr;
@@ -115,6 +116,15 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
Scrobbler.reset();
return true;
});
if (isLoggedIn()) {
findPreference("lastfm_auth").setSummary("Вы авторизованы как " + Scrobbler.getUserName());
findPreference("lastfm_auth").setEnabled(false);
} else {
findPreference("lastfm_reset").setEnabled(false);
findPreference("lastfm_enabled").setEnabled(false);
}
findPreference("select_photo_search_engine").setOnPreferenceClickListener(preference -> {
var items = Arrays.asList(
new ImagineArrayAdapter.ImagineArrayAdapterItem(getIdentifier("yandex", "drawable"), "Yandex"),
@@ -139,6 +149,20 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
});
}
@Override
public boolean onPreferenceTreeClick(Preference preference) {
if (isLoggedIn()) {
findPreference("lastfm_auth").setSummary("Вы авторизованы как " + Scrobbler.getUserName());
findPreference("lastfm_auth").setEnabled(false);
} else {
findPreference("lastfm_reset").setEnabled(false);
findPreference("lastfm_enabled").setEnabled(false);
}
return super.onPreferenceTreeClick(preference);
}
public class download implements Preference.OnPreferenceClickListener {
@Override // android.support.v7.preference.Preference.c
public boolean onPreferenceClick(Preference preference) {