rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: radius and color

Browse Source
This commit is contained in:
J-Jamet
2023-06-26 19:26:01 +02:00
parent 800335e416
commit ad670151c8
8 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/drawable-v21/background_button_small.xml
View File

@@ -8,7 +8,7 @@
<item android:bottom="2dp" android:left="2dp">
<shape>
<corners
android:radius="8dp" />
android:radius="@dimen/dialog_radius" />
<padding
android:left="14dp"
android:right="14dp"

4
app/src/main/res/drawable/background_button_small.xml
View File

@@ -5,7 +5,7 @@
<item android:bottom="2dp" android:left="2dp">
<shape>
<corners
android:radius="8dp" />
android:radius="@dimen/dialog_radius" />
<padding
android:left="14dp"
android:right="14dp"
@@ -21,7 +21,7 @@
<item android:bottom="2dp" android:left="2dp">
<shape>
<corners
android:radius="8dp" />
android:radius="@dimen/dialog_radius" />
<padding
android:left="14dp"
android:right="14dp"

3
app/src/main/res/layout/fragment_color_picker.xml
View File

@@ -36,7 +36,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<androidx.appcompat.widget.SwitchCompat
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/switch_element"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -44,6 +44,7 @@
android:text="@string/enable"
android:background="@drawable/background_button_small"
android:textColor="?attr/colorOnAccentColor"
android:theme="?attr/switchAppearance"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:minHeight="48dp"/>

2
app/src/main/res/values-v21/styles_moon.xml
View File

@@ -21,12 +21,14 @@
<style name="KeepassDXStyle.Blue" parent="KeepassDXStyle.Blue.v21" >
<item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
<item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
<item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Blue.DateTime.Dialog</item>
<item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Blue.DateTime.Dialog</item>
</style>
<style name="KeepassDXStyle.Blue.Night" parent="KeepassDXStyle.Blue.Night.v21" >
<item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
<item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
<item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Blue.Night.DateTime.Dialog</item>
<item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Blue.Night.DateTime.Dialog</item>
</style>

2
app/src/main/res/values-v21/styles_sun.xml
View File

@@ -21,12 +21,14 @@
<style name="KeepassDXStyle.Red" parent="KeepassDXStyle.Red.v21" >
<item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
<item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
<item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Red.DateTime.Dialog</item>
<item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Red.DateTime.Dialog</item>
</style>
<style name="KeepassDXStyle.Red.Night" parent="KeepassDXStyle.Red.Night.v21" >
<item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
<item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
<item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Red.Night.DateTime.Dialog</item>
<item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Red.Night.DateTime.Dialog</item>
</style>

4
app/src/main/res/values-v27/styles.xml
View File

@@ -19,11 +19,11 @@
-->
<resources>
<style name="KeepassDXStyle.Light.v27" parent="KeepassDXStyle.Light.v23" >
<item name="android:navigationBarColor">@color/white_dark</item>
<item name="android:navigationBarColor">@color/green_white_dark</item>
<item name="android:windowLightNavigationBar">true</item>
</style>
<style name="KeepassDXStyle.Night.v27" parent="KeepassDXStyle.Night.v23" >
<item name="android:navigationBarColor">@color/grey_dark</item>
<item name="android:navigationBarColor">@color/green_black</item>
<item name="android:windowLightNavigationBar">false</item>
</style>
</resources>

1
app/src/main/res/values/dimens.xml
View File

@@ -34,5 +34,6 @@
<dimen name="hidden_lock_button_size">0dp</dimen>
<dimen name="content_percent">1</dimen>
<dimen name="toolbar_parallax_height">160dp</dimen>
<dimen name="dialog_radius">16dp</dimen>
<integer name="animation_duration">260</integer>
</resources>

6
app/src/main/res/values/styles.xml
View File

@@ -307,11 +307,11 @@
</style>
<style name="KeepassDXStyle.Switch.Light" parent="KeepassDXStyle.Light">
<item name="colorPrimary">@color/orange</item>
<item name="colorOnPrimary">@color/green_white_dark</item>
<item name="colorOnPrimary">@color/green_white</item>
<item name="colorOnAccentColor">@color/white</item>
<item name="colorPrimaryContainer">?android:attr/windowBackground</item>
<item name="colorOutline">@color/orange</item>
<item name="colorSurfaceVariant">?android:attr/windowBackground</item>
<item name="colorSurfaceVariant">@color/green_white</item>
</style>
<style name="KeepassDXStyle.Switch.Night" parent="KeepassDXStyle.Night">
<item name="colorPrimary">@color/orange</item>
@@ -403,7 +403,7 @@
<item name="android:layout_marginLeft">@dimen/card_view_margin_horizontal</item>
<item name="android:layout_marginRight">@dimen/card_view_margin_horizontal</item>
<item name="android:padding">@dimen/card_view_padding</item>
<item name="cardCornerRadius">16dp</item>
<item name="cardCornerRadius">@dimen/dialog_radius</item>
</style>
<style name="KeepassDXStyle.Cardview.Light" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">@color/green_white</item>