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: Button color

Browse Source
This commit is contained in:
J-Jamet
2023-06-19 18:00:42 +02:00
parent 7324f630ba
commit c630b9d0c0
5 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,8 +52,9 @@
android:layout_height="wrap_content"
android:contentDescription="@string/validate"
android:src="@drawable/ic_check_white_24dp"
android:tint="?attr/colorOnAccentColor"
app:tint="?attr/colorOnAccentColor"
app:fabSize="mini"
app:fabCustomSize="@dimen/button_small_size"
app:layout_constraintTop_toTopOf="@+id/toolbar"
app:layout_constraintBottom_toTopOf="@+id/screenshot_mode_banner"
app:layout_constraintEnd_toEndOf="parent"

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

@@ -47,7 +47,7 @@
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimaryDark">
android:background="?attr/colorPrimary">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/toolbar_layout"
@@ -96,6 +96,11 @@
android:id="@+id/fragment_advanced_unlock_container_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_gravity="bottom"
android:background="?attr/colorPrimaryDark"/>
</FrameLayout>
<androidx.appcompat.widget.Toolbar
@@ -104,7 +109,6 @@
android:layout_height="?attr/actionBarSize"
android:theme="?attr/toolbarAppearance"
android:background="?attr/colorPrimary"
android:elevation="4dp"
app:layout_collapseMode="pin"
tools:targetApi="lollipop">
<TextView

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

@@ -8,6 +8,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/colorPrimaryDark"
android:background="?attr/colorPrimary"
android:visibility="gone"/>
</FrameLayout>

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

@@ -329,10 +329,10 @@
<item name="buttonBarPositiveButtonStyle">@style/KeepassDXStyle.Light.Dialog.PositiveButtonStyle</item>
</style>
<style name="KeepassDXStyle.Light.Dialog.NegativeButtonStyle" parent="Widget.Material3.Button.TextButton.Dialog">
<item name="android:textColor">@color/black</item>
<item name="android:textColor">@color/text_color_light</item>
</style>
<style name="KeepassDXStyle.Light.Dialog.PositiveButtonStyle" parent="Widget.Material3.Button.TextButton.Dialog">
<item name="android:textColor">@color/black</item>
<item name="android:textColor">@color/text_color_light</item>
</style>
<style name="KeepassDXStyle.Light.DateTime.Dialog" parent="Theme.Material3.Light.Dialog">
<item name="colorAccent">@color/orange</item>
@@ -350,10 +350,10 @@
<item name="buttonBarPositiveButtonStyle">@style/KeepassDXStyle.Night.Dialog.PositiveButtonStyle</item>
</style>
<style name="KeepassDXStyle.Night.Dialog.NegativeButtonStyle" parent="Widget.Material3.Button.TextButton.Dialog">
<item name="android:textColor">@color/white</item>
<item name="android:textColor">@color/text_color_night</item>
</style>
<style name="KeepassDXStyle.Night.Dialog.PositiveButtonStyle" parent="Widget.Material3.Button.TextButton.Dialog">
<item name="android:textColor">@color/white</item>
<item name="android:textColor">@color/text_color_night</item>
</style>
<style name="KeepassDXStyle.Night.DateTime.Dialog" parent="Theme.Material3.Dark.Dialog">
<item name="colorAccent">@color/orange_darker</item>

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

@@ -30,9 +30,9 @@
<item name="colorAccent">@color/orange</item>
<item name="colorAccentLight">@color/orange_lighter</item>
<item name="colorControlNormal">@color/grey_light</item>
<item name="colorControlActivated">@color/green_light</item>
<item name="android:textColorPrimary">@color/green_light</item>
<item name="android:textColorHintInverse">@color/green_lighter</item>
<item name="colorControlActivated">@color/orange</item>
<item name="android:textColorPrimary">@color/orange_light</item>
<item name="android:textColorHintInverse">@color/orange_lighter</item>
<item name="android:windowBackground">@color/white</item>
<item name="toolbarColorControl">@color/grey_light</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.White</item>
@@ -117,9 +117,9 @@
<item name="colorAccent">@color/orange_darker</item>
<item name="colorAccentLight">@color/orange</item>
<item name="colorControlNormal">@color/grey_light</item>
<item name="colorControlActivated">@color/green</item>
<item name="android:textColorPrimary">@color/green_lighter</item>
<item name="android:textColorHintInverse">@color/green_lighter</item>
<item name="colorControlActivated">@color/orange</item>
<item name="android:textColorPrimary">@color/orange_lighter</item>
<item name="android:textColorHintInverse">@color/orange_lighter</item>
<item name="android:textColorSecondaryInverse">@color/white_dark</item>
<item name="android:windowBackground">@color/black</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Black</item>