Merge pull request #677 from hjubb/ux_improvements

Small UI/UX Improvements

app/src/main/java/org/thoughtcrime/securesms/components/ProfilePictureView.kt

@@ -14,11 +14,11 @@ import org.session.libsession.avatars.ProfileContactPhoto
 import org.session.libsession.messaging.contacts.Contact
 import org.session.libsession.messaging.mentions.MentionsManager
 import org.session.libsession.utilities.Address
-import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.TextSecurePreferences
+import org.session.libsession.utilities.recipients.Recipient
 import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.thoughtcrime.securesms.util.AvatarPlaceholderGenerator
 import org.thoughtcrime.securesms.mms.GlideRequests
+import org.thoughtcrime.securesms.util.AvatarPlaceholderGenerator
 
 class ProfilePictureView : RelativeLayout {
     lateinit var glide: GlideRequests

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt

@@ -92,6 +92,7 @@ object ConversationMenuHelper {
             inflater.inflate(R.menu.menu_conversation_muted, menu)
         } else {
             inflater.inflate(R.menu.menu_conversation_unmuted, menu)
+            inflater.inflate(R.menu.menu_conversation_notification_settings, menu)
         }
 
         // Search

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt

@@ -94,7 +94,7 @@ class VisibleMessageView : LinearLayout {
             profilePictureContainer.visibility = if (isEndOfMessageCluster) View.VISIBLE else View.INVISIBLE
             profilePictureView.publicKey = senderSessionID
             profilePictureView.glide = glide
-            profilePictureView.update()
+            profilePictureView.update(message.individualRecipient, threadID)
             profilePictureView.setOnClickListener { showUserDetails(message.recipient.address.toString()) }
             if (thread.isOpenGroupRecipient) {
                 val openGroup = DatabaseFactory.getLokiThreadDatabase(context).getOpenGroupChat(threadID) ?: return

app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java

@@ -237,6 +237,7 @@ public class RecipientDatabase extends Database {
     values.put(NOTIFY_TYPE, notifyType);
     updateOrInsert(recipient.getAddress(), values);
     recipient.resolve().setNotifyType(notifyType);
+    notifyConversationListListeners();
   }
 
   public void setExpireMessages(@NonNull Recipient recipient, int expiration) {

app/src/main/java/org/thoughtcrime/securesms/home/ConversationOptionsBottomSheet.kt

@@ -59,7 +59,7 @@ public class ConversationOptionsBottomSheet : BottomSheetDialogFragment(), View.
         muteNotificationsTextView.isVisible = !recipient.isMuted && !recipient.isLocalNumber
         unMuteNotificationsTextView.setOnClickListener(this)
         muteNotificationsTextView.setOnClickListener(this)
-        notificationsTextView.isVisible = recipient.isGroupRecipient
+        notificationsTextView.isVisible = recipient.isGroupRecipient && !recipient.isMuted
         notificationsTextView.setOnClickListener(this)
         deleteTextView.setOnClickListener(this)
     }

app/src/main/java/org/thoughtcrime/securesms/home/UserDetailsBottomSheet.kt

@@ -5,13 +5,13 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.os.Bundle
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import kotlinx.android.synthetic.main.fragment_user_details_bottom_sheet.*
 import network.loki.messenger.R
 import org.session.libsession.messaging.contacts.Contact
@@ -34,7 +34,7 @@ class UserDetailsBottomSheet : BottomSheetDialogFragment() {
         profilePictureView.publicKey = publicKey
         profilePictureView.glide = GlideApp.with(this)
         profilePictureView.isLarge = true
-        profilePictureView.update()
+        profilePictureView.update(recipient, -1)
         nameTextViewContainer.visibility = View.VISIBLE
         nameTextViewContainer.setOnClickListener {
             nameTextViewContainer.visibility = View.INVISIBLE

app/src/main/res/menu/menu_conversation_closed_group.xml

@@ -13,8 +13,4 @@
         android:title="@string/conversation__menu_leave_group"
         app:showAsAction="collapseActionView"/>
 
-    <item
-        android:title="@string/RecipientPreferenceActivity_notification_settings"
-        android:id="@+id/menu_notification_settings"/>
-
 </menu>

app/src/main/res/menu/menu_conversation_notification_settings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:title="@string/RecipientPreferenceActivity_notification_settings"
+        android:id="@+id/menu_notification_settings"/>
+</menu>

app/src/main/res/menu/menu_conversation_open_group.xml

@@ -6,8 +6,4 @@
         android:title="@string/ConversationActivity_invite_to_open_group"
         android:id="@+id/menu_invite_to_open_group" />
 
-    <item
-        android:title="@string/RecipientPreferenceActivity_notification_settings"
-        android:id="@+id/menu_notification_settings"/>
-
 </menu>

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

@@ -247,7 +247,6 @@
     <string-array name="notify_types">
         <item>@string/notify_type_all</item>
         <item>@string/notify_type_mentions</item>
-        <item>@string/notify_type_none</item>
     </string-array>
 
 </resources>

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

@@ -893,5 +893,4 @@
     <string name="dialog_send_seed_send_button_title">Send</string>
     <string name="notify_type_all">All</string>
     <string name="notify_type_mentions">Mentions</string>
-    <string name="notify_type_none">None</string>
 </resources>