aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPostDetailActivity.java3
-rw-r--r--app/src/main/res/xml/about_preferences.xml6
-rw-r--r--app/src/main/res/xml/font_preferences.xml2
-rw-r--r--app/src/main/res/xml/gestures_and_buttons_preference.xml2
-rw-r--r--app/src/main/res/xml/interface_preference.xml12
-rw-r--r--app/src/main/res/xml/main_preferences.xml26
6 files changed, 27 insertions, 24 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPostDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPostDetailActivity.java
index f3cac524..0d992340 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPostDetailActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPostDetailActivity.java
@@ -1839,6 +1839,9 @@ public class ViewPostDetailActivity extends BaseActivity implements FlairBottomS
if (mSlidrInterface != null) {
mSlidrInterface.lock();
}
+ if (touchHelper != null) {
+ touchHelper.attachToRecyclerView(null);
+ }
}
public void unlockSwipeRightToGoBack() {
diff --git a/app/src/main/res/xml/about_preferences.xml b/app/src/main/res/xml/about_preferences.xml
index 03ba5f4e..5d8515ad 100644
--- a/app/src/main/res/xml/about_preferences.xml
+++ b/app/src/main/res/xml/about_preferences.xml
@@ -4,17 +4,17 @@
<Preference
app:title="@string/settings_acknowledgement_master_title"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.AcknowledgementFragment" />
+ app:fragment="ml.docilealligator.infinityforreddit.settings.AcknowledgementFragment" />
<Preference
app:title="@string/settings_credits_master_title"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.CreditsPreferenceFragment" />
+ app:fragment="ml.docilealligator.infinityforreddit.settings.CreditsPreferenceFragment" />
<Preference
android:key="translation"
app:title="@string/settings_translation_title"
app:summary="@string/settings_translation_summary"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.TranslationFragment"/>
+ app:fragment="ml.docilealligator.infinityforreddit.settings.TranslationFragment"/>
<Preference
android:key="open_source"
diff --git a/app/src/main/res/xml/font_preferences.xml b/app/src/main/res/xml/font_preferences.xml
index 83264ea0..541c487a 100644
--- a/app/src/main/res/xml/font_preferences.xml
+++ b/app/src/main/res/xml/font_preferences.xml
@@ -4,7 +4,7 @@
<Preference
app:title="@string/settings_preview_font_title"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.FontPreviewFragment" />
+ app:fragment="ml.docilealligator.infinityforreddit.settings.FontPreviewFragment" />
<PreferenceCategory
app:title="@string/settings_font_summary" />
diff --git a/app/src/main/res/xml/gestures_and_buttons_preference.xml b/app/src/main/res/xml/gestures_and_buttons_preference.xml
index bd407a7a..02a37524 100644
--- a/app/src/main/res/xml/gestures_and_buttons_preference.xml
+++ b/app/src/main/res/xml/gestures_and_buttons_preference.xml
@@ -46,6 +46,6 @@
<Preference
app:title="@string/settings_swipe_action_title"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.SwipeActionPreferenceFragment" />
+ app:fragment="ml.docilealligator.infinityforreddit.settings.SwipeActionPreferenceFragment" />
</PreferenceScreen> \ No newline at end of file
diff --git a/app/src/main/res/xml/interface_preference.xml b/app/src/main/res/xml/interface_preference.xml
index 7e2fec08..b55853c1 100644
--- a/app/src/main/res/xml/interface_preference.xml
+++ b/app/src/main/res/xml/interface_preference.xml
@@ -5,23 +5,23 @@
<Preference
app:title="@string/settings_font_title"
app:icon="@drawable/ic_font_size_24dp"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.FontPreferenceFragment" />
+ app:fragment="ml.docilealligator.infinityforreddit.settings.FontPreferenceFragment" />
<Preference
app:key="immersive_interface_entry"
app:title="@string/settings_immersive_interface_title"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.ImmersiveInterfacePreferenceFragment"
+ app:fragment="ml.docilealligator.infinityforreddit.settings.ImmersiveInterfacePreferenceFragment"
app:isPreferenceVisible="false" />
<Preference
app:title="@string/settings_customize_tabs_in_main_page_title"
app:summary="@string/only_for_logged_in_user"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.CustomizeMainPageTabsFragment" />
+ app:fragment="ml.docilealligator.infinityforreddit.settings.CustomizeMainPageTabsFragment" />
<Preference
app:title="@string/settings_customize_bottom_app_bar_title"
app:summary="@string/only_for_logged_in_user"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.CustomizeBottomAppBarFragment" />
+ app:fragment="ml.docilealligator.infinityforreddit.settings.CustomizeBottomAppBarFragment" />
<SwitchPreference
app:defaultValue="false"
@@ -31,7 +31,7 @@
<Preference
app:title="@string/settings_time_format_title"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.TimeFormatPreferenceFragment" />
+ app:fragment="ml.docilealligator.infinityforreddit.settings.TimeFormatPreferenceFragment" />
<SwitchPreference
app:defaultValue="false"
@@ -84,7 +84,7 @@
<Preference
app:title="@string/settings_number_of_columns_in_post_feed_title"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.NumberOfColumnsInPostFeedPreferenceFragment" />
+ app:fragment="ml.docilealligator.infinityforreddit.settings.NumberOfColumnsInPostFeedPreferenceFragment" />
<PreferenceCategory
app:title="@string/settings_category_comment_title" />
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
index 9a560383..9c964d01 100644
--- a/app/src/main/res/xml/main_preferences.xml
+++ b/app/src/main/res/xml/main_preferences.xml
@@ -5,27 +5,27 @@
<Preference
app:icon="@drawable/ic_outline_notifications_24dp"
app:title="@string/settings_notification_master_title"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.NotificationPreferenceFragment" />
+ app:fragment="ml.docilealligator.infinityforreddit.settings.NotificationPreferenceFragment" />
<Preference
app:icon="@drawable/ic_interface_24dp"
app:title="@string/settings_interface_title"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.InterfacePreferenceFragment" />
+ app:fragment="ml.docilealligator.infinityforreddit.settings.InterfacePreferenceFragment" />
<Preference
app:title="@string/settings_theme_title"
app:icon="@drawable/ic_outline_color_lens_24dp"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.ThemePreferenceFragment" />
+ app:fragment="ml.docilealligator.infinityforreddit.settings.ThemePreferenceFragment" />
<Preference
app:icon="@drawable/ic_gesture_24dp"
app:title="@string/settings_gestures_and_buttons_title"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.GesturesAndButtonsPreferenceFragment" />
+ app:fragment="ml.docilealligator.infinityforreddit.settings.GesturesAndButtonsPreferenceFragment" />
<Preference
app:title="@string/settigns_video_title"
android:icon="@drawable/ic_outline_video_24dp"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.VideoPreferenceFragment" />
+ app:fragment="ml.docilealligator.infinityforreddit.settings.VideoPreferenceFragment" />
<ListPreference
app:defaultValue="2.5"
@@ -39,43 +39,43 @@
<Preference
app:title="@string/settings_download_location_title"
android:icon="@drawable/ic_download_24dp"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.DownloadLocationPreferenceFragment" />
+ app:fragment="ml.docilealligator.infinityforreddit.settings.DownloadLocationPreferenceFragment" />
<Preference
app:key="security"
app:title="@string/settings_security_title"
android:icon="@drawable/ic_security_24dp"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.SecurityPreferenceFragment" />
+ app:fragment="ml.docilealligator.infinityforreddit.settings.SecurityPreferenceFragment" />
<Preference
app:key="security"
app:title="@string/settings_data_saving_mode"
app:icon="@drawable/ic_data_saving_mode_24dp"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.DataSavingModePreferenceFragment" />
+ app:fragment="ml.docilealligator.infinityforreddit.settings.DataSavingModePreferenceFragment" />
<Preference
app:icon="@drawable/ic_nsfw_on_24dp"
app:title="@string/settings_nsfw_and_spoiler_title"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.NsfwAndBlurringFragment"/>
+ app:fragment="ml.docilealligator.infinityforreddit.settings.NsfwAndBlurringFragment"/>
<Preference
app:icon="@drawable/ic_filter_24dp"
app:title="@string/settings_filter_title"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.FilterPreferenceFragment"/>
+ app:fragment="ml.docilealligator.infinityforreddit.settings.FilterPreferenceFragment"/>
<Preference
app:icon="@drawable/ic_miscellaneous_24dp"
app:title="@string/settings_miscellaneous_title"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.MiscellaneousPreferenceFragment"/>
+ app:fragment="ml.docilealligator.infinityforreddit.settings.MiscellaneousPreferenceFragment"/>
<Preference
android:icon="@drawable/ic_advanced_24dp"
app:title="@string/settings_advanced_master_title"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.AdvancedPreferenceFragment" />
+ app:fragment="ml.docilealligator.infinityforreddit.settings.AdvancedPreferenceFragment" />
<Preference
android:icon="@drawable/ic_about_24dp"
app:title="@string/settings_about_master_title"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.AboutPreferenceFragment" />
+ app:fragment="ml.docilealligator.infinityforreddit.settings.AboutPreferenceFragment" />
</androidx.preference.PreferenceScreen> \ No newline at end of file