From 0b5f38f232da015d7d11c3aa02fb8ab96c392ccd Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Thu, 27 Apr 2023 12:21:14 +0200
Subject: [PATCH] use icons for profile edit appbar

to use same design as for conversation info editing

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../main/java/com/nextcloud/talk/profile/ProfileActivity.kt | 6 ++++++
 app/src/main/res/menu/menu_profile.xml                      | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/nextcloud/talk/profile/ProfileActivity.kt b/app/src/main/java/com/nextcloud/talk/profile/ProfileActivity.kt
index 3f320aa25..1f2586e81 100644
--- a/app/src/main/java/com/nextcloud/talk/profile/ProfileActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/profile/ProfileActivity.kt
@@ -40,6 +40,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.annotation.DrawableRes
+import androidx.core.content.ContextCompat
 import androidx.core.net.toFile
 import androidx.core.view.ViewCompat
 import androidx.recyclerview.widget.RecyclerView
@@ -203,8 +204,10 @@ class ProfileActivity : BaseActivity() {
         menu.findItem(R.id.edit).isVisible = editableFields.size > 0
         if (edit) {
             menu.findItem(R.id.edit).setTitle(R.string.save)
+            menu.findItem(R.id.edit).icon = ContextCompat.getDrawable(this, R.drawable.ic_check)
         } else {
             menu.findItem(R.id.edit).setTitle(R.string.edit)
+            menu.findItem(R.id.edit).icon = ContextCompat.getDrawable(this, R.drawable.ic_edit)
         }
         return true
     }
@@ -217,6 +220,7 @@ class ProfileActivity : BaseActivity() {
             edit = !edit
             if (edit) {
                 item.setTitle(R.string.save)
+                item.icon = ContextCompat.getDrawable(this, R.drawable.ic_check)
                 binding.emptyList.root.visibility = View.GONE
                 binding.userinfoList.visibility = View.VISIBLE
                 if (CapabilitiesUtilNew.isAvatarEndpointAvailable(currentUser!!)) {
@@ -250,6 +254,8 @@ class ProfileActivity : BaseActivity() {
                     })
             } else {
                 item.setTitle(R.string.edit)
+                item.icon = ContextCompat.getDrawable(this, R.drawable.ic_edit)
+
                 binding.avatarButtons.visibility = View.INVISIBLE
                 if (adapter!!.filteredDisplayList.isEmpty()) {
                     binding.emptyList.root.visibility = View.VISIBLE
diff --git a/app/src/main/res/menu/menu_profile.xml b/app/src/main/res/menu/menu_profile.xml
index 31d4138c3..f8ccf9cdf 100644
--- a/app/src/main/res/menu/menu_profile.xml
+++ b/app/src/main/res/menu/menu_profile.xml
@@ -21,8 +21,11 @@
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+
     <item
         android:id="@+id/edit"
+        android:icon="@drawable/ic_edit"
         android:title="@string/edit"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom"
+        app:iconTint="@color/high_emphasis_text"/>
 </menu>