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

Prepare to add different themes. Try fixing timeout issue in okhttp3.

Browse Source
This commit is contained in:
Alex Ning
2020-02-26 22:40:15 +08:00
parent 6433014679
commit 0f36ad4e1d
36 changed files with 456 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/layout/activity_multi_reddit_listing.xml
View File

@@ -76,7 +76,7 @@
android:layout_height="wrap_content"
android:layout_margin="@dimen/fab_margin"
android:layout_gravity="bottom|end"
app:backgroundTint="@color/backgroundColorPrimary"
app:backgroundTint="?attr/colorPrimaryLightTheme"
app:srcCompat="@drawable/ic_add_bottom_app_bar_24dp"
app:tint="@android:color/white" />

8
app/src/main/res/layout/activity_post_image.xml
View File

@@ -92,7 +92,7 @@
android:textSize="?attr/font_default"
android:visibility="gone"
app:lib_setRadius="3dp"
app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme"
app:lib_setRoundedBorderColor="?attr/flairColor"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
@@ -106,7 +106,7 @@
android:textColor="@color/primaryTextColor"
android:textSize="?attr/font_default"
app:lib_setRadius="3dp"
app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme"
app:lib_setRoundedBorderColor="?attr/spoilerColor"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
@@ -164,7 +164,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/select_from_library_fab_post_image_activity"
app:layout_constraintHorizontal_chainStyle="spread"
app:backgroundTint="@color/backgroundColorPrimary"
app:backgroundTint="?attr/colorPrimaryLightTheme"
app:tint="@android:color/white" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -177,7 +177,7 @@
app:layout_constraintStart_toEndOf="@+id/capture_fab_post_image_activity"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:backgroundTint="@color/backgroundColorPrimary"
app:backgroundTint="?attr/colorPrimaryLightTheme"
app:tint="@android:color/white" />
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/activity_post_link.xml
View File

@@ -92,7 +92,7 @@
android:textSize="?attr/font_default"
android:visibility="gone"
app:lib_setRadius="3dp"
app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme"
app:lib_setRoundedBorderColor="?attr/flairColor"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
@@ -106,7 +106,7 @@
android:textColor="@color/primaryTextColor"
android:textSize="?attr/font_default"
app:lib_setRadius="3dp"
app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme"
app:lib_setRoundedBorderColor="?attr/spoilerColor"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />

4
app/src/main/res/layout/activity_post_text.xml
View File

@@ -92,7 +92,7 @@
android:textSize="?attr/font_default"
android:visibility="gone"
app:lib_setRadius="3dp"
app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme"
app:lib_setRoundedBorderColor="?attr/flairColor"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
@@ -106,7 +106,7 @@
android:textColor="@color/primaryTextColor"
android:textSize="?attr/font_default"
app:lib_setRadius="3dp"
app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme"
app:lib_setRoundedBorderColor="?attr/spoilerColor"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />

8
app/src/main/res/layout/activity_post_video.xml
View File

@@ -92,7 +92,7 @@
android:textSize="?attr/font_default"
android:visibility="gone"
app:lib_setRadius="3dp"
app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme"
app:lib_setRoundedBorderColor="?attr/flairColor"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
@@ -106,7 +106,7 @@
android:textColor="@color/primaryTextColor"
android:textSize="?attr/font_default"
app:lib_setRadius="3dp"
app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme"
app:lib_setRoundedBorderColor="?attr/spoilerColor"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
@@ -164,7 +164,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/select_from_library_fab_post_video_activity"
app:layout_constraintHorizontal_chainStyle="spread"
app:backgroundTint="@color/backgroundColorPrimary"
app:backgroundTint="?attr/colorPrimaryLightTheme"
app:tint="@android:color/white" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -177,7 +177,7 @@
app:layout_constraintStart_toEndOf="@+id/capture_fab_post_video_activity"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:backgroundTint="@color/backgroundColorPrimary"
app:backgroundTint="?attr/colorPrimaryLightTheme"
app:tint="@android:color/white" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/activity_view_post_detail.xml
View File

@@ -76,7 +76,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:backgroundTint="@color/backgroundColorPrimary"
app:backgroundTint="?attr/colorPrimaryLightTheme"
app:tint="@android:color/white"
app:srcCompat="@drawable/ic_keyboard_arrow_down_24dp" />

2
app/src/main/res/layout/activity_view_subreddit_detail.xml
View File

@@ -203,7 +203,7 @@
android:layout_height="wrap_content"
android:layout_margin="@dimen/fab_margin"
android:visibility="gone"
app:backgroundTint="@color/backgroundColorPrimary"
app:backgroundTint="?attr/colorPrimaryLightTheme"
app:srcCompat="@drawable/ic_add_bottom_app_bar_24dp"
app:tint="@android:color/white"
app:layout_anchor="@id/bottom_navigation_view_subreddit_detail_activity" />

2
app/src/main/res/layout/activity_view_user_detail.xml
View File

@@ -66,7 +66,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:textSize="?attr/font_18"
android:textColor="@color/colorPrimaryDarkDayNightTheme"
android:textColor="?attr/username"
android:layout_gravity="center_horizontal"/>
<TextView

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

@@ -131,7 +131,7 @@
android:layout_height="wrap_content"
android:layout_margin="@dimen/fab_margin"
android:visibility="gone"
app:backgroundTint="@color/backgroundColorPrimary"
app:backgroundTint="?attr/colorPrimaryLightTheme"
app:srcCompat="@drawable/ic_add_bottom_app_bar_24dp"
app:tint="@android:color/white"
app:layout_anchor="@id/bottom_navigation_main_activity" />

7
app/src/main/res/layout/item_comment.xml
View File

@@ -14,8 +14,7 @@
<View
android:id="@+id/vertical_block_item_post_comment"
android:layout_width="0dp"
android:layout_height="match_parent"
android:background="@color/colorPrimaryDarkDayNightTheme"/>
android:layout_height="match_parent" />
<LinearLayout
android:layout_width="match_parent"
@@ -48,7 +47,7 @@
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="2"
android:textColor="@color/colorPrimaryDarkDayNightTheme"
android:textColor="?attr/username"
android:textSize="?attr/font_default"
app:layout_constraintBottom_toTopOf="@id/author_flair_text_view_item_post_comment"
app:layout_constraintEnd_toStartOf="@+id/barrier"
@@ -62,7 +61,7 @@
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="2"
android:textColor="@color/authorFlairTextColor"
android:textColor="?attr/authorFlairTextColor"
android:textSize="?attr/font_12"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"

2
app/src/main/res/layout/item_footer_error.xml
View File

@@ -22,7 +22,7 @@
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:backgroundTint="@color/backgroundColorPrimary"
android:backgroundTint="?attr/colorPrimaryLightTheme"
android:textColor="@android:color/white"
android:text="@string/retry"
android:textSize="?attr/font_default" />

3
app/src/main/res/layout/item_load_more_comments_placeholder.xml
View File

@@ -12,8 +12,7 @@
<View
android:id="@+id/vertical_block_item_load_more_comments"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@color/colorPrimaryDarkDayNightTheme" />
android:layout_height="match_parent" />
<TextView
android:id="@+id/placeholder_text_view_item_load_more_comments"

22
app/src/main/res/layout/item_post.xml
View File

@@ -49,7 +49,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="8dp"
android:textColor="@color/colorPrimaryDarkDayNightTheme"
android:textColor="?attr/username"
android:textSize="?attr/font_default"
android:maxLines="2"
android:ellipsize="end"
@@ -64,7 +64,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="8dp"
android:tint="@color/backgroundColorPrimaryDark"
android:tint="?attr/stickiedPost"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/name_text_view_item_post"
@@ -127,8 +127,8 @@
android:padding="4dp"
android:textSize="?attr/font_12"
android:textColor="@android:color/white"
app:lib_setRoundedBGColor="@color/backgroundColorPrimaryDark"
app:lib_setRoundedBorderColor="@color/backgroundColorPrimaryDark"
app:lib_setRoundedBGColor="?attr/post_type"
app:lib_setRoundedBorderColor="?attr/post_type"
app:lib_setRadius="3dp"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
@@ -144,8 +144,8 @@
android:padding="4dp"
android:visibility="gone"
app:lib_setRadius="3dp"
app:lib_setRoundedBGColor="@color/spoilerBackgroundColor"
app:lib_setRoundedBorderColor="@color/spoilerBackgroundColor"
app:lib_setRoundedBGColor="?attr/spoilerColor"
app:lib_setRoundedBorderColor="?attr/spoilerColor"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
@@ -174,8 +174,8 @@
android:padding="4dp"
android:visibility="gone"
app:lib_setRadius="3dp"
app:lib_setRoundedBGColor="@color/flairBackgroundColor"
app:lib_setRoundedBorderColor="@color/flairBackgroundColor"
app:lib_setRoundedBGColor="?attr/flairColor"
app:lib_setRoundedBorderColor="?attr/flairColor"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
@@ -194,7 +194,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_archive_outline"
android:tint="@color/archivedTint"
android:tint="?attr/archivedTint"
android:visibility="gone" />
<ImageView
@@ -202,7 +202,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_outline_lock_24dp"
android:tint="@color/lockedIconTint"
android:tint="?attr/lockedIconTint"
android:visibility="gone" />
<ImageView
@@ -210,7 +210,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/crosspost"
android:tint="@color/colorAccent"
android:tint="?attr/crosspost"
android:visibility="gone" />
</com.nex3z.flowlayout.FlowLayout>

20
app/src/main/res/layout/item_post_compact.xml
View File

@@ -47,7 +47,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="8dp"
android:tint="@color/backgroundColorPrimaryDark"
android:tint="?attr/stickiedPost"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/guideline2"
@@ -115,8 +115,8 @@
android:textColor="@android:color/white"
android:textSize="?attr/font_10"
app:lib_setRadius="3dp"
app:lib_setRoundedBGColor="@color/backgroundColorPrimaryDark"
app:lib_setRoundedBorderColor="@color/backgroundColorPrimaryDark"
app:lib_setRoundedBGColor="?attr/post_type"
app:lib_setRoundedBorderColor="?attr/post_type"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
@@ -131,8 +131,8 @@
android:textSize="?attr/font_10"
android:visibility="gone"
app:lib_setRadius="3dp"
app:lib_setRoundedBGColor="@color/spoilerBackgroundColor"
app:lib_setRoundedBorderColor="@color/spoilerBackgroundColor"
app:lib_setRoundedBGColor="?attr/spoilerColor"
app:lib_setRoundedBorderColor="?attr/spoilerColor"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
@@ -161,8 +161,8 @@
android:textSize="?attr/font_10"
android:visibility="gone"
app:lib_setRadius="3dp"
app:lib_setRoundedBGColor="@color/flairBackgroundColor"
app:lib_setRoundedBorderColor="@color/flairBackgroundColor"
app:lib_setRoundedBGColor="?attr/flairColor"
app:lib_setRoundedBorderColor="?attr/flairColor"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
@@ -181,7 +181,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_archive_outline"
android:tint="@color/archivedTint"
android:tint="?attr/archivedTint"
android:visibility="gone" />
<ImageView
@@ -189,7 +189,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_outline_lock_24dp"
android:tint="@color/lockedIconTint"
android:tint="?attr/lockedIconTint"
android:visibility="gone" />
<ImageView
@@ -197,7 +197,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/crosspost"
android:tint="@color/colorAccent"
android:tint="?attr/crosspost"
android:visibility="gone" />
</com.nex3z.flowlayout.FlowLayout>

22
app/src/main/res/layout/item_post_detail.xml
View File

@@ -26,7 +26,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="8dp"
android:textColor="@color/colorAccent"
android:textColor="?attr/subreddit"
android:textSize="?attr/font_default"
android:maxLines="2"
android:ellipsize="end"
@@ -41,7 +41,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="8dp"
android:textColor="@color/colorPrimaryDarkDayNightTheme"
android:textColor="?attr/username"
android:textSize="?attr/font_default"
android:maxLines="2"
android:ellipsize="end"
@@ -109,8 +109,8 @@
android:padding="4dp"
android:textSize="?attr/font_12"
android:textColor="@android:color/white"
app:lib_setRoundedBGColor="@color/backgroundColorPrimaryDark"
app:lib_setRoundedBorderColor="@color/backgroundColorPrimaryDark"
app:lib_setRoundedBGColor="?attr/post_type"
app:lib_setRoundedBorderColor="?attr/post_type"
app:lib_setRadius="3dp"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
@@ -126,8 +126,8 @@
android:padding="4dp"
android:visibility="gone"
app:lib_setRadius="3dp"
app:lib_setRoundedBGColor="@color/spoilerBackgroundColor"
app:lib_setRoundedBorderColor="@color/spoilerBackgroundColor"
app:lib_setRoundedBGColor="?attr/spoilerColor"
app:lib_setRoundedBorderColor="?attr/spoilerColor"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
@@ -156,8 +156,8 @@
android:textColor="@android:color/white"
android:visibility="gone"
app:lib_setRadius="3dp"
app:lib_setRoundedBGColor="@color/flairBackgroundColor"
app:lib_setRoundedBorderColor="@color/flairBackgroundColor"
app:lib_setRoundedBGColor="?attr/flairColor"
app:lib_setRoundedBorderColor="?attr/flairColor"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
@@ -176,7 +176,7 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_archive_outline"
android:tint="@color/archivedTint"
android:tint="?attr/archivedTint"
android:visibility="gone" />
<ImageView
@@ -184,7 +184,7 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_outline_lock_24dp"
android:tint="@color/lockedIconTint"
android:tint="?attr/lockedIconTint"
android:visibility="gone" />
<ImageView
@@ -192,7 +192,7 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/crosspost"
android:tint="@color/colorAccent"
android:tint="?attr/crosspost"
android:visibility="gone" />
</com.nex3z.flowlayout.FlowLayout>

2
app/src/main/res/layout/item_subreddit_listing.xml
View File

@@ -36,7 +36,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_add_24dp"
android:tint="@color/colorPrimaryDarkDayNightTheme"
android:tint="?attr/unsubscribed"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"

2
app/src/main/res/layout/item_user_listing.xml
View File

@@ -36,7 +36,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_add_24dp"
android:tint="@color/colorPrimaryDarkDayNightTheme"
android:tint="?attr/unsubscribed"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"