From f26cab3b03a8764f90164d772bc421c69dd08bb5 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Fri, 16 Mar 2018 21:15:47 +0100
Subject: migrate to CardView in contact and muc details

---
 .../messenger/ui/ConferenceDetailsActivity.java    | 35 ++++++++--------------
 .../messenger/ui/ContactDetailsActivity.java       | 12 ++++----
 2 files changed, 18 insertions(+), 29 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/ui')

diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
index fc45c58a5..3cd57864f 100644
--- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
@@ -1,6 +1,5 @@
 package de.pixart.messenger.ui;
 
-import android.support.v7.app.AlertDialog;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -9,6 +8,8 @@ import android.content.IntentSender.SendIntentException;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.CardView;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
@@ -83,10 +84,10 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
     private TextView mFullJid;
     private TextView mAccountJid;
     private LinearLayout membersView;
-    private LinearLayout mMoreDetails;
+    private CardView mMoreDetails;
     private RelativeLayout mMucSettings;
     private TextView mConferenceType;
-    private LinearLayout mConferenceInfoTable;
+    private CardView mConferenceInfoTable;
     private TextView mConferenceInfoMam;
     private TextView mNotifyStatusText;
     private ImageButton mChangeConferenceSettingsButton;
@@ -298,25 +299,15 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
             getSupportActionBar().setHomeButtonEnabled(true);
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         }
-        mEditNickButton.setOnClickListener(new OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                quickEdit(mConversation.getMucOptions().getActualNick(),
-                        0,
-                        new OnValueEdited() {
-
-                            @Override
-                            public String onValueEdited(String value) {
-                                if (xmppConnectionService.renameInMuc(mConversation, value, renameCallback)) {
-                                    return null;
-                                } else {
-                                    return getString(R.string.invalid_username);
-                                }
-                            }
-                        });
-            }
-        });
+        mEditNickButton.setOnClickListener(v -> quickEdit(mConversation.getMucOptions().getActualNick(),
+                0,
+                value -> {
+                    if (xmppConnectionService.renameInMuc(mConversation, value, renameCallback)) {
+                        return null;
+                    } else {
+                        return getString(R.string.invalid_username);
+                    }
+                }));
         this.mAdvancedMode = getPreferences().getBoolean("advanced_muc_mode", false);
         this.mConferenceInfoTable = findViewById(R.id.muc_info_more);
         this.mConferenceInfoTable.setVisibility(this.mAdvancedMode ? View.VISIBLE : View.GONE);
diff --git a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java
index 8827d05ec..88c875d18 100644
--- a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java
@@ -14,6 +14,7 @@ import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Intents;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.ActionBar;
+import android.support.v7.widget.CardView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -123,7 +124,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
     private Button mShowInactiveDevicesButton;
     private QuickContactBadge badge;
     private LinearLayout keys;
-    private LinearLayout keysWrapper;
+    private CardView keysWrapper;
     private FlowLayout tags;
     private boolean showDynamicTags = false;
     private boolean showLastSeen = false;
@@ -292,12 +293,9 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
             getSupportActionBar().setHomeButtonEnabled(true);
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         }
-        mShowInactiveDevicesButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                showInactiveOmemo = !showInactiveOmemo;
-                populateView();
-            }
+        mShowInactiveDevicesButton.setOnClickListener(v -> {
+            showInactiveOmemo = !showInactiveOmemo;
+            populateView();
         });
         this.mNotifyStatusButton = findViewById(R.id.notification_status_button);
         this.mNotifyStatusButton.setOnClickListener(this.mNotifyStatusClickListener);
-- 
cgit v1.2.3