Implementation of the design and the new button
This commit is contained in:
parent
485abb1d4f
commit
cb5b20182c
12
app/src/main/res/drawable/button_bg.xml
Normal file
12
app/src/main/res/drawable/button_bg.xml
Normal file
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
>
|
||||
|
||||
<gradient android:startColor="@color/startColor"
|
||||
|
||||
android:endColor="#03A9F4"
|
||||
android:angle="270"
|
||||
/>
|
||||
<!-- <corners android:radius="8dp" />-->
|
||||
<!-- <stroke android:width="10dp" android:color="#000000" />-->
|
||||
</shape>
|
@ -40,6 +40,7 @@
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_width="280dp"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
@ -105,10 +106,14 @@
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/next"
|
||||
app:cardElevation="8dp"
|
||||
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/continue_"
|
||||
android:padding="12dp"
|
||||
app:strokeColor="@color/black"
|
||||
app:strokeWidth="1dp"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@color/white"
|
||||
app:backgroundTint="@color/primary"
|
||||
|
@ -96,6 +96,20 @@
|
||||
android:background="?android:attr/colorBackground"
|
||||
android:textColor="?attr/colorOnBackground"
|
||||
android:text="Должность пользователя" />
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/rights_using_smartphone"
|
||||
android:padding="15dp"
|
||||
android:layout_margin="16dp"
|
||||
android:layout_marginTop="10dp"
|
||||
|
||||
android:textAlignment="center"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="18sp"
|
||||
android:letterSpacing="0.05"
|
||||
android:background="?android:attr/colorBackground"
|
||||
android:textColor="?attr/colorOnBackground"
|
||||
android:text="Права с помощью смартфона" />
|
||||
|
||||
|
||||
|
||||
@ -103,7 +117,8 @@
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/scan"
|
||||
android:layout_margin="16dp"
|
||||
|
||||
app:strokeColor="@color/black"
|
||||
app:strokeWidth="1dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/scan"
|
||||
@ -111,7 +126,9 @@
|
||||
app:iconGravity="textStart"
|
||||
android:padding="12dp"
|
||||
android:textSize="16sp"
|
||||
app:cardElevation="8dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:maxHeight="200dp"
|
||||
|
||||
android:textColor="@color/white"
|
||||
app:cornerRadius="8dp"
|
||||
@ -119,15 +136,20 @@
|
||||
app:rippleColor="@color/white"/>
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/button_search"
|
||||
app:cardElevation="8dp"
|
||||
android:maxHeight="200dp"
|
||||
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/administrator_searc_button_search"
|
||||
app:strokeColor="@color/black"
|
||||
app:strokeWidth="1dp"
|
||||
android:padding="12dp"
|
||||
android:textSize="16sp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_margin="16dp"
|
||||
|
||||
|
||||
android:textColor="@color/white"
|
||||
app:cornerRadius="8dp"
|
||||
app:backgroundTint="@color/primary"
|
||||
@ -141,8 +163,30 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/logout"
|
||||
android:maxHeight="200dp"
|
||||
|
||||
app:strokeColor="@color/black"
|
||||
app:strokeWidth="1dp"
|
||||
android:padding="12dp"
|
||||
|
||||
android:textSize="16sp"
|
||||
android:textColor="@color/white"
|
||||
app:cornerRadius="8dp"
|
||||
app:backgroundTint="@color/primary"
|
||||
app:rippleColor="@color/white"/>
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/сhange_rights"
|
||||
android:layout_margin="16dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/сhange_rights"
|
||||
android:maxHeight="200dp"
|
||||
|
||||
android:padding="12dp"
|
||||
app:strokeColor="@color/black"
|
||||
app:strokeWidth="1dp"
|
||||
app:cardElevation="8dp"
|
||||
|
||||
|
||||
android:textSize="16sp"
|
||||
android:textColor="@color/white"
|
||||
|
@ -15,6 +15,8 @@
|
||||
<string name="ok">ОК</string>
|
||||
<string name="error">Error</string>
|
||||
<string name="administrator_search">Enter the username</string>
|
||||
<string name="administrator_searc_button_search">🔍 Search 🔍</string>
|
||||
<string name="administrator_searc_button_search"> Search </string>
|
||||
<string name="title_profile">Your profile</string>
|
||||
<string name="сhange_rights">Change rights using smartphone</string>
|
||||
|
||||
</resources>
|
@ -5,4 +5,5 @@
|
||||
<!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
|
||||
</style>
|
||||
<color name="icon_color_pro">#FFFFFF</color>
|
||||
<color name="startColor">#FFFFFF</color>
|
||||
</resources>
|
@ -18,4 +18,5 @@
|
||||
<string name="administrator_search">Введите логин пользователя</string>
|
||||
<string name="administrator_searc_button_search">🔍 Поиск 🔍</string>
|
||||
<string name="title_profile">Профиль</string>
|
||||
<string name="сhange_rights">Изменить права входа с помощью смартфона</string>
|
||||
</resources>
|
@ -15,6 +15,9 @@
|
||||
<string name="ok">ОК</string>
|
||||
<string name="error">Error</string>
|
||||
<string name="administrator_search">Enter the username</string>
|
||||
<string name="administrator_searc_button_search">🔍 Search 🔍</string>
|
||||
<string name="administrator_searc_button_search"> Search </string>
|
||||
<string name="title_profile">Your profile</string>
|
||||
<string name="сhange_rights">Change rights using smartphone</string>
|
||||
|
||||
|
||||
</resources>
|
@ -5,5 +5,6 @@
|
||||
<!-- <item name="colorPrimary">@color/my_light_primary</item> -->
|
||||
</style>
|
||||
<color name="icon_color_pro">#000000</color>
|
||||
<color name="startColor">#FFFFFF</color>
|
||||
<style name="Theme.ACSS" parent="Base.Theme.ACSS" />
|
||||
</resources>
|
Loading…
x
Reference in New Issue
Block a user