From c322f321cf15b04292fbf12142dcb0720ed160eb Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Mon, 30 Nov 2020 11:45:07 +0100
Subject: [PATCH] Layout fixes

---
 .../ToggleableFingerprintsAdapter.java        |   2 +-
 .../res/layout/fragment_contact_details.xml   | 102 +++++++++++++-----
 .../res/layout/layout_top_bottom_toolbar.xml  |  34 ++++++
 .../main/res/layout/layout_top_toolbar.xml    |   4 +-
 .../res/layout/view_fingerprints_card.xml     |  43 ++++++++
 .../view_fingerprints_card_toggleable.xml     |   2 +-
 .../view_openpgp_4_fingerprint_info.xml       |  37 +++++++
 ...openpgp_4_fingerprint_info_toggleable.xml} |   1 +
 8 files changed, 192 insertions(+), 33 deletions(-)
 create mode 100644 app/src/main/res/layout/layout_top_bottom_toolbar.xml
 create mode 100644 app/src/main/res/layout/view_fingerprints_card.xml
 create mode 100644 app/src/main/res/layout/view_openpgp_4_fingerprint_info.xml
 rename app/src/main/res/layout/{view_openpgp_4_fingerprint_toggleable.xml => view_openpgp_4_fingerprint_info_toggleable.xml} (95%)

diff --git a/app/src/main/java/org/mercury_im/messenger/android/ui/openpgp/ToggleableFingerprintsAdapter.java b/app/src/main/java/org/mercury_im/messenger/android/ui/openpgp/ToggleableFingerprintsAdapter.java
index 05e7340..7b1692f 100644
--- a/app/src/main/java/org/mercury_im/messenger/android/ui/openpgp/ToggleableFingerprintsAdapter.java
+++ b/app/src/main/java/org/mercury_im/messenger/android/ui/openpgp/ToggleableFingerprintsAdapter.java
@@ -42,7 +42,7 @@ public class ToggleableFingerprintsAdapter extends RecyclerView.Adapter<Toggleab
     @Override
     public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         View view = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.view_openpgp_4_fingerprint_toggleable, parent, false);
+                .inflate(R.layout.view_openpgp_4_fingerprint_info_toggleable, parent, false);
         return new ViewHolder(view);
     }
 
diff --git a/app/src/main/res/layout/fragment_contact_details.xml b/app/src/main/res/layout/fragment_contact_details.xml
index 92ca95d..afee307 100644
--- a/app/src/main/res/layout/fragment_contact_details.xml
+++ b/app/src/main/res/layout/fragment_contact_details.xml
@@ -119,37 +119,83 @@
                     android:layout_height="wrap_content"
                     tools:text="vanitasvitae@jabberhead.tk"/>
 
+                <LinearLayout
+                    android:visibility="gone"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="Categories"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Title"/>
+
+                    <com.google.android.material.chip.ChipGroup
+                        android:id="@+id/contact_groups"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:chipSpacing="4dp">
+
+                        <com.google.android.material.chip.Chip
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            app:chipStrokeColor="@color/black"
+                            android:text="Work"/>
+
+                        <com.google.android.material.chip.Chip
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Dungeons n' Dragons"/>
+
+                    </com.google.android.material.chip.ChipGroup>
+
+                    <Button
+                        android:id="@+id/button_add_to_group"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Mark Mercury Seven"/>
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </androidx.cardview.widget.CardView>
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:paddingStart="12dp"
+                android:paddingEnd="12dp"
+                android:paddingTop="12dp">
+
                 <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="Categories"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Title"/>
-
-                <com.google.android.material.chip.ChipGroup
-                    android:id="@+id/contact_groups"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:chipSpacing="4dp">
-
-                    <com.google.android.material.chip.Chip
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        app:chipStrokeColor="@color/black"
-                        android:text="Work"/>
-
-                    <com.google.android.material.chip.Chip
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="Dungeons n' Dragons"/>
-
-                </com.google.android.material.chip.ChipGroup>
-
-                <Button
-                    android:id="@+id/button_add_to_group"
+                    android:id="@+id/title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Mark Mercury Seven"/>
-            </LinearLayout>
+                    android:text="Identity Key"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+
+                <include
+                    android:id="@+id/contact_ikey_fingerprint"
+                    layout="@layout/view_openpgp_4_fingerprint_info_toggleable"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="8dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/title" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
         </androidx.cardview.widget.CardView>
 
diff --git a/app/src/main/res/layout/layout_top_bottom_toolbar.xml b/app/src/main/res/layout/layout_top_bottom_toolbar.xml
new file mode 100644
index 0000000..3aab7ad
--- /dev/null
+++ b/app/src/main/res/layout/layout_top_bottom_toolbar.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".android.ui.MainActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <include layout="@layout/view_toolbar_top" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <FrameLayout
+        android:id="@+id/fragment"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/appbar_layout"
+        app:layout_constraintBottom_toTopOf="@id/bottom_navigation">
+
+    </FrameLayout>
+
+    <include layout="@layout/view_toolbar_bottom" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_top_toolbar.xml b/app/src/main/res/layout/layout_top_toolbar.xml
index 3aab7ad..131352d 100644
--- a/app/src/main/res/layout/layout_top_toolbar.xml
+++ b/app/src/main/res/layout/layout_top_toolbar.xml
@@ -25,10 +25,8 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/appbar_layout"
-        app:layout_constraintBottom_toTopOf="@id/bottom_navigation">
+        app:layout_constraintBottom_toBottomOf="parent">
 
     </FrameLayout>
 
-    <include layout="@layout/view_toolbar_bottom" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_fingerprints_card.xml b/app/src/main/res/layout/view_fingerprints_card.xml
new file mode 100644
index 0000000..f640a6a
--- /dev/null
+++ b/app/src/main/res/layout/view_fingerprints_card.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:cardCornerRadius="4dp"
+    app:cardElevation="4dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
+        android:paddingTop="12dp"
+        android:paddingBottom="12dp">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Other Devices"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"  />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/fingerprint_list"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:listitem="@layout/view_openpgp_4_fingerprint_info"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="8dp"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/title"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_fingerprints_card_toggleable.xml b/app/src/main/res/layout/view_fingerprints_card_toggleable.xml
index 724bc9d..4042fd5 100644
--- a/app/src/main/res/layout/view_fingerprints_card_toggleable.xml
+++ b/app/src/main/res/layout/view_fingerprints_card_toggleable.xml
@@ -29,7 +29,7 @@
             android:id="@+id/fingerprint_list"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            tools:listitem="@layout/view_openpgp_4_fingerprint_toggleable"
+            tools:listitem="@layout/view_openpgp_4_fingerprint_info_toggleable"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="8dp"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
diff --git a/app/src/main/res/layout/view_openpgp_4_fingerprint_info.xml b/app/src/main/res/layout/view_openpgp_4_fingerprint_info.xml
new file mode 100644
index 0000000..eee185c
--- /dev/null
+++ b/app/src/main/res/layout/view_openpgp_4_fingerprint_info.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <include
+        android:id="@+id/fingerprint"
+        layout="@layout/view_openpgp_4_fingerprint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="4dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/fingerprint_timestamp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:text="2018-03-01T15:26:12Z"
+        app:layout_constraintStart_toStartOf="@id/fingerprint"
+        app:layout_constraintEnd_toEndOf="@id/fingerprint"
+        app:layout_constraintTop_toBottomOf="@id/fingerprint"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:attr/listDivider"
+        app:layout_constraintTop_toBottomOf="@id/fingerprint_timestamp" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_openpgp_4_fingerprint_toggleable.xml b/app/src/main/res/layout/view_openpgp_4_fingerprint_info_toggleable.xml
similarity index 95%
rename from app/src/main/res/layout/view_openpgp_4_fingerprint_toggleable.xml
rename to app/src/main/res/layout/view_openpgp_4_fingerprint_info_toggleable.xml
index 1ebcedf..4fc9b15 100644
--- a/app/src/main/res/layout/view_openpgp_4_fingerprint_toggleable.xml
+++ b/app/src/main/res/layout/view_openpgp_4_fingerprint_info_toggleable.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:layout_centerHorizontal="true"
     android:orientation="vertical">
 
     <include