mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-01 14:45:08 +00:00
Code Issues Releases Wiki Activity

Merge branch 'shavez/kdeconnect-android-theme-improvements'

Browse Source
This commit is contained in:
Albert Vaca Cintora
2020-03-20 21:28:37 +01:00
parent e9d96e90a0 a3b768fdf8
commit e7651ec9bc
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/activity_custom_devices.xml
View File

@@ -26,7 +26,7 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/floatingActionButton" android:id="@+id/floatingActionButton"
style="@style/Widget.MaterialComponents.FloatingActionButton" style="@style/KdeConnectThemeBase"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"

4
res/values/styles-dark.xml
View File

@@ -6,8 +6,10 @@
<!-- KdeConnectThemeBase styles must only be defined in the main res/values/ folder --> <!-- KdeConnectThemeBase styles must only be defined in the main res/values/ folder -->
<style name="KdeConnectThemeBase.Dark" parent="Theme.MaterialComponents"> <style name="KdeConnectThemeBase.Dark" parent="Theme.MaterialComponents">
<item name="colorPrimary">@color/darkGrey</item> <item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/darkStatusBarBackground</item> <item name="colorPrimaryDark">@color/darkStatusBarBackground</item>
<item name="colorSecondary">@color/primary</item>
<item name="colorOnSecondary">@android:color/black</item>
<item name="colorAccent">@color/accent</item> <item name="colorAccent">@color/accent</item>
<item name="android:windowBackground">@android:color/black</item> <item name="android:windowBackground">@android:color/black</item>
<item name="toolbarStyle">@style/KdeConnectTheme.Toolbar.Dark</item> <item name="toolbarStyle">@style/KdeConnectTheme.Toolbar.Dark</item>

2
res/values/styles.xml
View File

@@ -9,6 +9,8 @@
<!-- The three colors used by system widgets, according to https://chris.banes.me/2014/10/17/appcompat-v21/ --> <!-- The three colors used by system widgets, according to https://chris.banes.me/2014/10/17/appcompat-v21/ -->
<item name="colorPrimary">@color/primary</item> <item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primaryDark</item> <item name="colorPrimaryDark">@color/primaryDark</item>
<item name="colorSecondary">@color/primary</item>
<item name="colorOnSecondary">@android:color/white</item>
<item name="colorAccent">@color/accent</item> <item name="colorAccent">@color/accent</item>
<item name="toolbarStyle">@style/KdeConnectTheme.Toolbar</item> <item name="toolbarStyle">@style/KdeConnectTheme.Toolbar</item>
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item> <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>