From 3546a4c66d1e6b8c6859bc0e3d2c909770c16091 Mon Sep 17 00:00:00 2001 From: Odweta Date: Fri, 2 Feb 2024 20:01:21 +0100 Subject: [PATCH] about app dialog --- .../java/com/odweta/solen/AboutFragment.kt | 43 +++++++++++++++++++ .../src/main/java/com/odweta/solen/Dialogs.kt | 4 +- .../java/com/odweta/solen/MainActivity.kt | 33 +++++++------- .../src/main/res/layout/activity_about.xml | 25 +++++++++++ mobile/app/src/main/res/menu/menu_main.xml | 6 ++- mobile/app/src/main/res/values/strings.xml | 1 + 6 files changed, 94 insertions(+), 18 deletions(-) create mode 100644 mobile/app/src/main/java/com/odweta/solen/AboutFragment.kt create mode 100644 mobile/app/src/main/res/layout/activity_about.xml diff --git a/mobile/app/src/main/java/com/odweta/solen/AboutFragment.kt b/mobile/app/src/main/java/com/odweta/solen/AboutFragment.kt new file mode 100644 index 0000000..e8bb7d3 --- /dev/null +++ b/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 + } +} \ No newline at end of file diff --git a/mobile/app/src/main/java/com/odweta/solen/Dialogs.kt b/mobile/app/src/main/java/com/odweta/solen/Dialogs.kt index 22b9987..190282b 100644 --- a/mobile/app/src/main/java/com/odweta/solen/Dialogs.kt +++ b/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) diff --git a/mobile/app/src/main/java/com/odweta/solen/MainActivity.kt b/mobile/app/src/main/java/com/odweta/solen/MainActivity.kt index 7288820..732c55d 100644 --- a/mobile/app/src/main/java/com/odweta/solen/MainActivity.kt +++ b/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 - if (showSplash) { - showSplashScreen() - } - lifecycleScope.launch { Network.setupAPI() diff --git a/mobile/app/src/main/res/layout/activity_about.xml b/mobile/app/src/main/res/layout/activity_about.xml new file mode 100644 index 0000000..8fcd843 --- /dev/null +++ b/mobile/app/src/main/res/layout/activity_about.xml @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/mobile/app/src/main/res/menu/menu_main.xml b/mobile/app/src/main/res/menu/menu_main.xml index 01496f7..7747194 100644 --- a/mobile/app/src/main/res/menu/menu_main.xml +++ b/mobile/app/src/main/res/menu/menu_main.xml @@ -3,13 +3,17 @@ + + \ No newline at end of file diff --git a/mobile/app/src/main/res/values/strings.xml b/mobile/app/src/main/res/values/strings.xml index c936205..4171e6c 100644 --- a/mobile/app/src/main/res/values/strings.xml +++ b/mobile/app/src/main/res/values/strings.xml @@ -15,4 +15,5 @@ Změnit jazyk Vybrat splash screen + O aplikaci \ No newline at end of file