diff options
Diffstat (limited to 'org.fox.ttrss')
18 files changed, 677 insertions, 100 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index b5da6cd3..b79e3b05 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -98,7 +98,7 @@ android:excludeFromRecents="true" android:label="@string/app_name" android:exported="true" - android:theme="@style/DarkDialogTheme" > + android:theme="@style/MaterialAlertDialog.Material3" > <intent-filter> <action android:name="android.intent.action.SEND" /> @@ -112,7 +112,7 @@ android:excludeFromRecents="true" android:label="@string/subscribe_name" android:exported="true" - android:theme="@style/DarkDialogTheme" > + android:theme="@style/MaterialAlertDialog.Material3" > <intent-filter> <action android:name="android.intent.action.SEND" /> diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index ef2e23a6..06e815f0 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -1032,8 +1032,8 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { } - TypedValue tvAccent = new TypedValue(); - m_activity.getTheme().resolveAttribute(R.attr.colorAccent, tvAccent, true); + TypedValue tvTertiary = new TypedValue(); + m_activity.getTheme().resolveAttribute(R.attr.colorTertiary, tvTertiary, true); TypedValue tvPrimary = new TypedValue(); m_activity.getTheme().resolveAttribute(R.attr.colorPrimary, tvPrimary, true); @@ -1046,7 +1046,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { if (article.marked) - holder.markedView.setIconTint(ColorStateList.valueOf(tvAccent.data)); + holder.markedView.setIconTint(ColorStateList.valueOf(tvTertiary.data)); else holder.markedView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); @@ -1077,7 +1077,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { holder.scoreView.setIconResource(tv.resourceId); if (article.score > Article.SCORE_HIGH) - holder.scoreView.setIconTint(ColorStateList.valueOf(tvAccent.data)); + holder.scoreView.setIconTint(ColorStateList.valueOf(tvTertiary.data)); else holder.scoreView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); @@ -1137,7 +1137,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { holder.publishedView.setIconResource(tv.resourceId); if (article.published) - holder.publishedView.setIconTint(ColorStateList.valueOf(tvAccent.data)); + holder.publishedView.setIconTint(ColorStateList.valueOf(tvTertiary.data)); else holder.publishedView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index 368ec95c..8500d7c7 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -790,8 +790,8 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis holder.feedTitleView.setVisibility(View.GONE); } - TypedValue tvAccent = new TypedValue(); - m_activity.getTheme().resolveAttribute(R.attr.colorAccent, tvAccent, true); + TypedValue tvTertiary = new TypedValue(); + m_activity.getTheme().resolveAttribute(R.attr.colorTertiary, tvTertiary, true); TypedValue tvPrimary = new TypedValue(); m_activity.getTheme().resolveAttribute(R.attr.colorPrimary, tvPrimary, true); @@ -814,7 +814,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis holder.markedView.setIconResource(tv.resourceId); if (marked) - holder.markedView.setIconTint(ColorStateList.valueOf(tvAccent.data)); + holder.markedView.setIconTint(ColorStateList.valueOf(tvTertiary.data)); else holder.markedView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); @@ -845,7 +845,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis holder.publishedView.setIconResource(tv.resourceId); if (published) - holder.publishedView.setIconTint(ColorStateList.valueOf(tvAccent.data)); + holder.publishedView.setIconTint(ColorStateList.valueOf(tvTertiary.data)); else holder.publishedView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); diff --git a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml index 9770c4c8..9326a19e 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml @@ -20,11 +20,11 @@ android:layout_height="26dp" android:layout_weight="0" android:background="@drawable/ripple" - android:src="?ic_dots_vertical_circle" + android:src="?ic_dots_vertical" android:layout_alignParentRight="true" android:layout_marginRight="8dp" android:layout_marginTop="@dimen/activity_vertical_margin" - app:tint="?colorAccent" /> + app:tint="?colorTertiary" /> <ProgressBar style="?android:attr/progressBarStyleHorizontal" 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 de594e33..c18bca02 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 @@ -17,7 +17,7 @@ android:visibility="gone" android:src="@drawable/baseline_refresh_24" app:tint="@android:color/white" - app:backgroundTint="?colorAccent" + app:backgroundTint="?colorTertiary" android:layout_margin="16dp" /> <com.google.android.material.appbar.AppBarLayout diff --git a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml index 90aac490..d826da41 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml @@ -21,7 +21,7 @@ android:layout_weight="0" android:scaleType="fitXY" android:src="?ic_go_back" - app:tint="?colorAccent" /> + app:tint="?colorTertiary" /> <TextView android:fontFamily="sans-serif-medium" 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 97235dd1..3ebcf0eb 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row.xml @@ -49,7 +49,7 @@ android:textAlignment="viewEnd" android:singleLine="true" tools:text="3200" - android:textColor="?colorAccent" + android:textColor="?colorTertiary" 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 fb6cc91b..50771e60 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 @@ -55,7 +55,7 @@ android:textAlignment="viewEnd" android:singleLine="true" tools:text="3200" - android:textColor="?colorAccent" + android:textColor="?colorTertiary" android:textSize="14sp" /> <!-- <ImageButton diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml index d0c2ce2d..c5372044 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml @@ -148,7 +148,7 @@ android:layout_alignParentRight="true" android:layout_alignParentEnd="true" android:elevation="4dp" - app:tint="?colorAccent" + app:tint="?colorTertiary" android:layout_marginBottom="8dp" android:layout_marginStart="8dp" /> @@ -164,7 +164,7 @@ android:src="@drawable/baseline_more_vert_24" android:layout_gravity="bottom|end" android:elevation="4dp" - app:tint="?colorAccent" + app:tint="?colorTertiary" android:layout_marginBottom="10dp" tools:targetApi="lollipop" /> 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 6fc4fc0c..b00f344c 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 @@ -150,7 +150,7 @@ android:layout_alignParentRight="true" android:layout_alignParentEnd="true" android:elevation="4dp" - app:tint="?colorAccent" + app:tint="?colorTertiary" android:layout_marginBottom="8dp" android:layout_marginStart="8dp" /> @@ -166,7 +166,7 @@ android:src="@drawable/baseline_more_vert_24" android:layout_gravity="bottom|end" android:elevation="4dp" - app:tint="?colorAccent" + app:tint="?colorTertiary" android:layout_marginBottom="10dp" tools:targetApi="lollipop" /> diff --git a/org.fox.ttrss/src/main/res/values-night/colors.xml b/org.fox.ttrss/src/main/res/values-night/colors.xml new file mode 100644 index 00000000..8c59ab25 --- /dev/null +++ b/org.fox.ttrss/src/main/res/values-night/colors.xml @@ -0,0 +1,143 @@ +<resources> + <color name="md_theme_primary">#94CDF7</color> + <color name="md_theme_onPrimary">#00344D</color> + <color name="md_theme_primaryContainer">#004C6E</color> + <color name="md_theme_onPrimaryContainer">#C8E6FF</color> + <color name="md_theme_secondary">#B7C9D9</color> + <color name="md_theme_onSecondary">#21323F</color> + <color name="md_theme_secondaryContainer">#384956</color> + <color name="md_theme_onSecondaryContainer">#D3E5F5</color> + <color name="md_theme_tertiary">#FFB596</color> + <color name="md_theme_onTertiary">#542106</color> + <color name="md_theme_tertiaryContainer">#71361A</color> + <color name="md_theme_onTertiaryContainer">#FFDBCD</color> + <color name="md_theme_error">#FFB4AB</color> + <color name="md_theme_onError">#690005</color> + <color name="md_theme_errorContainer">#93000A</color> + <color name="md_theme_onErrorContainer">#FFDAD6</color> + <color name="md_theme_background">#101417</color> + <color name="md_theme_onBackground">#DFE3E8</color> + <color name="md_theme_surface">#101417</color> + <color name="md_theme_onSurface">#DFE3E8</color> + <color name="md_theme_surfaceVariant">#41484D</color> + <color name="md_theme_onSurfaceVariant">#C1C7CE</color> + <color name="md_theme_outline">#8B9198</color> + <color name="md_theme_outlineVariant">#41484D</color> + <color name="md_theme_scrim">#000000</color> + <color name="md_theme_inverseSurface">#DFE3E8</color> + <color name="md_theme_inverseOnSurface">#2D3135</color> + <color name="md_theme_inversePrimary">#246488</color> + <color name="md_theme_primaryFixed">#C8E6FF</color> + <color name="md_theme_onPrimaryFixed">#001E2F</color> + <color name="md_theme_primaryFixedDim">#94CDF7</color> + <color name="md_theme_onPrimaryFixedVariant">#004C6E</color> + <color name="md_theme_secondaryFixed">#D3E5F5</color> + <color name="md_theme_onSecondaryFixed">#0B1D29</color> + <color name="md_theme_secondaryFixedDim">#B7C9D9</color> + <color name="md_theme_onSecondaryFixedVariant">#384956</color> + <color name="md_theme_tertiaryFixed">#FFDBCD</color> + <color name="md_theme_onTertiaryFixed">#360F00</color> + <color name="md_theme_tertiaryFixedDim">#FFB596</color> + <color name="md_theme_onTertiaryFixedVariant">#71361A</color> + <color name="md_theme_surfaceDim">#101417</color> + <color name="md_theme_surfaceBright">#353A3E</color> + <color name="md_theme_surfaceContainerLowest">#0A0F12</color> + <color name="md_theme_surfaceContainerLow">#181C20</color> + <color name="md_theme_surfaceContainer">#1C2024</color> + <color name="md_theme_surfaceContainerHigh">#262A2E</color> + <color name="md_theme_surfaceContainerHighest">#313539</color> + <color name="md_theme_primary_mediumContrast">#BBE1FF</color> + <color name="md_theme_onPrimary_mediumContrast">#00293D</color> + <color name="md_theme_primaryContainer_mediumContrast">#5D97BE</color> + <color name="md_theme_onPrimaryContainer_mediumContrast">#000000</color> + <color name="md_theme_secondary_mediumContrast">#CCDFEF</color> + <color name="md_theme_onSecondary_mediumContrast">#162733</color> + <color name="md_theme_secondaryContainer_mediumContrast">#8193A2</color> + <color name="md_theme_onSecondaryContainer_mediumContrast">#000000</color> + <color name="md_theme_tertiary_mediumContrast">#FFD3C1</color> + <color name="md_theme_onTertiary_mediumContrast">#461600</color> + <color name="md_theme_tertiaryContainer_mediumContrast">#CA7E5B</color> + <color name="md_theme_onTertiaryContainer_mediumContrast">#000000</color> + <color name="md_theme_error_mediumContrast">#FFD2CC</color> + <color name="md_theme_onError_mediumContrast">#540003</color> + <color name="md_theme_errorContainer_mediumContrast">#FF5449</color> + <color name="md_theme_onErrorContainer_mediumContrast">#000000</color> + <color name="md_theme_background_mediumContrast">#101417</color> + <color name="md_theme_onBackground_mediumContrast">#DFE3E8</color> + <color name="md_theme_surface_mediumContrast">#101417</color> + <color name="md_theme_onSurface_mediumContrast">#FFFFFF</color> + <color name="md_theme_surfaceVariant_mediumContrast">#41484D</color> + <color name="md_theme_onSurfaceVariant_mediumContrast">#D7DDE4</color> + <color name="md_theme_outline_mediumContrast">#ACB3B9</color> + <color name="md_theme_outlineVariant_mediumContrast">#8B9197</color> + <color name="md_theme_scrim_mediumContrast">#000000</color> + <color name="md_theme_inverseSurface_mediumContrast">#DFE3E8</color> + <color name="md_theme_inverseOnSurface_mediumContrast">#262A2E</color> + <color name="md_theme_inversePrimary_mediumContrast">#004D6F</color> + <color name="md_theme_primaryFixed_mediumContrast">#C8E6FF</color> + <color name="md_theme_onPrimaryFixed_mediumContrast">#00131F</color> + <color name="md_theme_primaryFixedDim_mediumContrast">#94CDF7</color> + <color name="md_theme_onPrimaryFixedVariant_mediumContrast">#003A55</color> + <color name="md_theme_secondaryFixed_mediumContrast">#D3E5F5</color> + <color name="md_theme_onSecondaryFixed_mediumContrast">#02131E</color> + <color name="md_theme_secondaryFixedDim_mediumContrast">#B7C9D9</color> + <color name="md_theme_onSecondaryFixedVariant_mediumContrast">#273845</color> + <color name="md_theme_tertiaryFixed_mediumContrast">#FFDBCD</color> + <color name="md_theme_onTertiaryFixed_mediumContrast">#250800</color> + <color name="md_theme_tertiaryFixedDim_mediumContrast">#FFB596</color> + <color name="md_theme_onTertiaryFixedVariant_mediumContrast">#5C260B</color> + <color name="md_theme_surfaceDim_mediumContrast">#101417</color> + <color name="md_theme_surfaceBright_mediumContrast">#414549</color> + <color name="md_theme_surfaceContainerLowest_mediumContrast">#05080B</color> + <color name="md_theme_surfaceContainerLow_mediumContrast">#1A1E22</color> + <color name="md_theme_surfaceContainer_mediumContrast">#24282C</color> + <color name="md_theme_surfaceContainerHigh_mediumContrast">#2F3337</color> + <color name="md_theme_surfaceContainerHighest_mediumContrast">#3A3E42</color> + <color name="md_theme_primary_highContrast">#E4F2FF</color> + <color name="md_theme_onPrimary_highContrast">#000000</color> + <color name="md_theme_primaryContainer_highContrast">#90C9F3</color> + <color name="md_theme_onPrimaryContainer_highContrast">#000D17</color> + <color name="md_theme_secondary_highContrast">#E4F2FF</color> + <color name="md_theme_onSecondary_highContrast">#000000</color> + <color name="md_theme_secondaryContainer_highContrast">#B3C5D5</color> + <color name="md_theme_onSecondaryContainer_highContrast">#000D17</color> + <color name="md_theme_tertiary_highContrast">#FFECE5</color> + <color name="md_theme_onTertiary_highContrast">#000000</color> + <color name="md_theme_tertiaryContainer_highContrast">#FFB08D</color> + <color name="md_theme_onTertiaryContainer_highContrast">#1B0500</color> + <color name="md_theme_error_highContrast">#FFECE9</color> + <color name="md_theme_onError_highContrast">#000000</color> + <color name="md_theme_errorContainer_highContrast">#FFAEA4</color> + <color name="md_theme_onErrorContainer_highContrast">#220001</color> + <color name="md_theme_background_highContrast">#101417</color> + <color name="md_theme_onBackground_highContrast">#DFE3E8</color> + <color name="md_theme_surface_highContrast">#101417</color> + <color name="md_theme_onSurface_highContrast">#FFFFFF</color> + <color name="md_theme_surfaceVariant_highContrast">#41484D</color> + <color name="md_theme_onSurfaceVariant_highContrast">#FFFFFF</color> + <color name="md_theme_outline_highContrast">#EBF1F8</color> + <color name="md_theme_outlineVariant_highContrast">#BDC3CA</color> + <color name="md_theme_scrim_highContrast">#000000</color> + <color name="md_theme_inverseSurface_highContrast">#DFE3E8</color> + <color name="md_theme_inverseOnSurface_highContrast">#000000</color> + <color name="md_theme_inversePrimary_highContrast">#004D6F</color> + <color name="md_theme_primaryFixed_highContrast">#C8E6FF</color> + <color name="md_theme_onPrimaryFixed_highContrast">#000000</color> + <color name="md_theme_primaryFixedDim_highContrast">#94CDF7</color> + <color name="md_theme_onPrimaryFixedVariant_highContrast">#00131F</color> + <color name="md_theme_secondaryFixed_highContrast">#D3E5F5</color> + <color name="md_theme_onSecondaryFixed_highContrast">#000000</color> + <color name="md_theme_secondaryFixedDim_highContrast">#B7C9D9</color> + <color name="md_theme_onSecondaryFixedVariant_highContrast">#02131E</color> + <color name="md_theme_tertiaryFixed_highContrast">#FFDBCD</color> + <color name="md_theme_onTertiaryFixed_highContrast">#000000</color> + <color name="md_theme_tertiaryFixedDim_highContrast">#FFB596</color> + <color name="md_theme_onTertiaryFixedVariant_highContrast">#250800</color> + <color name="md_theme_surfaceDim_highContrast">#101417</color> + <color name="md_theme_surfaceBright_highContrast">#4C5055</color> + <color name="md_theme_surfaceContainerLowest_highContrast">#000000</color> + <color name="md_theme_surfaceContainerLow_highContrast">#1C2024</color> + <color name="md_theme_surfaceContainer_highContrast">#2D3135</color> + <color name="md_theme_surfaceContainerHigh_highContrast">#383C40</color> + <color name="md_theme_surfaceContainerHighest_highContrast">#43474B</color> +</resources> diff --git a/org.fox.ttrss/src/main/res/values-night/style.xml b/org.fox.ttrss/src/main/res/values-night/style.xml deleted file mode 100644 index 3c81805d..00000000 --- a/org.fox.ttrss/src/main/res/values-night/style.xml +++ /dev/null @@ -1,21 +0,0 @@ -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - - <style name="AppTheme" parent="AppTheme.Base"> - <item name="windowActionModeOverlay">true</item> - - <item name="feedlistTextColor">@android:color/white</item> - <item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item> - <item name="headlineHeaderBackground">#99000000</item> - <item name="linkColor">#2d92c8</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="feedlistSelectedTextColor">@android:color/white</item> - <item name="articleHeader">@android:color/transparent</item> - <item name="articleTextColor">#e0e0e0</item> - <item name="articleHeaderSeparator">#303030</item> - - <item name="colorAccent">#D84315</item> - </style> -</resources>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values-night/theme_overlays.xml b/org.fox.ttrss/src/main/res/values-night/theme_overlays.xml new file mode 100644 index 00000000..02adac70 --- /dev/null +++ b/org.fox.ttrss/src/main/res/values-night/theme_overlays.xml @@ -0,0 +1,98 @@ +<resources> + <style name="ThemeOverlay.AppTheme.MediumContrast" parent="Theme.Material3.Dark.NoActionBar"> + <item name="colorPrimary">@color/md_theme_primary_mediumContrast</item> + <item name="colorOnPrimary">@color/md_theme_onPrimary_mediumContrast</item> + <item name="colorPrimaryContainer">@color/md_theme_primaryContainer_mediumContrast</item> + <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer_mediumContrast</item> + <item name="colorSecondary">@color/md_theme_secondary_mediumContrast</item> + <item name="colorOnSecondary">@color/md_theme_onSecondary_mediumContrast</item> + <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_mediumContrast</item> + <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_mediumContrast</item> + <item name="colorTertiary">@color/md_theme_tertiary_mediumContrast</item> + <item name="colorOnTertiary">@color/md_theme_onTertiary_mediumContrast</item> + <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_mediumContrast</item> + <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_mediumContrast</item> + <item name="colorError">@color/md_theme_error_mediumContrast</item> + <item name="colorOnError">@color/md_theme_onError_mediumContrast</item> + <item name="colorErrorContainer">@color/md_theme_errorContainer_mediumContrast</item> + <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer_mediumContrast</item> + <item name="android:colorBackground">@color/md_theme_background_mediumContrast</item> + <item name="colorOnBackground">@color/md_theme_onBackground_mediumContrast</item> + <item name="colorSurface">@color/md_theme_surface_mediumContrast</item> + <item name="colorOnSurface">@color/md_theme_onSurface_mediumContrast</item> + <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant_mediumContrast</item> + <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant_mediumContrast</item> + <item name="colorOutline">@color/md_theme_outline_mediumContrast</item> + <item name="colorOutlineVariant">@color/md_theme_outlineVariant_mediumContrast</item> + <item name="colorSurfaceInverse">@color/md_theme_inverseSurface_mediumContrast</item> + <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface_mediumContrast</item> + <item name="colorPrimaryInverse">@color/md_theme_inversePrimary_mediumContrast</item> + <item name="colorPrimaryFixed">@color/md_theme_primaryFixed_mediumContrast</item> + <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_mediumContrast</item> + <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_mediumContrast</item> + <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_mediumContrast</item> + <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_mediumContrast</item> + <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_mediumContrast</item> + <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_mediumContrast</item> + <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant_mediumContrast</item> + <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_mediumContrast</item> + <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_mediumContrast</item> + <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_mediumContrast</item> + <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant_mediumContrast</item> + <item name="colorSurfaceDim">@color/md_theme_surfaceDim_mediumContrast</item> + <item name="colorSurfaceBright">@color/md_theme_surfaceBright_mediumContrast</item> + <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest_mediumContrast</item> + <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_mediumContrast</item> + <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_mediumContrast</item> + <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_mediumContrast</item> + <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest_mediumContrast</item> + </style> + <style name="ThemeOverlay.AppTheme.HighContrast" parent="Theme.Material3.Dark.NoActionBar"> + <item name="colorPrimary">@color/md_theme_primary_highContrast</item> + <item name="colorOnPrimary">@color/md_theme_onPrimary_highContrast</item> + <item name="colorPrimaryContainer">@color/md_theme_primaryContainer_highContrast</item> + <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer_highContrast</item> + <item name="colorSecondary">@color/md_theme_secondary_highContrast</item> + <item name="colorOnSecondary">@color/md_theme_onSecondary_highContrast</item> + <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_highContrast</item> + <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_highContrast</item> + <item name="colorTertiary">@color/md_theme_tertiary_highContrast</item> + <item name="colorOnTertiary">@color/md_theme_onTertiary_highContrast</item> + <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_highContrast</item> + <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_highContrast</item> + <item name="colorError">@color/md_theme_error_highContrast</item> + <item name="colorOnError">@color/md_theme_onError_highContrast</item> + <item name="colorErrorContainer">@color/md_theme_errorContainer_highContrast</item> + <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer_highContrast</item> + <item name="android:colorBackground">@color/md_theme_background_highContrast</item> + <item name="colorOnBackground">@color/md_theme_onBackground_highContrast</item> + <item name="colorSurface">@color/md_theme_surface_highContrast</item> + <item name="colorOnSurface">@color/md_theme_onSurface_highContrast</item> + <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant_highContrast</item> + <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant_highContrast</item> + <item name="colorOutline">@color/md_theme_outline_highContrast</item> + <item name="colorOutlineVariant">@color/md_theme_outlineVariant_highContrast</item> + <item name="colorSurfaceInverse">@color/md_theme_inverseSurface_highContrast</item> + <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface_highContrast</item> + <item name="colorPrimaryInverse">@color/md_theme_inversePrimary_highContrast</item> + <item name="colorPrimaryFixed">@color/md_theme_primaryFixed_highContrast</item> + <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_highContrast</item> + <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_highContrast</item> + <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_highContrast</item> + <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_highContrast</item> + <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_highContrast</item> + <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_highContrast</item> + <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant_highContrast</item> + <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_highContrast</item> + <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_highContrast</item> + <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_highContrast</item> + <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant_highContrast</item> + <item name="colorSurfaceDim">@color/md_theme_surfaceDim_highContrast</item> + <item name="colorSurfaceBright">@color/md_theme_surfaceBright_highContrast</item> + <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest_highContrast</item> + <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_highContrast</item> + <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_highContrast</item> + <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_highContrast</item> + <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest_highContrast</item> + </style> +</resources> diff --git a/org.fox.ttrss/src/main/res/values-night/themes.xml b/org.fox.ttrss/src/main/res/values-night/themes.xml new file mode 100644 index 00000000..e5f738e1 --- /dev/null +++ b/org.fox.ttrss/src/main/res/values-night/themes.xml @@ -0,0 +1,89 @@ +<resources> + <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar"> + <item name="android:statusBarColor">@android:color/transparent</item> + <item name="android:windowLightStatusBar">false</item> + + <item name="ic_rss_box">@drawable/baseline_rss_feed_24</item> + <item name="ic_checkbox_marked">@drawable/baseline_check_box_24</item> + <item name="ic_star">@drawable/baseline_star_24</item> + <item name="ic_star_outline">@drawable/baseline_star_outline_24</item> + <item name="ic_share">@drawable/baseline_share_24</item> + <item name="ic_inbox">@drawable/baseline_inbox_24</item> + <item name="ic_go_back">@drawable/baseline_arrow_back_24</item> + <item name="ic_settings">@drawable/baseline_settings_24</item> + <item name="ic_filter_variant">@drawable/baseline_filter_alt_24</item> + <item name="ic_cloud_download">@drawable/baseline_cloud_download_24</item> + <item name="ic_cloud_upload">@drawable/baseline_cloud_upload_24</item> + <item name="ic_archive">@drawable/baseline_archive_24</item> + <item name="ic_fresh">@drawable/baseline_local_fire_department_24</item> + <item name="ic_restore">@drawable/baseline_restore_24</item> + <item name="ic_folder_outline">@drawable/baseline_folder_open_24</item> + <item name="ic_dots_vertical">@drawable/baseline_more_vert_24</item> + <item name="ic_dots_vertical_circle">@drawable/outline_more_24</item> + <item name="ic_attachment">@drawable/baseline_attachment_24</item> + <item name="ic_attachment_vert">@drawable/baseline_attach_file_24</item> + <item name="ic_action_trending_up">@drawable/baseline_trending_up_24</item> + <item name="ic_action_trending_flat">@drawable/baseline_trending_flat_24</item> + <item name="ic_action_trending_down">@drawable/baseline_trending_down_24</item> + + <item name="feedlistTextColor">@android:color/white</item> + <item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item> + <item name="headlineHeaderBackground">#99000000</item> + <item name="linkColor">#2d92c8</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="feedlistSelectedTextColor">@android:color/white</item> + <item name="articleHeader">@android:color/transparent</item> + <item name="articleTextColor">#e0e0e0</item> + <item name="articleHeaderSeparator">#303030</item> + + <item name="colorPrimary">@color/md_theme_primary</item> + <item name="colorOnPrimary">@color/md_theme_onPrimary</item> + <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item> + <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer</item> + <item name="colorSecondary">@color/md_theme_secondary</item> + <item name="colorOnSecondary">@color/md_theme_onSecondary</item> + <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer</item> + <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer</item> + <item name="colorTertiary">@color/md_theme_tertiary</item> + <item name="colorOnTertiary">@color/md_theme_onTertiary</item> + <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item> + <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item> + <item name="colorError">@color/md_theme_error</item> + <item name="colorOnError">@color/md_theme_onError</item> + <item name="colorErrorContainer">@color/md_theme_errorContainer</item> + <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item> + <item name="android:colorBackground">@color/md_theme_background</item> + <item name="colorOnBackground">@color/md_theme_onBackground</item> + <item name="colorSurface">@color/md_theme_surface</item> + <item name="colorOnSurface">@color/md_theme_onSurface</item> + <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item> + <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item> + <item name="colorOutline">@color/md_theme_outline</item> + <item name="colorOutlineVariant">@color/md_theme_outlineVariant</item> + <item name="colorSurfaceInverse">@color/md_theme_inverseSurface</item> + <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item> + <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item> + <item name="colorPrimaryFixed">@color/md_theme_primaryFixed</item> + <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed</item> + <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim</item> + <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant</item> + <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed</item> + <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed</item> + <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim</item> + <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant</item> + <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed</item> + <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed</item> + <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim</item> + <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant</item> + <item name="colorSurfaceDim">@color/md_theme_surfaceDim</item> + <item name="colorSurfaceBright">@color/md_theme_surfaceBright</item> + <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest</item> + <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow</item> + <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item> + <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item> + <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item> + </style> +</resources> diff --git a/org.fox.ttrss/src/main/res/values/colors.xml b/org.fox.ttrss/src/main/res/values/colors.xml index d87ac346..2a9f1705 100755..100644 --- a/org.fox.ttrss/src/main/res/values/colors.xml +++ b/org.fox.ttrss/src/main/res/values/colors.xml @@ -1,6 +1,143 @@ -<?xml version="1.0" encoding="utf-8"?> <resources> - <item name="window_background" type="color">#216d96</item> - <item name="window_background_dark" type="color">#18506e</item> - <item name="window_background_amber" type="color">#6e4b1a</item> -</resources>
\ No newline at end of file + <color name="md_theme_primary">#246488</color> + <color name="md_theme_onPrimary">#FFFFFF</color> + <color name="md_theme_primaryContainer">#C8E6FF</color> + <color name="md_theme_onPrimaryContainer">#004C6E</color> + <color name="md_theme_secondary">#4F606E</color> + <color name="md_theme_onSecondary">#FFFFFF</color> + <color name="md_theme_secondaryContainer">#D3E5F5</color> + <color name="md_theme_onSecondaryContainer">#384956</color> + <color name="md_theme_tertiary">#8E4D2F</color> + <color name="md_theme_onTertiary">#FFFFFF</color> + <color name="md_theme_tertiaryContainer">#FFDBCD</color> + <color name="md_theme_onTertiaryContainer">#71361A</color> + <color name="md_theme_error">#BA1A1A</color> + <color name="md_theme_onError">#FFFFFF</color> + <color name="md_theme_errorContainer">#FFDAD6</color> + <color name="md_theme_onErrorContainer">#93000A</color> + <color name="md_theme_background">#F6F9FE</color> + <color name="md_theme_onBackground">#181C20</color> + <color name="md_theme_surface">#F6F9FE</color> + <color name="md_theme_onSurface">#181C20</color> + <color name="md_theme_surfaceVariant">#DDE3EA</color> + <color name="md_theme_onSurfaceVariant">#41484D</color> + <color name="md_theme_outline">#71787E</color> + <color name="md_theme_outlineVariant">#C1C7CE</color> + <color name="md_theme_scrim">#000000</color> + <color name="md_theme_inverseSurface">#2D3135</color> + <color name="md_theme_inverseOnSurface">#EEF1F6</color> + <color name="md_theme_inversePrimary">#94CDF7</color> + <color name="md_theme_primaryFixed">#C8E6FF</color> + <color name="md_theme_onPrimaryFixed">#001E2F</color> + <color name="md_theme_primaryFixedDim">#94CDF7</color> + <color name="md_theme_onPrimaryFixedVariant">#004C6E</color> + <color name="md_theme_secondaryFixed">#D3E5F5</color> + <color name="md_theme_onSecondaryFixed">#0B1D29</color> + <color name="md_theme_secondaryFixedDim">#B7C9D9</color> + <color name="md_theme_onSecondaryFixedVariant">#384956</color> + <color name="md_theme_tertiaryFixed">#FFDBCD</color> + <color name="md_theme_onTertiaryFixed">#360F00</color> + <color name="md_theme_tertiaryFixedDim">#FFB596</color> + <color name="md_theme_onTertiaryFixedVariant">#71361A</color> + <color name="md_theme_surfaceDim">#D7DADF</color> + <color name="md_theme_surfaceBright">#F6F9FE</color> + <color name="md_theme_surfaceContainerLowest">#FFFFFF</color> + <color name="md_theme_surfaceContainerLow">#F1F4F9</color> + <color name="md_theme_surfaceContainer">#EBEEF3</color> + <color name="md_theme_surfaceContainerHigh">#E5E8ED</color> + <color name="md_theme_surfaceContainerHighest">#DFE3E8</color> + <color name="md_theme_primary_mediumContrast">#003A55</color> + <color name="md_theme_onPrimary_mediumContrast">#FFFFFF</color> + <color name="md_theme_primaryContainer_mediumContrast">#367398</color> + <color name="md_theme_onPrimaryContainer_mediumContrast">#FFFFFF</color> + <color name="md_theme_secondary_mediumContrast">#273845</color> + <color name="md_theme_onSecondary_mediumContrast">#FFFFFF</color> + <color name="md_theme_secondaryContainer_mediumContrast">#5E6F7D</color> + <color name="md_theme_onSecondaryContainer_mediumContrast">#FFFFFF</color> + <color name="md_theme_tertiary_mediumContrast">#5C260B</color> + <color name="md_theme_onTertiary_mediumContrast">#FFFFFF</color> + <color name="md_theme_tertiaryContainer_mediumContrast">#9F5B3C</color> + <color name="md_theme_onTertiaryContainer_mediumContrast">#FFFFFF</color> + <color name="md_theme_error_mediumContrast">#740006</color> + <color name="md_theme_onError_mediumContrast">#FFFFFF</color> + <color name="md_theme_errorContainer_mediumContrast">#CF2C27</color> + <color name="md_theme_onErrorContainer_mediumContrast">#FFFFFF</color> + <color name="md_theme_background_mediumContrast">#F6F9FE</color> + <color name="md_theme_onBackground_mediumContrast">#181C20</color> + <color name="md_theme_surface_mediumContrast">#F6F9FE</color> + <color name="md_theme_onSurface_mediumContrast">#0D1215</color> + <color name="md_theme_surfaceVariant_mediumContrast">#DDE3EA</color> + <color name="md_theme_onSurfaceVariant_mediumContrast">#31373C</color> + <color name="md_theme_outline_mediumContrast">#4D5359</color> + <color name="md_theme_outlineVariant_mediumContrast">#676E74</color> + <color name="md_theme_scrim_mediumContrast">#000000</color> + <color name="md_theme_inverseSurface_mediumContrast">#2D3135</color> + <color name="md_theme_inverseOnSurface_mediumContrast">#EEF1F6</color> + <color name="md_theme_inversePrimary_mediumContrast">#94CDF7</color> + <color name="md_theme_primaryFixed_mediumContrast">#367398</color> + <color name="md_theme_onPrimaryFixed_mediumContrast">#FFFFFF</color> + <color name="md_theme_primaryFixedDim_mediumContrast">#165A7E</color> + <color name="md_theme_onPrimaryFixedVariant_mediumContrast">#FFFFFF</color> + <color name="md_theme_secondaryFixed_mediumContrast">#5E6F7D</color> + <color name="md_theme_onSecondaryFixed_mediumContrast">#FFFFFF</color> + <color name="md_theme_secondaryFixedDim_mediumContrast">#465764</color> + <color name="md_theme_onSecondaryFixedVariant_mediumContrast">#FFFFFF</color> + <color name="md_theme_tertiaryFixed_mediumContrast">#9F5B3C</color> + <color name="md_theme_onTertiaryFixed_mediumContrast">#FFFFFF</color> + <color name="md_theme_tertiaryFixedDim_mediumContrast">#824426</color> + <color name="md_theme_onTertiaryFixedVariant_mediumContrast">#FFFFFF</color> + <color name="md_theme_surfaceDim_mediumContrast">#C3C7CB</color> + <color name="md_theme_surfaceBright_mediumContrast">#F6F9FE</color> + <color name="md_theme_surfaceContainerLowest_mediumContrast">#FFFFFF</color> + <color name="md_theme_surfaceContainerLow_mediumContrast">#F1F4F9</color> + <color name="md_theme_surfaceContainer_mediumContrast">#E5E8ED</color> + <color name="md_theme_surfaceContainerHigh_mediumContrast">#DADDE2</color> + <color name="md_theme_surfaceContainerHighest_mediumContrast">#CED2D7</color> + <color name="md_theme_primary_highContrast">#002F47</color> + <color name="md_theme_onPrimary_highContrast">#FFFFFF</color> + <color name="md_theme_primaryContainer_highContrast">#004E71</color> + <color name="md_theme_onPrimaryContainer_highContrast">#FFFFFF</color> + <color name="md_theme_secondary_highContrast">#1D2E3A</color> + <color name="md_theme_onSecondary_highContrast">#FFFFFF</color> + <color name="md_theme_secondaryContainer_highContrast">#3A4B58</color> + <color name="md_theme_onSecondaryContainer_highContrast">#FFFFFF</color> + <color name="md_theme_tertiary_highContrast">#4F1D03</color> + <color name="md_theme_onTertiary_highContrast">#FFFFFF</color> + <color name="md_theme_tertiaryContainer_highContrast">#74391C</color> + <color name="md_theme_onTertiaryContainer_highContrast">#FFFFFF</color> + <color name="md_theme_error_highContrast">#600004</color> + <color name="md_theme_onError_highContrast">#FFFFFF</color> + <color name="md_theme_errorContainer_highContrast">#98000A</color> + <color name="md_theme_onErrorContainer_highContrast">#FFFFFF</color> + <color name="md_theme_background_highContrast">#F6F9FE</color> + <color name="md_theme_onBackground_highContrast">#181C20</color> + <color name="md_theme_surface_highContrast">#F6F9FE</color> + <color name="md_theme_onSurface_highContrast">#000000</color> + <color name="md_theme_surfaceVariant_highContrast">#DDE3EA</color> + <color name="md_theme_onSurfaceVariant_highContrast">#000000</color> + <color name="md_theme_outline_highContrast">#272D32</color> + <color name="md_theme_outlineVariant_highContrast">#444A50</color> + <color name="md_theme_scrim_highContrast">#000000</color> + <color name="md_theme_inverseSurface_highContrast">#2D3135</color> + <color name="md_theme_inverseOnSurface_highContrast">#FFFFFF</color> + <color name="md_theme_inversePrimary_highContrast">#94CDF7</color> + <color name="md_theme_primaryFixed_highContrast">#004E71</color> + <color name="md_theme_onPrimaryFixed_highContrast">#FFFFFF</color> + <color name="md_theme_primaryFixedDim_highContrast">#003650</color> + <color name="md_theme_onPrimaryFixedVariant_highContrast">#FFFFFF</color> + <color name="md_theme_secondaryFixed_highContrast">#3A4B58</color> + <color name="md_theme_onSecondaryFixed_highContrast">#FFFFFF</color> + <color name="md_theme_secondaryFixedDim_highContrast">#243541</color> + <color name="md_theme_onSecondaryFixedVariant_highContrast">#FFFFFF</color> + <color name="md_theme_tertiaryFixed_highContrast">#74391C</color> + <color name="md_theme_onTertiaryFixed_highContrast">#FFFFFF</color> + <color name="md_theme_tertiaryFixedDim_highContrast">#572307</color> + <color name="md_theme_onTertiaryFixedVariant_highContrast">#FFFFFF</color> + <color name="md_theme_surfaceDim_highContrast">#B5B9BE</color> + <color name="md_theme_surfaceBright_highContrast">#F6F9FE</color> + <color name="md_theme_surfaceContainerLowest_highContrast">#FFFFFF</color> + <color name="md_theme_surfaceContainerLow_highContrast">#EEF1F6</color> + <color name="md_theme_surfaceContainer_highContrast">#DFE3E8</color> + <color name="md_theme_surfaceContainerHigh_highContrast">#D1D5D9</color> + <color name="md_theme_surfaceContainerHighest_highContrast">#C3C7CB</color> +</resources> diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml deleted file mode 100755 index 41785b97..00000000 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ /dev/null @@ -1,53 +0,0 @@ -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - - <style name="AppTheme.Base" parent="Theme.Material3.DynamicColors.DayNight"> - <item name="windowActionBar">false</item> - <item name="windowNoTitle">true</item> - - <item name="ic_rss_box">@drawable/baseline_rss_feed_24</item> - <item name="ic_checkbox_marked">@drawable/baseline_check_box_24</item> - <item name="ic_star">@drawable/baseline_star_24</item> - <item name="ic_star_outline">@drawable/baseline_star_outline_24</item> - <item name="ic_share">@drawable/baseline_share_24</item> - <item name="ic_inbox">@drawable/baseline_inbox_24</item> - <item name="ic_go_back">@drawable/baseline_arrow_back_24</item> - <item name="ic_settings">@drawable/baseline_settings_24</item> - <item name="ic_filter_variant">@drawable/baseline_filter_alt_24</item> - <item name="ic_cloud_download">@drawable/baseline_cloud_download_24</item> - <item name="ic_cloud_upload">@drawable/baseline_cloud_upload_24</item> - <item name="ic_archive">@drawable/baseline_archive_24</item> - <item name="ic_fresh">@drawable/baseline_local_fire_department_24</item> - <item name="ic_restore">@drawable/baseline_restore_24</item> - <item name="ic_folder_outline">@drawable/baseline_folder_open_24</item> - <item name="ic_dots_vertical">@drawable/baseline_more_vert_24</item> - <item name="ic_dots_vertical_circle">@drawable/outline_more_24</item> - <item name="ic_attachment">@drawable/baseline_attachment_24</item> - <item name="ic_attachment_vert">@drawable/baseline_attach_file_24</item> - <item name="ic_action_trending_up">@drawable/baseline_trending_up_24</item> - <item name="ic_action_trending_flat">@drawable/baseline_trending_flat_24</item> - <item name="ic_action_trending_down">@drawable/baseline_trending_down_24</item> - </style> - - <style name="AppTheme" parent="AppTheme.Base"> - <item name="windowActionModeOverlay">true</item> - - <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_bright</item> - <item name="headlineHeaderBackground">#ccffffff</item> - <item name="feedlistTextColor">@android:color/black</item> - <item name="feedlistSelectedTextColor">@android:color/black</item> - <item name="headlineTitleHighScoreUnreadTextColor">#008000</item> - <item name="linkColor">?colorPrimary</item> - <item name="articleNoteTextColor">#9a8c59</item> - <item name="articleNoteBackground">#fff7d5</item> - <item name="parentBtnBackground">#dddddd</item> - <item name="articleHeader">@android:color/transparent</item> - <item name="articleTextColor">@android:color/black</item> - <!-- <item name="floatingActionButtonStyle">@style/FabTheme</item> --> - <item name="articleHeaderSeparator">#cccccc</item> - - <item name="colorAccent">#F4511E</item> - </style> - - <style name="DarkDialogTheme" parent="android:Theme"></style> - -</resources>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/theme_overlays.xml b/org.fox.ttrss/src/main/res/values/theme_overlays.xml new file mode 100644 index 00000000..e81f18fb --- /dev/null +++ b/org.fox.ttrss/src/main/res/values/theme_overlays.xml @@ -0,0 +1,98 @@ +<resources> + <style name="ThemeOverlay.AppTheme.MediumContrast" parent="Theme.Material3.Light.NoActionBar"> + <item name="colorPrimary">@color/md_theme_primary_mediumContrast</item> + <item name="colorOnPrimary">@color/md_theme_onPrimary_mediumContrast</item> + <item name="colorPrimaryContainer">@color/md_theme_primaryContainer_mediumContrast</item> + <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer_mediumContrast</item> + <item name="colorSecondary">@color/md_theme_secondary_mediumContrast</item> + <item name="colorOnSecondary">@color/md_theme_onSecondary_mediumContrast</item> + <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_mediumContrast</item> + <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_mediumContrast</item> + <item name="colorTertiary">@color/md_theme_tertiary_mediumContrast</item> + <item name="colorOnTertiary">@color/md_theme_onTertiary_mediumContrast</item> + <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_mediumContrast</item> + <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_mediumContrast</item> + <item name="colorError">@color/md_theme_error_mediumContrast</item> + <item name="colorOnError">@color/md_theme_onError_mediumContrast</item> + <item name="colorErrorContainer">@color/md_theme_errorContainer_mediumContrast</item> + <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer_mediumContrast</item> + <item name="android:colorBackground">@color/md_theme_background_mediumContrast</item> + <item name="colorOnBackground">@color/md_theme_onBackground_mediumContrast</item> + <item name="colorSurface">@color/md_theme_surface_mediumContrast</item> + <item name="colorOnSurface">@color/md_theme_onSurface_mediumContrast</item> + <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant_mediumContrast</item> + <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant_mediumContrast</item> + <item name="colorOutline">@color/md_theme_outline_mediumContrast</item> + <item name="colorOutlineVariant">@color/md_theme_outlineVariant_mediumContrast</item> + <item name="colorSurfaceInverse">@color/md_theme_inverseSurface_mediumContrast</item> + <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface_mediumContrast</item> + <item name="colorPrimaryInverse">@color/md_theme_inversePrimary_mediumContrast</item> + <item name="colorPrimaryFixed">@color/md_theme_primaryFixed_mediumContrast</item> + <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_mediumContrast</item> + <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_mediumContrast</item> + <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_mediumContrast</item> + <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_mediumContrast</item> + <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_mediumContrast</item> + <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_mediumContrast</item> + <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant_mediumContrast</item> + <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_mediumContrast</item> + <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_mediumContrast</item> + <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_mediumContrast</item> + <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant_mediumContrast</item> + <item name="colorSurfaceDim">@color/md_theme_surfaceDim_mediumContrast</item> + <item name="colorSurfaceBright">@color/md_theme_surfaceBright_mediumContrast</item> + <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest_mediumContrast</item> + <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_mediumContrast</item> + <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_mediumContrast</item> + <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_mediumContrast</item> + <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest_mediumContrast</item> + </style> + <style name="ThemeOverlay.AppTheme.HighContrast" parent="Theme.Material3.Light.NoActionBar"> + <item name="colorPrimary">@color/md_theme_primary_highContrast</item> + <item name="colorOnPrimary">@color/md_theme_onPrimary_highContrast</item> + <item name="colorPrimaryContainer">@color/md_theme_primaryContainer_highContrast</item> + <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer_highContrast</item> + <item name="colorSecondary">@color/md_theme_secondary_highContrast</item> + <item name="colorOnSecondary">@color/md_theme_onSecondary_highContrast</item> + <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer_highContrast</item> + <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer_highContrast</item> + <item name="colorTertiary">@color/md_theme_tertiary_highContrast</item> + <item name="colorOnTertiary">@color/md_theme_onTertiary_highContrast</item> + <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer_highContrast</item> + <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer_highContrast</item> + <item name="colorError">@color/md_theme_error_highContrast</item> + <item name="colorOnError">@color/md_theme_onError_highContrast</item> + <item name="colorErrorContainer">@color/md_theme_errorContainer_highContrast</item> + <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer_highContrast</item> + <item name="android:colorBackground">@color/md_theme_background_highContrast</item> + <item name="colorOnBackground">@color/md_theme_onBackground_highContrast</item> + <item name="colorSurface">@color/md_theme_surface_highContrast</item> + <item name="colorOnSurface">@color/md_theme_onSurface_highContrast</item> + <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant_highContrast</item> + <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant_highContrast</item> + <item name="colorOutline">@color/md_theme_outline_highContrast</item> + <item name="colorOutlineVariant">@color/md_theme_outlineVariant_highContrast</item> + <item name="colorSurfaceInverse">@color/md_theme_inverseSurface_highContrast</item> + <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface_highContrast</item> + <item name="colorPrimaryInverse">@color/md_theme_inversePrimary_highContrast</item> + <item name="colorPrimaryFixed">@color/md_theme_primaryFixed_highContrast</item> + <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed_highContrast</item> + <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim_highContrast</item> + <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant_highContrast</item> + <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed_highContrast</item> + <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed_highContrast</item> + <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim_highContrast</item> + <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant_highContrast</item> + <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed_highContrast</item> + <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed_highContrast</item> + <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim_highContrast</item> + <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant_highContrast</item> + <item name="colorSurfaceDim">@color/md_theme_surfaceDim_highContrast</item> + <item name="colorSurfaceBright">@color/md_theme_surfaceBright_highContrast</item> + <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest_highContrast</item> + <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow_highContrast</item> + <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer_highContrast</item> + <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh_highContrast</item> + <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest_highContrast</item> + </style> +</resources> diff --git a/org.fox.ttrss/src/main/res/values/themes.xml b/org.fox.ttrss/src/main/res/values/themes.xml new file mode 100644 index 00000000..54613ad9 --- /dev/null +++ b/org.fox.ttrss/src/main/res/values/themes.xml @@ -0,0 +1,86 @@ +<resources> + <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar"> + <item name="ic_rss_box">@drawable/baseline_rss_feed_24</item> + <item name="ic_checkbox_marked">@drawable/baseline_check_box_24</item> + <item name="ic_star">@drawable/baseline_star_24</item> + <item name="ic_star_outline">@drawable/baseline_star_outline_24</item> + <item name="ic_share">@drawable/baseline_share_24</item> + <item name="ic_inbox">@drawable/baseline_inbox_24</item> + <item name="ic_go_back">@drawable/baseline_arrow_back_24</item> + <item name="ic_settings">@drawable/baseline_settings_24</item> + <item name="ic_filter_variant">@drawable/baseline_filter_alt_24</item> + <item name="ic_cloud_download">@drawable/baseline_cloud_download_24</item> + <item name="ic_cloud_upload">@drawable/baseline_cloud_upload_24</item> + <item name="ic_archive">@drawable/baseline_archive_24</item> + <item name="ic_fresh">@drawable/baseline_local_fire_department_24</item> + <item name="ic_restore">@drawable/baseline_restore_24</item> + <item name="ic_folder_outline">@drawable/baseline_folder_open_24</item> + <item name="ic_dots_vertical">@drawable/baseline_more_vert_24</item> + <item name="ic_dots_vertical_circle">@drawable/outline_more_24</item> + <item name="ic_attachment">@drawable/baseline_attachment_24</item> + <item name="ic_attachment_vert">@drawable/baseline_attach_file_24</item> + <item name="ic_action_trending_up">@drawable/baseline_trending_up_24</item> + <item name="ic_action_trending_flat">@drawable/baseline_trending_flat_24</item> + <item name="ic_action_trending_down">@drawable/baseline_trending_down_24</item> + + <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_bright</item> + <item name="headlineHeaderBackground">#ccffffff</item> + <item name="feedlistTextColor">@android:color/black</item> + <item name="feedlistSelectedTextColor">@android:color/black</item> + <item name="headlineTitleHighScoreUnreadTextColor">#008000</item> + <item name="linkColor">?colorPrimary</item> + <item name="articleNoteTextColor">#9a8c59</item> + <item name="articleNoteBackground">#fff7d5</item> + <item name="parentBtnBackground">#dddddd</item> + <item name="articleHeader">@android:color/transparent</item> + <item name="articleTextColor">@android:color/black</item> + <item name="articleHeaderSeparator">#cccccc</item> + + <item name="colorPrimary">@color/md_theme_primary</item> + <item name="colorOnPrimary">@color/md_theme_onPrimary</item> + <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item> + <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer</item> + <item name="colorSecondary">@color/md_theme_secondary</item> + <item name="colorOnSecondary">@color/md_theme_onSecondary</item> + <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer</item> + <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer</item> + <item name="colorTertiary">@color/md_theme_tertiary</item> + <item name="colorOnTertiary">@color/md_theme_onTertiary</item> + <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item> + <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item> + <item name="colorError">@color/md_theme_error</item> + <item name="colorOnError">@color/md_theme_onError</item> + <item name="colorErrorContainer">@color/md_theme_errorContainer</item> + <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item> + <item name="android:colorBackground">@color/md_theme_background</item> + <item name="colorOnBackground">@color/md_theme_onBackground</item> + <item name="colorSurface">@color/md_theme_surface</item> + <item name="colorOnSurface">@color/md_theme_onSurface</item> + <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item> + <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item> + <item name="colorOutline">@color/md_theme_outline</item> + <item name="colorOutlineVariant">@color/md_theme_outlineVariant</item> + <item name="colorSurfaceInverse">@color/md_theme_inverseSurface</item> + <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item> + <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item> + <item name="colorPrimaryFixed">@color/md_theme_primaryFixed</item> + <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed</item> + <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim</item> + <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant</item> + <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed</item> + <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed</item> + <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim</item> + <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant</item> + <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed</item> + <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed</item> + <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim</item> + <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant</item> + <item name="colorSurfaceDim">@color/md_theme_surfaceDim</item> + <item name="colorSurfaceBright">@color/md_theme_surfaceBright</item> + <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest</item> + <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow</item> + <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item> + <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item> + <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item> + </style> +</resources> |