moved metadataSeparator to MusicFragment
This commit is contained in:
gdlbo
@@ -4,11 +4,8 @@ import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.view.Gravity;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.EditText;
|
||||
import android.widget.FrameLayout;
|
||||
import android.widget.LinearLayout;
|
||||
|
||||
import androidx.preference.Preference;
|
||||
import com.vk.core.dialogs.alert.VkAlertDialog;
|
||||
import com.vk.core.network.Network;
|
||||
@@ -94,41 +91,6 @@ public class MediaFragment extends TrackedMaterialPreferenceToolbarFragment {
|
||||
});
|
||||
|
||||
findPreference("maxquality").setEnabled(Preferences.isEnableExternalOpening());
|
||||
|
||||
findPreference("metadataSeparator").setOnPreferenceClickListener(preference -> {
|
||||
LinearLayout linearLayout = new LinearLayout(requireContext());
|
||||
linearLayout.setOrientation(LinearLayout.VERTICAL);
|
||||
|
||||
|
||||
EditText separator = new EditText(requireContext());
|
||||
separator.setHint("По-умолчанию: ; с пробелом");
|
||||
separator.setTextColor(ThemesUtils.getTextAttr());
|
||||
separator.setHintTextColor(ThemesUtils.getSTextAttr());
|
||||
separator.setBackgroundTintList(ThemesUtils.getAccenedColorStateList());
|
||||
separator.setText(Preferences.metadataSeparator());
|
||||
linearLayout.addView(separator);
|
||||
separator.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
|
||||
ViewGroup.MarginLayoutParams margin = ((ViewGroup.MarginLayoutParams) separator.getLayoutParams());
|
||||
margin.setMargins(AndroidUtils.dp2px(20f), 0, AndroidUtils.dp2px(20f), 0);
|
||||
separator.setLayoutParams(margin);
|
||||
|
||||
|
||||
var t = new VkAlertDialog.Builder(requireContext())
|
||||
.setTitle("Разделитель")
|
||||
.setView(linearLayout)
|
||||
.setPositiveButton("Сохранить", (dialog, which) -> {
|
||||
if (separator.getText().toString().isEmpty()) {
|
||||
AndroidUtils.sendToast("Разделитель не может быть пустым");
|
||||
return;
|
||||
}
|
||||
Preferences.setMetadataSeparator(separator.getText().toString());
|
||||
})
|
||||
.setNegativeButton("Отмена", (dialog, which) -> dialog.cancel())
|
||||
.show();
|
||||
|
||||
|
||||
return true;
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -103,6 +103,57 @@ public class MusicFragment extends TrackedMaterialPreferenceToolbarFragment {
|
||||
}
|
||||
);
|
||||
|
||||
PreferenceFragmentUtils.addMaterialSwitchPreference(
|
||||
getPreferenceScreen(),
|
||||
"setMetaData",
|
||||
"Сохранять метадату песен",
|
||||
"Сохранять id3v2 теги для песен для MP3",
|
||||
null,
|
||||
true,
|
||||
(preference, o) -> {
|
||||
Preferences.getPreferences().edit().putBoolean("setMetaData", (boolean) o).apply();
|
||||
return true;
|
||||
}
|
||||
);
|
||||
|
||||
PreferenceFragmentUtils.addPreference(
|
||||
getPreferenceScreen(),
|
||||
"metadataSeparator",
|
||||
"Разделитель для id3v2 тегов",
|
||||
null,
|
||||
null,
|
||||
preference -> {
|
||||
LinearLayout linearLayout = new LinearLayout(requireContext());
|
||||
linearLayout.setOrientation(LinearLayout.VERTICAL);
|
||||
|
||||
EditText separator = new EditText(requireContext());
|
||||
separator.setHint("По-умолчанию: ; с пробелом");
|
||||
separator.setTextColor(ThemesUtils.getTextAttr());
|
||||
separator.setHintTextColor(ThemesUtils.getSTextAttr());
|
||||
separator.setBackgroundTintList(ThemesUtils.getAccenedColorStateList());
|
||||
separator.setText(Preferences.metadataSeparator());
|
||||
linearLayout.addView(separator);
|
||||
separator.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
|
||||
ViewGroup.MarginLayoutParams margin = ((ViewGroup.MarginLayoutParams) separator.getLayoutParams());
|
||||
margin.setMargins(AndroidUtils.dp2px(20f), 0, AndroidUtils.dp2px(20f), 0);
|
||||
separator.setLayoutParams(margin);
|
||||
|
||||
new VkAlertDialog.Builder(requireContext())
|
||||
.setTitle("Разделитель")
|
||||
.setView(linearLayout)
|
||||
.setPositiveButton("Сохранить", (dialog, which) -> {
|
||||
if (separator.getText().toString().isEmpty()) {
|
||||
AndroidUtils.sendToast("Разделитель не может быть пустым");
|
||||
return;
|
||||
}
|
||||
Preferences.setMetadataSeparator(separator.getText().toString());
|
||||
})
|
||||
.setNegativeButton("Отмена", (dialog, which) -> dialog.cancel())
|
||||
.show();
|
||||
|
||||
return true;
|
||||
}
|
||||
);
|
||||
|
||||
if (!Preferences.serverFeaturesDisable()) {
|
||||
PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), "Интеграция Genius");
|
||||
|
||||
@@ -11,72 +11,6 @@
|
||||
android:key="compressVideos"
|
||||
android:summary="@string/sett_compress_video_summ"
|
||||
android:title="@string/sett_compress_videos"/>
|
||||
<com.vtosters.lite.ui.SummaryListPreference
|
||||
android:defaultValue="jpeg"
|
||||
android:dialogTitle="@string/compression_types_selection"
|
||||
android:entries="@array/compression_value"
|
||||
android:entryValues="@array/compression"
|
||||
android:key="compression"
|
||||
android:title="@string/compression_types"/>
|
||||
</PreferenceCategory>
|
||||
<PreferenceCategory android:title="@string/vtl_music_settings">
|
||||
<Preference
|
||||
android:key="cached_tracks"
|
||||
android:title="@string/cached_tracks_title"/>
|
||||
<com.vtosters.lite.ui.MaterialSwitchPreference
|
||||
android:defaultValue="false"
|
||||
android:key="invertCachedTracks"
|
||||
android:summary="@string/invertcached_summ"
|
||||
android:title="@string/invertcached_title"/>
|
||||
<com.vtosters.lite.ui.MaterialSwitchPreference
|
||||
android:defaultValue="false"
|
||||
android:key="autocache"
|
||||
android:summary="@string/autocache_summ"
|
||||
android:title="@string/autocache_title"/>
|
||||
<com.vtosters.lite.ui.MaterialSwitchPreference
|
||||
android:defaultValue="false"
|
||||
android:key="dldir"
|
||||
android:summary="Использовать папку Downloads вместо Music для скачивания музыки в MP3"
|
||||
android:title="Альтернативная папка для скачивания"/>
|
||||
<com.vtosters.lite.ui.MaterialSwitchPreference
|
||||
android:defaultValue="false"
|
||||
android:key="useGenius"
|
||||
android:summary="@string/useGenius_summ"
|
||||
android:title="@string/useGenius_title"/>
|
||||
<com.vtosters.lite.ui.MaterialSwitchPreference
|
||||
android:defaultValue="false"
|
||||
android:key="useOldAppVer"
|
||||
android:summary="@string/useOldAppVer_summ"
|
||||
android:title="@string/useOldAppVer_title"/>
|
||||
<com.vtosters.lite.ui.SummaryListPreference
|
||||
android:defaultValue="default"
|
||||
android:dialogTitle="@string/musicdefcatalog_dialogTitle"
|
||||
android:entries="@array/musicdefcatalog_value"
|
||||
android:entryValues="@array/musicdefcatalog"
|
||||
android:key="musicdefcatalog"
|
||||
android:title="@string/musicdefcatalog_title"/>
|
||||
<com.vtosters.lite.ui.MaterialSwitchPreference
|
||||
android:defaultValue="true"
|
||||
android:key="setMetaData"
|
||||
android:summary="Сохранять id3v2 теги для песен для MP3"
|
||||
android:title="Сохранять метадату песен"/>
|
||||
<Preference
|
||||
android:key="metadataSeparator"
|
||||
android:title="Разделитель для id3v2 тегов"/>
|
||||
<Preference
|
||||
android:key="audio_download"
|
||||
android:title="@string/audio_download_title"/>
|
||||
</PreferenceCategory>
|
||||
<PreferenceCategory android:title="Last.fm" android:key="lastfm">
|
||||
<Preference
|
||||
android:key="lastfm_auth"
|
||||
android:summary="@string/lastfm_auth_summ"
|
||||
android:title="@string/lastfm_auth_title"/>
|
||||
<com.vtosters.lite.ui.MaterialSwitchPreference
|
||||
android:defaultValue="false"
|
||||
android:key="lastfm_enabled"
|
||||
android:summary="@string/lastfm_enabled_summ"
|
||||
android:title="@string/lastfm_enabled_title"/>
|
||||
</PreferenceCategory>
|
||||
<PreferenceCategory android:title="@string/vtl_video_settings">
|
||||
<Preference
|
||||
|
||||
Reference in New Issue
Block a user