diff --git a/app/src/main/java/com/huanchengfly/tieba/post/App.kt b/app/src/main/java/com/huanchengfly/tieba/post/App.kt
index 2605c2df..8367f742 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/App.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/App.kt
@@ -577,6 +577,11 @@ class App : Application(), IApp, IGetter, SketchFactory {
R.attr.colorOnAccent
)
+ R.color.default_color_chip -> return return getColorByAttr(
+ context,
+ R.attr.colorChip
+ )
+
R.color.default_color_background -> return getColorByAttr(
context,
R.attr.colorBg
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/fragments/threadmenu/ThreadMenuFragment.kt b/app/src/main/java/com/huanchengfly/tieba/post/fragments/threadmenu/ThreadMenuFragment.kt
index 926140d4..06f40e76 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/fragments/threadmenu/ThreadMenuFragment.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/fragments/threadmenu/ThreadMenuFragment.kt
@@ -31,9 +31,6 @@ class ThreadMenuFragment(
@BindView(R.id.thread_menu_see_lz_text)
lateinit var seeLzText: TintTextView
- @BindView(R.id.thread_menu_see_lz_status)
- lateinit var seeLzStatus: TintTextView
-
@BindView(R.id.thread_menu_collect)
lateinit var collectItem: TintLinearLayout
@@ -43,9 +40,6 @@ class ThreadMenuFragment(
@BindView(R.id.thread_menu_collect_text)
lateinit var collectText: TintTextView
- @BindView(R.id.thread_menu_collect_status)
- lateinit var collectStatus: TintTextView
-
@BindView(R.id.thread_menu_pure_read)
lateinit var pureReadItem: TintLinearLayout
@@ -55,9 +49,6 @@ class ThreadMenuFragment(
@BindView(R.id.thread_menu_pure_read_text)
lateinit var pureReadText: TintTextView
- @BindView(R.id.thread_menu_pure_read_status)
- lateinit var pureReadStatus: TintTextView
-
@BindView(R.id.thread_menu_sort)
lateinit var sortItem: TintLinearLayout
@@ -67,9 +58,6 @@ class ThreadMenuFragment(
@BindView(R.id.thread_menu_sort_text)
lateinit var sortText: TintTextView
- @BindView(R.id.thread_menu_sort_status)
- lateinit var sortStatus: TintTextView
-
@BindView(R.id.thread_menu_delete)
lateinit var deleteMenuItem: View
@@ -85,63 +73,39 @@ class ThreadMenuFragment(
override fun initView() {
if (seeLz) {
seeLzItem.setBackgroundTintResId(R.color.default_color_accent)
- seeLzIcon.setTintListResId(R.color.default_color_card)
- seeLzText.tintResId = R.color.default_color_card
- seeLzStatus.tintResId = R.color.default_color_card
- seeLzStatus.setText(R.string.title_on)
- seeLzStatus.alpha = .75f
+ seeLzIcon.setTintListResId(R.color.default_color_background)
+ seeLzText.tintResId = R.color.default_color_background
} else {
- seeLzItem.setBackgroundTintResId(R.color.default_color_card)
- seeLzIcon.setTintListResId(R.color.default_color_accent)
+ seeLzItem.setBackgroundTintResId(R.color.default_color_chip)
+ seeLzIcon.setTintListResId(R.color.default_color_text)
seeLzText.tintResId = R.color.default_color_text
- seeLzStatus.tintResId = R.color.default_color_text_secondary
- seeLzStatus.setText(R.string.title_off)
- seeLzStatus.alpha = 1f
}
if (collect) {
collectItem.setBackgroundTintResId(R.color.default_color_accent)
- collectIcon.setTintListResId(R.color.default_color_card)
- collectText.tintResId = R.color.default_color_card
- collectStatus.tintResId = R.color.default_color_card
- collectStatus.setText(R.string.title_collected)
- collectStatus.alpha = .75f
+ collectIcon.setTintListResId(R.color.default_color_background)
+ collectText.tintResId = R.color.default_color_background
} else {
- collectItem.setBackgroundTintResId(R.color.default_color_card)
- collectIcon.setTintListResId(R.color.default_color_accent)
+ collectItem.setBackgroundTintResId(R.color.default_color_chip)
+ collectIcon.setTintListResId(R.color.default_color_text)
collectText.tintResId = R.color.default_color_text
- collectStatus.tintResId = R.color.default_color_text_secondary
- collectStatus.setText(R.string.title_uncollected)
- collectStatus.alpha = 1f
}
if (pureRead) {
pureReadItem.setBackgroundTintResId(R.color.default_color_accent)
- pureReadIcon.setTintListResId(R.color.default_color_card)
- pureReadText.tintResId = R.color.default_color_card
- pureReadStatus.tintResId = R.color.default_color_card
- pureReadStatus.setText(R.string.title_on)
- pureReadStatus.alpha = .75f
+ pureReadIcon.setTintListResId(R.color.default_color_background)
+ pureReadText.tintResId = R.color.default_color_background
} else {
- pureReadItem.setBackgroundTintResId(R.color.default_color_card)
- pureReadIcon.setTintListResId(R.color.default_color_accent)
+ pureReadItem.setBackgroundTintResId(R.color.default_color_chip)
+ pureReadIcon.setTintListResId(R.color.default_color_text)
pureReadText.tintResId = R.color.default_color_text
- pureReadStatus.tintResId = R.color.default_color_text_secondary
- pureReadStatus.setText(R.string.title_off)
- pureReadStatus.alpha = 1f
}
if (sort) {
sortItem.setBackgroundTintResId(R.color.default_color_accent)
- sortIcon.setTintListResId(R.color.default_color_card)
- sortText.tintResId = R.color.default_color_card
- sortStatus.tintResId = R.color.default_color_card
- sortStatus.setText(R.string.title_on)
- sortStatus.alpha = .75f
+ sortIcon.setTintListResId(R.color.default_color_background)
+ sortText.tintResId = R.color.default_color_background
} else {
- sortItem.setBackgroundTintResId(R.color.default_color_card)
- sortIcon.setTintListResId(R.color.default_color_accent)
+ sortItem.setBackgroundTintResId(R.color.default_color_chip)
+ sortIcon.setTintListResId(R.color.default_color_text)
sortText.tintResId = R.color.default_color_text
- sortStatus.tintResId = R.color.default_color_text_secondary
- sortStatus.setText(R.string.title_off)
- sortStatus.alpha = 1f
}
listOf(
seeLzItem,
diff --git a/app/src/main/res/drawable/ic_outline_delete.xml b/app/src/main/res/drawable/ic_outline_delete.xml
new file mode 100644
index 00000000..3fd5ac0c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_delete.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_outline_face.xml b/app/src/main/res/drawable/ic_outline_face.xml
new file mode 100644
index 00000000..379eff72
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_face.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_outline_report.xml b/app/src/main/res/drawable/ic_outline_report.xml
new file mode 100644
index 00000000..2c4ef16d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_report.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_outline_rocket_launch.xml b/app/src/main/res/drawable/ic_outline_rocket_launch.xml
new file mode 100644
index 00000000..7b43a0bd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_rocket_launch.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_outline_share.xml b/app/src/main/res/drawable/ic_outline_share.xml
new file mode 100644
index 00000000..55b23b62
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_share.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_round_arrow_circle_up.xml b/app/src/main/res/drawable/ic_round_arrow_circle_up.xml
new file mode 100644
index 00000000..c246d553
--- /dev/null
+++ b/app/src/main/res/drawable/ic_round_arrow_circle_up.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/layout/fragment_thread_menu_miui_style.xml b/app/src/main/res/layout/fragment_thread_menu_miui_style.xml
index 1ac46f30..c06c49f3 100644
--- a/app/src/main/res/layout/fragment_thread_menu_miui_style.xml
+++ b/app/src/main/res/layout/fragment_thread_menu_miui_style.xml
@@ -5,8 +5,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_top_radius_8dp"
- app:backgroundTint="@color/default_color_window_background"
- tools:backgroundTint="@color/default_color_window_background">
+ app:backgroundTint="@color/default_color_background"
+ tools:backgroundTint="@color/default_color_background">
+ app:backgroundTint="@color/default_color_divider" />
+ app:backgroundTint="@color/default_color_chip">
-
-
+ app:backgroundTint="@color/default_color_chip">
@@ -92,20 +83,11 @@
android:id="@+id/thread_menu_collect_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
+ android:layout_marginStart="8dp"
android:text="@string/title_collect"
- android:textSize="17sp"
+ android:textSize="15sp"
android:textStyle="bold"
app:tint="@color/default_color_text" />
-
-
@@ -118,20 +100,21 @@
android:paddingBottom="16dp">
+ app:backgroundTint="@color/default_color_chip">
@@ -139,72 +122,49 @@
android:id="@+id/thread_menu_pure_read_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
+ android:layout_marginStart="8dp"
android:text="@string/title_pure_read"
- android:textSize="17sp"
+ android:textSize="15sp"
android:textStyle="bold"
app:tint="@color/default_color_text" />
-
-
+ app:backgroundTint="@color/default_color_chip">
-
-
-
+ android:orientation="vertical">
+ app:srcCompat="@drawable/ic_outline_rocket_launch"
+ app:tint="@color/default_color_text" />
+ app:tint="@color/default_color_text" />
+ app:srcCompat="@drawable/ic_outline_share"
+ app:tint="@color/default_color_text" />
+ app:tint="@color/default_color_text" />
@@ -272,8 +232,8 @@
android:background="?selectableItemBackground"
android:orientation="horizontal"
android:paddingStart="16dp"
- android:paddingTop="12dp"
android:paddingEnd="16dp"
+ android:paddingTop="12dp"
android:paddingBottom="12dp">
+ app:tint="@color/default_color_text" />
+ app:tint="@color/default_color_text" />
+ app:srcCompat="@drawable/ic_outline_report"
+ app:tint="@color/default_color_text" />
+ app:tint="@color/default_color_text" />
+ app:srcCompat="@drawable/ic_outline_delete"
+ app:tint="@color/default_color_text" />
+ app:tint="@color/default_color_text" />
-
+
#FFF3F7F9
#FFFFFFFF
#FF6E7486
- #FFF3F7F9
+ #FFF8F8F8
#FFFFFFFF
#FFF7FBFE
#FEE9E9E9
#FFFFFFFF
+ #FFF8F8F8
@color/tieba
@color/tieba
@@ -173,12 +174,12 @@
#FF808080
#FF808080
- #FFF3F7F9
+ #FFF8F8F8
#15FFFFFF
#2A000000
#FF1A2A39
- #FF2A2A2A
- #FF151515
+ #FF1E1E1E
+ #FF1E1E1E
#FFFFFFFF
#10FFFFFF