offline stuff work, new menu design, update about

2024-02-03 18:43:03 +01:00
parent bd00d83a6f
commit b02ec8d239
119 changed files with 964 additions and 184 deletions
@@ -5,21 +5,122 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent">

-    <TextView
-        android:id="@+id/about_app_textView"
+    <ImageView
+        android:id="@+id/imageView2"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_marginStart="168dp"
-        android:layout_marginTop="349dp"
-        android:layout_marginEnd="183dp"
-        android:layout_marginBottom="363dp"
-        android:text="O aplikaci"
+        android:layout_marginBottom="16dp"
+        app:layout_constraintBottom_toTopOf="@+id/link"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0"
+        app:srcCompat="@drawable/solen" />
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fontFamily="@font/roboto_src"
+        android:theme="@style/Theme.Solen.AppBarOverlay">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/settingsToolbar"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="?attr/colorPrimary"
+            android:theme="@style/Theme.Solen.AppBarOverlay"
+            app:popupTheme="@style/Theme.Solen.PopupOverlay"
+            app:title="@string/about_app">
+
+        </androidx.appcompat.widget.Toolbar>
+
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="299dp"
+        android:layout_height="100dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginBottom="300dp"
+        android:text="Vylepšená verze školního informačního systému ŠkolaOnLine."
+        android:textAlignment="center"
        android:textColor="#FFFFFF"
-        android:textColorHighlight="#FFFFFF"
-        android:textColorHint="#FFFFFF"
-        android:textColorLink="#FFFFFF"
+        android:textSize="24sp"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.416"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/imageView2"
+        app:layout_constraintVertical_bias="0.804" />
+
+    <TextView
+        android:id="@+id/link"
+        style="@style/LinkText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="1dp"
+        android:layout_marginTop="70dp"
+        android:layout_marginEnd="139dp"
+        android:layout_marginBottom="188dp"
+        android:text=" Odweta"
+        android:textColor="#FFFFFF"
+        android:textFontWeight="400"
+        android:textSize="20sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/textView3"
+        app:layout_constraintTop_toBottomOf="@+id/textView"
+        app:layout_constraintVertical_bias="1.0" />
+
+    <TextView
+        android:id="@+id/textView3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="144dp"
+        android:layout_marginTop="70dp"
+        android:layout_marginEnd="1dp"
+        android:layout_marginBottom="188dp"
+        android:text="Vývoj:"
+        android:textColor="#FFFFFF"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/link"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView"
+        app:layout_constraintVertical_bias="1.0" />
+
+    <ImageView
+        android:id="@+id/imageView7"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="61dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.303"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/link"
+        app:layout_constraintVertical_bias="1.0"
+        app:srcCompat="@mipmap/gitlab_logo_foreground" />
+
+    <TextView
+        android:id="@+id/sourceCode"
+        style="@style/LinkText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="59dp"
+        android:layout_marginEnd="96dp"
+        android:layout_marginBottom="102dp"
+        android:text="Zdrojový kód"
+        android:textColor="#FFFFFF"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@+id/imageView7"
+        app:layout_constraintTop_toBottomOf="@+id/link"
+        app:layout_constraintVertical_bias="1.0" />
 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -8,31 +8,46 @@
    tools:context=".MainActivity">

    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout2"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_marginBottom="675dp"
        android:fontFamily="@font/roboto_src"
-        android:theme="@style/Theme.Solen.AppBarOverlay">
+        android:theme="@style/Theme.Solen.AppBarOverlay"
+        app:popupTheme="@style/Theme.Solen.PopupOverlay">

        <androidx.appcompat.widget.Toolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/Theme.Solen.PopupOverlay"
-            android:theme="@style/Theme.Solen.AppBarOverlay">
-
-
-        </androidx.appcompat.widget.Toolbar>
+            app:subtitle=""
+            app:title="" />

        <androidx.viewpager2.widget.ViewPager2
            android:id="@+id/dayPager"
            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent">
+
+        </androidx.viewpager2.widget.ViewPager2>

        <FrameLayout
            android:id="@+id/fragmentContainer"
            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent">
+
+        </FrameLayout>
+
    </com.google.android.material.appbar.AppBarLayout>
+
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/bottomNav"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:scrollIndicators="left"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout2"
+        app:layout_constraintVertical_bias="1.0"
+        app:menu="@menu/menu_navbar"
+        tools:layout_editor_absoluteX="0dp" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -0,0 +1,26 @@
+<?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">
+
+    <TextView
+        android:id="@+id/textView2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="146dp"
+        android:layout_marginTop="262dp"
+        android:layout_marginEnd="182dp"
+        android:layout_marginBottom="442dp"
+        android:text="ZNAMKY"
+        android:textColor="#FFFFFF"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0" />
+</androidx.constraintlayout.widget.ConstraintLayout>
@@ -0,0 +1,60 @@
+<?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">
+
+    <Button
+        android:id="@+id/menu_button_settings"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="200dp"
+        android:layout_marginBottom="50dp"
+        android:text="@string/settings"
+        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" />
+
+    <Button
+        android:id="@+id/menu_button_sign_out"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="50dp"
+        android:text="@string/sign_out"
+        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" />
+
+    <Button
+        android:id="@+id/menu_button_sign_in"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="50dp"
+        android:text="@string/sign_in"
+        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" />
+
+    <Button
+        android:id="@+id/menu_button_about"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="158dp"
+        android:layout_marginEnd="159dp"
+        android:layout_marginBottom="200dp"
+        android:text="@string/about_app"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/menu_button_sign_in" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
@@ -19,19 +19,12 @@
            android:layout_height="match_parent"
            android:background="?attr/colorPrimary"
            android:theme="@style/Theme.Solen.AppBarOverlay"
-            app:popupTheme="@style/Theme.Solen.PopupOverlay">
-
-            <!-- Add an ImageView for the image in the Toolbar -->
-            <ImageView
-                android:id="@+id/settingsBackButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
-                android:contentDescription="@string/back_button"
-                app:srcCompat="@drawable/ic_back_arrow" />  <!-- Adjust margin as needed -->
+            app:popupTheme="@style/Theme.Solen.PopupOverlay"
+            app:title="@string/settings">

        </androidx.appcompat.widget.Toolbar>

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

    <ScrollView
@@ -35,15 +35,14 @@

    <ImageView
        android:id="@+id/loading_gif"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="205dp"
-        android:layout_marginEnd="206dp"
-        android:contentDescription="@string/splash_screen"
+        android:layout_width="200dp"
+        android:layout_height="200dp"
+        android:src="@drawable/loading"
        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/imageView3"
-        app:layout_constraintVertical_bias="0.36" />
+        app:layout_constraintVertical_bias="0.0" />

 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/item_settings"
-        android:title="@string/settings" />
-    <!-- not really needed in the release version, basically just for development purposes
-    <item
-        android:id="@+id/item_refresh"
-        android:title="@string/refresh" />-->
-    <item
-        android:id="@+id/item_sign_out"
-        android:title="@string/sign_out" />
-    <item
-        android:id="@+id/item_sign_in"
-        android:title="@string/sign_in" />
-    <item
-        android:id="@+id/item_about"
-        android:title="@string/about_app" />
-</menu>
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/nav_timetable"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:icon="@android:drawable/ic_dialog_dialer"
+        android:title="Rozvrh" />
+    <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" />
+    <item
+        android:id="@+id/nav_menu"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:icon="@drawable/menu_240"
+        android:title="Menu" />
+</menu>
+
+<!--
+
+options menu for future reference
+
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/item_settings"
+        android:title="@string/settings" />
+    <item
+        android:id="@+id/item_sign_out"
+        android:title="@string/sign_out" />
+    <item
+        android:id="@+id/item_sign_in"
+        android:title="@string/sign_in" />
+    <item
+        android:id="@+id/item_about"
+        android:title="@string/about_app" />
+</menu>
+
+
+item click callbacks
+
+// Override onOptionsItemSelected to handle menu item clicks
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            // TODO: IMPLEMENT MARKS/GRADES
+            // TODO: NOTE -> IN A NAVBAR
+            /*R.id.item_marks -> {
+                showMarksScreen()
+
+                return true
+            }*/
+
+            R.id.item_sign_in -> {
+                SignInFragment().show(supportFragmentManager, "fragment_sign_in")
+                return true
+            }
+
+            R.id.item_settings -> {
+                showSettingsScreen()
+                return true
+            }
+
+            R.id.item_sign_out -> {
+                Dialogs.SignOut(this).show()
+                return true
+            }
+
+            R.id.item_about -> {
+                AboutFragment().show(supportFragmentManager, "fragment_about")
+                return true
+            }
+        }
+
+        return super.onOptionsItemSelected(item)
+    }
+
+-->
@@ -0,0 +1,5 @@
+<?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>
@@ -0,0 +1,5 @@
+<?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>
@@ -0,0 +1,5 @@
+<?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>
@@ -0,0 +1,5 @@
+<?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>
@@ -0,0 +1,5 @@
+<?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>
@@ -0,0 +1,5 @@
+<?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>
@@ -0,0 +1,5 @@
+<?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>
@@ -0,0 +1,5 @@
+<?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>
--- a/Show More
+++ b/Show More