fix: colors Kitkat selection and progressCircular

app/src/main/java/com/kunzisoft/keepass/adapters/EntryAttachmentsItemsAdapter.kt

@@ -27,9 +27,9 @@ import android.util.TypedValue
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.progressindicator.CircularProgressIndicator
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.ImageViewerActivity
 import com.kunzisoft.keepass.database.ContextualDatabase
@@ -38,6 +38,7 @@ import com.kunzisoft.keepass.database.helper.getLocalizedName
 import com.kunzisoft.keepass.model.AttachmentState
 import com.kunzisoft.keepass.model.EntryAttachmentState
 import com.kunzisoft.keepass.model.StreamDirection
+import com.kunzisoft.keepass.services.AttachmentFileNotificationService.Companion.FILE_PROGRESSION_MAX
 import com.kunzisoft.keepass.tasks.BinaryDatabaseManager
 import com.kunzisoft.keepass.view.expand
 import kotlin.math.max
@@ -138,6 +139,7 @@ class EntryAttachmentsItemsAdapter(context: Context)
                 visibility = View.GONE
             }
         }
+        holder.binaryFileProgress.max = FILE_PROGRESSION_MAX
         when (entryAttachmentState.streamDirection) {
             StreamDirection.UPLOAD -> {
                 holder.binaryFileProgressIcon.isActivated = true
@@ -182,7 +184,7 @@ class EntryAttachmentsItemsAdapter(context: Context)
                         AttachmentState.START,
                         AttachmentState.IN_PROGRESS -> View.VISIBLE
                     }
-                    progress = entryAttachmentState.downloadProgression
+                    setProgressCompat(entryAttachmentState.downloadProgression, true)
                 }
                 holder.binaryFileInfo.setOnClickListener {
                     onItemClickListener?.invoke(entryAttachmentState)
@@ -201,7 +203,7 @@ class EntryAttachmentsItemsAdapter(context: Context)
         var binaryFileCompression: TextView = itemView.findViewById(R.id.item_attachment_compression)
         var binaryFileProgressContainer: View = itemView.findViewById(R.id.item_attachment_progress_container)
         var binaryFileProgressIcon: ImageView = itemView.findViewById(R.id.item_attachment_icon)
-        var binaryFileProgress: ProgressBar = itemView.findViewById(R.id.item_attachment_progress)
+        var binaryFileProgress: CircularProgressIndicator = itemView.findViewById(R.id.item_attachment_progress)
         var binaryFileDeleteButton: View = itemView.findViewById(R.id.item_attachment_delete_button)
     }
 }

app/src/main/java/com/kunzisoft/keepass/services/AttachmentFileNotificationService.kt

@@ -240,10 +240,10 @@ class AttachmentFileNotificationService: LockNotificationService() {
                     setOngoing(true)
                 }
                 AttachmentState.IN_PROGRESS -> {
-                    if (attachmentNotification.entryAttachmentState.downloadProgression > 100) {
+                    if (attachmentNotification.entryAttachmentState.downloadProgression > FILE_PROGRESSION_MAX) {
                         setContentText(getString(R.string.download_finalization))
                     } else {
-                        setProgress(100,
+                        setProgress(FILE_PROGRESSION_MAX,
                                 attachmentNotification.entryAttachmentState.downloadProgression,
                                 false)
                         setContentText(getString(R.string.download_progression,
@@ -446,7 +446,7 @@ class AttachmentFileNotificationService: LockNotificationService() {
                         if (downloadState != AttachmentState.CANCELED
                                 && downloadState != AttachmentState.ERROR) {
                             downloadState = AttachmentState.COMPLETE
-                            downloadProgression = 100
+                            downloadProgression = FILE_PROGRESSION_MAX
                         }
                     }
                     attachmentNotification.attachmentFileAction = null
@@ -495,6 +495,8 @@ class AttachmentFileNotificationService: LockNotificationService() {
 
         const val FILE_URI_KEY = "FILE_URI_KEY"
         const val ATTACHMENT_KEY = "ATTACHMENT_KEY"
+
+        const val FILE_PROGRESSION_MAX = 100
     }
 
 }

app/src/main/res/color-v23/progress_color.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorSecondary" />
-</selector>

app/src/main/res/color/color_button_primary.xml

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

app/src/main/res/color/color_button_secondary.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorTertiary" android:state_enabled="false" />
-    <item android:color="?attr/colorSecondary" android:state_enabled="true" />
-</selector>

app/src/main/res/color/color_on_primary.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <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/colorOnPrimary" android:state_enabled="true" />
-</selector>

app/src/main/res/color/color_primary.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/white_grey" android:state_enabled="false" />
-    <item android:color="?attr/colorPrimaryContainer" android:state_pressed="false" />
-    <item android:color="?attr/colorPrimary"/>
-</selector>

app/src/main/res/color/color_secondary.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/white_grey" android:state_enabled="false" />
-    <item android:color="?attr/colorSecondaryContainer" android:state_pressed="false" />
-    <item android:color="?attr/colorSecondary"/>
-</selector>

app/src/main/res/color/edit_text_stroke_color.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2021 Jeremy Jamet / Kunzisoft.
-
- This file is part of KeePassDX.
-
-  KeePassDX is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  KeePassDX is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorSecondary" android:state_focused="true"/>
-    <item android:alpha="0.46" android:color="?attr/colorOnSurface" android:state_hovered="true"/>
-    <item android:alpha="0.38" android:color="?attr/colorOnSurface" android:state_enabled="false"/>
-    <item android:alpha="0.42" android:color="?attr/colorOnSurface"/>
-</selector>

app/src/main/res/color/entry_text_primary_color.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_enabled="false" android:color="@color/white_grey_dark"/>
+    <item android:state_selected="true" android:color="?attr/colorOnSecondary"/>
     <item android:color="?attr/colorOnSurface"/>
 </selector>

app/src/main/res/color/list_color.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_selected="true" android:color="@color/white"/>
-    <item android:color="?android:attr/textColor"/>
-</selector>

app/src/main/res/color/list_secondary_color.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_selected="true" android:color="@color/white"/>
-    <item android:color="@color/grey"/>
-</selector>

app/src/main/res/color/progress_color.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/white_dark" />
-</selector>

app/src/main/res/color/text_color_button.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/white_grey" android:state_enabled="false" />
-    <item android:color="?attr/colorOnSecondary" android:state_enabled="true" />
-</selector>

app/src/main/res/color/text_color_night.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_enabled="false" android:color="@color/grey"/>
-    <item android:color="?attr/colorOnSurface"/>
-</selector>

app/src/main/res/color/text_color_secondary_light.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_enabled="false" android:color="@color/white_grey_dark"/>
-    <item android:color="@color/grey_lighter"/>
-</selector>

app/src/main/res/color/text_color_secondary_night.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_enabled="false" android:color="@color/grey"/>
-    <item android:color="@color/white_grey_darker"/>
-</selector>

app/src/main/res/drawable/background_item_selection.xml

@@ -3,13 +3,13 @@
     <item android:state_selected="true">
         <shape>
             <corners android:radius="25dp" />
-            <solid android:color="@color/white_grey_darker"/>
+            <solid android:color="@color/grey_lighter"/>
         </shape>
     </item>
     <item android:state_selected="false">
         <shape>
             <corners android:radius="25dp" />
-            <solid android:color="@color/transparent"/>
+            <solid android:color="@color/black_selection"/>
         </shape>
     </item>
 </selector>

app/src/main/res/drawable/background_progress_circle.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <padding
-        android:bottom="-2dp"
-        android:left="-2dp"
-        android:right="-2dp"
-        android:top="-2dp" />
-    <stroke
-        android:width="1.5dp"
-        android:color="@color/white_grey_darker"/>
-</shape >

app/src/main/res/drawable/foreground_progress_circle.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fromDegrees="270"
-    android:toDegrees="270">
-    <shape
-        android:shape="ring"
-        android:innerRadiusRatio="2.5"
-        android:thickness="2dp"
-        android:useLevel="true">
-        <solid android:color="@color/progress_color" />
-    </shape>
-</rotate>

app/src/main/res/drawable/foreground_progress_circle_secondary.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fromDegrees="270"
-    android:toDegrees="270">
-    <shape
-        android:shape="ring"
-        android:innerRadiusRatio="2.5"
-        android:thickness="2dp"
-        android:useLevel="true">
-        <solid android:color="@color/list_secondary_color" />
-    </shape>
-</rotate>

app/src/main/res/drawable/ic_info_hint_color_24dp.xml

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/color_on_primary"
+        android:fillColor="@color/black"
         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>

app/src/main/res/layout/item_attachment.xml

@@ -137,14 +137,15 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <ProgressBar
+                <com.google.android.material.progressindicator.CircularProgressIndicator
                     android:id="@+id/item_attachment_progress"
-                    style="@style/KeepassDXStyle.ProgressBar.Circle"
+                    android:layout_width="wrap_content"
-                    android:layout_width="36dp"
+                    android:layout_height="wrap_content"
-                    android:layout_height="36dp"
                     android:layout_gravity="center"
-                    android:max="100"
+                    android:indeterminate="false"
-                    android:progress="60"
+                    app:indicatorSize="36dp"
+                    app:trackThickness="2dp"
+                    app:indicatorDirectionCircular="clockwise"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />

app/src/main/res/layout/item_list_nodes_entry.xml

@@ -131,7 +131,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
                 android:layout_marginRight="8dp"
-                android:background="@drawable/background_item_selection"
+                style="@style/KeepassDXStyle.Selectable.Item"
                 android:orientation="horizontal"
                 android:paddingStart="8dp"
                 android:paddingLeft="8dp"

app/src/main/res/values/colors.xml

@@ -39,6 +39,7 @@
     <color name="black_light">#0e0e0e</color>
     <color name="black_light_transparent">#E00E0E0E</color>
 	<color name="black">#000001</color> <!-- #000001 To fix refresh theme -->
+	<color name="black_selection">#0D000000</color>
 	<color name="black_transparent">#E0000000</color>
 
     <color name="blue_white_light">#F1F8FF</color>

app/src/main/res/values/styles.xml

@@ -81,15 +81,10 @@
         <item name="android:textAppearance">@style/KeepassDXStyle.TextAppearance</item>
         <item name="android:textAppearanceMedium">@style/KeepassDXStyle.TextAppearance</item>
 
-        <item name="android:textColor">@color/text_color_light</item>
+        <item name="android:textColor">?attr/colorOnSurface</item>
-        <item name="android:textColorLink">@color/text_color_light</item>
-        <item name="android:editTextColor">@color/grey_light</item>
         <item name="android:textColorPrimary">@color/green_light</item>
-        <item name="android:textColorPrimaryInverse">@color/white_darkest</item>
-        <item name="android:textColorSecondary">@color/text_color_secondary_light</item>
-        <item name="android:textColorHint">@color/grey_lighter</item>
 
-        <item name="iconPreferenceColor">@color/text_color_secondary_light</item>
+        <item name="iconPreferenceColor">?attr/colorOnSurface</item>
 
         <!-- Dialog -->
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Light.Dialog</item>
@@ -175,15 +170,10 @@
         <item name="android:textAppearance">@style/KeepassDXStyle.TextAppearance</item>
         <item name="android:textAppearanceMedium">@style/KeepassDXStyle.TextAppearance</item>
 
-        <item name="android:textColor">@color/text_color_night</item>
+        <item name="android:textColor">?attr/colorOnSurface</item>
-        <item name="android:textColorLink">@color/text_color_night</item>
-        <item name="android:editTextColor">@color/white</item>
         <item name="android:textColorPrimary">@color/green_light</item>
-        <item name="android:textColorPrimaryInverse">@color/white_darkest</item>
-        <item name="android:textColorSecondary">@color/text_color_secondary_night</item>
-        <item name="android:textColorHint">@color/grey_lighter</item>
 
-        <item name="iconPreferenceColor">@color/text_color_secondary_night</item>
+        <item name="iconPreferenceColor">?attr/colorOnSurface</item>
 
         <!-- Dialog -->
         <item name="android:alertDialogTheme">@style/KeepassDXStyle.Night.Dialog</item>
@@ -282,10 +272,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/text_color_light</item>
+        <item name="android:textColor">?attr/colorOnSurface</item>
     </style>
     <style name="KeepassDXStyle.Light.Dialog.PositiveButtonStyle" parent="Widget.Material3.Button.TextButton.Dialog">
-        <item name="android:textColor">@color/text_color_light</item>
+        <item name="android:textColor">?attr/colorOnSurface</item>
     </style>
 
     <style name="KeepassDXStyle.Night.Dialog" parent="ThemeOverlay.Material3.Dialog.Alert">
@@ -297,10 +287,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/text_color_night</item>
+        <item name="android:textColor">?attr/colorOnSurface</item>
     </style>
     <style name="KeepassDXStyle.Night.Dialog.PositiveButtonStyle" parent="Widget.Material3.Button.TextButton.Dialog">
-        <item name="android:textColor">@color/text_color_night</item>
+        <item name="android:textColor">?attr/colorOnSurface</item>
     </style>
 
     <!-- CardView -->
@@ -450,41 +440,41 @@
 
     <!-- Nodes Text Style -->
     <style name="KeepassDXStyle.TextAppearance.Entry.Title" parent="KeepassDXStyle.TextAppearance">
-        <item name="android:textColor">@color/list_color</item>
+        <item name="android:textColor">@color/entry_text_primary_color</item>
-        <item name="android:tint">@color/list_color</item>
+        <item name="android:tint">@color/entry_text_primary_color</item>
         <item name="android:textStyle">bold</item>
         <item name="android:textSize">16sp</item>
     </style>
     <style name="KeepassDXStyle.TextAppearance.Entry.SubTitle" parent="KeepassDXStyle.TextAppearance.Small">
-        <item name="android:textColor">@color/list_secondary_color</item>
+        <item name="android:textColor">@color/text_secondary_color</item>
-        <item name="android:tint">@color/list_secondary_color</item>
+        <item name="android:tint">@color/text_secondary_color</item>
     </style>
     <style name="KeepassDXStyle.TextAppearance.Entry.Meta" parent="KeepassDXStyle.TextAppearance.Tiny">
-        <item name="android:textColor">@color/list_color</item>
+        <item name="android:textColor">@color/entry_text_primary_color</item>
-        <item name="android:tint">@color/list_color</item>
+        <item name="android:tint">@color/entry_text_primary_color</item>
         <item name="android:textSize">11sp</item>
     </style>
     <style name="KeepassDXStyle.TextAppearance.Entry.Info" parent="KeepassDXStyle.TextAppearance.Small">
-        <item name="android:textColor">@color/list_secondary_color</item>
+        <item name="android:textColor">@color/text_secondary_color</item>
-        <item name="android:tint">@color/list_secondary_color</item>
+        <item name="android:tint">@color/text_secondary_color</item>
         <item name="android:textSize">16sp</item>
     </style>
     <style name="KeepassDXStyle.TextAppearance.Entry.Icon" parent="KeepassDXStyle.TextAppearance.Small">
-        <item name="tint">@color/list_secondary_color</item>
+        <item name="tint">@color/text_secondary_color</item>
     </style>
     <style name="KeepassDXStyle.TextAppearance.Group.Title" parent="KeepassDXStyle.TextAppearance">
-        <item name="android:textColor">@color/list_primary_color</item>
+        <item name="android:textColor">@color/group_text_primary_color</item>
-        <item name="android:tint">@color/list_primary_color</item>
+        <item name="android:tint">@color/group_text_primary_color</item>
         <item name="android:textStyle">bold</item>
         <item name="android:textSize">16sp</item>
     </style>
     <style name="KeepassDXStyle.TextAppearance.Group.SubTitle" parent="KeepassDXStyle.TextAppearance.Small">
-        <item name="android:textColor">@color/list_secondary_color</item>
+        <item name="android:textColor">@color/text_secondary_color</item>
-        <item name="android:tint">@color/list_secondary_color</item>
+        <item name="android:tint">@color/text_secondary_color</item>
     </style>
     <style name="KeepassDXStyle.TextAppearance.Group.Meta" parent="KeepassDXStyle.TextAppearance.Tiny">
-        <item name="android:textColor">@color/list_primary_color</item>
+        <item name="android:textColor">@color/group_text_primary_color</item>
-        <item name="android:tint">@color/list_primary_color</item>
+        <item name="android:tint">@color/group_text_primary_color</item>
         <item name="android:textSize">11sp</item>
     </style>
 
@@ -502,11 +492,11 @@
     <style name="KeepassDXStyle.ImageButton" parent="KeepassDXStyle.v21.ImageButton">
         <item name="android:colorForeground">?attr/colorOnSecondary</item>
         <item name="android:background">@drawable/background_image_button</item>
-        <item name="backgroundTint">@color/color_button_secondary</item>
+        <item name="backgroundTint">?attr/colorSecondary</item>
     </style>
     <style name="KeepassDXStyle.ImageButton.Simple" parent="KeepassDXStyle.v21.ImageButton">
-        <item name="android:colorForeground">@color/color_button_secondary</item>
+        <item name="android:colorForeground">?attr/colorSecondary</item>
-        <item name="tint">@color/color_button_secondary</item>
+        <item name="tint">?attr/colorSecondary</item>
         <item name="android:background">?android:attr/actionBarItemBackground</item>
         <item name="backgroundTint">@null</item>
         <item name="android:padding">12dp</item>
@@ -533,7 +523,7 @@
         <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/color_on_primary</item>
+        <item name="android:colorForeground">?attr/colorOnPrimary</item>
         <item name="tint">?android:attr/textColor</item>
     </style>
 
@@ -584,12 +574,6 @@
         <item name="android:textSize">16sp</item>
 	</style>
 
-    <!-- Progress bar -->
-    <style name="KeepassDXStyle.ProgressBar.Circle" parent="Widget.AppCompat.ProgressBar.Horizontal">
-        <item name="android:progressDrawable">@drawable/foreground_progress_circle</item>
-        <item name="android:background">@drawable/background_progress_circle</item>
-    </style>
-
     <!-- Snackbar -->
     <style name="KeepassDXStyle.SnackBar" parent="Widget.Material3.Snackbar">
         <item name="backgroundTint">@color/red</item>