code: Modification Scan result screen
This commit is contained in:
parent
3077f3f15e
commit
bad551e6f6
36
app/src/main/res/drawable/res_error.xml
Normal file
36
app/src/main/res/drawable/res_error.xml
Normal file
@ -0,0 +1,36 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="32dp"
|
||||
android:height="32dp"
|
||||
android:viewportWidth="32"
|
||||
android:viewportHeight="32">
|
||||
<path
|
||||
android:pathData="M11,25L11,25c-3.314,0 -6,2.686 -6,6v0h12v0C17,27.686 14.314,25 11,25z"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="2"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="#000000"/>
|
||||
<path
|
||||
android:pathData="M11,21m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="2"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="#000000"/>
|
||||
<path
|
||||
android:pathData="M27,1l-10,0l0,14l2,0l0,4l4,-4l4,0z"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="2"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="#000000"/>
|
||||
<path
|
||||
android:pathData="M22,10L22,12"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="2"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="#000000"/>
|
||||
<path
|
||||
android:pathData="M22,8L22,4"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="2"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="#000000"/>
|
||||
</vector>
|
9
app/src/main/res/drawable/res_fail.xml
Normal file
9
app/src/main/res/drawable/res_fail.xml
Normal file
@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="20dp"
|
||||
android:height="19.84dp"
|
||||
android:viewportWidth="20"
|
||||
android:viewportHeight="19.84">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M10.17,10l3.89,-3.89a0.37,0.37 0,1 0,-0.53 -0.53L9.64,9.43 5.75,5.54a0.37,0.37 0,1 0,-0.53 0.53L9.11,10 5.22,13.85a0.37,0.37 0,0 0,0 0.53,0.34 0.34,0 0,0 0.26,0.11 0.36,0.36 0,0 0,0.27 -0.11l3.89,-3.89 3.89,3.89a0.34,0.34 0,0 0,0.26 0.11,0.35 0.35,0 0,0 0.27,-0.11 0.37,0.37 0,0 0,0 -0.53Z"/>
|
||||
</vector>
|
@ -9,38 +9,36 @@
|
||||
android:id="@+id/loading"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<androidx.constraintlayout.widget.Guideline
|
||||
android:id="@+id/guideline_top"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintGuide_percent="0.25" />
|
||||
app:layout_constraintGuide_percent="0.24" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/error"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="4dp"
|
||||
android:gravity="center"
|
||||
android:text="@string/serverError"
|
||||
android:textSize="14sp"
|
||||
android:gravity="center"
|
||||
app:layout_constraintBottom_toTopOf="@+id/result"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
/>
|
||||
app:layout_constraintTop_toBottomOf="@+id/success_icon" />
|
||||
|
||||
<androidx.constraintlayout.widget.Guideline
|
||||
android:id="@+id/guideline_bottom"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintGuide_percent="0.7" />
|
||||
app:layout_constraintGuide_percent="0.61" />
|
||||
|
||||
<View
|
||||
android:id="@+id/close"
|
||||
@ -57,23 +55,43 @@
|
||||
android:id="@+id/success_icon"
|
||||
android:layout_width="150dp"
|
||||
android:layout_height="150dp"
|
||||
android:background="@drawable/success_icon"
|
||||
android:background="@drawable/res_success_ic"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/guideline_top" />
|
||||
|
||||
<View
|
||||
android:id="@+id/scan"
|
||||
android:layout_width="320dp"
|
||||
android:layout_height="80dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:background="@drawable/button_beige"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/guideline_bottom" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/result"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:text="@string/resulText"
|
||||
android:layout_marginStart="8dp"
|
||||
android:text="@string/success_t1"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="25sp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintBottom_toTopOf="@+id/guideline_bottom"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
android:textSize="20sp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/sub_result"
|
||||
app:layout_constraintStart_toStartOf="@+id/scan"
|
||||
app:layout_constraintTop_toBottomOf="@+id/scan" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/sub_result"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/success_t2"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="16sp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/scan"
|
||||
app:layout_constraintStart_toStartOf="@+id/result"
|
||||
app:layout_constraintTop_toBottomOf="@+id/result" />
|
||||
|
||||
<!--
|
||||
<TextView
|
||||
|
@ -15,7 +15,12 @@
|
||||
<string name="contentDescriptionRefresh">refresh</string>
|
||||
<string name="contentDescriptionLogout">logout</string>
|
||||
<string name="contentDescriptionPhoto">photo</string>
|
||||
<string name="resulText">Вход выполнен успешно</string>
|
||||
<string name="success_t1">Вход выполнен успешно</string>
|
||||
<string name="success_t2">Хорошего дня!</string>
|
||||
<string name="fail_t1">Вход был отменён</string>
|
||||
<string name="fail_t2">Попробуйте еще раз!</string>
|
||||
<string name="error_t1">Что-то пошло не так</string>
|
||||
<string name="error_t2">Попробуйте еще раз!</string>
|
||||
<string name="closeText">Закрыть/Close</string>
|
||||
<string name="errorLoginText">Ошибка входа</string>
|
||||
<string name="text_last_enter">Последний вход 12.12.1212</string>
|
||||
|
Loading…
x
Reference in New Issue
Block a user