Merge pull request #1213 from bemusementpark/fix-id-divider-color

Fix ID divider color
oxen-io · May 30, 2023 · d541f39 · d541f39
2 parents 5519f17 + 55dd622
commit d541f39
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 83 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/LabeledSeparatorView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/LabeledSeparatorView.kt
diff --git a/app/src/main/res/drawable/view_separator.xml b/app/src/main/res/drawable/view_separator.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <stroke android:color="?colorDividerBackground" android:width="1dp"/>
+    <corners android:radius="16dp"/>
+    <solid android:color="?colorPrimary"/>
+</shape>
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
@@ -61,7 +61,7 @@
 
             </RelativeLayout>
 
-            <org.thoughtcrime.securesms.components.LabeledSeparatorView
+            <include layout="@layout/view_separator"
                 android:id="@+id/separatorView"
                 android:layout_width="match_parent"
                 android:layout_height="32dp"

diff --git a/app/src/main/res/layout/fragment_enter_public_key.xml b/app/src/main/res/layout/fragment_enter_public_key.xml
@@ -70,7 +70,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/promptTextView">
 
-                <org.thoughtcrime.securesms.components.LabeledSeparatorView
+                <include layout="@layout/view_separator"
                     android:id="@+id/separatorView"
                     android:layout_width="match_parent"
                     android:layout_height="32dp"

diff --git a/app/src/main/res/layout/view_separator.xml b/app/src/main/res/layout/view_separator.xml
@@ -1,17 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/titleTextView"
+    <View
+        android:layout_gravity="center"
+        android:background="?colorDividerBackground"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"/>
+
+    <FrameLayout
+        android:layout_gravity="center"
+        android:background="@drawable/view_separator"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center"
-        android:textColor="?android:textColorTertiary"
-        android:textSize="@dimen/small_font_size"
-        android:text="@string/your_session_id" />
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/titleTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textColor="?android:textColorTertiary"
+            android:textSize="@dimen/small_font_size"
+            android:text="@string/your_session_id" />
+    </FrameLayout>
 
-</RelativeLayout>
+</FrameLayout>