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: Buttons and wording

Browse Source
This commit is contained in:
J-Jamet
2023-06-27 23:20:51 +02:00
parent c4daafea6d
commit 670e949e9f
11 changed files with 66 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/res/color/background_button_color_accent.xml → app/src/main/res/color/background_button_color_on_primary.xml
View File

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

3
app/src/main/res/color/background_button_color_secondary.xml
View File

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

18
app/src/main/res/drawable-v21/background_button.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="8dp"
android:right="8dp"
android:top="12dp"
android:bottom="12dp"/>
<solid android:color="?attr/colorAccent"/>
</shape>
</item>
</ripple>

27
app/src/main/res/drawable/background_button.xml
View File

@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape>
<corners
android:radius="0dp" />
<padding
android:left="8dp"
android:right="8dp"
android:top="12dp"
android:bottom="12dp"/>
<solid android:color="@color/orange_lighter"/>
</shape>
</item>
<item>
<shape>
<corners
android:radius="0dp" />
<padding
android:left="8dp"
android:right="8dp"
android:top="12dp"
android:bottom="12dp"/>
<solid android:color="@color/orange"/>
</shape>
</item>
</selector>

2
app/src/main/res/drawable/ic_info_hint_color_24dp.xml
View File

@@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/background_button_color_secondary"
android:fillColor="@color/background_button_color_on_primary"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
</vector>

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

@@ -140,57 +140,36 @@
app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<FrameLayout
<LinearLayout
android:id="@+id/file_selection_buttons_container"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/database_buttons_container"
android:layout_width="match_parent"
android:orientation="horizontal"
android:weightSum="2">
<Button
android:id="@+id/open_database_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_gravity="top"
app:layout_constraintBottom_toTopOf="@+id/open_database_button"
android:background="?attr/colorPrimaryDark"/>
android:text="@string/select_database_file"
app:icon="@drawable/ic_folder_white_24dp"
app:iconGravity="start"
android:layout_weight="1"
android:focusable="true"
style="@style/KeepassDXStyle.Button.Secondary"/>
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/open_database_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/select_database_file"
android:drawableRight="@drawable/ic_folder_white_24dp"
android:drawableEnd="@drawable/ic_folder_white_24dp"
style="@style/KeepassDXStyle.Button.Primary"
android:focusable="true"
android:paddingLeft="32dp"
android:paddingStart="32dp"
android:paddingRight="24dp"
android:paddingEnd="24dp"
app:layout_constraintBottom_toTopOf="@+id/create_database_button"/>
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/create_database_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="true"
app:layout_constraintBottom_toBottomOf="parent"
android:drawableRight="@drawable/ic_database_plus_white_24dp"
android:drawableEnd="@drawable/ic_database_plus_white_24dp"
android:paddingLeft="24dp"
android:paddingStart="24dp"
android:paddingRight="24dp"
android:paddingEnd="24dp"
android:text="@string/create_keepass_file"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>
<Button
android:id="@+id/create_database_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:icon="@drawable/ic_database_plus_white_24dp"
app:iconGravity="start"
android:layout_weight="1"
android:focusable="true"
style="@style/KeepassDXStyle.Button.Primary"
android:text="@string/create_keepass_file"/>
</LinearLayout>
<include layout="@layout/view_screenshot_mode_banner" />
</androidx.constraintlayout.widget.ConstraintLayout>

9
app/src/main/res/layout/activity_main_credential.xml
View File

@@ -195,12 +195,15 @@
android:layout_height="1dp"
android:background="?attr/colorAccentLight"/>
</LinearLayout>
<androidx.appcompat.widget.AppCompatButton
<Button
android:id="@+id/activity_password_open_button"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:focusable="true"
android:text="@string/menu_open" />
app:icon="@drawable/ic_lock_open_white_24dp"
style="@style/KeepassDXStyle.Button.Primary"
android:text="@string/unlock" />
</LinearLayout>
<include layout="@layout/view_screenshot_mode_banner" />

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

@@ -48,16 +48,7 @@
</style>
<!-- Button Style -->
<style name="KeepassDXStyle.v21.Button" parent="KeepassDXStyle.v23.Button" >
<item name="android:gravity">center</item>
<item name="android:elevation">4dp</item>
</style>
<style name="KeepassDXStyle.v21.Button.Primary" parent="KeepassDXStyle.v23.Button.Primary" >
<item name="android:gravity">center</item>
<item name="android:elevation">4dp</item>
</style>
<style name="KeepassDXStyle.v21.ImageButton" parent="Widget.AppCompat.ImageButton" >
<item name="android:gravity">center</item>
<style name="KeepassDXStyle.v21.ImageButton" parent="KeepassDXStyle.Base.ImageButton" >
<item name="android:elevation">4dp</item>
</style>

7
app/src/main/res/values-v23/styles.xml
View File

@@ -26,11 +26,4 @@
<item name="android:statusBarColor">@color/white</item>
<item name="android:windowLightStatusBar">true</item>
</style>
<style name="KeepassDXStyle.v23.Button" parent="Base.TextAppearance.MaterialComponents.Button">
<item name="android:drawableTint">?attr/colorOnAccentColor</item>
</style>
<style name="KeepassDXStyle.v23.Button.Primary" parent="Base.TextAppearance.MaterialComponents.Button">
<item name="android:drawableTint">?attr/textColorInverse</item>
</style>
</resources>

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

@@ -286,8 +286,8 @@
<string name="never">Never</string>
<string name="no_results">No search results</string>
<string name="no_url_handler">Install a web browser to open this URL.</string>
<string name="select_database_file">Open existing database</string>
<string name="create_keepass_file">Create new database</string>
<string name="select_database_file">Open existing vault</string>
<string name="create_keepass_file">Create new vault</string>
<string name="auto_focus_search_title">Quick search</string>
<string name="auto_focus_search_summary">Request a search when opening a database</string>
<string name="subdomain_search_title">Subdomain search</string>
@@ -428,6 +428,7 @@
<string name="lock_database_show_button_title">Show lock button</string>
<string name="lock_database_show_button_summary">Displays the lock button in the user interface</string>
<string name="content">Content</string>
<string name="unlock">Unlock</string>
<string name="advanced_unlock">Advanced unlock</string>
<string name="advanced_unlock_tap_delete">Tap to delete advanced unlocking keys</string>
<string name="advanced_unlock_explanation_summary">Use advanced unlocking to open a database more easily</string>

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

@@ -38,8 +38,9 @@
<item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="android:buttonStyle">@style/KeepassDXStyle.Button</item>
<item name="buttonStyle">@style/KeepassDXStyle.Button</item>
<item name="android:buttonStyle">@style/KeepassDXStyle.Button.Primary</item>
<item name="buttonStyle">@style/KeepassDXStyle.Button.Primary</item>
<item name="materialButtonStyle">@style/KeepassDXStyle.Button.Primary</item>
<item name="android:imageButtonStyle">@style/KeepassDXStyle.ImageButton</item>
<item name="imageButtonStyle">@style/KeepassDXStyle.ImageButton</item>
@@ -126,8 +127,9 @@
<item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="android:buttonStyle">@style/KeepassDXStyle.Button</item>
<item name="buttonStyle">@style/KeepassDXStyle.Button</item>
<item name="android:buttonStyle">@style/KeepassDXStyle.Button.Primary</item>
<item name="buttonStyle">@style/KeepassDXStyle.Button.Primary</item>
<item name="materialButtonStyle">@style/KeepassDXStyle.Button.Primary</item>
<item name="android:imageButtonStyle">@style/KeepassDXStyle.ImageButton</item>
<item name="imageButtonStyle">@style/KeepassDXStyle.ImageButton</item>
@@ -529,37 +531,30 @@
</style>
<!-- Button Style -->
<style name="KeepassDXStyle.v23.Button" parent="Base.TextAppearance.MaterialComponents.Button" />
<style name="KeepassDXStyle.v23.Button.Primary" parent="Base.TextAppearance.MaterialComponents.Button" />
<style name="KeepassDXStyle.v21.Button" parent="KeepassDXStyle.v23.Button">
<item name="android:gravity">center</item>
</style>
<style name="KeepassDXStyle.v21.Button.Primary" parent="KeepassDXStyle.v23.Button.Primary">
<item name="android:gravity">center</item>
</style>
<style name="KeepassDXStyle.v21.ImageButton" parent="Widget.AppCompat.ImageButton">
<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/background_button</item>
<item name="backgroundTint">@color/background_button_color_accent</item>
<item name="drawableTint">?attr/colorOnAccentColor</item>
</style>
<style name="KeepassDXStyle.Button.Primary" parent="KeepassDXStyle.v21.Button.Primary">
<style name="KeepassDXStyle.Button.Primary" parent="Widget.Material3.Button">
<item name="android:textColor">?attr/textColorInverse</item>
<item name="android:background">@drawable/background_button</item>
<item name="backgroundTint">@color/background_button_color_primary</item>
<item name="drawableTint">?attr/textColorInverse</item>
<item name="iconTint">?attr/textColorInverse</item>
<item name="android:layout_margin">8dp</item>
</style>
<style name="KeepassDXStyle.Button.Secondary" parent="Widget.Material3.Button.OutlinedButton">
<item name="strokeColor">@color/background_button_color_secondary</item>
<item name="android:textColor">@color/background_button_color_secondary</item>
<item name="iconTint">@color/background_button_color_secondary</item>
<item name="android:layout_margin">8dp</item>
</style>
<style name="KeepassDXStyle.Base.ImageButton" parent="Widget.AppCompat.ImageButton" />
<style name="KeepassDXStyle.v21.ImageButton" parent="KeepassDXStyle.Base.ImageButton">
<item name="android:gravity">center</item>
</style>
<style name="KeepassDXStyle.ImageButton" parent="KeepassDXStyle.v21.ImageButton">
<item name="android:colorForeground">?attr/textColorInverse</item>
<item name="android:background">@drawable/background_image_button</item>
<item name="backgroundTint">@color/background_button_color_accent</item>
<item name="backgroundTint">@color/background_button_color_secondary</item>
</style>
<style name="KeepassDXStyle.ImageButton.Simple" parent="KeepassDXStyle.v21.ImageButton">
<item name="android:colorForeground">@color/background_button_color_accent</item>
<item name="tint">@color/background_button_color_accent</item>
<item name="android:colorForeground">@color/background_button_color_secondary</item>
<item name="tint">@color/background_button_color_secondary</item>
<item name="android:background">?android:attr/actionBarItemBackground</item>
<item name="backgroundTint">@null</item>
<item name="android:padding">12dp</item>
@@ -567,14 +562,14 @@
<item name="android:layout_height">48dp</item>
</style>
<style name="KeepassDXStyle.ImageButton.Simple.Secondary" parent="KeepassDXStyle.ImageButton.Simple">
<item name="android:colorForeground">@color/background_button_color_secondary</item>
<item name="tint">@color/background_button_color_secondary</item>
<item name="android:colorForeground">@color/background_button_color_on_primary</item>
<item name="tint">@color/background_button_color_on_primary</item>
</style>
<style name="KeepassDXStyle.ImageButton.Simple.Mini" parent="KeepassDXStyle.ImageButton.Simple">
<item name="android:padding">12dp</item>
<item name="android:layout_width">36dp</item>
<item name="android:layout_height">36dp</item>
<item name="android:colorForeground">@color/background_button_color_secondary</item>
<item name="android:colorForeground">@color/background_button_color_on_primary</item>
<item name="tint">?android:attr/textColor</item>
</style>
@@ -585,7 +580,7 @@
</style>
<!-- Icon Style -->
<style name="KeepassDXStyle.Icon" parent="KeepassDXStyle.v21.Button">
<style name="KeepassDXStyle.Icon" parent="KeepassDXStyle.v21.ImageButton">
<item name="android:background">@drawable/background_icon</item>
<item name="backgroundTint">?android:attr/windowBackground</item>
</style>
@@ -606,7 +601,7 @@
<item name="android:textSize">15sp</item>
<item name="android:textColor">?attr/colorOnAccentColor</item>
<item name="android:background">@drawable/background_button_small</item>
<item name="backgroundTint">@color/background_button_color_accent</item>
<item name="backgroundTint">@color/background_button_color_secondary</item>
</style>
<!-- Form -->