yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refine color schemes

Browse Source 
* Don't always be green
This commit is contained in:
tarsin committed 2022-05-18 00:55:16 +08:00
1 parent 43bc5ab50c
commit 4e462a1903
9 files changed
+16 -52
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/res/drawable/category_background.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<color android:color="@android:color/white" />
<color android:color="@android:color/system_neutral1_50" />
</item>
<item android:drawable="?android:attr/selectableItemBackground" />
</layer-list>
app/src/main/res/layout/activity_filter.xml
-1
View File
@@ -38,7 +38,6 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/fab"
style="@style/Widget.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/corner_fab_margin"
app/src/main/res/layout/activity_hosts.xml
-1
View File
@@ -39,7 +39,6 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/fab"
style="@style/Widget.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/corner_fab_margin"
app/src/main/res/layout/gallery_detail_header.xml
-4
View File
@@ -30,7 +30,6 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="?attr/galleryDetailHeaderBackgroundColor"
android:elevation="4dp"
app:fitsSystemWindowsInsets="top" />
@@ -49,7 +48,6 @@
android:id="@+id/header_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
app:fitsSystemWindowsInsets="top">
<com.hippo.widget.LoadImageView
@@ -70,7 +68,6 @@
android:layout_toRightOf="@id/thumb"
android:ellipsize="end"
android:maxLines="5"
android:textColor="@android:color/white"
android:textSize="@dimen/text_little_large" />
<TextView
@@ -84,7 +81,6 @@
android:background="?selectableItemBackground"
android:ellipsize="end"
android:singleLine="true"
android:textColor="@android:color/white"
android:textSize="@dimen/text_little_small" />
<TextView
app/src/main/res/layout/scene_download.xml
+5 -6
View File
@@ -62,37 +62,36 @@
app:fitsSystemWindowsInsets="bottom">
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.FloatingActionButton.Accent.Mini"
app:fabSize="mini"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_check_all_dark_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.FloatingActionButton.Accent.Mini"
app:fabSize="mini"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_play_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.FloatingActionButton.Accent.Mini"
app:fabSize="mini"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_pause_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.FloatingActionButton.Accent.Mini"
app:fabSize="mini"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_delete_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.FloatingActionButton.Accent.Mini"
app:fabSize="mini"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_folder_move_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_close_dark_x24" />
app/src/main/res/layout/scene_favorites.xml
+6 -7
View File
@@ -44,46 +44,45 @@
app:fitsSystemWindowsInsets="top|bottom">
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.FloatingActionButton.Accent.Mini"
app:fabSize="mini"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_heart_box_dark_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.FloatingActionButton.Accent.Mini"
app:fabSize="mini"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_go_to_dark_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.FloatingActionButton.Accent.Mini"
app:fabSize="mini"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_refresh_dark_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.FloatingActionButton.Accent.Mini"
app:fabSize="mini"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:srcCompat="@drawable/v_download_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.FloatingActionButton.Accent.Mini"
app:fabSize="mini"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:srcCompat="@drawable/v_delete_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.FloatingActionButton.Accent.Mini"
app:fabSize="mini"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:srcCompat="@drawable/v_folder_move_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
app/src/main/res/layout/scene_gallery_comments.xml
+1 -3
View File
@@ -69,8 +69,7 @@
android:maxHeight="112dp"
android:minHeight="56dp"
android:padding="@dimen/keyline_margin"
android:textColor="?colorOnPrimarySurface"
android:theme="@style/CommentEditText" />
android:textColor="?colorOnPrimarySurface" />
<ImageView
android:id="@+id/send"
@@ -95,7 +94,6 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
style="@style/Widget.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_reply_dark_x24" />
app/src/main/res/layout/scene_gallery_list.xml
+3 -5
View File
@@ -51,25 +51,24 @@
app:fitsSystemWindowsInsets="top|bottom">
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.FloatingActionButton.Accent.Mini"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:fabSize="mini"
app:srcCompat="@drawable/v_magnify_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.FloatingActionButton.Accent.Mini"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:fabSize="mini"
app:srcCompat="@drawable/v_go_to_dark_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.FloatingActionButton.Accent.Mini"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:fabSize="mini"
app:srcCompat="@drawable/v_refresh_dark_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@@ -84,7 +83,6 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/search_fab"
style="@style/Widget.FloatingActionButton.Accent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scaleX="0"
app/src/main/res/values/themes.xml
-24
View File
@@ -20,9 +20,6 @@
<!-- Base Theme -->
<!-- ========== -->
<style name="Base.AppTheme.Light" parent="Theme.Material3.Light">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:colorBackground">@color/colorBackground</item>
<item name="android:windowSplashScreenIconBackgroundColor" tools:targetApi="s">@color/ic_launcher_background</item>
@@ -61,9 +58,6 @@
</style>
<style name="Base.AppTheme" parent="Theme.Material3.DayNight">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/grey_875</item>
<item name="colorAccent">@color/colorPrimary</item>
<item name="colorControlActivated">@color/colorPrimary</item>
<item name="android:colorBackground">@color/grey_850</item>
<item name="android:windowSplashScreenIconBackgroundColor" tools:targetApi="s">@color/ic_launcher_background</item>
@@ -109,8 +103,6 @@
<style name="ThemeOverlay" />
<style name="ThemeOverlay.Black">
<item name="colorPrimaryDark">@android:color/black</item>
<item name="android:colorBackground">@android:color/black</item>
<item name="android:textColorPrimary">@color/primary_text_material_black</item>
@@ -143,25 +135,9 @@
<!-- ============ -->
<!-- Widget Theme -->
<!-- ============ -->
<style name="CommentEditText" parent="ThemeOverlay.Material3">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@android:color/white</item>
</style>
<style name="RatingBarTheme" parent="ThemeOverlay.Material3">
<item name="colorControlNormal">@color/yellow_800</item>
<item name="colorControlActivated">@color/yellow_800</item>
</style>
<style name="Widget.FloatingActionButton" parent="Widget.Material3.FloatingActionButton.Tertiary">
</style>
<style name="Widget.FloatingActionButton.Accent" parent="Widget.Material3.FloatingActionButton.Secondary">
</style>
<style name="Widget.FloatingActionButton.Accent.Mini" parent="Widget.FloatingActionButton.Accent">
<item name="fabSize">mini</item>
</style>
</resources>