Skip to content
Snippets Groups Projects
Commit 4cf31179 authored by Kamal Bramwell's avatar Kamal Bramwell
Browse files

Updated Crust username UI

parent 6fc4b72a
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -9,14 +9,9 @@
type="io.xxlabs.messenger.backup.cloud.crust.login.ui.CrustLoginUi" />
</data>
<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:layout_marginTop="@dimen/spacing_36"
tools:context=".backup.cloud.crust.login.ui.CrustLoginActivity">
<TextView
......@@ -25,8 +20,8 @@
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"
android:layout_marginTop="24dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
......@@ -36,8 +31,8 @@
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"
android:layout_marginTop="24dp"
app:layout_constraintTop_toBottomOf="@id/crust_login_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
......@@ -47,8 +42,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:enabled="@{ui.textInputEnabled}"
android:layout_marginBottom="18dp"
app:layout_constraintBottom_toTopOf="@id/crust_submit_button"
android:layout_marginTop="18dp"
app:layout_constraintTop_toBottomOf="@id/crust_login_body"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">
......@@ -69,10 +64,11 @@
android:enabled="@{ui.submitButtonEnabled}"
android:onClick="@{() -> ui.onSubmitClicked()}"
android:text="@string/registration_flow_next"
app:layout_constraintBottom_toBottomOf="parent"
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" />
<ProgressBar
......@@ -85,7 +81,6 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
app:layout_constraintBottom_toBottomOf="@id/crust_submit_button" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</layout>
\ No newline at end of file
......@@ -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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment