about app dialog

mobile/app/src/main/java/com/odweta/solen/AboutFragment.kt

@@ -0,0 +1,43 @@
+package com.odweta.solen
+
+import android.app.Dialog
+import android.content.DialogInterface
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.Window
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.DialogFragment
+
+class AboutFragment : DialogFragment() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NORMAL, android.R.style.Theme_Black_NoTitleBar)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.activity_about, container, false)
+    }
+
+    override fun onCancel(dialog: DialogInterface) {
+        super.onCancel(dialog)
+
+        // Change statusBarColor when the back button is pressed (dialog dismissed)
+        requireActivity().window.statusBarColor = ContextCompat.getColor(
+            requireContext(),
+            R.color.primary
+        )
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = super.onCreateDialog(savedInstanceState)
+        dialog.window?.requestFeature(Window.FEATURE_NO_TITLE)
+        dialog.setCancelable(true)
+
+        return dialog
+    }
+}

mobile/app/src/main/java/com/odweta/solen/Dialogs.kt

@@ -9,8 +9,8 @@ class Dialogs {
     class SignOut(context: Context) : AlertDialog(context) {
         init {
             // Initialize your dialog properties
-            setTitle("Opravdu se chcete odhlásit?")
-            setMessage("Uložené přihlašovací údaje budou vymazány.")
+            setTitle("Opravdu se chcete odhlásit a ukončit aplikaci?")
+            //setMessage("Uložené přihlašovací údaje budou vymazány.")
             setCancelable(true) // Set whether the dialog can be canceled by tapping outside
 
             // Set positive button (e.g., "OK" button)

mobile/app/src/main/java/com/odweta/solen/MainActivity.kt

@@ -1,23 +1,18 @@
 package com.odweta.solen
 
 import android.content.Context
-import android.content.DialogInterface
 import android.content.Intent
 import android.graphics.ImageDecoder
 import android.graphics.drawable.AnimatedImageDrawable
-import android.media.Image
 import android.os.Bundle
-import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.widget.Button
 import android.widget.EditText
 import android.widget.ImageView
 import android.widget.Toast
-import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
-import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.launch
 
@@ -65,17 +60,23 @@ class MainActivity : AppCompatActivity() {
     // Override onOptionsItemSelected to handle menu item clicks
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.item_refresh -> {
+            /*R.id.item_refresh -> {
                 lifecycleScope.launch {
                     launch()
                 }
                 return true
-            }
+            }*/
+
+            // TODO: IMPLEMENT MARKS/GRADES
+            /*R.id.item_marks -> {
+                showMarksScreen()
+
+                return true
+            }*/
 
             R.id.item_sign_in -> {
                 window.statusBarColor = ContextCompat.getColor(this, R.color.black)
-                val signInFragment = SignInFragment()
-                signInFragment.show(supportFragmentManager, "fragment_sign_in")
+                SignInFragment().show(supportFragmentManager, "fragment_sign_in")
                 return true
             }
 
@@ -88,6 +89,12 @@ class MainActivity : AppCompatActivity() {
                 Dialogs.SignOut(this).show()
                 return true
             }
+
+            R.id.item_about -> {
+                window.statusBarColor = ContextCompat.getColor(this, R.color.black)
+                AboutFragment().show(supportFragmentManager, "fragment_about")
+                return true
+            }
         }
 
         return super.onOptionsItemSelected(item)
@@ -153,18 +160,14 @@ class MainActivity : AppCompatActivity() {
                 showSignInScreen()
             } else {
                 // launch!
-                launchPhase1(false)
+                launchPhase1()
             }
         }
     }
 
-    private fun launchPhase1(showSplash: Boolean) {
+    private fun launchPhase1() {
         var week: List<Day>
 
-        if (showSplash) {
-            showSplashScreen()
-        }
-
         lifecycleScope.launch {
             Network.setupAPI()
 

mobile/app/src/main/res/layout/activity_about.xml

@@ -0,0 +1,25 @@
+<?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">
+
+    <TextView
+        android:id="@+id/about_app_textView"
+        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:textColor="#FFFFFF"
+        android:textColorHighlight="#FFFFFF"
+        android:textColorHint="#FFFFFF"
+        android:textColorLink="#FFFFFF"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>

mobile/app/src/main/res/menu/menu_main.xml

@@ -3,13 +3,17 @@
     <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" />
+        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>

mobile/app/src/main/res/values/strings.xml

@@ -15,4 +15,5 @@
     <string name="lang_change">Změnit jazyk</string>
     <string name="lang_choose">Vybrat</string>
     <string name="splash_screen">splash screen</string>
+    <string name="about_app">O aplikaci</string>
 </resources>