diff options
7 files changed, 4 insertions, 44 deletions
diff --git a/org.fox.ttrss/src/main/res/layout/activity_tasker_settings.xml b/org.fox.ttrss/src/main/res/layout/activity_tasker_settings.xml deleted file mode 100644 index efdd76ab..00000000 --- a/org.fox.ttrss/src/main/res/layout/activity_tasker_settings.xml +++ /dev/null @@ -1,36 +0,0 @@ -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/main" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="5dp" > - - <Button - android:id="@+id/close_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_centerHorizontal="true" - android:text="@string/tasker_save_and_close" /> - - <RadioGroup - android:id="@+id/taskerActions" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" > - - <RadioButton - android:id="@+id/actionDownload" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:checked="true" - android:text="@string/download_articles_and_go_offline" /> - - <RadioButton - android:id="@+id/actionUpload" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/synchronize_read_articles_and_go_online" /> - </RadioGroup> - -</RelativeLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row.xml b/org.fox.ttrss/src/main/res/layout/feeds_row.xml index 7a10bc23..6b980382 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row.xml @@ -48,7 +48,7 @@ android:textAlignment="viewEnd" android:singleLine="true" tools:text="3200" - android:textColor="?unreadCounterColor" + android:textColor="?colorOnPrimaryContainer" android:textSize="14sp" /> <!-- <ImageButton 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 6c7a4b29..23a972e3 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 @@ -50,7 +50,7 @@ android:textAlignment="viewEnd" android:singleLine="true" tools:text="3200" - android:textColor="?unreadCounterColor" + android:textColor="?colorOnPrimaryContainer" android:textSize="14sp" /> <!-- <ImageButton diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml index f9f377f6..0dbbcfc9 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/feeds_row" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -39,7 +40,7 @@ android:textColor="?feedlistTextColor" android:textSize="14sp" /> - <androidx.appcompat.widget.SwitchCompat + <com.google.android.material.materialswitch.MaterialSwitch android:id="@+id/row_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" 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 9f9183e8..f000a8ed 100644 --- a/org.fox.ttrss/src/main/res/values-night/style.xml +++ b/org.fox.ttrss/src/main/res/values-night/style.xml @@ -3,8 +3,6 @@ <style name="AppTheme" parent="AppTheme.Base"> <item name="windowActionModeOverlay">true</item> - <!-- <item name="statusBarHintColor">?colorPrimary</item> --> - <item name="unreadCounterColor">#909090</item> <item name="feedlistTextColor">@android:color/white</item> <item name="headlineUnreadTextColor">@android:color/white</item> <item name="headlineSelectedTextColor">@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 a16fd6f4..4282657b 100755 --- a/org.fox.ttrss/src/main/res/values/attrs.xml +++ b/org.fox.ttrss/src/main/res/values/attrs.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <attr name="ttrssHorizontalDivider" format="reference|color" /> - <attr name="unreadCounterColor" format="reference|color" /> <attr name="feedlistTextColor" format="reference|color" /> <attr name="feedlistSelectedTextColor" format="reference|color" /> <attr name="headlineHeaderBackground" 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 ab3f39dc..bc447681 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -9,9 +9,7 @@ <style name="AppTheme" parent="AppTheme.Base"> <item name="windowActionModeOverlay">true</item> - <!-- <item name="statusBarHintColor">?colorPrimary</item> --> <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_bright</item> - <item name="unreadCounterColor">#909090</item> <item name="headlineHeaderBackground">#ccffffff</item> <item name="feedlistTextColor">@android:color/black</item> <item name="feedlistSelectedTextColor">@android:color/black</item> |