Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
c66e737bc6
@ -1,6 +1,7 @@
|
||||
package com.displaynone.acss.ui.auth
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.graphics.drawable.TransitionDrawable
|
||||
import android.os.Bundle
|
||||
import android.text.Editable
|
||||
import android.text.TextWatcher
|
||||
@ -28,7 +29,6 @@ class AuthFragment: Fragment(R.layout.fragment_auth) {
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
_binding = FragmentAuthBinding.bind(view)
|
||||
setupLoginButton()
|
||||
|
||||
viewModel.action.collectWithLifecycle(this) { action ->
|
||||
if (action is Action.GotoProfile) {
|
||||
blockLoginButton() // FIXME() При двойном нажатии вылетает с ошибкой
|
||||
|
||||
4
app/src/main/res/drawable/animated_gradient.xml
Normal file
4
app/src/main/res/drawable/animated_gradient.xml
Normal file
@ -0,0 +1,4 @@
|
||||
<transition xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/gradient_1" />
|
||||
<item android:drawable="@drawable/gradient_2" />
|
||||
</transition>
|
||||
10
app/src/main/res/drawable/gradient_1.xml
Normal file
10
app/src/main/res/drawable/gradient_1.xml
Normal file
@ -0,0 +1,10 @@
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
>
|
||||
|
||||
<gradient
|
||||
|
||||
android:startColor="?android:attr/colorBackground"
|
||||
android:endColor="#BCE0E0"
|
||||
android:angle="270"
|
||||
android:type="linear" />
|
||||
</shape>
|
||||
7
app/src/main/res/drawable/gradient_2.xml
Normal file
7
app/src/main/res/drawable/gradient_2.xml
Normal file
@ -0,0 +1,7 @@
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<gradient
|
||||
android:startColor="#03a9f4"
|
||||
android:endColor="#ffffff"
|
||||
android:angle="270"
|
||||
android:type="linear" />
|
||||
</shape>
|
||||
50
app/src/main/res/drawable/image_1.xml
Normal file
50
app/src/main/res/drawable/image_1.xml
Normal file
@ -0,0 +1,50 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="274dp"
|
||||
android:height="274dp"
|
||||
android:viewportWidth="274"
|
||||
android:viewportHeight="274">
|
||||
<path
|
||||
android:pathData="M121,10.2c-1.8,1.3 -4.3,3.6 -5.4,5.1 -2.1,2.8 -2.1,3.1 -2.1,92.2 0,88.7 0,89.4 2.1,92.1 1.1,1.5 3.3,3.7 4.8,4.8 2.7,2 4.1,2.1 44.2,2.4 38.3,0.3 41.4,0.4 41.4,2 0,4.5 2.5,9.8 6.5,13.9 4.1,4.2 4.4,4.8 4.7,10.6 0.3,5.4 0,6.3 -1.7,7.2 -1.8,0.9 -2,2.2 -2.3,12.4 -0.2,8.5 0.1,11.7 1,12.3 0.7,0.4 12.2,0.8 25.4,0.8 19.5,-0 24.4,-0.3 25.3,-1.4 0.8,-0.9 1.1,-5.1 0.9,-12.2 -0.3,-10.2 -0.4,-11 -2.5,-11.9l-2.3,-1 0,-44.5c0,-42.1 -0.1,-44.7 -2,-48.8 -1.1,-2.4 -7.6,-14.6 -14.5,-27.1l-12.5,-22.7 0,-39.1c0,-38.9 0,-39 -2.3,-42.4 -4.7,-7 -3.7,-6.9 -57.3,-6.9l-48.1,-0 -3.3,2.2zM143.2,17.7c1.1,4.2 5.9,8 11.1,8.8 2.4,0.4 12.4,0.5 22.3,0.3 20.6,-0.3 22.2,-0.9 25.4,-8.4l1.9,-4.4 7.1,-0c7.6,-0 12.2,1.6 14,4.9 0.7,1.3 1,27.5 1,77.2l0,75.2 -12.3,-12c-11.3,-11.1 -12.7,-12.2 -16.9,-12.8 -2.6,-0.4 -6,-0.4 -7.8,-0 -3.7,0.8 -9.5,5.6 -11.6,9.6 -1.7,3.3 -1.8,10.6 -0.3,14.6 0.5,1.5 7,8.8 14.2,16.1l13.2,13.3 -8.4,-0.3 -8.5,-0.3 -0.8,-3.1c-1.2,-4.7 -5,-7.6 -10.7,-8.2 -9.8,-0.9 -16.2,2.3 -17.6,8.9l-0.7,2.9 -16.4,-0c-16.2,-0 -16.5,-0 -18.9,-2.5l-2.5,-2.4 0,-87.9 0,-87.9 2.3,-2c3.2,-2.9 4.3,-3.2 12.6,-3l7.5,0.2 0.8,3.2zM196,15.8c0,3.9 -1.7,4.2 -23.1,4.2 -20.3,-0 -20.8,-0 -22.3,-2.2 -0.9,-1.2 -1.6,-2.6 -1.6,-3 0,-0.5 10.6,-0.8 23.5,-0.8 22,-0 23.5,0.1 23.5,1.8zM243.6,130.7l10.9,19.8 0.3,44.7 0.3,44.8 -15.6,-0 -15.5,-0 0,-5.5c0,-7.1 -1.8,-11.5 -6.9,-16.4 -3.8,-3.7 -4.1,-4.4 -4.1,-9.5 0,-3 -0.5,-6.7 -1.1,-8.3 -0.5,-1.5 -7.3,-9.1 -14.9,-16.8 -8.3,-8.4 -14.1,-15.1 -14.5,-16.8 -2.1,-8.2 6.5,-16.6 14.1,-13.7 1.6,0.6 8.6,6.7 15.5,13.6 6.9,6.8 13.2,12.4 14,12.4 0.8,-0 2.5,-0.7 3.7,-1.6 2.2,-1.5 2.2,-1.6 2.2,-34 0,-17.8 0.2,-32.4 0.4,-32.4 0.2,-0 5.2,8.9 11.2,19.7zM180.4,197.2c0.5,0.9 0.8,2 0.4,2.3 -0.3,0.3 -4.2,0.5 -8.7,0.3l-8.1,-0.3 1.6,-2.3c1.4,-2 2.3,-2.3 7.6,-2 4.4,0.2 6.4,0.8 7.2,2zM260,248.5c0,1.2 -1.9,1.5 -10.9,1.5 -11.3,-0 -13.8,0.9 -12.5,4.3 0.5,1.3 2.6,1.7 11.7,1.9 9.2,0.2 11.2,0.6 11.2,1.8 0,1.3 -2.9,1.5 -20,1.5l-20,-0 -0.3,-6.3 -0.3,-6.2 20.6,-0c17.6,-0 20.5,0.2 20.5,1.5z"
|
||||
android:fillColor="@color/wheteTem"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M127.6,40.5c-0.3,0.9 -0.6,5.7 -0.6,10.5 0,7.8 0.2,9.1 1.9,10 3.4,1.8 5.1,-1.2 5.1,-9l0,-6.9 7.8,-0.3c7.5,-0.3 7.7,-0.4 7.7,-2.8 0,-2.5 0,-2.5 -10.6,-2.8 -9.1,-0.2 -10.8,-0 -11.3,1.3z"
|
||||
android:fillColor="@color/wheteTem"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M195.6,40.6c-1.2,3.2 1.3,4.4 9,4.4l7.4,-0 0,7.4c0,7.7 1.2,10.2 4.4,9 1.4,-0.6 1.6,-2.1 1.4,-11.3l-0.3,-10.6 -10.6,-0.3c-9.2,-0.2 -10.7,-0 -11.3,1.4z"
|
||||
android:fillColor="@color/wheteTem"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M128.2,154.2c-1.8,1.8 -1.6,19.2 0.2,20.7 0.9,0.8 4.8,1.1 11.2,0.9 9.8,-0.3 9.9,-0.3 9.9,-2.8 0,-2.4 -0.2,-2.5 -7.7,-2.8l-7.8,-0.3 0,-7.2c0,-7 -1,-9.7 -3.5,-9.7 -0.6,-0 -1.6,0.5 -2.3,1.2z"
|
||||
android:fillColor="@color/wheteTem"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M8.5,41.3c-0.3,0.7 -0.4,13.1 -0.3,27.7l0.3,26.5 27.4,0.3c21.3,0.2 27.6,-0.1 28.3,-1 0.9,-1.5 1.1,-50.8 0.2,-53.2 -0.5,-1.4 -4,-1.6 -28,-1.6 -21.2,-0 -27.6,0.3 -27.9,1.3zM58,68l0,22 -22,-0 -22,-0 0,-22 0,-22 22,-0 22,-0 0,22z"
|
||||
android:fillColor="@color/wheteTem"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M25.1,57.9c-1.6,2.8 -1.4,18.3 0.2,20.4 1,1.5 2.7,1.7 11.7,1.5l10.5,-0.3 0,-11.5 0,-11.5 -10.7,-0.3c-9.8,-0.2 -10.8,-0.1 -11.7,1.7zM42,68l0,6 -5.5,-0 -5.5,-0 0,-6 0,-6 5.5,-0 5.5,-0 0,6z"
|
||||
android:fillColor="@color/wheteTem"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M83.5,41.3c-0.3,0.7 -0.4,13.1 -0.3,27.7l0.3,26.5 9.6,0.3c8.2,0.2 9.8,-0 10.3,-1.4 1.1,-3 -1.3,-4.4 -7.5,-4.4l-5.9,-0 0,-22 0,-22 5.9,-0c6.1,-0 8.9,-1.6 7.7,-4.5 -0.7,-2 -19.4,-2.2 -20.1,-0.2z"
|
||||
android:fillColor="@color/wheteTem"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M8.7,116.7c-0.4,0.3 -0.7,12.7 -0.7,27.4 0,25.5 0.1,26.9 1.9,27.9 2.6,1.4 50.6,1.4 53.2,-0 1.8,-1 1.9,-2.4 1.9,-27 0,-14.2 -0.3,-26.5 -0.6,-27.4 -0.5,-1.4 -3.9,-1.6 -27.8,-1.6 -15,-0 -27.6,0.3 -27.9,0.7zM58,144l0,22 -22,-0 -22,-0 0,-21.3c0,-11.8 0.3,-21.7 0.7,-22 0.3,-0.4 10.2,-0.7 22,-0.7l21.3,-0 0,22z"
|
||||
android:fillColor="@color/wheteTem"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M25.1,133.9c-1.7,3 -1.4,19.6 0.3,21 0.9,0.8 5,1.1 11.7,0.9l10.4,-0.3 0,-11.5 0,-11.5 -10.7,-0.3c-9.8,-0.2 -10.8,-0.1 -11.7,1.7zM42,144.5l0,5.5 -5.5,-0 -5.5,-0 0,-5.5 0,-5.5 5.5,-0 5.5,-0 0,5.5z"
|
||||
android:fillColor="@color/wheteTem"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M84.2,117.2c-1.9,1.9 -1.6,19.3 0.4,21.2 2.2,2.3 16.6,2.3 18.5,-0 2.4,-2.9 -0.1,-4.9 -7,-5.2l-6.1,-0.3 0,-5.4 0,-5.5 6.4,-0c5.6,-0 6.6,-0.3 7.1,-2 0.3,-1.1 0.3,-2.4 0,-3 -0.9,-1.4 -17.8,-1.3 -19.3,0.2z"
|
||||
android:fillColor="@color/wheteTem"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M83.6,150.6c-0.3,0.9 -0.6,5.5 -0.6,10.4 0,11.3 0.6,12 10.4,12 8.3,-0 11.9,-1.6 10,-4.7 -0.8,-1.4 -2.6,-1.9 -7.3,-2.1l-6.1,-0.3 0,-5.4 0,-5.5 5.9,-0c6.1,-0 8.9,-1.6 7.7,-4.5 -0.8,-2.3 -19.1,-2.2 -20,0.1z"
|
||||
android:fillColor="@color/wheteTem"
|
||||
android:strokeColor="#00000000"/>
|
||||
</vector>
|
||||
@ -7,6 +7,7 @@
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".MainActivity">
|
||||
|
||||
|
||||
<com.google.android.material.appbar.AppBarLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
@ -69,6 +69,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="15dp"
|
||||
android:maxLines="1"
|
||||
android:hint="@string/login"
|
||||
|
||||
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
android:background="?android:attr/colorBackground">
|
||||
|
||||
<LinearLayout
|
||||
android:background="?android:attr/colorBackground"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
@ -18,11 +19,12 @@
|
||||
android:paddingTop="50dp">
|
||||
|
||||
<ImageView
|
||||
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="200dp"
|
||||
android:foregroundGravity="center"
|
||||
android:importantForAccessibility="no"
|
||||
android:src="@mipmap/ic_app"
|
||||
android:src="@drawable/image_1"
|
||||
app:layout_constraintBottom_toTopOf="@+id/title"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
@ -40,8 +42,9 @@
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<LinearLayout
|
||||
android:background="@drawable/gradient_1"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_width="280dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center_horizontal">
|
||||
@ -54,6 +57,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:textSize="24sp"
|
||||
android:visibility="visible"
|
||||
android:letterSpacing="0.05"
|
||||
android:background="?android:attr/colorBackground"
|
||||
android:textColor="?attr/colorOnBackground"
|
||||
@ -63,6 +67,8 @@
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="70dp"
|
||||
android:layout_marginRight="70dp"
|
||||
app:boxStrokeColor="@color/primary"
|
||||
app:hintTextColor="?attr/colorOnBackground"
|
||||
app:helperTextTextColor="?attr/colorOnBackground"
|
||||
@ -73,6 +79,8 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="14dp"
|
||||
android:maxLines="1"
|
||||
|
||||
|
||||
android:hint="@string/login"
|
||||
android:textColorHint="?attr/colorSecondary"
|
||||
@ -85,15 +93,19 @@
|
||||
app:boxStrokeColor="@color/primary"
|
||||
app:hintTextColor="?attr/colorOnBackground"
|
||||
app:helperTextTextColor="?attr/colorOnBackground"
|
||||
android:layout_marginBottom="10dp">
|
||||
android:layout_marginBottom="10dp"
|
||||
android:hint="@string/password">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/password"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="70dp"
|
||||
android:layout_marginRight="70dp"
|
||||
android:padding="14dp"
|
||||
android:maxLines="1"
|
||||
|
||||
|
||||
android:hint="@string/password"
|
||||
android:textColorHint="?attr/colorSecondary"
|
||||
android:textColor="?attr/colorSecondary" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
@ -108,7 +120,7 @@
|
||||
android:id="@+id/next"
|
||||
app:cardElevation="8dp"
|
||||
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="200dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/continue_"
|
||||
android:padding="12dp"
|
||||
|
||||
@ -64,7 +64,7 @@
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
|
||||
<LinearLayout
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
@ -206,9 +206,19 @@
|
||||
android:layout_weight="1"
|
||||
tools:listitem="@layout/item_scanner_view"
|
||||
android:padding="16dp" />
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<com.google.android.material.bottomnavigation.BottomNavigationView
|
||||
android:id="@+id/bottomNavigation"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:menu="@menu/bottom_nav_menu"/>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
|
||||
|
||||
@ -23,6 +23,14 @@
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<com.google.android.material.bottomnavigation.BottomNavigationView
|
||||
android:id="@+id/bottomNavigation"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:menu="@menu/bottom_nav_menu"/>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@ -18,5 +18,6 @@
|
||||
<string name="administrator_searc_button_search"> Search </string>
|
||||
<string name="title_profile">Your profile</string>
|
||||
<string name="сhange_rights">Change rights using smartphone</string>
|
||||
<string name="admin">Admin panel</string>
|
||||
|
||||
</resources>
|
||||
@ -6,4 +6,6 @@
|
||||
</style>
|
||||
<color name="icon_color_pro">#FFFFFF</color>
|
||||
<color name="startColor">#FFFFFF</color>
|
||||
<color name="wheteTem">#FFFFFF</color>
|
||||
|
||||
</resources>
|
||||
@ -19,4 +19,5 @@
|
||||
<string name="administrator_searc_button_search">🔍 Поиск 🔍</string>
|
||||
<string name="title_profile">Профиль</string>
|
||||
<string name="сhange_rights">Изменить права входа с помощью смартфона</string>
|
||||
><string name="admin">Панель администратора</string>
|
||||
</resources>
|
||||
@ -7,4 +7,6 @@
|
||||
<color name="icon_color_pro">#000000</color>
|
||||
<color name="startColor">#FFFFFF</color>
|
||||
<style name="Theme.ACSS" parent="Base.Theme.ACSS" />
|
||||
<color name="wheteTem">#000000</color>
|
||||
|
||||
</resources>
|
||||
Loading…
x
Reference in New Issue
Block a user