Remove username from select signup type

app/src/main/java/org/futo/circles/feature/sign_up/sign_up_type/SelectSignUpTypeFragment.kt

@@ -2,7 +2,6 @@ package org.futo.circles.feature.sign_up.sign_up_type
 
 import android.os.Bundle
 import android.view.View
-import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.Fragment
 import by.kirich1409.viewbindingdelegate.viewBinding
 import org.futo.circles.BuildConfig
@@ -43,30 +42,16 @@ class SelectSignUpTypeFragment : Fragment(R.layout.fragment_select_sign_up_type)
     private fun setupViews() {
         with(binding) {
             groupSubscription.setIsVisible(BuildConfig.IS_SUBSCRIPTIONS_ENABLED)
-            tilUserName.editText?.doAfterTextChanged { setSignupButtonsEnabled() }
+            btnEU.text = getString(R.string.eu_server_format, BuildConfig.EU_SERVER_DOMAIN)
+            btnUS.text = getString(R.string.us_server_format, BuildConfig.EU_SERVER_DOMAIN)
             btnToken.setOnClickListener {
                 startLoading(btnToken)
-                viewModel.startSignUp(
-                    tilUserName.getText(),
-                    tvServerDomain.text.toString()
-                )
+                viewModel.startSignUp(getDomain())
             }
             btnSubscription.setOnClickListener {
                 startLoading(btnSubscription)
-                viewModel.startSignUp(
-                    tilUserName.getText(),
-                    tvServerDomain.text.toString(),
-                    true
-                )
-            }
-            serverLocationGroup.setOnCheckedChangeListener { _, checkedId ->
-                tvServerDomain.text = when (checkedId) {
-                    btnUS.id -> BuildConfig.US_SERVER_DOMAIN
-                    btnEU.id -> BuildConfig.EU_SERVER_DOMAIN
-                    else -> BuildConfig.US_SERVER_DOMAIN
-                }
+                viewModel.startSignUp(getDomain(), true)
             }
-            serverLocationGroup.check(btnUS.id)
         }
     }
 
@@ -84,9 +69,9 @@ class SelectSignUpTypeFragment : Fragment(R.layout.fragment_select_sign_up_type)
         }
     }
 
-    private fun setSignupButtonsEnabled() {
-        val isEnabled = binding.tilUserName.getText().isNotEmpty()
-        binding.btnToken.isEnabled = isEnabled
-        binding.btnSubscription.isEnabled = isEnabled
+    private fun getDomain() = when (binding.serverLocationGroup.checkedRadioButtonId) {
+        binding.btnUS.id -> BuildConfig.US_SERVER_DOMAIN
+        binding.btnEU.id -> BuildConfig.EU_SERVER_DOMAIN
+        else -> BuildConfig.US_SERVER_DOMAIN
     }
 }
\ No newline at end of file

app/src/main/res/layout/fragment_select_sign_up_type.xml

@@ -29,100 +29,58 @@
         style="@style/headline"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
+        android:layout_marginTop="8dp"
         android:text="@string/server_location"
-        app:layout_constraintBottom_toBottomOf="@id/serverLocationGroup"
-        app:layout_constraintEnd_toStartOf="@+id/serverLocationGroup"
-        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/serverLocationGroup" />
+        app:layout_constraintTop_toBottomOf="@id/guidelineLogo" />
 
     <RadioGroup
         android:id="@+id/serverLocationGroup"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/tvServerLocationTitle"
-        app:layout_constraintTop_toBottomOf="@id/guidelineLogo">
+        android:orientation="vertical"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvServerLocationTitle">
 
         <com.google.android.material.radiobutton.MaterialRadioButton
             android:id="@+id/btnUS"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:checked="true"
             android:paddingHorizontal="8dp"
-            android:text="@string/us"
-            android:textAppearance="@style/headline" />
+            android:textAppearance="@style/headline"
+            tools:text="US some.server.domain" />
 
         <com.google.android.material.radiobutton.MaterialRadioButton
             android:id="@+id/btnEU"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingHorizontal="8dp"
-            android:text="@string/eu"
-            android:textAppearance="@style/headline" />
+            android:textAppearance="@style/headline"
+            tools:text="EU - (some.server.domain)" />
 
     </RadioGroup>
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/tilUserName"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="4dp"
-        android:hint="@string/username"
-        app:layout_constraintEnd_toStartOf="@id/tvServerDomain"
-        app:layout_constraintHorizontal_weight="0.6"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/serverLocationGroup">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:imeOptions="actionDone"
-            android:inputType="text"
-            android:maxLines="1"
-            android:padding="12dp" />
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <TextView
-        android:id="@+id/tvServerDomain"
-        style="@style/footNote"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:lines="1"
-        app:layout_constraintBottom_toBottomOf="@id/tilUserName"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_weight="0.4"
-        app:layout_constraintStart_toEndOf="@id/tilUserName"
-        app:layout_constraintTop_toTopOf="@id/tilUserName"
-        tools:text="eu.kombucha.social" />
-
-
     <TextView
         android:id="@+id/tvTokenTitle"
         style="@style/headline"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
         android:gravity="center"
         android:text="@string/already_have_a_token"
         app:layout_constraintBottom_toTopOf="@id/btnToken"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tilUserName"
-        app:layout_constraintVertical_bias="0.2"
-        app:layout_constraintVertical_chainStyle="packed" />
+        app:layout_constraintTop_toBottomOf="@id/serverLocationGroup" />
 
     <org.futo.circles.view.LoadingButton
         android:id="@+id/btnToken"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:enabled="false"
         android:text="@string/sign_up_with_token"
-        app:layout_constraintBottom_toTopOf="@id/tvOr"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvTokenTitle" />
@@ -133,20 +91,18 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
         android:gravity="center"
         android:text="@string/or"
-        app:layout_constraintBottom_toTopOf="@id/tvSubscriptionTitle"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/btnToken" />
 
-
     <TextView
         android:id="@+id/tvSubscriptionTitle"
         style="@style/headline"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
         android:gravity="center"
         android:text="@string/create_a_subscription"
         app:layout_constraintBottom_toTopOf="@id/btnSubscription"
@@ -159,9 +115,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:enabled="false"
         android:text="@string/choose_a_subscription"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvSubscriptionTitle" />