summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xorg.fox.ttrss/build.gradle1
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java2
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java2
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/NetworkPreferencesFragment.java13
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java3
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesFragment.java26
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java4
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/util/FontSizeDialogPreference.java224
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/util/LessBrokenSwitchPreference.java77
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/util/LessBrokenWebView.java37
-rwxr-xr-xorg.fox.ttrss/src/main/res/xml/preferences.xml73
11 files changed, 65 insertions, 397 deletions
diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle
index 39fdb5ae..87483406 100755
--- a/org.fox.ttrss/build.gradle
+++ b/org.fox.ttrss/build.gradle
@@ -124,6 +124,7 @@ dependencies {
implementation 'com.nineoldandroids:library:2.4.0'
implementation 'com.github.amulyakhare:TextDrawable:558677ea31'
implementation 'com.telefonica:nestedscrollwebview:0.1.6'
+ implementation 'androidx.preference:preference:1.2.1'
}
java {
toolchain {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
index ac162a3e..f2fbce2c 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
@@ -192,7 +192,7 @@ public class ArticleFragment extends androidx.fragment.app.Fragment {
return view;
} */
- m_articleFontSize = Integer.parseInt(m_prefs.getString("article_font_size_sp", "16"));
+ m_articleFontSize = m_prefs.getInt("article_font_size_sp_int", 16);
m_articleSmallFontSize = Math.max(10, Math.min(18, m_articleFontSize - 2));
TextView title = view.findViewById(R.id.title);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
index 723b0069..b6953bc6 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
@@ -931,7 +931,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
public void onBindViewHolder(final ArticleViewHolder holder, int position) {
holder.article = items.get(position);
- int headlineFontSize = Integer.parseInt(m_prefs.getString("headlines_font_size_sp", "13"));
+ int headlineFontSize = m_prefs.getInt("headlines_font_size_sp_int", 13);
int headlineSmallFontSize = Math.max(10, Math.min(18, headlineFontSize - 2));
final Article article = holder.article;
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/NetworkPreferencesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/NetworkPreferencesFragment.java
index 8e0e6519..b279f307 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/NetworkPreferencesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/NetworkPreferencesFragment.java
@@ -1,15 +1,14 @@
package org.fox.ttrss;
import android.os.Bundle;
-import android.preference.PreferenceFragment;
-public class NetworkPreferencesFragment extends PreferenceFragment {
+import androidx.annotation.Nullable;
+import androidx.preference.PreferenceFragmentCompat;
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
+public class NetworkPreferencesFragment extends PreferenceFragmentCompat {
- // Load the preferences from an XML resource
- addPreferencesFromResource(R.xml.preferences_network);
+ @Override
+ public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
+ setPreferencesFromResource(R.xml.preferences_network, rootKey);
}
} \ No newline at end of file
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java
index 7c0c7e3e..9ac9f56c 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java
@@ -5,6 +5,7 @@ import android.preference.PreferenceManager;
import android.view.MenuItem;
import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.FragmentTransaction;
public class PreferencesActivity extends CommonActivity {
@Override
@@ -26,7 +27,7 @@ public class PreferencesActivity extends CommonActivity {
getSupportActionBar().setHomeButtonEnabled(true);
if (savedInstanceState == null) {
- android.app.FragmentTransaction ft = getFragmentManager().beginTransaction();
+ FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
ft.replace(R.id.preferences_container, new PreferencesFragment());
ft.commit();
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesFragment.java
index 14639abb..af4c6b44 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesFragment.java
@@ -5,30 +5,31 @@ import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
+
+import androidx.activity.EdgeToEdge;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceManager;
import java.text.SimpleDateFormat;
import java.util.Date;
-public class PreferencesFragment extends PreferenceFragment {
+public class PreferencesFragment extends PreferenceFragmentCompat {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- // Load the preferences from an XML resource
- addPreferencesFromResource(R.xml.preferences);
-
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext());
findPreference("ttrss_url").setSummary(prefs.getString("ttrss_url", getString(R.string.ttrss_url_summary)));
findPreference("login").setSummary(prefs.getString("login", getString(R.string.login_summary)));
- findPreference("show_logcat").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+ findPreference("show_logcat").setOnPreferenceClickListener(new androidx.preference.Preference.OnPreferenceClickListener() {
@Override
- public boolean onPreferenceClick(Preference preference) {
+ public boolean onPreferenceClick(@NonNull androidx.preference.Preference preference) {
Intent intent = new Intent(getActivity(), LogcatActivity.class);
startActivity(intent);
return false;
@@ -38,7 +39,7 @@ public class PreferencesFragment extends PreferenceFragment {
findPreference("network_settings").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
- getFragmentManager()
+ getActivity().getSupportFragmentManager()
.beginTransaction()
.replace(R.id.preferences_container, new NetworkPreferencesFragment() )
.addToBackStack( NetworkPreferencesFragment.class.getSimpleName() )
@@ -74,4 +75,9 @@ public class PreferencesFragment extends PreferenceFragment {
}
}
+
+ @Override
+ public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
+ setPreferencesFromResource(R.xml.preferences,rootKey);
+ }
} \ No newline at end of file
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index 853f960e..7994b576 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -662,8 +662,8 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
final ArticleViewHolder holder;
final int articleId = article.getInt(0);
-
- int headlineFontSize = Integer.parseInt(m_prefs.getString("headlines_font_size_sp", "13"));
+
+ int headlineFontSize = m_prefs.getInt("headlines_font_size_sp_int", 13);
int headlineSmallFontSize = Math.max(10, Math.min(18, headlineFontSize - 2));
if (v == null) {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/FontSizeDialogPreference.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/FontSizeDialogPreference.java
deleted file mode 100644
index 3f3d1a53..00000000
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/FontSizeDialogPreference.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package org.fox.ttrss.util;
-
-// http://www.lukehorvat.com/blog/android-seekbardialogpreference/
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.preference.DialogPreference;
-import android.util.AttributeSet;
-import android.util.TypedValue;
-import android.view.View;
-import android.widget.SeekBar;
-import android.widget.SeekBar.OnSeekBarChangeListener;
-import android.widget.TextView;
-
-import org.fox.ttrss.R;
-
-/**
- * A {@link DialogPreference} that provides a user with the means to select an
- * integer from a {@link SeekBar}, and persist it.
- *
- * @author lukehorvat
- *
- */
-public class FontSizeDialogPreference extends DialogPreference {
- private static final int DEFAULT_MIN_PROGRESS = 9;
- private static final int DEFAULT_MAX_PROGRESS = 24;
- private static final String DEFAULT_PROGRESS = "0";
-
- private int mMinProgress = DEFAULT_MIN_PROGRESS;
- private int mMaxProgress = DEFAULT_MAX_PROGRESS;
- private int mProgress;
- private CharSequence mProgressTextSuffix;
- private TextView mProgressText;
- private SeekBar mSeekBar;
-
- public FontSizeDialogPreference(Context context) {
- this(context, null);
- }
-
- public FontSizeDialogPreference(Context context, AttributeSet attrs) {
- super(context, attrs);
-
- setProgressTextSuffix(" " + context.getString(R.string.font_size_dialog_suffix));
-
- // set layout
- setDialogLayoutResource(R.layout.settings_select_font_size);
- setPositiveButtonText(android.R.string.ok);
- setNegativeButtonText(android.R.string.cancel);
- setDialogIcon(null);
- }
-
- @Override
- protected void onSetInitialValue(boolean restore, Object defaultValue) {
- setProgress(restore ? Integer.valueOf(getPersistedString(DEFAULT_PROGRESS))
- : Integer.valueOf((String)defaultValue));
- }
-
- @Override
- protected Object onGetDefaultValue(TypedArray a, int index) {
- return a.getString(index);
- }
-
- @Override
- protected void onBindDialogView(View view) {
- super.onBindDialogView(view);
-
- mProgressText = (TextView) view.findViewById(R.id.text_progress);
-
- mSeekBar = (SeekBar) view.findViewById(R.id.seek_bar);
- mSeekBar.setOnSeekBarChangeListener(new OnSeekBarChangeListener() {
- @Override
- public void onStopTrackingTouch(SeekBar seekBar) {
- }
-
- @Override
- public void onStartTrackingTouch(SeekBar seekBar) {
- }
-
- @Override
- public void onProgressChanged(SeekBar seekBar, int progress,
- boolean fromUser) {
- // update text that displays the current SeekBar progress value
- // note: this does not persist the progress value. that is only
- // ever done in setProgress()
- String progressStr = String.valueOf(progress + mMinProgress);
- mProgressText.setText(mProgressTextSuffix == null ? progressStr
- : progressStr.concat(mProgressTextSuffix.toString()));
- mProgressText.setTextSize(TypedValue.COMPLEX_UNIT_SP, progress + mMinProgress);
- }
- });
-
- mSeekBar.setMax(mMaxProgress - mMinProgress);
- mSeekBar.setProgress(mProgress - mMinProgress);
- }
-
- public int getMinProgress() {
- return mMinProgress;
- }
-
- public void setMinProgress(int minProgress) {
- mMinProgress = minProgress;
- setProgress(Math.max(mProgress, mMinProgress));
- }
-
- public int getMaxProgress() {
- return mMaxProgress;
- }
-
- public void setMaxProgress(int maxProgress) {
- mMaxProgress = maxProgress;
- setProgress(Math.min(mProgress, mMaxProgress));
- }
-
- public int getProgress() {
- return mProgress;
- }
-
- public void setProgress(int progress) {
- progress = Math.max(Math.min(progress, mMaxProgress), mMinProgress);
-
- if (progress != mProgress) {
- mProgress = progress;
- persistString(String.valueOf(progress));
- notifyChanged();
- }
- }
-
- public CharSequence getProgressTextSuffix() {
- return mProgressTextSuffix;
- }
-
- public void setProgressTextSuffix(CharSequence progressTextSuffix) {
- mProgressTextSuffix = progressTextSuffix;
- }
-
- @Override
- protected void onDialogClosed(boolean positiveResult) {
- super.onDialogClosed(positiveResult);
-
- // when the user selects "OK", persist the new value
- if (positiveResult) {
- int seekBarProgress = mSeekBar.getProgress() + mMinProgress;
- if (callChangeListener(seekBarProgress)) {
- setProgress(seekBarProgress);
- }
- }
- }
-
- @Override
- protected Parcelable onSaveInstanceState() {
- // save the instance state so that it will survive screen orientation
- // changes and other events that may temporarily destroy it
- final Parcelable superState = super.onSaveInstanceState();
-
- // set the state's value with the class member that holds current
- // setting value
- final SavedState myState = new SavedState(superState);
- myState.minProgress = getMinProgress();
- myState.maxProgress = getMaxProgress();
- myState.progress = getProgress();
-
- return myState;
- }
-
- @Override
- protected void onRestoreInstanceState(Parcelable state) {
- // check whether we saved the state in onSaveInstanceState()
- if (state == null || !state.getClass().equals(SavedState.class)) {
- // didn't save the state, so call superclass
- super.onRestoreInstanceState(state);
- return;
- }
-
- // restore the state
- SavedState myState = (SavedState) state;
- setMinProgress(myState.minProgress);
- setMaxProgress(myState.maxProgress);
- setProgress(myState.progress);
-
- super.onRestoreInstanceState(myState.getSuperState());
- }
-
- private static class SavedState extends BaseSavedState {
- int minProgress;
- int maxProgress;
- int progress;
-
- public SavedState(Parcelable superState) {
- super(superState);
- }
-
- public SavedState(Parcel source) {
- super(source);
-
- minProgress = source.readInt();
- maxProgress = source.readInt();
- progress = source.readInt();
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- super.writeToParcel(dest, flags);
-
- dest.writeInt(minProgress);
- dest.writeInt(maxProgress);
- dest.writeInt(progress);
- }
-
- @SuppressWarnings("unused")
- public static final Parcelable.Creator<SavedState> CREATOR = new Parcelable.Creator<SavedState>() {
- @Override
- public SavedState createFromParcel(Parcel in) {
- return new SavedState(in);
- }
-
- @Override
- public SavedState[] newArray(int size) {
- return new SavedState[size];
- }
- };
- }
-} \ No newline at end of file
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/LessBrokenSwitchPreference.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/LessBrokenSwitchPreference.java
deleted file mode 100644
index df116064..00000000
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/LessBrokenSwitchPreference.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.fox.ttrss.util;
-
-// android is shit garbage
-// https://code.google.com/p/android/issues/detail?id=26194
-
-import android.content.Context;
-import android.preference.SwitchPreference;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Switch;
-
-public class LessBrokenSwitchPreference extends SwitchPreference {
-
- /**
- * Construct a new SwitchPreference with the given style options.
- *
- * @param context The Context that will style this preference
- * @param attrs Style attributes that differ from the default
- * @param defStyle Theme attribute defining the default style options
- */
- public LessBrokenSwitchPreference(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- }
-
- /**
- * Construct a new SwitchPreference with the given style options.
- *
- * @param context The Context that will style this preference
- * @param attrs Style attributes that differ from the default
- */
- public LessBrokenSwitchPreference(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- /**
- * Construct a new SwitchPreference with default style options.
- *
- * @param context The Context that will style this preference
- */
- public LessBrokenSwitchPreference(Context context) {
- super(context, null);
- }
-
- @Override
- protected void onBindView(View view) {
- // Clean listener before invoke SwitchPreference.onBindView
- ViewGroup viewGroup= (ViewGroup)view;
- clearListenerInViewGroup(viewGroup);
- super.onBindView(view);
- }
-
- /**
- * Clear listener in Switch for specify ViewGroup.
- *
- * @param viewGroup The ViewGroup that will need to clear the listener.
- */
- private void clearListenerInViewGroup(ViewGroup viewGroup) {
- if (null == viewGroup) {
- return;
- }
-
- int count = viewGroup.getChildCount();
- for(int n = 0; n < count; ++n) {
- View childView = viewGroup.getChildAt(n);
- if(childView instanceof Switch) {
- final Switch switchView = (Switch) childView;
- switchView.setOnCheckedChangeListener(null);
- return;
- } else if (childView instanceof ViewGroup){
- ViewGroup childGroup = (ViewGroup)childView;
- clearListenerInViewGroup(childGroup);
- }
- }
- }
-
-} \ No newline at end of file
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/LessBrokenWebView.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/LessBrokenWebView.java
deleted file mode 100644
index 4a3ea826..00000000
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/LessBrokenWebView.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.fox.ttrss.util;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.webkit.WebView;
-
-public class LessBrokenWebView extends WebView {
-
- public LessBrokenWebView(Context context) {
- super(context);
- // TODO Auto-generated constructor stub
- }
-
- public LessBrokenWebView(Context context, AttributeSet attrs) {
- super(context, attrs);
- // TODO Auto-generated constructor stub
- }
-
- public LessBrokenWebView(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- // TODO Auto-generated constructor stub
- }
-
- @Override
- public boolean onTouchEvent(MotionEvent event) {
-
- if (event.getAction() == MotionEvent.ACTION_DOWN) {
- int temp_ScrollY = getScrollY();
- scrollTo(getScrollX(), getScrollY() + 1);
- scrollTo(getScrollX(), temp_ScrollY);
- }
-
- return super.onTouchEvent(event);
- }
-
-}
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index 175639db..7c85bac2 100755
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<PreferenceCategory android:title="@string/connection" >
<EditTextPreference
@@ -37,20 +38,20 @@
android:key="theme"
android:title="@string/pref_theme" />
- <org.fox.ttrss.util.LessBrokenSwitchPreference
+ <SwitchPreference
android:defaultValue="false"
android:key="sort_feeds_by_unread"
android:title="@string/sort_feeds_by_unread" />
- <!-- <org.fox.ttrss.util.LessBrokenSwitchPreference
+ <!-- <SwitchPreference
android:defaultValue="false"
android:key="download_feed_icons"
android:title="@string/download_feed_icons" /> -->
- <org.fox.ttrss.util.LessBrokenSwitchPreference
+ <SwitchPreference
android:defaultValue="false"
android:key="enable_cats"
android:title="@string/enable_cats" />
- <org.fox.ttrss.util.LessBrokenSwitchPreference
+ <SwitchPreference
android:defaultValue="false"
android:dependency="enable_cats"
android:key="browse_cats_like_feeds"
@@ -64,7 +65,7 @@
android:key="open_on_startup"
android:title="@string/open_on_startup" />
- <org.fox.ttrss.util.LessBrokenSwitchPreference
+ <SwitchPreference
android:defaultValue="false"
android:key="force_phone_layout"
android:summary="@string/force_phone_layout_summary"
@@ -75,10 +76,12 @@
android:key="category_headlines"
android:title="@string/headlines" >
- <org.fox.ttrss.util.FontSizeDialogPreference
- android:defaultValue="13"
- android:key="headlines_font_size_sp"
- android:dialogMessage="@string/pref_headline_font_size"
+ <SeekBarPreference
+ app:defaultValue="13"
+ app:min="12"
+ android:max="21"
+ app:showSeekBarValue="true"
+ app:key="headlines_font_size_sp_int"
android:title="@string/pref_headline_font_size" />
<ListPreference
@@ -89,36 +92,30 @@
android:summary="@string/prefs_headline_display_mode_long"
android:title="@string/prefs_headline_display_mode" />
- <org.fox.ttrss.util.LessBrokenSwitchPreference
+ <SwitchPreference
android:defaultValue="false"
android:key="headline_images_wifi_only"
android:summary="@string/prefs_headline_images_wifi_only_long"
android:title="@string/prefs_headline_images_wifi_only" />
- <org.fox.ttrss.util.LessBrokenSwitchPreference
+ <SwitchPreference
android:defaultValue="true"
android:key="headlines_show_content"
android:title="@string/pref_headlines_show_content" />
- <org.fox.ttrss.util.LessBrokenSwitchPreference
+ <SwitchPreference
android:defaultValue="false"
android:disableDependentsState="true"
android:key="headlines_mark_read_scroll"
android:title="@string/pref_headlines_mark_read_scroll" />
- <org.fox.ttrss.util.LessBrokenSwitchPreference
+ <SwitchPreference
android:defaultValue="true"
android:dependency="headlines_mark_read_scroll"
android:key="headlines_swipe_to_dismiss"
android:summary="@string/pref_headlines_swipe_to_dismiss_long"
android:title="@string/pref_headlines_swipe_to_dismiss" />
- <!-- <org.fox.ttrss.util.LessBrokenSwitchPreference
- android:defaultValue="false"
- android:key="enable_condensed_fonts"
- android:summary="@string/pref_headlines_use_condensed_fonts_long"
- android:title="@string/pref_headlines_use_condensed_fonts" /> -->
-
<ListPreference
android:defaultValue="15"
android:entries="@array/pref_headlines_request_values"
@@ -127,20 +124,20 @@
android:summary="@string/prefs_headline_request_size_long"
android:title="@string/prefs_headline_request_size" />
- <org.fox.ttrss.util.LessBrokenSwitchPreference
+ <SwitchPreference
android:defaultValue="false"
android:key="enable_image_downsampling"
android:title="@string/prefs_enable_image_downsampling"
android:summary="@string/prefs_enable_image_downsampling_long" />
- <org.fox.ttrss.util.LessBrokenSwitchPreference
+ <SwitchPreference
android:defaultValue="false"
android:key="always_downsample_images"
android:dependency="enable_image_downsampling"
android:title="@string/prefs_always_downsample_images"
android:summary="@string/prefs_always_downsample_images_long" />
- <org.fox.ttrss.util.LessBrokenSwitchPreference
+ <SwitchPreference
android:defaultValue="false"
android:key="inline_video_player"
android:summary="@string/prefs_inline_video_player"
@@ -149,37 +146,39 @@
</PreferenceCategory>
<PreferenceCategory android:title="@string/reading" >
- <org.fox.ttrss.util.FontSizeDialogPreference
- android:defaultValue="16"
- android:key="article_font_size_sp"
- android:inputType="number"
+ <SeekBarPreference
+ app:defaultValue="16"
+ app:min="12"
+ android:max="32"
+ app:showSeekBarValue="true"
+ app:key="article_font_size_sp_int"
android:title="@string/pref_font_size" />
- <org.fox.ttrss.util.LessBrokenSwitchPreference
+ <SwitchPreference
android:defaultValue="true"
android:key="justify_article_text"
android:title="@string/justify_article_text" />
- <org.fox.ttrss.util.LessBrokenSwitchPreference
+ <SwitchPreference
android:defaultValue="false"
android:key="use_volume_keys"
android:summary="@string/use_volume_keys_long"
android:title="@string/use_volume_keys" />
- <org.fox.ttrss.util.LessBrokenSwitchPreference
+ <SwitchPreference
android:defaultValue="true"
android:key="enable_article_fab"
android:summary="@string/prefs_enable_fab_long"
android:title="@string/prefs_enable_fab" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/prefs_opening_links" >
- <org.fox.ttrss.util.LessBrokenSwitchPreference
+ <SwitchPreference
android:defaultValue="true"
android:key="enable_custom_tabs"
android:summary="@string/prefs_custom_tabs_summary"
android:title="@string/prefs_use_custom_tabs" />
- <org.fox.ttrss.util.LessBrokenSwitchPreference
+ <SwitchPreference
android:defaultValue="true"
android:key="custom_tabs_ask_always"
android:title="@string/ask_me_every_time" />
- <org.fox.ttrss.util.LessBrokenSwitchPreference
+ <SwitchPreference
android:defaultValue="false"
android:key="always_open_uri"
android:summary="@string/prefs_always_open_uri_summary"
@@ -194,12 +193,12 @@
android:summary="@string/offline_articles_to_download_long"
android:title="@string/offline_articles_to_download" />
- <org.fox.ttrss.util.LessBrokenSwitchPreference
+ <SwitchPreference
android:defaultValue="false"
android:key="offline_sort_by_feed"
android:title="@string/prefs_offline_sort_by_feed" />
- <org.fox.ttrss.util.LessBrokenSwitchPreference
+ <SwitchPreference
android:defaultValue="false"
android:key="offline_image_cache_enabled"
android:summary="@string/offline_media_cache_enabled_summary"
@@ -221,7 +220,7 @@
android:key="widget_background"
android:title="@string/pref_widget_background" />
- <org.fox.ttrss.util.LessBrokenSwitchPreference
+ <SwitchPreference
android:defaultValue="true"
android:key="widget_show_fresh"
android:title="@string/prefs_widget_show_fresh"
@@ -233,7 +232,7 @@
android:key="show_logcat"
android:title="@string/logcat_title" />
- <org.fox.ttrss.util.LessBrokenSwitchPreference
+ <SwitchPreference
android:defaultValue="false"
android:key="transport_debugging"
android:title="@string/transport_debugging" />