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 049a777..22b9987 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("Upozornění") - setMessage("Opravdu se chcete odhlásit? Tato akce vymaže uložené přihlašovací údaje a zavře aplikaci. Budete se poté muset znovu přihlásit.") + setTitle("Opravdu se chcete odhlásit?") + 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 44c89e4..7288820 100644 --- a/mobile/app/src/main/java/com/odweta/solen/MainActivity.kt +++ b/mobile/app/src/main/java/com/odweta/solen/MainActivity.kt @@ -1,6 +1,7 @@ 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 @@ -13,6 +14,7 @@ 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 @@ -72,7 +74,8 @@ class MainActivity : AppCompatActivity() { R.id.item_sign_in -> { window.statusBarColor = ContextCompat.getColor(this, R.color.black) - SignInFragment().show(supportFragmentManager, "fragment_sign_in") + val signInFragment = SignInFragment() + signInFragment.show(supportFragmentManager, "fragment_sign_in") return true } @@ -169,6 +172,7 @@ class MainActivity : AppCompatActivity() { week = Parsing.parseTimeTableJSON(Network.getTimeTableJSON()) launchPhase2(week) } else { + // TODO: IMPLEMENT OFFLINE STUFF // show some sort of warning message and/or load offline files //week = } diff --git a/mobile/app/src/main/java/com/odweta/solen/SignInFragment.kt b/mobile/app/src/main/java/com/odweta/solen/SignInFragment.kt index 792464b..720ea50 100644 --- a/mobile/app/src/main/java/com/odweta/solen/SignInFragment.kt +++ b/mobile/app/src/main/java/com/odweta/solen/SignInFragment.kt @@ -1,12 +1,14 @@ package com.odweta.solen import android.app.Dialog +import android.content.DialogInterface import android.os.Bundle import androidx.fragment.app.DialogFragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.view.Window +import androidx.core.content.ContextCompat class SignInFragment : DialogFragment() { override fun onCreate(savedInstanceState: Bundle?) { @@ -21,6 +23,16 @@ class SignInFragment : DialogFragment() { return inflater.inflate(R.layout.activity_sign_in, 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)