UI update, mark details

2024-02-11 20:13:24 +01:00
parent ba787b06fc
commit 91ac67075d
185 changed files with 1116 additions and 669 deletions
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- fade_in.xml -->
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fromAlpha="0.0"
-    android:toAlpha="1.0"
-    android:duration="200" />
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- fade_in.xml -->
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fromAlpha="1.0"
-    android:toAlpha="0.0"
-    android:duration="200" />
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:fromXDelta="100%p"
-        android:toXDelta="0"
-        android:duration="250" />
-</set>
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:fromXDelta="0"
-        android:toXDelta="-100%p"
-        android:duration="250" />
-</set>
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333"
-    android:alpha="0.6">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M17.77,3.77l-1.77,-1.77l-10,10l10,10l1.77,-1.77l-8.23,-8.23z"/>
-</vector>
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF"
-    android:alpha="0.8">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M17.77,3.77l-1.77,-1.77l-10,10l10,10l1.77,-1.77l-8.23,-8.23z"/>
-</vector>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/button_clicked_background" android:state_pressed="true" />
+    <item android:drawable="@drawable/button_background" />
+</selector>
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="@dimen/corner_radius" />
+    <solid android:color="#90FFCC33" />
+    <stroke android:width="5dp" android:color="@color/pastel_yellow" />
+</shape>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <size android:width="2dp" /> <!-- Adjust width as needed -->
+    <solid android:color="@color/white" /> <!-- Set desired color -->
+</shape>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/pastel_yellow_transparent" />
+    <corners android:radius="@dimen/corner_radius" />
+</shape>
@@ -1,5 +0,0 @@
-<!-- res/drawable/rounded_corner_background.xml -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="20dp" /> <!-- Adjust the radius as needed -->
-    <solid android:color="#696969" /> <!-- Set the background color -->
-</shape>
@@ -9,21 +9,25 @@
        android:id="@+id/appBarLayout"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:background="@color/black">
+        android:layout_marginTop="0dp"
+        android:background="@color/black"
+        app:layout_constraintBottom_toTopOf="@+id/imageView2"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">

        <TextView
            android:id="@+id/toolbar"
-            android:fontFamily="@font/roboto"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginHorizontal="20dp"
-            android:layout_marginTop="20dp"
-            android:text="@string/about_app"
            android:background="@drawable/toolbar_background"
+            android:fontFamily="@font/roboto"
            android:gravity="center"
            android:padding="10dp"
+            android:text="@string/about_app"
            android:textColor="@color/white"
-            android:textSize="25dp" />
+            android:textSize="25sp" />

    </com.google.android.material.appbar.AppBarLayout>

@@ -31,6 +35,7 @@
        android:id="@+id/imageView2"
        android:layout_width="300dp"
        android:layout_height="300dp"
+        android:contentDescription="@string/solon_logo"
        app:layout_constraintBottom_toTopOf="@+id/podstata"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@@ -44,7 +49,7 @@
        android:layout_marginTop="6dp"
        android:layout_marginBottom="8dp"
        android:fontFamily="monospace"
-        android:text="Přehlednost je podstata."
+        android:text="@string/slogan"
        android:textAllCaps="false"
        android:textColor="#FFFFFF"
        android:textSize="20sp"
@@ -60,7 +65,7 @@
        android:layout_height="wrap_content"
        android:layout_marginStart="16dp"
        android:layout_marginBottom="250dp"
-        android:text="Vylepšená verze mobilní aplikace ŠkolaOnLine"
+        android:text="@string/desc_about"
        android:textAlignment="center"
        android:textColor="#FFFFFF"
        android:textSize="24sp"
@@ -69,7 +74,8 @@
        app:layout_constraintHorizontal_bias="0.416"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/imageView2"
-        app:layout_constraintVertical_bias="1.0" />
+        app:layout_constraintVertical_bias="1.0"
+        tools:ignore="TextSizeCheck" />

    <TextView
        android:id="@+id/link"
@@ -78,7 +84,7 @@
        android:layout_height="wrap_content"
        android:layout_marginStart="1dp"
        android:layout_marginEnd="139dp"
-        android:text=" Odweta"
+        android:text="@string/odweta"
        android:textColor="#FFFFFF"
        android:textFontWeight="400"
        android:textSize="20sp"
@@ -95,7 +101,7 @@
        android:layout_height="wrap_content"
        android:layout_marginStart="144dp"
        android:layout_marginEnd="1dp"
-        android:text="Vývoj:"
+        android:text="@string/development_vyvoj"
        android:textColor="#FFFFFF"
        android:textSize="20sp"
        app:layout_constraintBottom_toBottomOf="parent"
@@ -109,11 +115,11 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginBottom="61dp"
+        android:contentDescription="@string/gitlab_logo"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintHorizontal_bias="0.303"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintVertical_bias="0.54"
        app:srcCompat="@mipmap/gitlab_logo_foreground" />

    <TextView
@@ -123,7 +129,7 @@
        android:layout_height="wrap_content"
        android:layout_marginEnd="96dp"
        android:layout_marginBottom="100dp"
-        android:text="Zdrojový kód"
+        android:text="@string/source_code"
        android:textColor="#FFFFFF"
        android:textSize="20sp"
        app:layout_constraintBottom_toBottomOf="parent"
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/cal_week_root"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    tools:context=".MainActivity"
@@ -2,6 +2,4 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:id="@+id/app_root">
-
-</FrameLayout>
+    android:id="@+id/app_root" />
@@ -2,29 +2,31 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_roott"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    tools:context=".MainActivity">

    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/toolbarFrame"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:id="@+id/toolbarFrame"
-        android:background="@color/black">
+        android:background="@color/black"
+        app:layout_constraintBottom_toTopOf="@+id/fragmentContainer"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">

        <TextView
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="20dp"
-            android:layout_marginTop="20dp"
+            android:layout_margin="20dp"
            android:background="@drawable/toolbar_background"
-            android:gravity="center"
            android:fontFamily="@font/roboto"
-            android:padding="10dp"
+            android:gravity="center"
+            android:padding="15dp"
            android:textColor="@color/white"
-            android:textSize="25dp" />
+            android:textSize="25sp" />
    </com.google.android.material.appbar.AppBarLayout>

    <FrameLayout
@@ -44,10 +46,10 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:background="@drawable/toolbar_background"
-        android:layout_marginHorizontal="20dp"
-        android:layout_marginVertical="20dp"
+        android:layout_margin="20dp"
        android:fontFamily="@font/roboto"
        app:itemTextColor="@color/white"
+        android:padding="5dp"
        app:layout_constraintTop_toBottomOf="@+id/fragmentContainer"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintLeft_toLeftOf="parent"
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:id="@+id/one_mark_root"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:gravity="center"
+        android:layout_marginTop="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black">
+    android:layout_height="match_parent">

    <ScrollView
-        android:id="@+id/scroll"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        app:layout_constraintBottom_toBottomOf="parent"
@@ -18,7 +15,7 @@
        <LinearLayout
            android:id="@+id/root"
            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
            android:layout_marginStart="1dp"
            android:layout_marginTop="1dp"
            android:layout_marginEnd="1dp"
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:id="@+id/mark_details_root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:layout_marginTop="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/menu_layout_root"
    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black">
+    android:layout_height="match_parent">

    <Button
        android:id="@+id/menu_button_settings"
@@ -13,44 +10,46 @@
        android:layout_height="80dp"
        android:layout_marginTop="200dp"
        android:layout_marginBottom="50dp"
+        android:background="@drawable/button_background_selector"
        android:text="@string/settings"
-        android:textSize="20sp"
+        android:textSize="22sp"
        app:layout_constraintBottom_toTopOf="@+id/menu_button_sign_out"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintHorizontal_bias="0.497"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:background="@drawable/button_background"/>
+        app:layout_constraintTop_toTopOf="parent" />

    <Button
        android:id="@+id/menu_button_sign_out"
        android:layout_width="190dp"
        android:layout_height="80dp"
        android:layout_marginBottom="50dp"
+        android:background="@drawable/button_background_selector"
        android:text="@string/sign_out"
-        android:textSize="20sp"
+        android:textSize="22sp"
        app:cornerRadius="@dimen/corner_radius"
        app:layout_constraintBottom_toTopOf="@+id/menu_button_sign_in"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintHorizontal_bias="0.498"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/menu_button_settings"
-        android:background="@drawable/button_background" />
+        app:layout_constraintTop_toBottomOf="@+id/menu_button_settings" />

    <Button
        android:id="@+id/menu_button_sign_in"
        android:layout_width="190dp"
        android:layout_height="80dp"
        android:layout_marginBottom="50dp"
+        android:background="@drawable/button_background_selector"
+        android:ellipsize="none"
+        android:scrollHorizontally="false"
        android:text="@string/sign_in"
-        android:textSize="20sp"
+        android:textSize="22sp"
        app:cornerRadius="@dimen/corner_radius"
        app:layout_constraintBottom_toTopOf="@+id/menu_button_about"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintHorizontal_bias="0.497"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/menu_button_sign_out"
-        android:background="@drawable/button_background" />
+        app:layout_constraintTop_toBottomOf="@+id/menu_button_sign_out" />

    <Button
        android:id="@+id/menu_button_about"
@@ -59,13 +58,13 @@
        android:layout_marginStart="158dp"
        android:layout_marginEnd="159dp"
        android:layout_marginBottom="200dp"
+        android:background="@drawable/button_background_selector"
        android:text="@string/about_app"
-        android:textSize="20sp"
+        android:textSize="22sp"
        app:cornerRadius="@dimen/corner_radius"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/menu_button_sign_in"
-        android:background="@drawable/button_background" />
+        app:layout_constraintTop_toBottomOf="@+id/menu_button_sign_in" />

 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    android:id="@+id/no_mark_root">
+    android:layout_height="match_parent">

    <LinearLayout
        android:id="@+id/no_mark_container"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:orientation="vertical"
+        android:foregroundGravity="center"
        android:gravity="center"
-        android:foregroundGravity="center" />
+        android:orientation="vertical" />
 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -1,30 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools">

    <com.google.android.material.appbar.AppBarLayout
        android:id="@+id/appBarLayout"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:background="@color/black">
+        android:layout_marginTop="0dp"
+        android:background="@color/black"
+        app:layout_constraintBottom_toTopOf="@+id/scrollViewSettings"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">

        <TextView
            android:id="@+id/toolbar"
-            android:fontFamily="@font/roboto"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginHorizontal="20dp"
-            android:layout_marginTop="20dp"
-            android:text="@string/settings"
            android:background="@drawable/toolbar_background"
+            android:fontFamily="@font/roboto"
            android:gravity="center"
            android:padding="10dp"
+            android:text="@string/settings"
            android:textColor="@color/white"
-            android:textSize="25dp" />
+            android:textSize="25sp" />

    </com.google.android.material.appbar.AppBarLayout>

@@ -42,23 +45,21 @@
        app:layout_constraintTop_toBottomOf="@+id/appBarLayout">

        <LinearLayout
-            android:id="@+id/scrollViewLinear"
            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
            android:orientation="vertical">

            <LinearLayout
-            android:id="@+id/setting_language"
-            android:layout_width="match_parent"
+                android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:orientation="horizontal"
            android:paddingLeft="20dp"
            android:paddingTop="10dp"
            android:paddingRight="20dp"
-            android:paddingBottom="10dp">
+            android:paddingBottom="10dp"
+                tools:ignore="UselessParent">

            <TextView
-                android:id="@+id/settings_language_text"
                android:layout_width="180dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
@@ -74,7 +75,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_weight="1"
-                android:background="@drawable/button_background"
+                android:background="@drawable/button_background_selector"
                android:text="@string/lang_choose" />
            </LinearLayout>
        </LinearLayout>
@@ -1,78 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fillViewport="true">

-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="457dp"
-        android:layout_height="307dp"
-        android:layout_marginBottom="17dp"
-        app:layout_constraintBottom_toTopOf="@+id/usernameField"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.528"
-        app:srcCompat="@drawable/solon_500_yellow" />
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">

-    <EditText
-        android:id="@+id/usernameField"
-        android:layout_width="240dp"
-        android:layout_height="50dp"
-        android:layout_marginTop="292dp"
-        android:background="@drawable/button_background"
-        android:ems="10"
-        android:hint="Uživatelské jméno"
-        android:inputType="text"
-        android:paddingHorizontal="20dp"
-        android:textColor="@color/white"
-        android:textColorHighlight="@color/white"
-        android:textColorHint="#C8FFFFFF"
-        android:textColorLink="@color/white"
-        android:theme="@style/sign_in_field"
-        app:circularflow_radiusInDP="20dp"
-        app:layout_constraintBottom_toTopOf="@+id/passwordField"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.85" />
+        <ImageView
+            android:id="@+id/logo"
+            android:layout_width="286dp"
+            android:layout_height="96dp"
+            android:layout_marginTop="120dp"
+            android:contentDescription="@string/solon_logo"
+            app:layout_constraintBottom_toTopOf="@+id/usernameField"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.496"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.0"
+            app:srcCompat="@drawable/solon_just_yellow" />

-    <EditText
-        android:id="@+id/passwordField"
-        android:layout_width="240dp"
-        android:layout_height="50dp"
-        android:layout_marginBottom="224dp"
-        android:background="@drawable/button_background"
-        android:ems="10"
-        android:hint="Heslo"
-        android:inputType="textPassword"
-        android:paddingHorizontal="20dp"
-        android:textColor="@color/white"
-        android:textColorHighlight="@color/white"
-        android:textColorHint="#C8FFFFFF"
-        android:textColorLink="@color/white"
-        android:theme="@style/sign_in_field"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        <LinearLayout
+            android:id="@+id/frame"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="50dp"
+            android:orientation="vertical"
+            app:layout_constraintBottom_toTopOf="@+id/signInButton"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/logo">

-    <Button
-        android:id="@+id/signInButton"
-        android:layout_width="240dp"
-        android:layout_height="80dp"
-        android:layout_marginStart="137dp"
-        android:layout_marginTop="72dp"
-        android:layout_marginEnd="137dp"
-        android:layout_marginBottom="88dp"
-        android:text="Přihlásit se"
-        android:fontFamily="@font/roboto"
-        android:textSize="20sp"
-        android:background="@drawable/button_background"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/passwordField" />
+            <EditText
+                android:id="@+id/usernameField"
+                android:layout_width="240dp"
+                android:layout_height="50dp"
+                android:layout_marginBottom="10dp"
+                android:background="@drawable/button_background"
+                android:ems="10"
+                android:hint="@string/username"
+                android:importantForAutofill="no"
+                android:inputType="text"
+                android:paddingHorizontal="20dp"
+                android:textColor="@color/white"
+                android:textColorHighlight="@color/white"
+                android:textColorHint="#C8FFFFFF"
+                android:textColorLink="@color/white"
+                android:textCursorDrawable="@drawable/cursor"
+                android:theme="@style/sign_in_field"
+                app:circularflow_radiusInDP="20dp" />

-</androidx.constraintlayout.widget.ConstraintLayout>
+            <EditText
+                android:id="@+id/passwordField"
+                android:layout_width="240dp"
+                android:layout_height="50dp"
+                android:background="@drawable/button_background"
+                android:ems="10"
+                android:hint="@string/password"
+                android:importantForAutofill="no"
+                android:inputType="textPassword"
+                android:paddingHorizontal="20dp"
+                android:textColor="@color/white"
+                android:textColorHighlight="@color/white"
+                android:textColorHint="#C8FFFFFF"
+                android:textColorLink="@color/white"
+                android:textCursorDrawable="@drawable/cursor"
+                android:theme="@style/sign_in_field" />
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/signInButton"
+            android:layout_width="240dp"
+            android:layout_height="80dp"
+            android:background="@drawable/button_background_selector"
+            android:fontFamily="@font/roboto"
+            android:text="@string/sign_in_"
+            android:textSize="20sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.497"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/frame"
+            app:layout_constraintVertical_bias="0.056" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/splash_root">
+    android:layout_height="match_parent">

    <ImageView
        android:id="@+id/imageView3"
@@ -25,6 +23,7 @@
        android:id="@+id/loading_gif"
        android:layout_width="200dp"
        android:layout_height="200dp"
+        android:contentDescription="@string/loading_gif"
        android:src="@drawable/loading3"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
@@ -2,11 +2,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:gravity="center">

    <TextView
-        android:id="@+id/heading"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_weight="1"
@@ -11,5 +11,5 @@
        android:layout_height="match_parent"
        android:background="@color/black"
        android:fontFamily="@font/roboto"
-        android:orientation="vertical"></LinearLayout>
+        android:orientation="vertical" />
 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">

    <RadioGroup
-        android:id="@+id/settings_language_choice"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:layout_weight="1"
        android:padding="20dp">

        <RadioButton
-            android:id="@+id/radio_button_language_cz"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:text="@string/lang_cz"
@@ -21,7 +18,6 @@
            android:theme="@style/Theme.Solen.RadioButton" />

        <RadioButton
-            android:id="@+id/radio_button_language_en"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:text="@string/lang_en"
@@ -6,19 +6,19 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:icon="@android:drawable/ic_dialog_dialer"
-        android:title="Rozvrh" />
+        android:title="@string/timetable" />
    <item
        android:id="@+id/nav_marks"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:icon="@mipmap/grade2_foreground"
-        android:title="Známky" />
+        android:title="@string/marks" />
    <item
        android:id="@+id/nav_menu"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:icon="@drawable/menu_240"
-        android:title="Menu" />
+        android:title="@string/menu" />
 </menu>

 <!--
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/gitlab_logo_background"/>
-    <foreground android:drawable="@mipmap/gitlab_logo_foreground"/>
-</adaptive-icon>
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/gitlab_logo_background"/>
-    <foreground android:drawable="@mipmap/gitlab_logo_foreground"/>
-</adaptive-icon>
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/grade_background"/>
-    <foreground android:drawable="@mipmap/grade_foreground"/>
-</adaptive-icon>
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/grade2_background"/>
-    <foreground android:drawable="@mipmap/grade2_foreground"/>
-</adaptive-icon>
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/grade2_background"/>
-    <foreground android:drawable="@mipmap/grade2_foreground"/>
-</adaptive-icon>
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/grade_background"/>
-    <foreground android:drawable="@mipmap/grade_foreground"/>
-</adaptive-icon>
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/left_arrow_background"/>
-    <foreground android:drawable="@mipmap/left_arrow_foreground"/>
-</adaptive-icon>
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/left_arrow_background"/>
-    <foreground android:drawable="@mipmap/left_arrow_foreground"/>
-</adaptive-icon>
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/menu_background"/>
-    <foreground android:drawable="@mipmap/menu_foreground"/>
-</adaptive-icon>
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/menu_background"/>
-    <foreground android:drawable="@mipmap/menu_foreground"/>
-</adaptive-icon>
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+<adaptive-icon xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="MonochromeLauncherIcon">
    <background android:drawable="@color/ic_launcher_background"/>
    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+<adaptive-icon xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="MonochromeLauncherIcon">
    <background android:drawable="@color/ic_launcher_background"/>
    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
--- a/Show More
+++ b/Show More