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: Chips

Browse Source
This commit is contained in:
J-Jamet
2023-07-22 20:08:54 +02:00
parent b607cce691
commit a4cfc8ff49
12 changed files with 6 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/res/color/background_color_chip.xml
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="0.97" android:color="?attr/chipFilterBackgroundColorDisabled" android:state_enabled="false" />
<item android:alpha="1.00" android:color="?attr/chipFilterBackgroundColor" android:state_checked="true" />
<item android:alpha="0.98" android:color="?attr/chipFilterBackgroundColor" />
</selector>

5
app/src/main/res/layout/fragment_generate_passphrase.xml
View File

@@ -113,10 +113,7 @@
android:stepSize="1"
android:value="@integer/passphrase_generator_word_count_default"
android:valueFrom="@integer/passphrase_generator_word_count_min"
android:valueTo="@integer/passphrase_generator_word_count_max"
app:thumbColor="?attr/chipFilterBackgroundColor"
app:trackColorActive="?attr/chipFilterBackgroundColor"
app:trackColorInactive="?attr/chipFilterBackgroundColorDisabled" />
android:valueTo="@integer/passphrase_generator_word_count_max" />
<EditText
android:id="@+id/word_count"

7
app/src/main/res/layout/fragment_generate_password.xml
View File

@@ -111,10 +111,7 @@
android:stepSize="1"
android:value="@integer/password_generator_length_default"
android:valueFrom="@integer/password_generator_length_min"
android:valueTo="@integer/password_generator_length_max"
app:thumbColor="?attr/chipFilterBackgroundColor"
app:trackColorActive="?attr/chipFilterBackgroundColor"
app:trackColorInactive="?attr/chipFilterBackgroundColorDisabled" />
android:valueTo="@integer/password_generator_length_max" />
<EditText
android:id="@+id/length"
@@ -207,6 +204,7 @@
android:layout_height="wrap_content">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/consider_chars_filter_layout"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/ignore_chars_filter_layout"
android:layout_width="0dp"
@@ -219,6 +217,7 @@
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/ignore_chars_filter_layout"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toEndOf="@+id/consider_chars_filter_layout"
app:layout_constraintEnd_toEndOf="parent"
android:layout_width="0dp"

4
app/src/main/res/values/attrs.xml
View File

@@ -21,10 +21,6 @@
<attr name="toolbarSpecialStyle" format="reference" />
<attr name="toolbarActionStyle" format="reference" />
<attr name="chipFilterTextColor" format="color" />
<attr name="chipFilterBackgroundColor" format="color" />
<attr name="chipFilterBackgroundColorDisabled" format="color" />
<attr name="cardBackgroundTransparentColor" format="reference|color" />
<attr name="iconPreferenceColor" format="reference|color" />

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

@@ -117,11 +117,6 @@
<item name="switchPreferenceStyle">@style/KeepassDXStyle.SwitchPreference</item>
<item name="switchPreferenceCompatStyle">@style/KeepassDXStyle.SwitchPreference</item>
<!-- Chip -->
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/green_light</item>
<item name="chipFilterBackgroundColorDisabled">@color/green</item>
<!-- Education Hint -->
<item name="educationCircleColor">@color/green_lighter</item>
<item name="educationTextColor">@color/white</item>
@@ -221,11 +216,6 @@
<item name="switchPreferenceStyle">@style/KeepassDXStyle.SwitchPreference</item>
<item name="switchPreferenceCompatStyle">@style/KeepassDXStyle.SwitchPreference</item>
<!-- Chip -->
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/green_lighter</item>
<item name="chipFilterBackgroundColorDisabled">@color/green</item>
<!-- Education Hint -->
<item name="educationCircleColor">@color/green_light</item>
<item name="educationTextColor">@color/white</item>
@@ -280,26 +270,17 @@
</style>
<!-- Chip -->
<style name="KeepassDXStyle.Chip.Filter" parent="Widget.MaterialComponents.Chip.Filter">
<style name="KeepassDXStyle.Chip.Filter" parent="Widget.Material3.Chip.Filter">
<item name="chipCornerRadius">8dp</item>
<item name="chipBackgroundColor">@color/background_color_chip</item>
<item name="android:textColor">?attr/chipFilterTextColor</item>
<item name="checkedIcon">@drawable/ic_check_white_24dp</item>
<item name="checkedIconTint">?attr/chipFilterTextColor</item>
<item name="chipIconVisible">false</item>
<item name="closeIconSize">24dp</item>
<item name="ensureMinTouchTargetSize">false</item>
</style>
<style name="KeepassDXStyle.Chip.Filter.Icon" parent="Widget.MaterialComponents.Chip.Filter">
<style name="KeepassDXStyle.Chip.Filter.Icon" parent="Widget.Material3.Chip.Filter">
<item name="chipCornerRadius">8dp</item>
<item name="chipBackgroundColor">@color/background_color_chip</item>
<item name="android:textColor">?attr/chipFilterTextColor</item>
<item name="checkedIcon">@drawable/ic_check_white_24dp</item>
<item name="checkedIconTint">?attr/chipFilterTextColor</item>
<item name="chipIconVisible">true</item>
<item name="closeIconVisible">true</item>
<item name="closeIconSize">24dp</item>
<item name="closeIconTint">?attr/chipFilterTextColor</item>
<item name="ensureMinTouchTargetSize">false</item>
</style>

8
app/src/main/res/values/styles_classic.xml
View File

@@ -65,10 +65,6 @@
<item name="cardBackgroundTransparentColor">@color/white_grey_lighter_transparent</item>
<item name="educationCircleColor">@color/cyan_lighter</item>
<item name="educationTextColor">@color/white</item>
<item name="chipFilterTextColor">@color/text_color_light</item>
<item name="chipFilterBackgroundColor">@color/white_darkest</item>
<item name="chipFilterBackgroundColorDisabled">@color/white_grey_lighter</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Clear.Dialog" parent="KeepassDXStyle.Light.Dialog">
@@ -125,10 +121,6 @@
<item name="cardBackgroundTransparentColor">@color/black_light_transparent</item>
<item name="educationCircleColor">@color/cyan</item>
<item name="educationTextColor">@color/white</item>
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/black_lighter</item>
<item name="chipFilterBackgroundColorDisabled">@color/grey_darker</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Dark.Dialog" parent="KeepassDXStyle.Night.Dialog">

8
app/src/main/res/values/styles_divine.xml
View File

@@ -65,10 +65,6 @@
<item name="cardBackgroundTransparentColor">@color/white_transparent</item>
<item name="educationCircleColor">@color/orange</item>
<item name="educationTextColor">@color/white</item>
<item name="chipFilterTextColor">@color/grey_light</item>
<item name="chipFilterBackgroundColor">@color/white_darkest</item>
<item name="chipFilterBackgroundColorDisabled">@color/white</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.White.Dialog" parent="KeepassDXStyle.Light.Dialog">
@@ -125,10 +121,6 @@
<item name="cardBackgroundTransparentColor">@color/black_light_transparent</item>
<item name="educationCircleColor">@color/orange_darker</item>
<item name="educationTextColor">@color/white</item>
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/grey_darker</item>
<item name="chipFilterBackgroundColorDisabled">@color/black_light</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Black.Dialog" parent="KeepassDXStyle.Night.Dialog">

8
app/src/main/res/values/styles_kunzite.xml
View File

@@ -65,10 +65,6 @@
<item name="cardBackgroundTransparentColor">@color/white_purple_light_transparent</item>
<item name="educationCircleColor">@color/purple_dark</item>
<item name="educationTextColor">@color/white</item>
<item name="chipFilterTextColor">@color/white_purple_light</item>
<item name="chipFilterBackgroundColor">@color/purple_light</item>
<item name="chipFilterBackgroundColorDisabled">@color/purple</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Purple.Dialog" parent="KeepassDXStyle.Light.Dialog">
@@ -125,10 +121,6 @@
<item name="cardBackgroundTransparentColor">@color/black_purple_transparent</item>
<item name="educationCircleColor">@color/black_purple</item>
<item name="educationTextColor">@color/white</item>
<item name="chipFilterTextColor">@color/white_purple_light</item>
<item name="chipFilterBackgroundColor">@color/purple_dark</item>
<item name="chipFilterBackgroundColorDisabled">@color/purple_darker</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Purple.Dark.Dialog" parent="KeepassDXStyle.Night.Dialog">

8
app/src/main/res/values/styles_moon.xml
View File

@@ -63,10 +63,6 @@
<item name="educationCircleColor">@color/blue_dark</item>
<item name="educationTextColor">@color/white</item>
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/blue_light</item>
<item name="chipFilterBackgroundColorDisabled">@color/blue</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Blue.Dialog" parent="KeepassDXStyle.Light.Dialog">
@@ -121,10 +117,6 @@
<item name="educationCircleColor">@color/blue_dark</item>
<item name="educationTextColor">@color/white</item>
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/blue_light</item>
<item name="chipFilterBackgroundColorDisabled">@color/blue</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Blue.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">

8
app/src/main/res/values/styles_reply.xml
View File

@@ -64,10 +64,6 @@
<item name="educationCircleColor">@color/reply_theme_light_primaryContainer</item>
<item name="educationTextColor">@color/reply_theme_light_onPrimaryContainer</item>
<item name="chipFilterTextColor">@color/reply_theme_light_onPrimaryContainer</item>
<item name="chipFilterBackgroundColor">@color/reply_theme_light_primaryContainer</item>
<item name="chipFilterBackgroundColorDisabled">@color/reply_theme_light_inverseSurface</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Reply.Dialog" parent="KeepassDXStyle.Light.Dialog">
@@ -125,10 +121,6 @@
<item name="cardBackgroundTransparentColor">@color/reply_black_transparent</item>
<item name="educationCircleColor">@color/reply_theme_night_primaryContainer</item>
<item name="educationTextColor">@color/reply_theme_night_onPrimaryContainer</item>
<item name="chipFilterTextColor">@color/reply_theme_night_onPrimaryContainer</item>
<item name="chipFilterBackgroundColor">@color/reply_theme_night_primaryContainer</item>
<item name="chipFilterBackgroundColorDisabled">@color/reply_theme_night_inverseSurface</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Reply.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">

8
app/src/main/res/values/styles_simple.xml
View File

@@ -65,10 +65,6 @@
<item name="cardBackgroundTransparentColor">@color/white_slight_transparent</item>
<item name="educationCircleColor">@color/blue_dark</item>
<item name="educationTextColor">@color/white</item>
<item name="chipFilterTextColor">@color/text_color_light</item>
<item name="chipFilterBackgroundColor">@color/blue_white</item>
<item name="chipFilterBackgroundColorDisabled">@color/white_dark</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Simple.Dialog" parent="KeepassDXStyle.Light.Dialog">
@@ -125,10 +121,6 @@
<item name="cardBackgroundTransparentColor">@color/grey_slight_transparent</item>
<item name="educationCircleColor">@color/blue_slight</item>
<item name="educationTextColor">@color/white</item>
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/grey_black_slight</item>
<item name="chipFilterBackgroundColorDisabled">@color/grey_darker</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Simple.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">

8
app/src/main/res/values/styles_sun.xml
View File

@@ -63,10 +63,6 @@
<item name="educationCircleColor">@color/red_dark</item>
<item name="educationTextColor">@color/white</item>
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/red_lighter</item>
<item name="chipFilterBackgroundColorDisabled">@color/red</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Red.Dialog" parent="KeepassDXStyle.Light.Dialog">
@@ -121,10 +117,6 @@
<item name="educationCircleColor">@color/red_dark</item>
<item name="educationTextColor">@color/white</item>
<item name="chipFilterTextColor">@color/white</item>
<item name="chipFilterBackgroundColor">@color/red_lighter</item>
<item name="chipFilterBackgroundColorDisabled">@color/red</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Red.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">