Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
f3f0daf7e7
17 changed files with 634 additions and 23 deletions
|
@ -33,6 +33,10 @@
|
|||
android:background="@drawable/rounded_top_corners"
|
||||
android:gravity="end"
|
||||
android:maxLines="1"
|
||||
app:autoSizeMaxTextSize="48sp"
|
||||
app:autoSizeMinTextSize="10sp"
|
||||
app:autoSizeStepGranularity="2sp"
|
||||
app:autoSizeTextType="uniform"
|
||||
android:textColor="?attr/colorOnSurfaceVariant"
|
||||
android:textSize="48sp"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
|
@ -46,7 +50,11 @@
|
|||
android:layout_marginEnd="32dp"
|
||||
android:background="?attr/colorSurfaceVariant"
|
||||
android:gravity="end"
|
||||
android:maxLines="1"
|
||||
android:maxLines="2"
|
||||
app:autoSizeMaxTextSize="48sp"
|
||||
app:autoSizeMinTextSize="10sp"
|
||||
app:autoSizeStepGranularity="2sp"
|
||||
app:autoSizeTextType="uniform"
|
||||
android:textColor="?attr/colorOnSurfaceVariant"
|
||||
android:textSize="28sp"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
|
@ -60,7 +68,11 @@
|
|||
android:layout_marginEnd="32dp"
|
||||
android:background="@drawable/rounded_bottom_corners"
|
||||
android:gravity="end"
|
||||
android:maxLines="1"
|
||||
android:maxLines="2"
|
||||
app:autoSizeMaxTextSize="48sp"
|
||||
app:autoSizeMinTextSize="10sp"
|
||||
app:autoSizeStepGranularity="2sp"
|
||||
app:autoSizeTextType="uniform"
|
||||
android:textColor="?attr/colorOnSurfaceVariant"
|
||||
android:textSize="28sp"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout 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"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
|
@ -54,11 +54,14 @@
|
|||
<EditText
|
||||
android:id="@+id/editText"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1"
|
||||
android:layout_margin="16dp"
|
||||
android:fontFamily="@font/poppins"
|
||||
android:inputType="textMultiLine"
|
||||
android:padding="16dp"
|
||||
android:nestedScrollingEnabled="true"
|
||||
android:gravity="top|start"
|
||||
android:textColor="?attr/colorOnBackground"
|
||||
android:textIsSelectable="true"
|
||||
android:textSize="12sp"
|
||||
|
@ -101,4 +104,4 @@
|
|||
|
||||
</LinearLayout>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</LinearLayout>
|
|
@ -10,16 +10,34 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="@string/enter_password"
|
||||
android:maxLength="32"
|
||||
android:inputType="numberPassword" />
|
||||
android:inputType="numberPassword"
|
||||
android:maxLength="32" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/confirmPasswordInput"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:hint="@string/confirm_password"
|
||||
android:inputType="numberPassword"
|
||||
android:maxLength="32"
|
||||
android:layout_marginTop="16dp" />
|
||||
android:maxLength="32" />
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/biometricCheckbox"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:fontFamily="@font/poppins"
|
||||
android:text="@string/enable_biometric"
|
||||
android:textSize="16sp" />
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/forgotPasswordCheckbox"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:fontFamily="@font/poppins"
|
||||
android:text="@string/enable_forgot_password"
|
||||
android:textSize="16sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
android:src="@drawable/linear_gradient_bg"
|
||||
tools:ignore="ContentDescription" />
|
||||
|
||||
<LinearLayout
|
||||
<androidx.core.widget.NestedScrollView
|
||||
android:id="@+id/textActivityContainer"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
|
@ -47,7 +47,7 @@
|
|||
android:textSize="18sp"
|
||||
android:visibility="gone"
|
||||
tools:ignore="HardcodedText" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/leftTouchPanel"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue