a couple of improvements
This commit is contained in:
@@ -9,8 +9,8 @@ class Dialogs {
|
|||||||
class SignOut(context: Context) : AlertDialog(context) {
|
class SignOut(context: Context) : AlertDialog(context) {
|
||||||
init {
|
init {
|
||||||
// Initialize your dialog properties
|
// Initialize your dialog properties
|
||||||
setTitle("Upozornění")
|
setTitle("Opravdu se chcete odhlásit?")
|
||||||
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.")
|
setMessage("Uložené přihlašovací údaje budou vymazány.")
|
||||||
setCancelable(true) // Set whether the dialog can be canceled by tapping outside
|
setCancelable(true) // Set whether the dialog can be canceled by tapping outside
|
||||||
|
|
||||||
// Set positive button (e.g., "OK" button)
|
// Set positive button (e.g., "OK" button)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.odweta.solen
|
package com.odweta.solen
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
|
import android.content.DialogInterface
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.graphics.ImageDecoder
|
import android.graphics.ImageDecoder
|
||||||
import android.graphics.drawable.AnimatedImageDrawable
|
import android.graphics.drawable.AnimatedImageDrawable
|
||||||
@@ -13,6 +14,7 @@ import android.widget.Button
|
|||||||
import android.widget.EditText
|
import android.widget.EditText
|
||||||
import android.widget.ImageView
|
import android.widget.ImageView
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
|
import androidx.activity.OnBackPressedCallback
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.core.content.ContextCompat
|
import androidx.core.content.ContextCompat
|
||||||
import androidx.fragment.app.DialogFragment
|
import androidx.fragment.app.DialogFragment
|
||||||
@@ -72,7 +74,8 @@ class MainActivity : AppCompatActivity() {
|
|||||||
|
|
||||||
R.id.item_sign_in -> {
|
R.id.item_sign_in -> {
|
||||||
window.statusBarColor = ContextCompat.getColor(this, R.color.black)
|
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
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -169,6 +172,7 @@ class MainActivity : AppCompatActivity() {
|
|||||||
week = Parsing.parseTimeTableJSON(Network.getTimeTableJSON())
|
week = Parsing.parseTimeTableJSON(Network.getTimeTableJSON())
|
||||||
launchPhase2(week)
|
launchPhase2(week)
|
||||||
} else {
|
} else {
|
||||||
|
// TODO: IMPLEMENT OFFLINE STUFF
|
||||||
// show some sort of warning message and/or load offline files
|
// show some sort of warning message and/or load offline files
|
||||||
//week =
|
//week =
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,14 @@
|
|||||||
package com.odweta.solen
|
package com.odweta.solen
|
||||||
|
|
||||||
import android.app.Dialog
|
import android.app.Dialog
|
||||||
|
import android.content.DialogInterface
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import androidx.fragment.app.DialogFragment
|
import androidx.fragment.app.DialogFragment
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import android.view.Window
|
import android.view.Window
|
||||||
|
import androidx.core.content.ContextCompat
|
||||||
|
|
||||||
class SignInFragment : DialogFragment() {
|
class SignInFragment : DialogFragment() {
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
@@ -21,6 +23,16 @@ class SignInFragment : DialogFragment() {
|
|||||||
return inflater.inflate(R.layout.activity_sign_in, container, false)
|
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 {
|
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
|
||||||
val dialog = super.onCreateDialog(savedInstanceState)
|
val dialog = super.onCreateDialog(savedInstanceState)
|
||||||
dialog.window?.requestFeature(Window.FEATURE_NO_TITLE)
|
dialog.window?.requestFeature(Window.FEATURE_NO_TITLE)
|
||||||
|
|||||||
Reference in New Issue
Block a user