Merge branch 'Frontend'
This commit is contained in:
commit
60110e8e68
@ -1,6 +1,7 @@
|
|||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:padding="16dp">
|
android:padding="16dp">
|
||||||
|
|
||||||
@ -33,6 +34,10 @@
|
|||||||
android:id="@+id/refresh"
|
android:id="@+id/refresh"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:backgroundTint="@color/colorPrimary"
|
||||||
|
android:textColor="@android:color/white"
|
||||||
|
android:padding="12dp"
|
||||||
|
app:cornerRadius="16dp"
|
||||||
android:text="@string/refresh" />
|
android:text="@string/refresh" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
@ -52,6 +57,10 @@
|
|||||||
android:id="@+id/scan_qr_code"
|
android:id="@+id/scan_qr_code"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:backgroundTint="@color/colorPrimary"
|
||||||
|
android:textColor="@android:color/white"
|
||||||
|
android:padding="12dp"
|
||||||
|
app:cornerRadius="16dp"
|
||||||
android:text="Сканировать QR-код"
|
android:text="Сканировать QR-код"
|
||||||
android:visibility="gone" />
|
android:visibility="gone" />
|
||||||
|
|
||||||
@ -59,6 +68,10 @@
|
|||||||
android:id="@+id/adminPanelButton"
|
android:id="@+id/adminPanelButton"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:backgroundTint="@color/colorPrimary"
|
||||||
|
android:textColor="@android:color/white"
|
||||||
|
android:padding="12dp"
|
||||||
|
app:cornerRadius="16dp"
|
||||||
android:text="Admin Panel"
|
android:text="Admin Panel"
|
||||||
android:visibility="gone" />
|
android:visibility="gone" />
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user