diff options
Diffstat (limited to '')
40 files changed, 973 insertions, 348 deletions
diff --git a/app/src/main/res/drawable-night/ic_download_24dp.xml b/app/src/main/res/drawable-night/ic_download_24dp.xml new file mode 100644 index 00000000..eb39e3f3 --- /dev/null +++ b/app/src/main/res/drawable-night/ic_download_24dp.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:pathData="M13,5v6h1.17L12,13.17 9.83,11L11,11L11,5h2m2,-2L9,3v6L5,9l7,7 7,-7h-4L15,3zM19,18L5,18v2h14v-2z" + android:fillColor="#FFFFFF"/> +</vector> diff --git a/app/src/main/res/drawable/ic_download_24dp.xml b/app/src/main/res/drawable/ic_download_24dp.xml new file mode 100644 index 00000000..ad852174 --- /dev/null +++ b/app/src/main/res/drawable/ic_download_24dp.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:pathData="M13,5v6h1.17L12,13.17 9.83,11L11,11L11,5h2m2,-2L9,3v6L5,9l7,7 7,-7h-4L15,3zM19,18L5,18v2h14v-2z" + android:fillColor="#000000"/> +</vector> diff --git a/app/src/main/res/layout/activity_submit_crosspost.xml b/app/src/main/res/layout/activity_submit_crosspost.xml new file mode 100644 index 00000000..8e15afb1 --- /dev/null +++ b/app/src/main/res/layout/activity_submit_crosspost.xml @@ -0,0 +1,191 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/coordinator_layout_submit_crosspost_activity" + tools:context=".Activity.SubmitCrosspostActivity"> + + <com.google.android.material.appbar.AppBarLayout + android:id="@+id/appbar_layout_submit_crosspost_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:theme="@style/AppTheme.AppBarOverlay"> + + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar_submit_crosspost_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?attr/actionBarSize" + app:navigationIcon="?attr/homeAsUpIndicator" + app:popupTheme="@style/AppTheme.PopupOverlay" /> + + </com.google.android.material.appbar.AppBarLayout> + + <androidx.core.widget.NestedScrollView + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layout_behavior="@string/appbar_scrolling_view_behavior"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingStart="16dp" + android:paddingTop="8dp" + android:paddingEnd="16dp" + android:paddingBottom="8dp"> + + <pl.droidsonroids.gif.GifImageView + android:id="@+id/subreddit_icon_gif_image_view_submit_crosspost_activity" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_alignParentStart="true" + android:layout_centerVertical="true" /> + + <TextView + android:id="@+id/subreddit_name_text_view_submit_crosspost_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_marginStart="32dp" + android:layout_marginEnd="16dp" + android:layout_toStartOf="@id/rules_button_submit_crosspost_activity" + android:layout_toEndOf="@id/subreddit_icon_gif_image_view_submit_crosspost_activity" + android:text="@string/choose_a_subreddit" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> + + <Button + android:id="@+id/rules_button_submit_crosspost_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_centerVertical="true" + android:text="@string/rules" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> + + </RelativeLayout> + + <View + android:id="@+id/divider_1_submit_crosspost_activity" + android:layout_width="match_parent" + android:layout_height="1dp" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <com.libRG.CustomTextView + android:id="@+id/flair_custom_text_view_submit_crosspost_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:padding="4dp" + android:text="@string/flair" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" + android:visibility="gone" + app:lib_setRadius="3dp" + app:lib_setRoundedView="true" + app:lib_setShape="rectangle" /> + + <com.libRG.CustomTextView + android:id="@+id/spoiler_custom_text_view_submit_crosspost_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:padding="4dp" + android:text="@string/spoiler" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" + app:lib_setRadius="3dp" + app:lib_setRoundedView="true" + app:lib_setShape="rectangle" /> + + <com.libRG.CustomTextView + android:id="@+id/nsfw_custom_text_view_submit_crosspost_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:padding="4dp" + android:text="@string/nsfw" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" + app:lib_setRadius="3dp" + app:lib_setRoundedView="true" + app:lib_setShape="rectangle" /> + + </LinearLayout> + + <View + android:id="@+id/divider_2_submit_crosspost_activity" + android:layout_width="match_parent" + android:layout_height="1dp" /> + + <EditText + android:id="@+id/post_title_edit_text_submit_crosspost_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="#00000000" + android:gravity="top" + android:hint="@string/post_title_hint" + android:inputType="textCapSentences|textMultiLine" + android:padding="16dp" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/title_font_18" + android:fontFamily="?attr/title_font_family" /> + + <View + android:id="@+id/divider_3_submit_crosspost_activity" + android:layout_width="match_parent" + android:layout_height="1dp" /> + + <TextView + android:id="@+id/post_content_text_view_submit_crosspost_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="16dp" + android:textSize="?attr/content_font_default" + android:fontFamily="?attr/content_font_family" + android:visibility="gone" /> + + <FrameLayout + android:id="@+id/frame_layout_submit_crosspost_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone"> + + <com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView + android:id="@+id/image_view_submit_crosspost_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:adjustViewBounds="true" + android:scaleType="fitStart" /> + + <ImageView + android:id="@+id/play_button_image_view_submit_crosspost_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:layout_gravity="start" + android:background="@drawable/play_button_round_background" + android:src="@drawable/ic_play_circle_36dp" + android:visibility="gone" /> + + </FrameLayout> + + </LinearLayout> + + </androidx.core.widget.NestedScrollView> + +</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_view_post_detail.xml b/app/src/main/res/layout/activity_view_post_detail.xml index 621903a8..d250cb83 100644 --- a/app/src/main/res/layout/activity_view_post_detail.xml +++ b/app/src/main/res/layout/activity_view_post_detail.xml @@ -42,6 +42,7 @@ android:id="@+id/recycler_view_view_post_detail" android:layout_width="match_parent" android:layout_height="wrap_content" + android:paddingBottom="144dp" android:clipToPadding="false" /> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> diff --git a/app/src/main/res/layout/dialog_edit_text.xml b/app/src/main/res/layout/dialog_edit_text.xml new file mode 100644 index 00000000..158ff59d --- /dev/null +++ b/app/src/main/res/layout/dialog_edit_text.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" android:layout_width="match_parent" + android:layout_height="match_parent"> + + <EditText + android:id="@+id/edit_text_edit_text_dialog" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="24dp" + android:background="#00000000" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> + +</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customize_main_page_tabs.xml b/app/src/main/res/layout/fragment_customize_main_page_tabs.xml new file mode 100644 index 00000000..a6803e7f --- /dev/null +++ b/app/src/main/res/layout/fragment_customize_main_page_tabs.xml @@ -0,0 +1,365 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".Settings.CustomizeMainPageTabsFragment"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <TextView + android:id="@+id/info_text_view_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="16dp" + android:drawablePadding="32dp" + android:text="@string/settings_tab_info" + android:textColor="@color/settingsSubtitleColor" + android:gravity="center_vertical" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" + app:drawableStartCompat="@drawable/ic_info_preference_24dp" /> + + <View + android:id="@+id/divider_1_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="@color/dividerColor" /> + + <TextView + android:id="@+id/tab_1_group_summary_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="@string/settings_tab_1_summary" + android:textColor="@color/colorAccent" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> + + <LinearLayout + android:id="@+id/tab_1_title_linear_layout_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/settings_tab_title" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_18" + android:fontFamily="?attr/font_family" /> + + <TextView + android:id="@+id/tab_1_title_summary_text_view_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="?attr/secondaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> + + </LinearLayout> + + <LinearLayout + android:id="@+id/tab_1_type_linear_layout_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/settings_tab_post_type" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_18" + android:fontFamily="?attr/font_family" /> + + <TextView + android:id="@+id/tab_1_type_summary_text_view_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="?attr/secondaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> + + </LinearLayout> + + <LinearLayout + android:id="@+id/tab_1_name_linear_layout_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" + android:visibility="gone"> + + <TextView + android:id="@+id/tab_1_name_title_text_view_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_18" + android:fontFamily="?attr/font_family" /> + + <TextView + android:id="@+id/tab_1_name_summary_text_view_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="?attr/secondaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> + + </LinearLayout> + + <View + android:id="@+id/divider_2_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="@color/dividerColor" /> + + <TextView + android:id="@+id/tab_2_group_summary_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="@string/settings_tab_2_summary" + android:textColor="@color/colorAccent" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> + + <LinearLayout + android:id="@+id/tab_2_title_linear_layout_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/settings_tab_title" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_18" + android:fontFamily="?attr/font_family" /> + + <TextView + android:id="@+id/tab_2_title_summary_text_view_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="?attr/secondaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> + + </LinearLayout> + + <LinearLayout + android:id="@+id/tab_2_type_linear_layout_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/settings_tab_post_type" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_18" + android:fontFamily="?attr/font_family" /> + + <TextView + android:id="@+id/tab_2_type_summary_text_view_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="?attr/secondaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> + + </LinearLayout> + + <LinearLayout + android:id="@+id/tab_2_name_linear_layout_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" + android:visibility="gone"> + + <TextView + android:id="@+id/tab_2_name_title_text_view_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_18" + android:fontFamily="?attr/font_family" /> + + <TextView + android:id="@+id/tab_2_name_summary_text_view_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="?attr/secondaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> + + </LinearLayout> + + <View + android:id="@+id/divider_3_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="@color/dividerColor" /> + + <TextView + android:id="@+id/tab_3_group_summary_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="@string/settings_tab_3_summary" + android:textColor="@color/colorAccent" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> + + <LinearLayout + android:id="@+id/tab_3_title_linear_layout_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/settings_tab_title" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_18" + android:fontFamily="?attr/font_family" /> + + <TextView + android:id="@+id/tab_3_title_summary_text_view_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="?attr/secondaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> + + </LinearLayout> + + <LinearLayout + android:id="@+id/tab_3_type_linear_layout_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/settings_tab_post_type" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_18" + android:fontFamily="?attr/font_family" /> + + <TextView + android:id="@+id/tab_3_type_summary_text_view_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="?attr/secondaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> + + </LinearLayout> + + <LinearLayout + android:id="@+id/tab_3_name_linear_layout_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" + android:visibility="gone"> + + <TextView + android:id="@+id/tab_3_name_title_text_view_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_18" + android:fontFamily="?attr/font_family" /> + + <TextView + android:id="@+id/tab_3_name_summary_text_view_customize_main_page_tabs_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="?attr/secondaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> + + </LinearLayout> + + </LinearLayout> + +</androidx.core.widget.NestedScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_font_preview.xml b/app/src/main/res/layout/fragment_font_preview.xml index d1140996..b73da09b 100644 --- a/app/src/main/res/layout/fragment_font_preview.xml +++ b/app/src/main/res/layout/fragment_font_preview.xml @@ -1,176 +1,182 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" tools:context=".Settings.FontPreviewFragment"> - <TextView + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="72dp" - android:paddingEnd="16dp" - android:text="@string/default_font_font_preview" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="72dp" - android:paddingEnd="16dp" - android:text="Balsamiq Sans" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" - android:fontFamily="@font/balsamiq_sans" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="72dp" - android:paddingEnd="16dp" - android:text="Balsamiq Sans Bold" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" - android:fontFamily="@font/balsamiq_sans_bold_version" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="72dp" - android:paddingEnd="16dp" - android:text="Noto Sans" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" - android:fontFamily="@font/noto_sans" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="72dp" - android:paddingEnd="16dp" - android:text="Noto Sans Bold" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" - android:fontFamily="@font/noto_sans_bold_version" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="72dp" - android:paddingEnd="16dp" - android:text="Harmonia Sans" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" - android:fontFamily="@font/harmonia_sans" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="72dp" - android:paddingEnd="16dp" - android:text="Harmonia Sans Bold" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" - android:fontFamily="@font/harmonia_sans_bold" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="72dp" - android:paddingEnd="16dp" - android:text="Roboto Condensed" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" - android:fontFamily="@font/roboto_condensed" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="72dp" - android:paddingEnd="16dp" - android:text="Roboto Condensed Bold" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" - android:fontFamily="@font/roboto_condensed_bold_version" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="72dp" - android:paddingEnd="16dp" - android:text="Inter" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" - android:fontFamily="@font/inter" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="72dp" - android:paddingEnd="16dp" - android:text="Inter Bold" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" - android:fontFamily="@font/inter_bold" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="72dp" - android:paddingEnd="16dp" - android:text="Manrope" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" - android:fontFamily="@font/manrope" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="72dp" - android:paddingEnd="16dp" - android:text="Manrope Bold" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" - android:fontFamily="@font/manrope_bold" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="72dp" - android:paddingEnd="16dp" - android:text="Sriracha" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" - android:fontFamily="@font/sriracha_regular" /> - -</LinearLayout>
\ No newline at end of file + android:orientation="vertical"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="@string/default_font_font_preview" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="Balsamiq Sans" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="@font/balsamiq_sans" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="Balsamiq Sans Bold" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="@font/balsamiq_sans_bold_version" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="Noto Sans" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="@font/noto_sans" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="Noto Sans Bold" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="@font/noto_sans_bold_version" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="Harmonia Sans" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="@font/harmonia_sans" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="Harmonia Sans Bold" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="@font/harmonia_sans_bold" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="Roboto Condensed" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="@font/roboto_condensed" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="Roboto Condensed Bold" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="@font/roboto_condensed_bold_version" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="Inter" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="@font/inter" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="Inter Bold" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="@font/inter_bold" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="Manrope" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="@font/manrope" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="Manrope Bold" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="@font/manrope_bold" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" + android:text="Sriracha" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="@font/sriracha_regular" /> + + </LinearLayout> + +</androidx.core.widget.NestedScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml index d5c9e34d..91c0ed62 100644 --- a/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml @@ -69,25 +69,6 @@ app:drawableTint="?attr/primaryTextColor" /> <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/random_type_text_view_sort_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?attr/selectableItemBackground" - android:clickable="true" - android:drawableStart="@drawable/ic_random_24" - android:drawablePadding="48dp" - android:focusable="true" - android:fontFamily="?attr/font_family" - android:paddingStart="32dp" - android:paddingTop="16dp" - android:paddingEnd="32dp" - android:paddingBottom="16dp" - android:text="@string/sort_random" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" - app:drawableTint="?attr/primaryTextColor" /> - - <androidx.appcompat.widget.AppCompatTextView android:id="@+id/rising_type_text_view_sort_type_bottom_sheet_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/fragment_theme_preview_comments.xml b/app/src/main/res/layout/fragment_theme_preview_comments.xml index 69e8d7f3..c810b949 100644 --- a/app/src/main/res/layout/fragment_theme_preview_comments.xml +++ b/app/src/main/res/layout/fragment_theme_preview_comments.xml @@ -145,7 +145,6 @@ android:clickable="true" android:focusable="true" android:src="@drawable/ic_arrow_downward_grey_24dp" - android:tint="@android:color/tab_indicator_text" app:layout_constraintStart_toEndOf="@+id/score_text_view_theme_preview_comments_fragment" app:layout_constraintEnd_toStartOf="@id/more_button_theme_preview_comments_fragment" app:layout_constraintTop_toTopOf="parent" @@ -176,7 +175,6 @@ android:clickable="true" android:focusable="true" android:src="@drawable/ic_expand_less_grey_24dp" - android:tint="@android:color/tab_indicator_text" app:layout_constraintEnd_toStartOf="@+id/save_button_theme_preview_comments_fragment" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> @@ -354,7 +352,6 @@ android:clickable="true" android:focusable="true" android:src="@drawable/ic_arrow_downward_grey_24dp" - android:tint="@android:color/tab_indicator_text" app:layout_constraintStart_toEndOf="@+id/score_text_view_award_background_theme_preview_comments_fragment" app:layout_constraintEnd_toStartOf="@id/more_button_award_background_theme_preview_comments_fragment" app:layout_constraintTop_toTopOf="parent" @@ -385,7 +382,6 @@ android:clickable="true" android:focusable="true" android:src="@drawable/ic_expand_less_grey_24dp" - android:tint="@android:color/tab_indicator_text" app:layout_constraintEnd_toStartOf="@+id/save_button_award_background_theme_preview_comments_fragment" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/app/src/main/res/layout/fragment_theme_preview_posts.xml b/app/src/main/res/layout/fragment_theme_preview_posts.xml index 7e384540..05c32376 100644 --- a/app/src/main/res/layout/fragment_theme_preview_posts.xml +++ b/app/src/main/res/layout/fragment_theme_preview_posts.xml @@ -233,7 +233,7 @@ android:layout_height="150dp" android:scaleType="center" android:src="@drawable/ic_link" - android:tint="@android:color/tab_indicator_text" /> + app:tint="@android:color/tab_indicator_text" /> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/fragment_view_imgur_images.xml b/app/src/main/res/layout/fragment_view_imgur_images.xml index 20110897..36286c05 100644 --- a/app/src/main/res/layout/fragment_view_imgur_images.xml +++ b/app/src/main/res/layout/fragment_view_imgur_images.xml @@ -16,8 +16,7 @@ <com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView android:id="@+id/image_view_view_imgur_image_fragment" android:layout_width="match_parent" - android:layout_height="match_parent" - app:quickScaleEnabled="false" /> + android:layout_height="match_parent" /> <LinearLayout android:id="@+id/load_image_error_linear_layout_view_imgur_image_fragment" diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml index 8724cda8..afc779b6 100644 --- a/app/src/main/res/layout/item_comment.xml +++ b/app/src/main/res/layout/item_comment.xml @@ -120,7 +120,6 @@ android:id="@+id/bottom_constraint_layout_item_post_comment" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingBottom="12dp" android:paddingStart="4dp" android:paddingEnd="4dp"> @@ -128,8 +127,7 @@ android:id="@+id/up_vote_button_item_post_comment" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingStart="8dp" - android:paddingEnd="8dp" + android:padding="8dp" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" @@ -154,13 +152,11 @@ android:id="@+id/down_vote_button_item_post_comment" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingStart="8dp" - android:paddingEnd="8dp" + android:padding="8dp" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" android:src="@drawable/ic_arrow_downward_grey_24dp" - android:tint="@android:color/tab_indicator_text" app:layout_constraintStart_toEndOf="@+id/score_text_view_item_post_comment" app:layout_constraintEnd_toStartOf="@id/more_button_item_post_comment" app:layout_constraintTop_toTopOf="parent" @@ -171,8 +167,7 @@ android:id="@+id/more_button_item_post_comment" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingStart="8dp" - android:paddingEnd="8dp" + android:padding="8dp" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" @@ -185,13 +180,11 @@ android:id="@+id/expand_button_item_post_comment" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingStart="8dp" - android:paddingEnd="8dp" + android:padding="8dp" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" android:src="@drawable/ic_expand_less_grey_24dp" - android:tint="@android:color/tab_indicator_text" android:visibility="gone" app:layout_constraintEnd_toStartOf="@+id/save_button_item_post_comment" app:layout_constraintTop_toTopOf="parent" @@ -201,8 +194,7 @@ android:id="@+id/save_button_item_post_comment" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingStart="8dp" - android:paddingEnd="8dp" + android:padding="8dp" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" @@ -214,8 +206,7 @@ android:id="@+id/reply_button_item_post_comment" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingStart="8dp" - android:paddingEnd="8dp" + android:padding="8dp" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/item_flair.xml b/app/src/main/res/layout/item_flair.xml index 9d6f1c33..9379800d 100644 --- a/app/src/main/res/layout/item_flair.xml +++ b/app/src/main/res/layout/item_flair.xml @@ -2,6 +2,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" + xmlns:app="http://schemas.android.com/apk/res-auto" android:clickable="true" android:focusable="true" android:background="?attr/selectableItemBackground"> @@ -23,7 +24,7 @@ android:layout_marginStart="32dp" android:src="@drawable/ic_outline_edit_24px" android:visibility="gone" - android:tint="?attr/primaryTextColor" + app:tint="?attr/primaryTextColor" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" /> diff --git a/app/src/main/res/layout/item_post_compact.xml b/app/src/main/res/layout/item_post_compact.xml index a5943b69..54f1f34d 100644 --- a/app/src/main/res/layout/item_post_compact.xml +++ b/app/src/main/res/layout/item_post_compact.xml @@ -266,7 +266,7 @@ android:layout_height="72dp" android:scaleType="center" android:src="@drawable/ic_link" - android:tint="@android:color/tab_indicator_text" /> + app:tint="@android:color/tab_indicator_text" /> </FrameLayout> diff --git a/app/src/main/res/layout/item_post_compact_right_thumbnail.xml b/app/src/main/res/layout/item_post_compact_right_thumbnail.xml index 0458c12b..92a8c4c5 100644 --- a/app/src/main/res/layout/item_post_compact_right_thumbnail.xml +++ b/app/src/main/res/layout/item_post_compact_right_thumbnail.xml @@ -134,7 +134,7 @@ android:layout_height="72dp" android:scaleType="center" android:src="@drawable/ic_link" - android:tint="@android:color/tab_indicator_text" /> + app:tint="@android:color/tab_indicator_text" /> </FrameLayout> diff --git a/app/src/main/res/layout/item_post_detail_gallery.xml b/app/src/main/res/layout/item_post_detail_gallery.xml index 1de319c2..321a7638 100644 --- a/app/src/main/res/layout/item_post_detail_gallery.xml +++ b/app/src/main/res/layout/item_post_detail_gallery.xml @@ -254,7 +254,6 @@ android:layout_height="wrap_content" android:padding="12dp" android:src="@drawable/ic_arrow_upward_grey_24dp" - android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" @@ -280,7 +279,6 @@ android:layout_height="wrap_content" android:padding="12dp" android:src="@drawable/ic_arrow_downward_grey_24dp" - android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" @@ -308,7 +306,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="12dp" - android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml b/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml index add4082f..2d3e70f0 100644 --- a/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml +++ b/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml @@ -245,7 +245,6 @@ android:layout_height="wrap_content" android:padding="12dp" android:src="@drawable/ic_arrow_upward_grey_24dp" - android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" @@ -271,7 +270,6 @@ android:layout_height="wrap_content" android:padding="12dp" android:src="@drawable/ic_arrow_downward_grey_24dp" - android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" @@ -299,7 +297,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="12dp" - android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/item_post_detail_link.xml b/app/src/main/res/layout/item_post_detail_link.xml index 27a3f407..9266e19e 100644 --- a/app/src/main/res/layout/item_post_detail_link.xml +++ b/app/src/main/res/layout/item_post_detail_link.xml @@ -255,7 +255,6 @@ android:layout_height="wrap_content" android:padding="12dp" android:src="@drawable/ic_arrow_upward_grey_24dp" - android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" @@ -281,7 +280,6 @@ android:layout_height="wrap_content" android:padding="12dp" android:src="@drawable/ic_arrow_downward_grey_24dp" - android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" @@ -309,7 +307,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="12dp" - android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/item_post_detail_no_preview_link.xml b/app/src/main/res/layout/item_post_detail_no_preview_link.xml index 99f5ad0b..7b6d5778 100644 --- a/app/src/main/res/layout/item_post_detail_no_preview_link.xml +++ b/app/src/main/res/layout/item_post_detail_no_preview_link.xml @@ -218,7 +218,8 @@ android:layout_width="match_parent" android:layout_height="150dp" android:scaleType="center" - android:src="@drawable/ic_link" /> + android:src="@drawable/ic_link" + app:tint="@android:color/tab_indicator_text" /> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" @@ -231,7 +232,6 @@ android:layout_height="wrap_content" android:padding="12dp" android:src="@drawable/ic_arrow_upward_grey_24dp" - android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" @@ -257,7 +257,6 @@ android:layout_height="wrap_content" android:padding="12dp" android:src="@drawable/ic_arrow_downward_grey_24dp" - android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" @@ -285,7 +284,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="12dp" - android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/item_post_detail_text.xml b/app/src/main/res/layout/item_post_detail_text.xml index 590d4c87..289fdec2 100644 --- a/app/src/main/res/layout/item_post_detail_text.xml +++ b/app/src/main/res/layout/item_post_detail_text.xml @@ -214,7 +214,6 @@ android:layout_height="wrap_content" android:padding="12dp" android:src="@drawable/ic_arrow_upward_grey_24dp" - android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" @@ -240,7 +239,6 @@ android:layout_height="wrap_content" android:padding="12dp" android:src="@drawable/ic_arrow_downward_grey_24dp" - android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" @@ -268,7 +266,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="12dp" - android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml b/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml index 7334e1d8..c2c448cb 100644 --- a/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml +++ b/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml @@ -257,7 +257,6 @@ android:layout_height="wrap_content" android:padding="12dp" android:src="@drawable/ic_arrow_upward_grey_24dp" - android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" @@ -283,7 +282,6 @@ android:layout_height="wrap_content" android:padding="12dp" android:src="@drawable/ic_arrow_downward_grey_24dp" - android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" @@ -311,7 +309,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="12dp" - android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/item_post_detail_video_autoplay.xml b/app/src/main/res/layout/item_post_detail_video_autoplay.xml index 200562ad..6f3183b7 100644 --- a/app/src/main/res/layout/item_post_detail_video_autoplay.xml +++ b/app/src/main/res/layout/item_post_detail_video_autoplay.xml @@ -227,7 +227,6 @@ android:layout_height="wrap_content" android:padding="12dp" android:src="@drawable/ic_arrow_upward_grey_24dp" - android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" @@ -253,7 +252,6 @@ android:layout_height="wrap_content" android:padding="12dp" android:src="@drawable/ic_arrow_downward_grey_24dp" - android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" @@ -281,7 +279,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="12dp" - android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" diff --git a/app/src/main/res/layout/item_post_gallery.xml b/app/src/main/res/layout/item_post_gallery.xml index de750751..c0b29287 100644 --- a/app/src/main/res/layout/item_post_gallery.xml +++ b/app/src/main/res/layout/item_post_gallery.xml @@ -244,7 +244,7 @@ android:layout_height="150dp" android:scaleType="center" android:src="@drawable/ic_link" - android:tint="@android:color/tab_indicator_text" + app:tint="@android:color/tab_indicator_text" android:visibility="gone" /> <androidx.constraintlayout.widget.ConstraintLayout diff --git a/app/src/main/res/layout/item_post_no_preview_link.xml b/app/src/main/res/layout/item_post_no_preview_link.xml index c7d6861b..0c56da7e 100644 --- a/app/src/main/res/layout/item_post_no_preview_link.xml +++ b/app/src/main/res/layout/item_post_no_preview_link.xml @@ -213,7 +213,7 @@ android:layout_height="150dp" android:scaleType="center" android:src="@drawable/ic_link" - android:tint="@android:color/tab_indicator_text" /> + app:tint="@android:color/tab_indicator_text" /> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/bottom_constraint_layout_item_post_no_preview_link_type" diff --git a/app/src/main/res/menu/submit_crosspost_activity.xml b/app/src/main/res/menu/submit_crosspost_activity.xml new file mode 100644 index 00000000..30118470 --- /dev/null +++ b/app/src/main/res/menu/submit_crosspost_activity.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + <item + android:id="@+id/action_send_submit_crosspost_activity" + android:orderInCategory="1" + android:title="@string/action_send" + android:icon="@drawable/ic_send_toolbar_24dp" + app:showAsAction="ifRoom" /> +</menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/view_post_detail_activity.xml b/app/src/main/res/menu/view_post_detail_activity.xml index 29c49e1f..306fabb0 100644 --- a/app/src/main/res/menu/view_post_detail_activity.xml +++ b/app/src/main/res/menu/view_post_detail_activity.xml @@ -79,8 +79,7 @@ android:id="@+id/action_report_view_post_detail_activity" android:orderInCategory="12" android:title="@string/action_report" - app:showAsAction="never" - android:visible="false"/> + app:showAsAction="never" /> <item android:id="@+id/action_see_removed_view_post_detail_activity" @@ -88,4 +87,10 @@ android:title="@string/action_see_removed" app:showAsAction="never" android:visible="false" /> + + <item + android:id="@+id/action_crosspost_view_post_detail_activity" + android:orderInCategory="14" + android:title="@string/action_crosspost" + app:showAsAction="never" /> </menu> diff --git a/app/src/main/res/menu/view_user_detail_activity.xml b/app/src/main/res/menu/view_user_detail_activity.xml index 50170f31..a06c2677 100644 --- a/app/src/main/res/menu/view_user_detail_activity.xml +++ b/app/src/main/res/menu/view_user_detail_activity.xml @@ -33,14 +33,24 @@ app:showAsAction="never" /> <item - android:id="@+id/action_share_view_user_detail_activity" + android:id="@+id/action_send_private_message_view_user_detail_activity" android:orderInCategory="6" - android:title="@string/action_share" + android:title="@string/action_send_private_message" app:showAsAction="never" /> <item - android:id="@+id/action_send_private_message_view_user_detail_activity" - android:orderInCategory="6" - android:title="@string/action_send_private_message" + android:id="@+id/action_share_view_user_detail_activity" + android:orderInCategory="7" + android:title="@string/action_share" app:showAsAction="never" /> + + <item + android:id="@+id/action_report_view_user_detail_activity" + android:orderInCategory="8" + android:title="@string/action_report" /> + + <item + android:id="@+id/action_block_user_view_user_detail_activity" + android:orderInCategory="9" + android:title="@string/action_block_user" /> </menu> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 4ab1f8bd..e4d0fdcd 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -9,4 +9,6 @@ <color name="playButtonBackgroundColor">#FFFFFF</color> <color name="roundedBottomSheetPrimaryBackground">#242424</color> <color name="primaryTextColor">#FFFFFF</color> + <color name="settingsSubtitleColor">#4DFFFFFF</color> + <color name="dividerColor">#69666c</color> </resources> diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index e3ad548e..94df20c9 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -160,7 +160,7 @@ <item>ManropeBold</item> <item>Sriracha</item> </string-array> - + <string-array name="settings_tab_post_type"> <item>Home</item> <item>Popular</item> @@ -228,4 +228,19 @@ <item>yyyy.M.d HH:mm</item> <item>yyyy.M.d hh:mm a</item> </string-array> + + <string-array name="settings_number_of_columns_in_post_feed"> + <item>1</item> + <item>2</item> + </string-array> + <!-- Reply Preference --> + <string-array name="reply_entries"> + <item>Reply</item> + <item>Reply to all</item> + </string-array> + + <string-array name="reply_values"> + <item>reply</item> + <item>reply_all</item> + </string-array> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c940e5fa..03423272 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -10,4 +10,6 @@ <color name="roundedBottomSheetPrimaryBackground">#FFFFFF</color> <color name="roundedBottomSheetPrimaryNavigationBarColor">#000000</color> <color name="primaryTextColor">#000000</color> + <color name="settingsSubtitleColor">#42000000</color> + <color name="dividerColor">#E0E0E0</color> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 447922e7..f9ef4518 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ <resources> - <string name="application_name">Infinity</string> + <string name="application_name" translatable="false">Infinity</string> <string name="login_activity_label">Login</string> <string name="search_activity_label">Search</string> <string name="comment_activity_label">Send Comment</string> @@ -32,6 +32,7 @@ <string name="view_reddit_gallery_activity_image_label">Image %1$d/%2$d</string> <string name="view_reddit_gallery_activity_gif_label">Gif %1$d/%2$d</string> <string name="view_reddit_gallery_activity_video_label">Video %1$d/%2$d</string> + <string name="submit_crosspost_activity_label">Crosspost</string> <string name="navigation_drawer_open">Open navigation drawer</string> <string name="navigation_drawer_close">Close navigation drawer</string> @@ -66,8 +67,10 @@ <string name="action_preview">Preview</string> <string name="action_report">Report</string> <string name="action_see_removed">See Removed</string> + <string name="action_crosspost">Crosspost</string> <string name="action_set_wallpaper">Set as Wallpaper</string> <string name="action_send_private_message">Send Private Message</string> + <string name="action_block_user">Block User</string> <string name="parse_json_response_error">Error occurred when parsing the JSON response</string> <string name="retrieve_token_error">Error Retrieving the token</string> @@ -124,9 +127,6 @@ <string name="cannot_fetch_sidebar">Cannot fetch sidebar</string> <string name="cannot_fetch_multireddit">Cannot fetch multireddit info</string> - <string name="gilded_count">x%1$d</string> - <string name="title_activity_view_user_detail">ViewUserDetailActivity</string> - <string name="subscribe">Subscribe</string> <string name="unsubscribe">Unsubscribe</string> <string name="subscribed">Subscribed</string>" @@ -303,18 +303,18 @@ <string name="show_removed_post_failed">Could not find the removed post</string> <string name="cancel">Cancel</string> <string name="ok">OK</string> - <string name="edit_success">Edit successful</string> + <string name="edit_success">Edit successfully</string> <string name="delete_post_success">Delete successfully</string> <string name="delete_post_failed">Delete failed</string> - <string name="mark_nsfw_success">Mark NSFW successful</string> + <string name="mark_nsfw_success">Mark NSFW successfully</string> <string name="mark_nsfw_failed">Mark NSFW failed</string> - <string name="unmark_nsfw_success">Unmark NSFW successful</string> + <string name="unmark_nsfw_success">Unmark NSFW successfully</string> <string name="unmark_nsfw_failed">Unmark NSFW failed</string> - <string name="mark_spoiler_success">Mark spoiler successful</string> + <string name="mark_spoiler_success">Mark spoiler successfully</string> <string name="mark_spoiler_failed">Mark spoiler failed</string> - <string name="unmark_spoiler_success">Unmark spoiler successful</string> + <string name="unmark_spoiler_success">Unmark spoiler successfully</string> <string name="unmark_spoiler_failed">Unmark spoiler failed</string> - <string name="update_flair_success">Update flair successful</string> + <string name="update_flair_success">Update flair successfully</string> <string name="update_flair_failed">Update flair failed</string> <string name="edit_flair">Edit Flair</string> @@ -347,6 +347,8 @@ <string name="settings_amoled_dark_title">Amoled Dark</string> <string name="settings_interface_title">Interface</string> <string name="settings_gestures_and_buttons_title">Gestures & Buttons</string> + <string name="settings_save_front_page_scrolled_position_title">Save Scrolled Position in HOME</string> + <string name="settings_save_front_page_scrolled_position_summary">Browse new posts after refreshing in HOME (Front Page, sort type: Best)</string> <string name="settings_open_link_in_app_title">Open Link In App</string> <string name="settigns_video_title">Video</string> <string name="settings_video_autoplay_title">Video Autoplay</string> @@ -387,6 +389,9 @@ <string name="settings_default_post_layout">Default Post Layout</string> <string name="settings_show_divider_in_compact_layout">Show Divider in Compact Layout</string> <string name="settings_show_thumbnail_on_the_left_in_compact_layout">Show Thumbnail on the Left in Compact Layout</string> + <string name="settings_number_of_columns_in_post_feed_title">The Number of Columns in Post Feed</string> + <string name="settings_number_of_columns_in_post_feed_portrait_title">Portrait</string> + <string name="settings_number_of_columns_in_post_feed_landscape_title">Landscape</string> <string name="settings_swap_tap_and_long_title">Swap Tap and Long Press in Comments</string> <string name="settings_swipe_to_go_back_title">Swipe Right to Go Back</string> <string name="settings_swipe_to_go_back_summary">Does Not Apply to All Pages</string> @@ -408,7 +413,6 @@ <string name="settings_enable_nsfw_title">Enable NSFW</string> <string name="settings_blur_nsfw_title">Blur NSFW Images</string> <string name="settings_blur_spoiler_title">Blur Spoiler Images</string> - <string name="settings_layout_no_limits_title">Display Under Navigation bar and Status Bar</string> <string name="settings_about_master_title">About</string> <string name="settings_acknowledgement_master_title">Acknowledgement</string> <string name="settings_credits_master_title">Credits</string> @@ -441,8 +445,6 @@ <string name="settings_subreddit_summary">r/Infinity_For_Reddit</string> <string name="settings_share_title">Share</string> <string name="settings_share_summary">Share this app to other people if you enjoy it</string> - <string name="settings_crash_reports_title">Crash Reports</string> - <string name="settings_crash_reports_summary">See the error logs and send them to me when you report bugs</string> <string name="settings_version_title">Infinity For Reddit</string> <string name="settings_version_summary">Version %s</string> <string name="settings_category_customization_title">Customization</string> @@ -457,6 +459,8 @@ <string name="settings_delete_all_sort_type_data_in_database_title">Delete All Sort Types in Database</string> <string name="settings_delete_all_post_layout_data_in_database_title">Delete All Post Layouts in Database</string> <string name="settings_delete_all_themes_in_database_title">Delete All Themes in Database</string> + <string name="settings_delete_front_page_scrolled_positions_in_database_title">Delete All Front Page Scrolled Positions in Database</string> + <string name="settings_delete_all_legacy_settings_title">Delete All Legacy Settings</string> <string name="settings_reset_all_settings_title">Reset All Settings</string> <string name="settings_advanced_settings_summary">Clean the database and shared preferences</string> <string name="settings_tab_info">Restart the app to see the changes</string> @@ -469,6 +473,10 @@ <string name="settings_tab_multi_reddit_name">MultiReddit Name (/user/yourusername/m/yourmultiredditname)</string> <string name="settings_tab_username">Username (Without u/ prefix)</string> <string name="no_developer_easter_egg">There\'s no developer options here</string> + <string name="settings_download_location_title">Download Location</string> + <string name="settings_image_download_location_title">Image Download Location</string> + <string name="settings_gif_download_location_title">Gif Download Location</string> + <string name="settings_video_download_location_title">Video Download Location</string> <string name="no_link_available">Cannot get the link</string> @@ -686,7 +694,7 @@ <string name="theme_item_subscribed_color">Subscribed</string> <string name="theme_item_subscribed_color_detail">Applied to: Unsubscribe button</string> <string name="theme_item_unsubscribed_color">Unsubscribed</string> - <string name="theme_item_unsubscribed_color_detail">Applied to: Sbscribe button</string> + <string name="theme_item_unsubscribed_color_detail">Applied to: Subscribe button</string> <string name="theme_item_username_color">Username Color</string> <string name="theme_item_username_color_detail">Applied to: Username</string> <string name="theme_item_subreddit_color">Subreddit Color</string> @@ -759,11 +767,11 @@ <string name="cannot_find_theme">Cannot find this theme</string> <string name="import_theme">Import Theme</string> <string name="no_data_in_clipboard">Cannot find data in clipboard</string> - <string name="import_theme_success">Import theme successful</string> + <string name="import_theme_success">Import theme successfully</string> <string name="parse_theme_failed">Parse Theme Failed</string> <string name="share_theme_to_subreddit_dialog_title">Share it to r/Infinity_For_Reddit?</string> <string name="share_theme_to_subreddit_dialog_message">The theme configuration is copied! - Do you want to share it to r/Infinity so that other people can use it?</string> + Do you want to share it to r/Infinity_For_Reddit so that other people can use it?</string> <string name="duplicate_theme_name_dialog_title">Duplicate Theme Found</string> <string name="duplicate_theme_name_dialog_message">A theme in the database is also called %1$s. Do you want to change the name of this imported theme?</string> <string name="rename">Rename</string> @@ -772,12 +780,14 @@ <string name="color_picker">Color Picker</string> <string name="invalid_color">Invalid Color</string> - <string name="delete_all_subreddits_success">Delete all subreddits successful</string> - <string name="delete_all_users_success">Delete all users successful</string> - <string name="delete_all_sort_types_success">Delete all sort types successful</string> - <string name="delete_all_post_layouts_success">Delete all post layouts successful</string> - <string name="delete_all_themes_success">Delete all themes successful</string> - <string name="reset_all_settings_success">Reset all settings successful</string> + <string name="delete_all_subreddits_success">Delete all subreddits successfully</string> + <string name="delete_all_users_success">Delete all users successfully</string> + <string name="delete_all_sort_types_success">Delete all sort types successfully</string> + <string name="delete_all_post_layouts_success">Delete all post layouts successfully</string> + <string name="delete_all_themes_success">Delete all themes successfully</string> + <string name="delete_all_front_page_scrolled_positions_success">Delete all scrolled positions in front page successfully</string> + <string name="delete_all_legacy_settings_success">Delete all legacy settings successfully</string> + <string name="reset_all_settings_success">Reset all settings successfully</string> <string name="theme_preview">Theme Preview</string> <string name="username_preview">u/Hostilenemy</string> @@ -834,6 +844,17 @@ <string name="downloading_reddit_video_failed_cannot_save_audio">Download failed: cannot save audio to cache directory</string> <string name="downloading_reddit_video_failed_cannot_mux">Download failed: cannot mux video and audio</string> <string name="downloading_reddit_video_failed_cannot_save_mux_video">Download failed: cannot save the video to public directory</string> + <string name="downloading_video">Downloading Video</string> + <string name="downloading_video_save_video">Saving Video</string> + + <string name="downloading_image">Downloading Image</string> + <string name="downloading_gif">Downloading Gif</string> + <string name="downloading_image_save_image">Saving Image</string> + <string name="downloading_gif_save_gif">Saving Gif</string> + <string name="downloading_media_finished">Downloaded</string> + <string name="downloading_image_or_gif_failed_cannot_get_destination_directory">Download failed: cannot access destination directory</string> + <string name="downloading_media_failed_cannot_download_media">Download failed</string> + <string name="downloading_media_failed_cannot_save_to_destination_directory">Download failed: cannot save the file to destination directory</string> <string name="wallpaper_set">Wallpaper set</string> <string name="error_set_wallpaper">Cannot set wallpaper</string> @@ -850,4 +871,22 @@ <string name="login_activity_2fa_prompt">If you have 2-factor authentication enabled, kindly type your password like the following: <password>:<2FA code>.\nExample: yourpass:123456</string> + <string name="block_user">Block User</string> + <string name="block_user_success">Blocked</string> + <string name="block_user_failed">Failed to block user</string> + <!-- Preference Titles --> + <string name="messages_header">Messages</string> + <string name="sync_header">Sync</string> + + <!-- Messages Preferences --> + <string name="signature_title">Your signature</string> + <string name="reply_title">Default reply action</string> + + <!-- Sync Preferences --> + <string name="sync_title">Sync email periodically</string> + <string name="attachment_title">Download incoming attachments</string> + <string name="attachment_summary_on">Automatically download attachments for incoming emails + </string> + <string name="attachment_summary_off">Only download attachments when manually requested</string> + </resources> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 0e0d703f..ccf3e1a3 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -35,7 +35,7 @@ <style name="AppTheme.SlidableWithActionBar"> <item name="android:windowIsTranslucent">true</item> <item name="android:windowTranslucentStatus">true</item> - <item name="android:windowBackground">@android:color/black</item> + <item name="android:windowBackground">#00000000</item> <item name="android:fontFamily">?attr/font_family</item> </style> diff --git a/app/src/main/res/xml-sw600dp/number_of_columns_in_post_feed_preferences.xml b/app/src/main/res/xml-sw600dp/number_of_columns_in_post_feed_preferences.xml new file mode 100644 index 00000000..4a61e4fc --- /dev/null +++ b/app/src/main/res/xml-sw600dp/number_of_columns_in_post_feed_preferences.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"> + <ListPreference + app:defaultValue="2" + app:entries="@array/settings_number_of_columns_in_post_feed" + app:entryValues="@array/settings_number_of_columns_in_post_feed" + app:key="number_of_columns_in_post_feed_portrait" + app:title="@string/settings_number_of_columns_in_post_feed_portrait_title" + app:useSimpleSummaryProvider="true" /> + + <ListPreference + app:defaultValue="2" + app:entries="@array/settings_number_of_columns_in_post_feed" + app:entryValues="@array/settings_number_of_columns_in_post_feed" + app:key="number_of_columns_in_post_feed_landscape" + app:title="@string/settings_number_of_columns_in_post_feed_landscape_title" + app:useSimpleSummaryProvider="true" /> +</PreferenceScreen>
\ No newline at end of file diff --git a/app/src/main/res/xml/about_preferences.xml b/app/src/main/res/xml/about_preferences.xml index 6561eec3..a73f9aaa 100644 --- a/app/src/main/res/xml/about_preferences.xml +++ b/app/src/main/res/xml/about_preferences.xml @@ -46,11 +46,6 @@ app:summary="@string/settings_share_summary" /> <Preference - app:title="@string/settings_crash_reports_title" - app:summary="@string/settings_crash_reports_summary" - app:fragment="ml.docilealligator.infinityforreddit.Settings.CrashReportsFragment" /> - - <Preference android:key="version" app:title="@string/settings_version_title" app:summary="@string/settings_version_summary" /> diff --git a/app/src/main/res/xml/advanced_preferences.xml b/app/src/main/res/xml/advanced_preferences.xml index 432623d3..0d6c02e5 100644 --- a/app/src/main/res/xml/advanced_preferences.xml +++ b/app/src/main/res/xml/advanced_preferences.xml @@ -23,6 +23,14 @@ app:title="@string/settings_delete_all_themes_in_database_title" /> <Preference + app:key="delete_front_page_scrolled_positions_in_database" + app:title="@string/settings_delete_front_page_scrolled_positions_in_database_title" /> + + <Preference + app:key="delete_all_legacy_settings" + app:title="@string/settings_delete_all_legacy_settings_title" /> + + <Preference app:key="reset_all_settings" app:title="@string/settings_reset_all_settings_title" /> diff --git a/app/src/main/res/xml/customize_main_page_tabs_preferences.xml b/app/src/main/res/xml/customize_main_page_tabs_preferences.xml deleted file mode 100644 index 37e17d0c..00000000 --- a/app/src/main/res/xml/customize_main_page_tabs_preferences.xml +++ /dev/null @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> - - <Preference - android:icon="@drawable/ic_info_preference_24dp" - app:summary="@string/settings_tab_info" - app:enabled="false" /> - - <PreferenceCategory - app:title="@string/settings_tab_1_summary" /> - - <EditTextPreference - app:defaultValue="@string/home" - app:key="main_page_tab_1_title" - app:title="@string/settings_tab_title" - app:useSimpleSummaryProvider="true" /> - - <ListPreference - app:defaultValue="0" - android:entries="@array/settings_tab_post_type" - app:entryValues="@array/settings_tab_post_type_values" - app:key="main_page_tab_1_post_type" - app:title="@string/settings_tab_post_type" - app:useSimpleSummaryProvider="true" /> - - <EditTextPreference - app:key="main_page_tab_1_name" - app:isPreferenceVisible="false" - app:useSimpleSummaryProvider="true" /> - - <PreferenceCategory - app:title="@string/settings_tab_2_summary" /> - - <EditTextPreference - app:defaultValue="@string/popular" - app:key="main_page_tab_2_title" - app:title="@string/settings_tab_title" - app:useSimpleSummaryProvider="true" /> - - <ListPreference - app:defaultValue="1" - android:entries="@array/settings_tab_post_type" - app:entryValues="@array/settings_tab_post_type_values" - app:key="main_page_tab_2_post_type" - app:title="@string/settings_tab_post_type" - app:useSimpleSummaryProvider="true" /> - - <EditTextPreference - app:key="main_page_tab_2_name" - app:isPreferenceVisible="false" - app:useSimpleSummaryProvider="true" /> - - <PreferenceCategory - app:title="@string/settings_tab_3_summary" /> - - <EditTextPreference - app:defaultValue="@string/all" - app:key="main_page_tab_3_title" - app:title="@string/settings_tab_title" - app:useSimpleSummaryProvider="true" /> - - <ListPreference - app:defaultValue="2" - android:entries="@array/settings_tab_post_type" - app:entryValues="@array/settings_tab_post_type_values" - app:key="main_page_tab_3_post_type" - app:title="@string/settings_tab_post_type" - app:useSimpleSummaryProvider="true" /> - - <EditTextPreference - app:key="main_page_tab_3_name" - app:isPreferenceVisible="false" - app:useSimpleSummaryProvider="true" /> - -</PreferenceScreen>
\ No newline at end of file diff --git a/app/src/main/res/xml/download_location_preferences.xml b/app/src/main/res/xml/download_location_preferences.xml new file mode 100644 index 00000000..7954cb87 --- /dev/null +++ b/app/src/main/res/xml/download_location_preferences.xml @@ -0,0 +1,13 @@ +<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"> + <Preference + app:key="image_download_location" + app:title="@string/settings_image_download_location_title" /> + + <Preference + app:key="gif_download_location" + app:title="@string/settings_gif_download_location_title" /> + + <Preference + app:key="video_download_location" + app:title="@string/settings_video_download_location_title" /> +</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 2e5c71e3..0fcd1977 100644 --- a/app/src/main/res/xml/interface_preference.xml +++ b/app/src/main/res/xml/interface_preference.xml @@ -62,6 +62,10 @@ app:key="show_thumbnail_on_the_left_in_compact_layout" app:title="@string/settings_show_thumbnail_on_the_left_in_compact_layout" /> + <Preference + app:title="@string/settings_number_of_columns_in_post_feed_title" + 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 af3f3898..ce6ff184 100644 --- a/app/src/main/res/xml/main_preferences.xml +++ b/app/src/main/res/xml/main_preferences.xml @@ -36,6 +36,17 @@ app:title="@string/settings_lazy_mode_interval_title" app:useSimpleSummaryProvider="true" /> + <Preference + app:title="@string/settings_download_location_title" + android:icon="@drawable/ic_download_24dp" + app:fragment="ml.docilealligator.infinityforreddit.Settings.DownloadLocationPreferenceFragment" /> + + <SwitchPreference + app:defaultValue="false" + app:key="save_front_page_scrolled_position" + app:title="@string/settings_save_front_page_scrolled_position_title" + app:summary="@string/settings_save_front_page_scrolled_position_summary" /> + <SwitchPreference app:defaultValue="false" app:icon="@drawable/ic_link" diff --git a/app/src/main/res/xml/number_of_columns_in_post_feed_preferences.xml b/app/src/main/res/xml/number_of_columns_in_post_feed_preferences.xml new file mode 100644 index 00000000..cbaea03e --- /dev/null +++ b/app/src/main/res/xml/number_of_columns_in_post_feed_preferences.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + <Preference + android:icon="@drawable/ic_info_preference_24dp" + app:summary="@string/settings_tab_info" + app:enabled="false" /> + + <ListPreference + app:defaultValue="1" + app:entries="@array/settings_number_of_columns_in_post_feed" + app:entryValues="@array/settings_number_of_columns_in_post_feed" + app:key="number_of_columns_in_post_feed_portrait" + app:title="@string/settings_number_of_columns_in_post_feed_portrait_title" + app:useSimpleSummaryProvider="true" /> + + <ListPreference + app:defaultValue="2" + app:entries="@array/settings_number_of_columns_in_post_feed" + app:entryValues="@array/settings_number_of_columns_in_post_feed" + app:key="number_of_columns_in_post_feed_landscape" + app:title="@string/settings_number_of_columns_in_post_feed_landscape_title" + app:useSimpleSummaryProvider="true" /> +</PreferenceScreen>
\ No newline at end of file |