From 1802b45f41b9a4aa0e1291e05576bdc39964e06d Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sun, 29 Apr 2018 22:28:45 +0200
Subject: use styled borderless button

---
 .../messenger/ui/ConferenceDetailsActivity.java    | 44 +++++++++++++---------
 src/main/res/layout/activity_change_password.xml   |  4 +-
 src/main/res/layout/activity_contact_details.xml   |  4 +-
 src/main/res/layout/activity_edit_account.xml      |  8 ++--
 src/main/res/layout/activity_muc_details.xml       |  8 ++--
 .../layout/activity_publish_profile_picture.xml    |  4 +-
 src/main/res/layout/activity_recording.xml         |  4 +-
 src/main/res/layout/activity_share_locaction.xml   |  4 +-
 src/main/res/layout/activity_trust_keys.xml        |  6 +--
 src/main/res/layout/activity_verify_otr.xml        |  4 +-
 src/main/res/layout/magic_create.xml               |  2 +-
 src/main/res/layout/message_status.xml             |  2 +-
 src/main/res/layout/welcome.xml                    |  6 +--
 src/main/res/values/styles.xml                     |  4 ++
 src/main/res/values/themes.xml                     |  2 +-
 15 files changed, 59 insertions(+), 47 deletions(-)

diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
index 72c9a811f..7c2f51bbb 100644
--- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
@@ -64,7 +64,25 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
             inviteToConversation(mConversation);
         }
     };
-
+    private OnClickListener destroyListener = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            final AlertDialog.Builder DestroyMucDialog = new AlertDialog.Builder(ConferenceDetailsActivity.this);
+            DestroyMucDialog.setNegativeButton(getString(R.string.cancel), null);
+            DestroyMucDialog.setTitle(getString(R.string.destroy_muc));
+            DestroyMucDialog.setMessage(getString(R.string.destroy_muc_text, mConversation.getName()));
+            DestroyMucDialog.setPositiveButton(getString(R.string.delete), (dialogInterface, i) -> {
+                Intent intent = new Intent(xmppConnectionService, ConversationsActivity.class);
+                intent.setAction(ConversationsActivity.ACTION_DESTROY_MUC);
+                intent.putExtra("MUC_UUID", mConversation.getUuid());
+                Log.d(Config.LOGTAG, "Sending DESTROY intent for " + mConversation.getName());
+                startActivity(intent);
+                deleteBookmark();
+                finish();
+            });
+            DestroyMucDialog.create().show();
+        }
+    };
     private ActivityMucDetailsBinding binding;
     private String uuid = null;
     private User mSelectedUser = null;
@@ -257,6 +275,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
         this.binding.invite.setVisibility(View.GONE);
         this.binding.invite.setOnClickListener(inviteListener);
         this.binding.destroy.setVisibility(View.GONE);
+        this.binding.destroy.setOnClickListener(destroyListener);
         this.binding.leaveMuc.setVisibility(View.GONE);
         this.binding.addContactButton.setVisibility(View.GONE);
         this.binding.mucMoreDetails.setVisibility(View.GONE);
@@ -587,23 +606,12 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
                 this.binding.mucInfoMam.setText(R.string.server_info_unavailable);
             }
             if (self.getAffiliation().ranks(MucOptions.Affiliation.OWNER)) {
-                this.binding.destroy.setVisibility(View.VISIBLE);
-                this.binding.destroy.setOnClickListener(v -> {
-                    final AlertDialog.Builder DestroyMucDialog = new AlertDialog.Builder(ConferenceDetailsActivity.this);
-                    DestroyMucDialog.setNegativeButton(getString(R.string.cancel), null);
-                    DestroyMucDialog.setTitle(getString(R.string.destroy_muc));
-                    DestroyMucDialog.setMessage(getString(R.string.destroy_muc_text, mConversation.getName()));
-                    DestroyMucDialog.setPositiveButton(getString(R.string.delete), (dialogInterface, i) -> {
-                        Intent intent = new Intent(xmppConnectionService, ConversationsActivity.class);
-                        intent.setAction(ConversationsActivity.ACTION_DESTROY_MUC);
-                        intent.putExtra("MUC_UUID", mConversation.getUuid());
-                        Log.d(Config.LOGTAG, "Sending DESTROY intent for " + mConversation.getName());
-                        startActivity(intent);
-                        deleteBookmark();
-                        finish();
-                    });
-                });
-                this.binding.destroy.getBackground().setColorFilter(getWarningButtonColor(), PorterDuff.Mode.MULTIPLY);
+                if (mAdvancedMode) {
+                    this.binding.destroy.getBackground().setColorFilter(getWarningButtonColor(), PorterDuff.Mode.MULTIPLY);
+                    this.binding.destroy.setVisibility(View.VISIBLE);
+                } else {
+                    this.binding.destroy.setVisibility(View.GONE);
+                }
                 this.binding.changeConferenceButton.setVisibility(View.VISIBLE);
             } else {
                 this.binding.destroy.setVisibility(View.GONE);
diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index bebbd32ef..f6dfc5d0e 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -80,7 +80,7 @@
 
         <Button
             android:id="@+id/left_button"
-            style="?android:attr/borderlessButtonStyle"
+            style="@style/Widget.Conversations.Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -95,7 +95,7 @@
 
         <Button
             android:id="@+id/right_button"
-            style="?android:attr/borderlessButtonStyle"
+            style="@style/Widget.Conversations.Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 7c93e5be2..2f8f33f01 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -64,7 +64,7 @@
 
                         <LinearLayout
                             android:id="@+id/details_jidbox"
-                            android:layout_width="wrap_content"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_alignParentEnd="true"
                             android:layout_alignParentLeft="true"
@@ -126,7 +126,7 @@
 
                             <Button
                                 android:id="@+id/add_contact_button"
-                                android:layout_width="wrap_content"
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentTop="true"
                                 android:layout_centerHorizontal="true"
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index f47bcc5bb..e4a654620 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -211,7 +211,7 @@
 
                             <Button
                                 android:id="@+id/os_optimization_disable"
-                                style="?android:attr/borderlessButtonStyle"
+                                style="@style/Widget.Conversations.Button.Borderless"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:minWidth="0dp"
@@ -646,7 +646,7 @@
 
                         <Button
                             android:id="@+id/clear_devices"
-                            style="?android:attr/borderlessButtonStyle"
+                            style="@style/Widget.Conversations.Button.Borderless"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_horizontal"
@@ -669,7 +669,7 @@
 
             <Button
                 android:id="@+id/cancel_button"
-                style="?android:attr/borderlessButtonStyle"
+                style="@style/Widget.Conversations.Button.Borderless"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -683,7 +683,7 @@
 
             <Button
                 android:id="@+id/save_button"
-                style="?android:attr/borderlessButtonStyle"
+                style="@style/Widget.Conversations.Button.Borderless"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 214936b6b..523e2b53c 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -208,7 +208,7 @@
                         <Button
                             android:id="@+id/invite"
                             style="?android:attr/buttonStyleSmall"
-                            android:layout_width="wrap_content"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_horizontal"
                             android:layout_marginTop="24dp"
@@ -217,7 +217,7 @@
                         <Button
                             android:id="@+id/leave_muc"
                             style="?android:attr/buttonStyleSmall"
-                            android:layout_width="wrap_content"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_horizontal"
                             android:layout_marginTop="24dp"
@@ -226,7 +226,7 @@
                         <Button
                             android:id="@+id/add_contact_button"
                             style="?android:attr/buttonStyleSmall"
-                            android:layout_width="wrap_content"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_horizontal"
                             android:layout_marginTop="24dp"
@@ -235,7 +235,7 @@
                         <Button
                             android:id="@+id/destroy"
                             style="?android:attr/buttonStyleSmall"
-                            android:layout_width="wrap_content"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_horizontal"
                             android:layout_marginTop="24dp"
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index 0fce24346..d761169d8 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -101,7 +101,7 @@
 
         <Button
             android:id="@+id/cancel_button"
-            style="?android:attr/borderlessButtonStyle"
+            style="@style/Widget.Conversations.Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -115,7 +115,7 @@
 
         <Button
             android:id="@+id/publish_button"
-            style="?android:attr/borderlessButtonStyle"
+            style="@style/Widget.Conversations.Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
diff --git a/src/main/res/layout/activity_recording.xml b/src/main/res/layout/activity_recording.xml
index c6a57f98d..c8f83b0e0 100644
--- a/src/main/res/layout/activity_recording.xml
+++ b/src/main/res/layout/activity_recording.xml
@@ -14,7 +14,7 @@
 
         <Button
             android:id="@+id/cancel_button"
-            style="?android:attr/borderlessButtonStyle"
+            style="@style/Widget.Conversations.Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -30,7 +30,7 @@
 
         <Button
             android:id="@+id/share_button"
-            style="?android:attr/borderlessButtonStyle"
+            style="@style/Widget.Conversations.Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
diff --git a/src/main/res/layout/activity_share_locaction.xml b/src/main/res/layout/activity_share_locaction.xml
index 2131bb0f3..14be5b2e4 100644
--- a/src/main/res/layout/activity_share_locaction.xml
+++ b/src/main/res/layout/activity_share_locaction.xml
@@ -38,7 +38,7 @@
 
                 <Button
                     android:id="@+id/cancel_button"
-                    style="?android:attr/borderlessButtonStyle"
+                    style="@style/Widget.Conversations.Button.Borderless"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -52,7 +52,7 @@
 
                 <Button
                     android:id="@+id/share_button"
-                    style="?android:attr/borderlessButtonStyle"
+                    style="@style/Widget.Conversations.Button.Borderless"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml
index 0e5159942..2fe9250f1 100644
--- a/src/main/res/layout/activity_trust_keys.xml
+++ b/src/main/res/layout/activity_trust_keys.xml
@@ -79,7 +79,7 @@
 
                             <Button
                                 android:id="@+id/disable_button"
-                                style="?android:attr/borderlessButtonStyle"
+                                style="@style/Widget.Conversations.Button.Borderless"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:minWidth="0dp"
@@ -148,7 +148,7 @@
 
             <Button
                 android:id="@+id/cancel_button"
-                style="?android:attr/borderlessButtonStyle"
+                style="@style/Widget.Conversations.Button.Borderless"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -163,7 +163,7 @@
 
             <Button
                 android:id="@+id/save_button"
-                style="?android:attr/borderlessButtonStyle"
+                style="@style/Widget.Conversations.Button.Borderless"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
diff --git a/src/main/res/layout/activity_verify_otr.xml b/src/main/res/layout/activity_verify_otr.xml
index bd5e04b29..899b2fa31 100644
--- a/src/main/res/layout/activity_verify_otr.xml
+++ b/src/main/res/layout/activity_verify_otr.xml
@@ -129,7 +129,7 @@
 
         <Button
             android:id="@+id/left_button"
-            style="?android:attr/borderlessButtonStyle"
+            style="@style/Widget.Conversations.Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1" />
@@ -143,7 +143,7 @@
 
         <Button
             android:id="@+id/right_button"
-            style="?android:attr/borderlessButtonStyle"
+            style="@style/Widget.Conversations.Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1" />
diff --git a/src/main/res/layout/magic_create.xml b/src/main/res/layout/magic_create.xml
index d3aaad1b6..8d2b811f0 100644
--- a/src/main/res/layout/magic_create.xml
+++ b/src/main/res/layout/magic_create.xml
@@ -66,7 +66,7 @@
 
                 <Button
                     android:id="@+id/create_account"
-                    style="?android:attr/borderlessButtonStyle"
+                    style="@style/Widget.Conversations.Button.Borderless"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="right"
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index e9d6fcaf4..e9c43279f 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -11,7 +11,7 @@
 
     <Button
         android:id="@+id/load_more_messages"
-        style="?android:attr/borderlessButtonStyle"
+        style="@style/Widget.Conversations.Button.Borderless"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
diff --git a/src/main/res/layout/welcome.xml b/src/main/res/layout/welcome.xml
index 77615718b..a388f1d91 100644
--- a/src/main/res/layout/welcome.xml
+++ b/src/main/res/layout/welcome.xml
@@ -59,7 +59,7 @@
 
                 <Button
                     android:id="@+id/import_database"
-                    style="?android:attr/borderlessButtonStyle"
+                    style="@style/Widget.Conversations.Button.Borderless"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="right"
@@ -69,7 +69,7 @@
 
                 <Button
                     android:id="@+id/create_account"
-                    style="?android:attr/borderlessButtonStyle"
+                    style="@style/Widget.Conversations.Button.Borderless"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="right"
@@ -78,7 +78,7 @@
 
                 <Button
                     android:id="@+id/use_existing_account"
-                    style="?android:attr/borderlessButtonStyle"
+                    style="@style/Widget.Conversations.Button.Borderless"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="right"
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index ea9016211..e3038c62e 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -38,6 +38,10 @@
         <item name="android:textSize">?TextSizeBody1</item>
     </style>
 
+    <style name="Widget.Conversations.Button.Borderless" parent="@style/Widget.AppCompat.Button.Borderless">
+        <item name="android:textSize">?TextSizeBody2</item>
+    </style>
+
     <style name="TextAppearance.Conversations.Design.Hint" parent="TextAppearance.Design.Hint">
         <item name="android:textSize">?TextSizeCaption</item>
     </style>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index c656c5ed4..0eb408e09 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -62,7 +62,7 @@
         <item name="icon_remove" type="reference">@drawable/ic_delete_grey600_24dp</item>
         <item name="icon_search" type="reference">@drawable/ic_search_white_24dp</item>
         <item name="icon_secure" type="reference">@drawable/ic_lock_open_white_24dp</item>
-        <item name="icon_settings" type="reference">@drawable/ic_settings_grey600_24dp</item>
+        <item name="icon_settings" type="reference">@drawable/ic_settings_black_24dp</item>
         <item name="icon_import_export" type="reference">@drawable/ic_import_export_white_24dp
         </item>
         <item name="icon_share" type="reference">@drawable/ic_share_white_24dp</item>
-- 
cgit v1.2.3