From d8ba01cf5d5b29988009971492dba4612f53496b Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Wed, 2 Jun 2021 10:51:36 +1000
Subject: [PATCH] Clean up join open group screen

---
 .../loki/activities/JoinPublicChatActivity.kt |  5 ++-
 .../fragment_enter_chat_url.xml               | 38 +++++++++++++------
 .../res/layout/fragment_enter_chat_url.xml    | 36 +++++++++++++-----
 .../org/session/libsession/snode/SnodeAPI.kt  |  2 +-
 4 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt
index 78b7ced770..deec2bf434 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt
@@ -40,6 +40,7 @@ import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragmentDelega
 import org.thoughtcrime.securesms.loki.protocol.MultiDeviceProtocol
 import org.thoughtcrime.securesms.loki.viewmodel.DefaultGroupsViewModel
 import org.thoughtcrime.securesms.loki.viewmodel.State
+import java.util.*
 
 class JoinPublicChatActivity : PassphraseRequiredActionBarActivity(), ScanQRCodeWrapperFragmentDelegate {
     private val adapter = JoinPublicChatActivityAdapter(this)
@@ -179,6 +180,7 @@ class EnterChatURLFragment : Fragment() {
         joinPublicChatButton.setOnClickListener { joinPublicChatIfPossible() }
         viewModel.defaultRooms.observe(viewLifecycleOwner) { state ->
             defaultRoomsContainer.isVisible = state is State.Success
+            defaultRoomsLoaderContainer.isVisible = state is State.Loading
             defaultRoomsLoader.isVisible = state is State.Loading
             when (state) {
                 State.Loading -> {
@@ -210,7 +212,6 @@ class EnterChatURLFragment : Fragment() {
             chip.setOnClickListener {
                 (requireActivity() as JoinPublicChatActivity).joinPublicChatIfPossible(defaultGroup.joinURL)
             }
-
             defaultRoomsGridLayout.addView(chip)
         }
         if ((groups.size and 1) != 0) { // This checks that the number of rooms is even
@@ -222,7 +223,7 @@ class EnterChatURLFragment : Fragment() {
     private fun joinPublicChatIfPossible() {
         val inputMethodManager = requireContext().getSystemService(BaseActionBarActivity.INPUT_METHOD_SERVICE) as InputMethodManager
         inputMethodManager.hideSoftInputFromWindow(chatURLEditText.windowToken, 0)
-        val chatURL = chatURLEditText.text.trim().toString().toLowerCase()
+        val chatURL = chatURLEditText.text.trim().toString().toLowerCase(Locale.US)
         (requireActivity() as JoinPublicChatActivity).joinPublicChatIfPossible(chatURL)
     }
     // endregion
diff --git a/app/src/main/res/layout-sw400dp/fragment_enter_chat_url.xml b/app/src/main/res/layout-sw400dp/fragment_enter_chat_url.xml
index a011b2bf4b..a689ad6258 100644
--- a/app/src/main/res/layout-sw400dp/fragment_enter_chat_url.xml
+++ b/app/src/main/res/layout-sw400dp/fragment_enter_chat_url.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/contentView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -13,23 +15,37 @@
         android:elevation="1dp" />
 
     <EditText
-        style="@style/SessionEditText"
+        style="@style/SmallSessionEditText"
         android:id="@+id/chatURLEditText"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="64dp"
         android:layout_marginLeft="@dimen/large_spacing"
         android:layout_marginTop="@dimen/large_spacing"
         android:layout_marginRight="@dimen/large_spacing"
-        android:inputType="textWebEmailAddress"
+        android:inputType="textWebEmailAddress|textMultiLine"
+        android:paddingTop="0dp"
+        android:paddingBottom="0dp"
+        android:gravity="center_vertical"
+        android:maxLines="3"
         android:hint="@string/fragment_enter_chat_url_edit_text_hint" />
 
-    <com.github.ybq.android.spinkit.SpinKitView
-        android:visibility="gone"
-        android:id="@+id/defaultRoomsLoader"
-        style="@style/SpinKitView.Small.WanderingCubes"
-        android:layout_marginVertical="16dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+    <RelativeLayout
+        android:id="@+id/defaultRoomsLoaderContainer"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:layout_marginTop="56dp"
+        android:visibility="gone">
+
+        <com.github.ybq.android.spinkit.SpinKitView
+            android:id="@+id/defaultRoomsLoader"
+            style="@style/SpinKitView.Large.ThreeBounce"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:SpinKit_Color="@color/text"
+            android:visibility="gone"
+            android:layout_centerInParent="true" />
+
+    </RelativeLayout>
 
     <LinearLayout
         android:visibility="gone"
diff --git a/app/src/main/res/layout/fragment_enter_chat_url.xml b/app/src/main/res/layout/fragment_enter_chat_url.xml
index 462c99e434..a689ad6258 100644
--- a/app/src/main/res/layout/fragment_enter_chat_url.xml
+++ b/app/src/main/res/layout/fragment_enter_chat_url.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/contentView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -16,20 +18,34 @@
         style="@style/SmallSessionEditText"
         android:id="@+id/chatURLEditText"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="64dp"
         android:layout_marginLeft="@dimen/large_spacing"
         android:layout_marginTop="@dimen/large_spacing"
         android:layout_marginRight="@dimen/large_spacing"
-        android:inputType="textWebEmailAddress"
+        android:inputType="textWebEmailAddress|textMultiLine"
+        android:paddingTop="0dp"
+        android:paddingBottom="0dp"
+        android:gravity="center_vertical"
+        android:maxLines="3"
         android:hint="@string/fragment_enter_chat_url_edit_text_hint" />
 
-    <com.github.ybq.android.spinkit.SpinKitView
-        android:visibility="gone"
-        android:id="@+id/defaultRoomsLoader"
-        style="@style/SpinKitView.Small.WanderingCubes"
-        android:layout_marginVertical="16dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+    <RelativeLayout
+        android:id="@+id/defaultRoomsLoaderContainer"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:layout_marginTop="56dp"
+        android:visibility="gone">
+
+        <com.github.ybq.android.spinkit.SpinKitView
+            android:id="@+id/defaultRoomsLoader"
+            style="@style/SpinKitView.Large.ThreeBounce"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:SpinKit_Color="@color/text"
+            android:visibility="gone"
+            android:layout_centerInParent="true" />
+
+    </RelativeLayout>
 
     <LinearLayout
         android:visibility="gone"
diff --git a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
index f126871a40..281bd906e7 100644
--- a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
+++ b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
@@ -168,7 +168,7 @@ object SnodeAPI {
         val validationCount = 3
         val sessionIDByteCount = 33
         // Hash the ONS name using BLAKE2b
-        val onsName = onsName.toLowerCase(Locale.ENGLISH)
+        val onsName = onsName.toLowerCase(Locale.US)
         val nameAsData = onsName.toByteArray()
         val nameHash = ByteArray(GenericHash.BYTES)
         if (!sodium.cryptoGenericHash(nameHash, nameHash.size, nameAsData, nameAsData.size.toLong())) {