diff --git a/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.java b/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.java index 3082f2f..41933bb 100644 --- a/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.java +++ b/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.java @@ -34,6 +34,7 @@ public class LoginFragment extends Fragment { private FragmentLoginBinding binding; private PreferenceManager preferenceManager; + private LoginViewModel viewModel; @Nullable diff --git a/app/src/main/res/color/gray_50.xml b/app/src/main/res/color/gray_50.xml new file mode 100644 index 0000000..a8b409b --- /dev/null +++ b/app/src/main/res/color/gray_50.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/iconmain.png b/app/src/main/res/drawable/iconmain.png new file mode 100644 index 0000000..52df5f6 Binary files /dev/null and b/app/src/main/res/drawable/iconmain.png differ diff --git a/app/src/main/res/layout/activity_root.xml b/app/src/main/res/layout/activity_root.xml index 701ce19..e55aede 100644 --- a/app/src/main/res/layout/activity_root.xml +++ b/app/src/main/res/layout/activity_root.xml @@ -5,11 +5,21 @@ android:layout_height="match_parent" xmlns:tools="http://schemas.android.com/tools"> + + - - - - - - - - - + app:layout_constraintTop_toTopOf="parent"> + + + + - - - - - - + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="parent" /> diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml index 8d464dd..5dea193 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/app/src/main/res/layout/fragment_login.xml @@ -9,7 +9,7 @@ android:id="@+id/username" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/username"/> + android:hint="@string/username" /> - + app:layout_constraintTop_toTopOf="parent" + android:id="@+id/text" + /> + + + +