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

Rollback lock button

Browse Source
This commit is contained in:
J-Jamet
2020-08-04 10:38:49 +02:00
parent 46394c600e
commit c285411371
7 changed files with 61 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/color/background_special_button_color.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorAccentLight" android:state_pressed="true" /> <item android:color="?attr/colorPrimaryDark" android:state_pressed="true" />
<item android:color="@color/grey_dark" android:state_enabled="false" /> <item android:color="@color/grey_dark" android:state_enabled="false" />
<item android:color="?attr/colorAccent" android:state_enabled="true" /> <item android:color="?android:windowBackground" android:state_enabled="true" />
</selector> </selector>

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

@@ -10,7 +10,7 @@
android:topRightRadius="40dp" android:topRightRadius="40dp"
android:bottomLeftRadius="0dp" android:bottomLeftRadius="0dp"
android:bottomRightRadius="0dp"/> android:bottomRightRadius="0dp"/>
<solid android:color="?attr/colorAccent"/> <solid android:color="?android:attr/windowBackground"/>
</shape> </shape>
</item> </item>
</ripple> </ripple>

20
app/src/main/res/drawable-v21/btn_special_start_bottom_stroke.xml Normal file
View File

@@ -0,0 +1,20 @@
<?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>
<stroke
android:width="1dp"
android:color="?android:attr/textColorPrimary" />
<corners
android:topLeftRadius="0dp"
android:topRightRadius="40dp"
android:bottomLeftRadius="0dp"
android:bottomRightRadius="0dp"/>
<solid
android:color="@color/transparent"/>
</shape>
</item>
</ripple>

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

@@ -13,7 +13,7 @@
android:right="12dp" android:right="12dp"
android:top="18dp" android:top="18dp"
android:bottom="8dp"/> android:bottom="8dp"/>
<solid android:color="@color/orange_light"/> <solid android:color="@color/grey_dark"/>
</shape> </shape>
</item> </item>
<item> <item>
@@ -28,7 +28,7 @@
android:right="12dp" android:right="12dp"
android:top="18dp" android:top="18dp"
android:bottom="8dp"/> android:bottom="8dp"/>
<solid android:color="@color/orange"/> <solid android:color="@color/grey"/>
</shape> </shape>
</item> </item>
</selector> </selector>

18
app/src/main/res/drawable/btn_special_start_bottom_stroke.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/white">
<item>
<shape>
<stroke
android:width="1dp"
android:color="@color/green" />
<corners
android:topLeftRadius="0dp"
android:topRightRadius="40dp"
android:bottomLeftRadius="0dp"
android:bottomRightRadius="0dp"/>
<solid
android:color="@color/transparent"/>
</shape>
</item>
</selector>

14
app/src/main/res/layout/view_button_lock.xml
View File

@@ -17,6 +17,18 @@
style="@style/KeepassDXStyle.Special.Button.Background" style="@style/KeepassDXStyle.Special.Button.Background"
android:layout_gravity="bottom|start" android:layout_gravity="bottom|start"
android:contentDescription="@string/menu_lock" /> android:contentDescription="@string/menu_lock" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/lock_button_stroke"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="-2dp"
android:layout_marginLeft="-2dp"
android:layout_marginBottom="-2dp"
tools:targetApi="lollipop"
android:elevation="4dp"
style="@style/KeepassDXStyle.Special.Button.Stroke"
android:layout_gravity="bottom|start"
android:contentDescription="@string/menu_lock" />
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/lock_button_icon" android:id="@+id/lock_button_icon"
android:layout_width="48dp" android:layout_width="48dp"
@@ -30,7 +42,7 @@
tools:targetApi="lollipop" tools:targetApi="lollipop"
android:elevation="4dp" android:elevation="4dp"
android:src="@drawable/ic_lock_white_24dp" android:src="@drawable/ic_lock_white_24dp"
android:tint="?android:attr/textColor" android:tint="?android:attr/textColorPrimary"
android:layout_gravity="bottom|start" android:layout_gravity="bottom|start"
android:contentDescription="@string/menu_lock" /> android:contentDescription="@string/menu_lock" />
</FrameLayout> </FrameLayout>

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

@@ -351,6 +351,11 @@
<item name="android:background">@drawable/btn_special_start_bottom_background</item> <item name="android:background">@drawable/btn_special_start_bottom_background</item>
<item name="backgroundTint">@color/background_special_button_color</item> <item name="backgroundTint">@color/background_special_button_color</item>
</style> </style>
<style name="KeepassDXStyle.Special.Button.Stroke" parent="KeepassDXStyle.v21.Button">
<item name="android:background">@drawable/btn_special_start_bottom_stroke</item>
<item name="backgroundTint">?android:attr/textColorPrimary</item>
<item name="backgroundTintMode">src_atop</item>
</style>
<!-- FAB --> <!-- FAB -->
<style name="KeepassDXStyle.v21.Fab" parent="KeepassDXStyle.Light.v21" /> <style name="KeepassDXStyle.v21.Fab" parent="KeepassDXStyle.Light.v21" />