Add database color #913

app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt

@@ -25,6 +25,8 @@ import android.app.TimePickerDialog
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
+import android.graphics.Color
+import android.graphics.PorterDuff
 import android.os.*
 import android.util.Log
 import android.view.Menu
@@ -88,6 +90,8 @@ class GroupActivity : DatabaseLockActivity(),
     private var coordinatorLayout: CoordinatorLayout? = null
     private var lockView: View? = null
     private var toolbar: Toolbar? = null
+    private var databaseNameContainer: ViewGroup? = null
+    private var databaseColorView: ImageView? = null
     private var databaseNameView: TextView? = null
     private var searchContainer: ViewGroup? = null
     private var searchNumbers: TextView? = null
@@ -144,6 +148,8 @@ class GroupActivity : DatabaseLockActivity(),
         numberChildrenView = findViewById(R.id.group_numbers)
         addNodeButtonView = findViewById(R.id.add_node_button)
         toolbar = findViewById(R.id.toolbar)
+        databaseNameContainer = findViewById(R.id.database_name_container)
+        databaseColorView = findViewById(R.id.database_color)
         databaseNameView = findViewById(R.id.database_name)
         searchContainer = findViewById(R.id.search_container)
         searchNumbers = findViewById(R.id.search_numbers)
@@ -412,6 +418,7 @@ class GroupActivity : DatabaseLockActivity(),
         // Search suggestion
         database?.let {
             databaseNameView?.text = if (it.name.isNotEmpty()) it.name else getString(R.string.database)
+            databaseColorView?.setColorFilter(Color.parseColor(it.customColor), PorterDuff.Mode.SRC_IN)
             mSearchSuggestionAdapter = SearchEntryCursorAdapter(this, it)
             mBreadcrumbAdapter?.iconDrawableFactory = it.iconDrawableFactory
             mOnSuggestionListener = object : SearchView.OnSuggestionListener {
@@ -566,12 +573,12 @@ class GroupActivity : DatabaseLockActivity(),
             val title = group.title
             searchString?.text = if (title.isNotEmpty()) title else ""
             searchNumbers?.text = group.numberOfChildEntries.toString()
-            databaseNameView?.visibility = View.GONE
+            databaseNameContainer?.visibility = View.GONE
             toolbarBreadcrumb?.navigationIcon = null
             toolbarBreadcrumb?.collapse()
         } else {
             searchContainer?.visibility = View.GONE
-            databaseNameView?.visibility = View.VISIBLE
+            databaseNameContainer?.visibility = View.VISIBLE
             // Refresh breadcrumb
             if (toolbarBreadcrumb?.isVisible != true) {
                 toolbarBreadcrumb?.expand {

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

@@ -39,12 +39,26 @@
         android:layout_below="@+id/special_mode_view"
         android:background="?attr/colorPrimary"
         android:theme="?attr/toolbarAppearance" >
-        <TextView
-            android:id="@+id/database_name"
+        <LinearLayout
+            android:id="@+id/database_name_container"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            tools:text="Database"
-            style="@style/KeepassDXStyle.TextAppearance.Title.TextOnPrimary" />
+            android:orientation="horizontal">
+            <ImageView
+                android:id="@+id/database_color"
+                android:layout_width="9dp"
+                android:layout_height="9dp"
+                android:src="@drawable/background_rounded_square"
+                android:layout_marginRight="6dp"
+                android:layout_marginEnd="6dp"
+                android:contentDescription="@string/database"/>
+            <TextView
+                android:id="@+id/database_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="Database"
+                style="@style/KeepassDXStyle.TextAppearance.Title.TextOnPrimary" />
+        </LinearLayout>
         <RelativeLayout
             android:id="@+id/search_container"
             android:layout_width="wrap_content"

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

@@ -357,7 +357,7 @@
     <style name="KeepassDXStyle.TextAppearance.Info" parent="KeepassDXStyle.TextAppearance">
         <item name="android:textSize">12sp</item>
         <item name="android:textColor">@color/white</item>
-        <item name="android:background">@drawable/background_text_info</item>
+        <item name="android:background">@drawable/background_rounded_square</item>
         <item name="backgroundTint">?attr/colorAccent</item>
     </style>