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 style for pre lollipop devices

Browse Source
This commit is contained in:
J-Jamet
2019-08-07 13:50:42 +02:00
parent ced6a77819
commit 43f14e1474
9 changed files with 65 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/res/drawable-v21/button_background_primary.xml
View File

@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:color="@color/white"
tools:targetApi="lollipop">
<item>
<shape>
<corners
android:radius="0dp" />
<padding
android:left="0dp"
android:right="0dp"
android:top="12dp"
android:bottom="12dp"/>
<solid android:color="?attr/colorPrimary"/>
</shape>
</item>
</ripple>

18
app/src/main/res/drawable-v21/button_large_enable.xml
View File

@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:color="@color/white"
tools:targetApi="lollipop">
<item>
<shape>
<corners
android:radius="0dp" />
<padding
android:left="0dp"
android:right="0dp"
android:top="12dp"
android:bottom="12dp"/>
<solid android:color="?attr/colorAccentCompat"/>
</shape>
</item>
</ripple>

22
app/src/main/res/drawable-v21/button_small_background.xml
View File

@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:color="@color/white"
tools:targetApi="lollipop">
<item>
<layer-list>
<item android:bottom="2dp" android:left="2dp">
<shape>
<corners
android:radius="8dp" />
<padding
android:left="14dp"
android:right="14dp"
android:top="4dp"
android:bottom="8dp"/>
<solid android:color="?attr/colorAccentCompat"/>
</shape>
</item>
</layer-list>
</item>
</ripple>

9
app/src/main/res/drawable/button_background_primary.xml
View File

@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:color="@color/white"
tools:targetApi="lollipop">
<item>
<shape>
<corners
@@ -9,7 +12,7 @@
android:right="0dp"
android:top="12dp"
android:bottom="12dp"/>
<solid android:color="@color/green_dark"/>
<solid android:color="?attr/colorPrimary"/>
</shape>
</item>
</layer-list>
</ripple>

9
app/src/main/res/drawable/button_large_enable.xml
View File

@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:color="@color/white"
tools:targetApi="lollipop">
<item>
<shape>
<corners
@@ -9,7 +12,7 @@
android:right="0dp"
android:top="12dp"
android:bottom="12dp"/>
<solid android:color="@color/orange"/>
<solid android:color="?attr/colorAccentCompat"/>
</shape>
</item>
</layer-list>
</ripple>

33
app/src/main/res/drawable/button_small_background.xml
View File

@@ -1,15 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:bottom="2dp" android:left="2dp">
<shape>
<corners
android:radius="8dp" />
<padding
android:left="14dp"
android:right="14dp"
android:top="4dp"
android:bottom="8dp"/>
<solid android:color="@color/orange"/>
</shape>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:color="@color/white"
tools:targetApi="lollipop">
<item>
<layer-list>
<item android:bottom="2dp" android:left="2dp">
<shape>
<corners
android:radius="8dp" />
<padding
android:left="14dp"
android:right="14dp"
android:top="4dp"
android:bottom="8dp"/>
<solid android:color="?attr/colorAccentCompat"/>
</shape>
</item>
</layer-list>
</item>
</layer-list>
</ripple>

2
app/src/main/res/layout/activity_file_selection.xml
View File

@@ -123,7 +123,7 @@
android:id="@+id/container_file_list"
android:layout_height="wrap_content"
android:layout_width="0dp"
android:backgroundTint="?attr/colorPrimary"
style="@style/KeepassDXStyle.CardView.PrimaryColor"
android:layout_margin="12dp"
app:layout_constraintWidth_percent="@dimen/content_percent"
app:layout_constraintTop_toBottomOf="@+id/label_warning"

10
app/src/main/res/values-v21/styles.xml
View File

@@ -12,8 +12,17 @@
<!-- Button Style -->
<style name="KeepassDXStyle.v21.Button" parent="Base.TextAppearance.AppCompat.Button" >
<item name="android:gravity">center</item>
<item name="android:elevation">4dp</item>
</style>
<style name="KeepassDXStyle.Button" parent="KeepassDXStyle.v21.Button">
<item name="android:textColor">@color/text_color_button</item>
<item name="android:background">@drawable/button_large</item>
</style>
<style name="KeepassDXStyle.Button.Primary" parent="KeepassDXStyle.v21.Button">
<item name="android:textColor">?attr/textColorInverse</item>
<item name="android:background">@drawable/button_background_primary</item>
</style>
<!-- FAB -->
<style name="KeepassDXStyle.v21.Fab" parent="Theme.AppCompat">
@@ -23,5 +32,6 @@
<!-- Menu FAB -->
<style name="KeepassDXStyle.v21.FabMenu" parent="KeepassDXStyle.TextAppearance.Default.TextOnPrimary">
<item name="android:elevation">4dp</item>
<item name="android:background">@drawable/button_small_background</item>
</style>
</resources>

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

@@ -213,6 +213,11 @@
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<!-- CardView -->
<style name="KeepassDXStyle.CardView.PrimaryColor" parent="CardView">
<item name="cardBackgroundColor">?attr/colorPrimary</item>
</style>
<!-- CheckBox -->
<style name="KeepassDXStyle.CheckBox" parent="Widget.AppCompat.CompoundButton.CheckBox">
<item name="android:textColor">?android:attr/textColor</item>
@@ -266,21 +271,24 @@
</style>
<!-- Button Style -->
<style name="KeepassDXStyle.v21.Button" parent="Base.TextAppearance.AppCompat.Button" />
<style name="KeepassDXStyle.v21.Button" parent="Base.TextAppearance.AppCompat.Button">
<item name="android:gravity">center</item>
</style>
<style name="KeepassDXStyle.Button" parent="KeepassDXStyle.v21.Button">
<item name="android:textColor">@color/text_color_button</item>
<item name="android:background">@drawable/button_large</item>
<item name="android:gravity">center</item>
<item name="android:background">?attr/colorAccentCompat</item>
<item name="android:paddingTop">12dp</item>
<item name="android:paddingBottom">12dp</item>
</style>
<style name="KeepassDXStyle.Button.Primary" parent="KeepassDXStyle.v21.Button">
<item name="android:textColor">?attr/textColorInverse</item>
<item name="android:background">@drawable/button_background_primary</item>
<item name="android:gravity">center</item>
<item name="android:background">?attr/colorPrimary</item>
<item name="android:paddingTop">12dp</item>
<item name="android:paddingBottom">12dp</item>
</style>
<style name="KeepassDXStyle.ImageButton" parent="KeepassDXStyle.Light.v21">
<style name="KeepassDXStyle.ImageButton" parent="KeepassDXStyle.v21.Button">
<item name="android:colorForeground">?attr/textColorInverse</item>
<item name="android:background">@drawable/background_image_button</item>
<item name="android:gravity">center</item>
</style>
<!-- FAB -->
@@ -293,10 +301,15 @@
</style>
<!-- Menu FAB -->
<style name="KeepassDXStyle.v21.FabMenu" parent="KeepassDXStyle.TextAppearance.Default.TextOnPrimary" />
<style name="KeepassDXStyle.v21.FabMenu" parent="KeepassDXStyle.TextAppearance.Default.TextOnPrimary">
<item name="android:paddingTop">4dp</item>
<item name="android:paddingLeft">14dp</item>
<item name="android:paddingRight">14dp</item>
<item name="android:paddingBottom">8dp</item>
<item name="android:background">?attr/colorAccentCompat</item>
</style>
<style name="KeepassDXStyle.FabMenu" parent="KeepassDXStyle.v21.FabMenu">
<item name="android:textSize">15sp</item>
<item name="android:background">@drawable/button_small_background</item>
</style>
<!-- Form -->