Author: Adam <git@apiote.xyz>
[wip] add new onboarding flow
app/src/main/res/layout/account.xml | 47 ++++++++++++++ app/src/main/res/layout/account_edit.xml | 6 + app/src/main/res/layout/login.xml | 85 ++++++++++++++++++++++++++ app/src/main/res/values/strings.xml | 2
diff --git a/app/src/main/res/layout/account.xml b/app/src/main/res/layout/account.xml new file mode 100644 index 0000000000000000000000000000000000000000..3de5cf75542f454fbc97f2b5bcc7a56b4d3f657e --- /dev/null +++ b/app/src/main/res/layout/account.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.google.android.material.textview.MaterialTextView + android:id="@+id/headline" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="32dp" + android:layout_marginTop="64dp" + android:text="Way to go, Adam!" + android:textAppearance="@style/TextAppearance.Material3.HeadlineLarge" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <com.google.android.material.textview.MaterialTextView + android:id="@+id/login" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="32dp" + android:layout_marginTop="16dp" + android:text="Logged in as adam@bimba.app\non my-bimba.apiote.xyz" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/headline" /> + + <Button + android:id="@+id/account_button" + style="?attr/materialIconButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + app:icon="@drawable/open_outside" + app:layout_constraintBottom_toBottomOf="@+id/login" + app:layout_constraintStart_toEndOf="@+id/login" + app:layout_constraintTop_toTopOf="@+id/login" /> + + <View + android:id="@+id/divider" + android:layout_width="match_parent" + android:layout_height="1dp" + android:layout_marginTop="16dp" + android:background="?android:attr/listDivider" + app:layout_constraintTop_toBottomOf="@+id/login" /> +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/account_edit.xml b/app/src/main/res/layout/account_edit.xml new file mode 100644 index 0000000000000000000000000000000000000000..0d4867f726bc0c3f708f0d068ffb09750af1ee93 --- /dev/null +++ b/app/src/main/res/layout/account_edit.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/login.xml b/app/src/main/res/layout/login.xml new file mode 100644 index 0000000000000000000000000000000000000000..dc3a1d72dbf4dd6190d42ec6984161a265996cbe --- /dev/null +++ b/app/src/main/res/layout/login.xml @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.google.android.material.imageview.ShapeableImageView + android:id="@+id/logo" + android:layout_width="100dp" + android:layout_height="100dp" + android:layout_marginTop="32dp" + android:background="@color/bimba_grey" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:shapeAppearanceOverlay="@style/roundedImageView" + app:srcCompat="@drawable/ic_launcher_foreground" /> + + <com.google.android.material.textview.MaterialTextView + android:id="@+id/app_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:text="@string/app_name" + android:textAppearance="@style/TextAppearance.AppCompat.Display1" + app:layout_constraintEnd_toEndOf="@+id/logo" + app:layout_constraintStart_toStartOf="@+id/logo" + app:layout_constraintTop_toBottomOf="@+id/logo" /> + + <com.google.android.material.textview.MaterialTextView + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" + android:layout_marginBottom="16dp" + android:text="@string/seatbelts_everyone" + android:textAlignment="center" + android:textAppearance="@style/TextAppearance.Material3.BodySmall" + android:textStyle="italic" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/server" + android:layout_width="400dp" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="64dp" + android:layout_marginEnd="16dp" + android:hint="@string/bimba_server_address_hint" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/app_name"> + + <com.google.android.material.textfield.TextInputEditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="bimba.apiote.xyz" + tools:ignore="HardcodedText" /> + + </com.google.android.material.textfield.TextInputLayout> + + <Button + android:id="@+id/account_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="64dp" + android:text="@string/log_in_or_sign_up" + app:layout_constraintEnd_toEndOf="@+id/server" + app:layout_constraintStart_toStartOf="@+id/server" + app:layout_constraintTop_toBottomOf="@+id/server" /> + + <Button + android:id="@+id/anonymous_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:text="@string/continue_without_account" + app:layout_constraintEnd_toEndOf="@+id/account_button" + app:layout_constraintStart_toStartOf="@+id/account_button" + app:layout_constraintTop_toBottomOf="@+id/account_button" /> + +</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0f28969a1ce9661561811d143e015aedfe141d66..78ddc5284daf508032464dfe9be1bb7066e450c2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -285,4 +285,6 @@show <string name="terminus_arrival_showing">Terminus arrivals</string> <string name="matrix_button_description">link to Matrix channel</string> <string name="email_button_description">link to email</string> + <string name="log_in_or_sign_up">Log in or Sign up</string> + <string name="continue_without_account">Continue without account</string> </resources>