diff options
Diffstat (limited to 'org.fox.ttrss/src/main/res')
13 files changed, 17 insertions, 43 deletions
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml index 9ba663f6..879725c1 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml @@ -27,14 +27,13 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="0.25" - android:background="?feedlistBackground" > + android:background="?colorSurfaceContainer"> </FrameLayout> <androidx.coordinatorlayout.widget.CoordinatorLayout android:layout_width="0dp" android:layout_weight="0.75" android:elevation="4dp" - android:background="?headlinesBackground" android:layout_height="match_parent"> <FrameLayout diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml index 95cb35e0..714a68d5 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml @@ -32,8 +32,7 @@ android:id="@+id/headlines_fragment" app:layout_behavior=".util.FabAwareScrollingViewBehavior" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?headlinesBackground" /> + android:layout_height="wrap_content"/> </androidx.coordinatorlayout.widget.CoordinatorLayout> @@ -45,7 +44,6 @@ android:layout_width="300dp" android:layout_height="match_parent" android:layout_gravity="start" - android:background="@android:color/white" android:elevation="10dp" android:fitsSystemWindows="true" app:insetForeground="#4000"> @@ -53,7 +51,7 @@ <FrameLayout android:id="@+id/feeds_fragment" android:layout_width="match_parent" - android:background="?feedlistBackground" + android:background="?colorSurfaceContainer" android:layout_height="match_parent" > </FrameLayout> diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp/activity_detail.xml b/org.fox.ttrss/src/main/res/layout-sw600dp/activity_detail.xml index 89ab61f5..be10ef36 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp/activity_detail.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp/activity_detail.xml @@ -26,8 +26,7 @@ android:id="@+id/headlines_fragment" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_weight="0.3" - android:background="?headlinesBackground" > + android:layout_weight="0.3"> </FrameLayout> <androidx.coordinatorlayout.widget.CoordinatorLayout diff --git a/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml index ddffc89e..1d428e5e 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml @@ -40,8 +40,7 @@ android:id="@+id/headlines_fragment" android:visibility="gone" android:layout_height="0dp" - android:layout_width="0dp" - android:background="?headlinesBackground"> + android:layout_width="0dp"> </FrameLayout> </FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml index 6ae5064f..9f47eb24 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml @@ -31,8 +31,7 @@ android:id="@+id/headlines_fragment" app:layout_behavior=".util.FabAwareScrollingViewBehavior" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?headlinesBackground" /> + android:layout_height="wrap_content"/> </androidx.coordinatorlayout.widget.CoordinatorLayout> @@ -42,7 +41,6 @@ android:layout_width="300dp" android:layout_height="match_parent" android:layout_gravity="start" - android:background="@android:color/white" android:elevation="10dp" android:fitsSystemWindows="true" app:insetForeground="#4000"> @@ -50,7 +48,7 @@ <FrameLayout android:id="@+id/feeds_fragment" android:layout_width="match_parent" - android:background="?feedlistBackground" + android:background="?colorSurfaceContainer" android:layout_height="match_parent" > </FrameLayout> diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml index d5b6cb3c..6c7a4b29 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:descendantFocusability="blocksDescendants" - android:background="?feedsSelectedBackground" + android:background="?colorSurfaceDim" android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingTop="8dp" diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml index da2401eb..bd114157 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml @@ -8,7 +8,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:background="?headlineSelectedBackground" + android:background="?colorPrimaryContainer" tools:ignore="HardcodedText" > <FrameLayout diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml index 3b6436fe..3422fae6 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml @@ -8,7 +8,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:background="?headlineSelectedBackground" + android:background="?colorPrimaryContainer" tools:ignore="HardcodedText" > <FrameLayout diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml index aafad9a8..5ea05c31 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml @@ -5,7 +5,7 @@ android:id="@+id/headlines_row" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="?headlineUnreadBackground"> + android:background="?colorSurfaceContainerLowest"> <TableLayout android:layout_width="fill_parent" diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml index e440188f..f65cee58 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml @@ -2,12 +2,13 @@ <LinearLayout xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/headlines_row" android:padding="@dimen/activity_horizontal_margin" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:background="?headlineUnreadBackground" + android:background="?colorSurfaceContainerLowest" tools:ignore="HardcodedText" > <FrameLayout @@ -112,17 +113,16 @@ /> - <ImageView + <com.google.android.material.button.MaterialButton android:id="@+id/marked" + style="?attr/materialIconButtonStyle" android:background="@drawable/ripple" - android:layout_width="24dp" + android:layout_width="wrap_content" android:layout_gravity="bottom|end" android:layout_height="24dp" android:layout_weight="0" android:clickable="true" - android:src="?ic_star_outline" /> - - + app:icon="?ic_star_outline" /> </LinearLayout> diff --git a/org.fox.ttrss/src/main/res/values-night/style.xml b/org.fox.ttrss/src/main/res/values-night/style.xml index 3c15a0fd..9f9183e8 100644 --- a/org.fox.ttrss/src/main/res/values-night/style.xml +++ b/org.fox.ttrss/src/main/res/values-night/style.xml @@ -13,19 +13,13 @@ <item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item> <item name="headlineSelectedExcerptTextColor">#bebebe</item> <item name="headlineSelectedSecondaryTextColor">?headlineSelectedExcerptTextColor</item> - <item name="headlineSelectedBackground">#1c1c1c</item> <item name="headlineHeaderBackground">#99000000</item> - <item name="headlineUnreadBackground">#101010</item> <item name="linkColor">#2d92c8</item> <item name="loadingBackground">@android:color/black</item> <item name="articleNoteTextColor">#bebebe</item> <item name="articleNoteBackground">#303030</item> <item name="parentBtnBackground">#101010</item> <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item> - <item name="feedlistBackground">#1c1d1e</item> - <item name="headlinesBackground">#1c1d1e</item> - <item name="articleBackground">@android:color/black</item> - <item name="feedsSelectedBackground">#1c1c1c</item> <item name="feedlistSelectedTextColor">@android:color/white</item> <item name="articleHeader">@android:color/transparent</item> <item name="articleHeaderTextColor">@android:color/white</item> diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml index 93892545..a16fd6f4 100755 --- a/org.fox.ttrss/src/main/res/values/attrs.xml +++ b/org.fox.ttrss/src/main/res/values/attrs.xml @@ -1,16 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <attr name="ttrssHorizontalDivider" format="reference|color" /> - <attr name="feedlistBackground" format="reference|color" /> <attr name="unreadCounterColor" format="reference|color" /> - <attr name="headlinesBackground" format="reference|color" /> - <attr name="articleBackground" format="reference|color" /> - <attr name="headlineSelectedBackground" format="reference|color" /> - <attr name="headlineUnreadBackground" format="reference|color" /> - <attr name="feedsSelectedBackground" format="reference|color" /> <attr name="feedlistTextColor" format="reference|color" /> <attr name="feedlistSelectedTextColor" format="reference|color" /> - <!-- <attr name="headlineTextColor" format="reference|color" /> --> <attr name="headlineHeaderBackground" format="reference|color" /> <attr name="headlineUnreadTextColor" format="reference|color" /> <attr name="headlineSelectedTextColor" format="reference|color" /> diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index 6a494015..ab3f39dc 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -11,14 +11,8 @@ <!-- <item name="statusBarHintColor">?colorPrimary</item> --> <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_bright</item> - <item name="feedlistBackground">#e0e0e0</item> <item name="unreadCounterColor">#909090</item> - <item name="headlinesBackground">#f0f0f0</item> - <item name="articleBackground">@android:color/white</item> - <item name="headlineSelectedBackground">#dddddd</item> <item name="headlineHeaderBackground">#ccffffff</item> - <item name="headlineUnreadBackground">@android:color/white</item> - <item name="feedsSelectedBackground">#dddddd</item> <item name="feedlistTextColor">@android:color/black</item> <item name="feedlistSelectedTextColor">@android:color/black</item> <item name="headlineUnreadTextColor">@android:color/black</item> |