From 4cf311794cc6ff82215d6ea5291196f5c7ce3505 Mon Sep 17 00:00:00 2001
From: Kamal Bramwell <kamal@elixxir.io>
Date: Fri, 2 Dec 2022 12:25:10 -0500
Subject: [PATCH] Updated Crust username UI
---
app/src/main/AndroidManifest.xml | 3 +-
.../main/res/layout/activity_crust_login.xml | 137 +++++++++---------
app/src/main/res/values/styles.xml | 6 +
3 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9c41090d..cf4423cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -101,8 +101,7 @@
<activity android:name=".backup.cloud.dropbox.DropboxAuthActivity" />
<activity
android:name=".backup.cloud.crust.login.ui.CrustLoginActivity"
- android:theme="@style/Theme.AppCompat.Dialog"
- android:excludeFromRecents="true"
+ android:theme="@style/AppDialogTheme"
/>
<meta-data
diff --git a/app/src/main/res/layout/activity_crust_login.xml b/app/src/main/res/layout/activity_crust_login.xml
index bb6e6f96..77027604 100644
--- a/app/src/main/res/layout/activity_crust_login.xml
+++ b/app/src/main/res/layout/activity_crust_login.xml
@@ -9,83 +9,78 @@
type="io.xxlabs.messenger.backup.cloud.crust.login.ui.CrustLoginUi" />
</data>
- <androidx.cardview.widget.CardView
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="match_parent"
+ tools:context=".backup.cloud.crust.login.ui.CrustLoginActivity">
- <androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginTop="@dimen/spacing_36"
- tools:context=".backup.cloud.crust.login.ui.CrustLoginActivity">
+ <TextView
+ android:id="@+id/crust_login_title"
+ style="@style/dialog_title"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:text="@string/crust_login_title"
+ android:layout_marginTop="24dp"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent" />
- <TextView
- android:id="@+id/crust_login_title"
- style="@style/dialog_title"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:text="@string/crust_login_title"
- android:layout_marginBottom="24dp"
- app:layout_constraintBottom_toTopOf="@id/crust_login_body"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent" />
+ <TextView
+ android:id="@+id/crust_login_body"
+ style="@style/dialog_body"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:text="@string/crust_login_body"
+ android:layout_marginTop="24dp"
+ app:layout_constraintTop_toBottomOf="@id/crust_login_title"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent" />
- <TextView
- android:id="@+id/crust_login_body"
- style="@style/dialog_body"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:text="@string/crust_login_body"
- android:layout_marginBottom="24dp"
- app:layout_constraintBottom_toTopOf="@id/crust_login_username"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent" />
+ <com.google.android.material.textfield.TextInputLayout
+ android:id="@+id/crust_login_username"
+ style="@style/registration_text_input"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:enabled="@{ui.textInputEnabled}"
+ android:layout_marginTop="18dp"
+ app:layout_constraintTop_toBottomOf="@id/crust_login_body"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent">
- <com.google.android.material.textfield.TextInputLayout
- android:id="@+id/crust_login_username"
- style="@style/registration_text_input"
- android:layout_width="0dp"
+ <com.google.android.material.textfield.TextInputEditText
+ style="@style/registration_text_input_edittext"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:enabled="@{ui.textInputEnabled}"
- android:layout_marginBottom="18dp"
- app:layout_constraintBottom_toTopOf="@id/crust_submit_button"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent">
+ android:hint="@string/crust_login_username_hint"
+ android:imeOptions="actionNext"
+ android:maxLength="@{ui.maxUsernameLength}"
+ android:afterTextChanged="@{ui::onUsernameInput}" />
+ </com.google.android.material.textfield.TextInputLayout>
- <com.google.android.material.textfield.TextInputEditText
- style="@style/registration_text_input_edittext"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:hint="@string/crust_login_username_hint"
- android:imeOptions="actionNext"
- android:maxLength="@{ui.maxUsernameLength}"
- android:afterTextChanged="@{ui::onUsernameInput}" />
- </com.google.android.material.textfield.TextInputLayout>
+ <io.xxlabs.messenger.support.view.SingleClickButton
+ android:id="@+id/crust_submit_button"
+ style="@style/registration_step_next_button"
+ android:layout_marginBottom="@dimen/spacing_36"
+ android:enabled="@{ui.submitButtonEnabled}"
+ android:onClick="@{() -> ui.onSubmitClicked()}"
+ android:text="@string/registration_flow_next"
+ app:layout_constraintTop_toBottomOf="@id/crust_login_username"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintVertical_bias="0.0"
+ app:layout_constraintBottom_toBottomOf="parent"
+ tools:enabled="false" />
- <io.xxlabs.messenger.support.view.SingleClickButton
- android:id="@+id/crust_submit_button"
- style="@style/registration_step_next_button"
- android:layout_marginBottom="@dimen/spacing_36"
- android:enabled="@{ui.submitButtonEnabled}"
- android:onClick="@{() -> ui.onSubmitClicked()}"
- android:text="@string/registration_flow_next"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintVertical_bias="0.0"
- tools:enabled="false" />
-
- <ProgressBar
- android:id="@+id/crust_progressbar"
- style="?android:attr/progressBarStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:progressTint="@color/brand_default"
- android:visibility="@{!ui.textInputEnabled}"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintBottom_toBottomOf="parent" />
- </androidx.constraintlayout.widget.ConstraintLayout>
- </androidx.cardview.widget.CardView>
+ <ProgressBar
+ android:id="@+id/crust_progressbar"
+ style="?android:attr/progressBarStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:progressTint="@color/brand_default"
+ android:visibility="@{!ui.textInputEnabled}"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintBottom_toBottomOf="@id/crust_submit_button" />
+ </androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f1649964..5db015d3 100755
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -15,6 +15,12 @@
<item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
</style>
+ <style name="AppDialogTheme" parent="Theme.MaterialComponents.Light.Dialog.Alert">
+ <!-- Customize your theme here. -->
+ <item name="windowActionBar">false</item>
+ <item name="android:windowNoTitle">true</item>
+ </style>
+
<!-- Splash Screen theme -->
<style name="SplashTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
<item name="android:background">@drawable/bg_splash_screen</item>
--
GitLab