1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2025-02-10 11:04:41 +00:00

Fix contrast of top app bar (#1916)

This commit is contained in:
Bnyro 2023-06-13 21:32:15 +02:00 committed by GitHub
parent 7b669e77dd
commit ebd31829b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 7 additions and 31 deletions

View file

@ -1,6 +1,7 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:tint="?colorControlNormal"
android:viewportWidth="24.0" android:viewportWidth="24.0"
android:viewportHeight="24.0"> android:viewportHeight="24.0">
<path <path

View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout" android:id="@+id/drawer_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
@ -15,13 +14,7 @@
<com.google.android.material.tabs.TabLayout <com.google.android.material.tabs.TabLayout
android:id="@+id/tabContainer" android:id="@+id/tabContainer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content" />
android:background="?colorPrimary"
android:elevation="@dimen/toolbar_elevation"
android:theme="@style/ThemeOverlay.Syncthing.Toolbar"
app:tabIndicatorColor="@android:color/white"
app:tabSelectedTextColor="@android:color/white"
app:tabTextColor="@android:color/white" />
<androidx.viewpager.widget.ViewPager <androidx.viewpager.widget.ViewPager
android:id="@+id/pager" android:id="@+id/pager"

View file

@ -1,13 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.appcompat.widget.Toolbar <com.google.android.material.appbar.MaterialToolbar
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?android:actionBarSize" android:layout_height="?android:actionBarSize"
android:minHeight="?android:actionBarSize" android:minHeight="?android:actionBarSize"
android:background="?colorPrimary" app:titleMarginStart="16dp" />
android:elevation="@dimen/toolbar_elevation"
app:titleMarginStart="16dp"
android:theme="@style/ThemeOverlay.Syncthing.Toolbar"
android:popupTheme="@style/ThemeOverlay.AppCompat.Light" />

View file

@ -5,7 +5,7 @@
<item <item
android:id="@+id/add_device" android:id="@+id/add_device"
android:icon="@drawable/ic_add_white_24dp" android:icon="@drawable/ic_add_24dp"
android:title="@string/add_device" android:title="@string/add_device"
app:showAsAction="always|withText" /> app:showAsAction="always|withText" />

View file

@ -5,7 +5,7 @@
<item <item
android:id="@+id/add_folder" android:id="@+id/add_folder"
android:icon="@drawable/ic_add_white_24dp" android:icon="@drawable/ic_add_24dp"
android:title="@string/add_folder" android:title="@string/add_folder"
app:showAsAction="always|withText" /> app:showAsAction="always|withText" />

View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<dimen name="material_divider_inset">72dp</dimen> <dimen name="material_divider_inset">72dp</dimen>
<dimen name="toolbar_elevation">4dp</dimen>
<!-- Default screen margins, per the Android Design guidelines. --> <!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="dots_height">30dp</dimen> <dimen name="dots_height">30dp</dimen>

View file

@ -41,11 +41,6 @@
<item name="android:background">@null</item> <item name="android:background">@null</item>
</style> </style>
<style name="Widget.Syncthing.DrawerArrowToggle" parent="Widget.AppCompat.DrawerArrowToggle">
<item name="spinBars">false</item>
<item name="color">@android:color/white</item>
</style>
<!-- Text appearances --> <!-- Text appearances -->
<eat-comment /> <eat-comment />

View file

@ -15,7 +15,6 @@
<item name="windowActionModeOverlay">true</item> <item name="windowActionModeOverlay">true</item>
<item name="android:listViewStyle">@style/Widget.Syncthing.ListView</item> <item name="android:listViewStyle">@style/Widget.Syncthing.ListView</item>
<item name="android:listDivider">@drawable/list_divider_inset</item> <item name="android:listDivider">@drawable/list_divider_inset</item>
<item name="drawerArrowStyle">@style/Widget.Syncthing.DrawerArrowToggle</item>
<item name="android:actionBarSize">@dimen/abc_action_bar_default_height_material</item> <item name="android:actionBarSize">@dimen/abc_action_bar_default_height_material</item>
@ -27,7 +26,7 @@
<item name="android:dialogCornerRadius" tools:targetApi="p">@dimen/dialog_corner_radius</item> <item name="android:dialogCornerRadius" tools:targetApi="p">@dimen/dialog_corner_radius</item>
<item name="dialogCornerRadius">@dimen/dialog_corner_radius</item> <item name="dialogCornerRadius">@dimen/dialog_corner_radius</item>
<item name="android:statusBarColor" tools:targetApi="m">?attr/colorPrimary</item> <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
<item name="android:navigationBarColor">@android:color/transparent</item> <item name="android:navigationBarColor">@android:color/transparent</item>
</style> </style>
@ -56,13 +55,6 @@
<style name="Theme.Syncthing.ButtonStyle" parent="Widget.Material3.Button.TextButton.Dialog" /> <style name="Theme.Syncthing.ButtonStyle" parent="Widget.Material3.Button.TextButton.Dialog" />
<!-- Toolbar themes -->
<eat-comment/>
<style name="ThemeOverlay.Syncthing.Toolbar" parent="ThemeOverlay.Material3.Dark.ActionBar">
<item name="android:windowBackground">@null</item>
</style>
<!-- Preference dialog theme --> <!-- Preference dialog theme -->
<eat-comment/> <eat-comment/>