mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2025-10-06 05:49:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support showing subscribed subreddits in the main page.

Browse Source
This commit is contained in:
Alex Ning
2020-09-24 15:20:11 +08:00
parent 396501e350
commit cf1d14264d
7 changed files with 127 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/res/layout/app_bar_main.xml
View File

@@ -40,7 +40,6 @@
app:layout_scrollFlags="scroll|enterAlways"
app:tabGravity="fill"
app:tabIndicatorHeight="3dp"
app:tabMode="fixed"
app:tabRippleColor="?attr/colorControlHighlight"
app:tabUnboundedRipple="false" />

67
app/src/main/res/layout/fragment_customize_main_page_tabs.xml
View File

@@ -60,7 +60,7 @@
android:layout_height="wrap_content"
android:text="@string/settings_tab_title"
android:textColor="@color/primaryTextColor"
android:textSize="?attr/font_18"
android:textSize="?attr/font_16"
android:fontFamily="?attr/font_family" />
<TextView
@@ -91,7 +91,7 @@
android:layout_height="wrap_content"
android:text="@string/settings_tab_post_type"
android:textColor="@color/primaryTextColor"
android:textSize="?attr/font_18"
android:textSize="?attr/font_16"
android:fontFamily="?attr/font_family" />
<TextView
@@ -123,7 +123,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/primaryTextColor"
android:textSize="?attr/font_18"
android:textSize="?attr/font_16"
android:fontFamily="?attr/font_family" />
<TextView
@@ -172,7 +172,7 @@
android:layout_height="wrap_content"
android:text="@string/settings_tab_title"
android:textColor="@color/primaryTextColor"
android:textSize="?attr/font_18"
android:textSize="?attr/font_16"
android:fontFamily="?attr/font_family" />
<TextView
@@ -203,7 +203,7 @@
android:layout_height="wrap_content"
android:text="@string/settings_tab_post_type"
android:textColor="@color/primaryTextColor"
android:textSize="?attr/font_18"
android:textSize="?attr/font_16"
android:fontFamily="?attr/font_family" />
<TextView
@@ -235,7 +235,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/primaryTextColor"
android:textSize="?attr/font_18"
android:textSize="?attr/font_16"
android:fontFamily="?attr/font_family" />
<TextView
@@ -284,7 +284,7 @@
android:layout_height="wrap_content"
android:text="@string/settings_tab_title"
android:textColor="@color/primaryTextColor"
android:textSize="?attr/font_18"
android:textSize="?attr/font_16"
android:fontFamily="?attr/font_family" />
<TextView
@@ -315,7 +315,7 @@
android:layout_height="wrap_content"
android:text="@string/settings_tab_post_type"
android:textColor="@color/primaryTextColor"
android:textSize="?attr/font_18"
android:textSize="?attr/font_16"
android:fontFamily="?attr/font_family" />
<TextView
@@ -347,7 +347,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/primaryTextColor"
android:textSize="?attr/font_18"
android:textSize="?attr/font_16"
android:fontFamily="?attr/font_family" />
<TextView
@@ -360,6 +360,55 @@
</LinearLayout>
<View
android:id="@+id/divider_4_customize_main_page_tabs_fragment"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/dividerColor" />
<TextView
android:id="@+id/more_tabs_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_more_tabs_summary"
android:textColor="@color/colorAccent"
android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family" />
<LinearLayout
android:id="@+id/show_subscribed_subreddits_linear_layout_customize_main_page_tabs_fragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingStart="72dp"
android:paddingEnd="16dp"
android:clickable="true"
android:focusable="true"
android:background="?attr/selectableItemBackground">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginEnd="16dp"
android:layout_gravity="center_vertical"
android:text="@string/settings_more_tabs_show_subscribed_subreddits_title"
android:textColor="?attr/primaryTextColor"
android:textSize="?attr/font_16"
android:fontFamily="?attr/font_family" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/show_subscribed_subreddits_switch_material_customize_main_page_tabs_fragment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>

6
app/src/main/res/layout/fragment_nsfw_and_spoiler.xml
View File

@@ -34,7 +34,7 @@
android:drawablePadding="32dp"
android:text="@string/settings_enable_nsfw_title"
android:textColor="?attr/primaryTextColor"
android:textSize="?attr/font_default"
android:textSize="?attr/font_16"
android:fontFamily="?attr/font_family" />
<com.google.android.material.switchmaterial.SwitchMaterial
@@ -66,7 +66,7 @@
android:layout_gravity="center_vertical"
android:text="@string/settings_blur_nsfw_title"
android:textColor="?attr/primaryTextColor"
android:textSize="?attr/font_default"
android:textSize="?attr/font_16"
android:fontFamily="?attr/font_family" />
<com.google.android.material.switchmaterial.SwitchMaterial
@@ -97,7 +97,7 @@
android:layout_gravity="center_vertical"
android:text="@string/settings_blur_spoiler_title"
android:textColor="?attr/primaryTextColor"
android:textSize="?attr/font_default"
android:textSize="?attr/font_16"
android:fontFamily="?attr/font_family" />
<com.google.android.material.switchmaterial.SwitchMaterial