Merge pull request #39 from tal-sitton/upgrade-sdk

upgraded sdk, and changed the onBack because deprecation
tal-sitton · Sep 18, 2022 · 171b4e8 · 171b4e8
2 parents 2c65a92 + eea4518
commit 171b4e8
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 22 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,14 +4,14 @@ plugins {
 }
 
 android {
-    compileSdk 32
+    compileSdk 33
 
     defaultConfig {
         applicationId "com.example.movietime"
         minSdk 26
-        targetSdk 32
-        versionCode 1
-        versionName "1.0"
+        targetSdk 33
+        versionCode 2
+        versionName "0.7"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -44,6 +44,7 @@ dependencies {
     implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
     implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
     implementation 'com.google.android.gms:play-services-location:18.0.0'
+    implementation 'androidx.appcompat:appcompat:1.6.0-rc01'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

diff --git a/app/src/main/java/com/example/movietime/AboutActivity.kt b/app/src/main/java/com/example/movietime/AboutActivity.kt
@@ -14,7 +14,7 @@ class AboutActivity : MyTemplateActivity() {
 
         val mainActivityButton: Button = findViewById(R.id.backButton)
         mainActivityButton.setOnClickListener {
-            onBackPressed()
+            onBackPressedCallback.handleOnBackPressed()
         }
 
         val supportButton: ImageView = findViewById(R.id.supportButton)
@@ -27,7 +27,7 @@ class AboutActivity : MyTemplateActivity() {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == R.id.action_about) {
-            onBackPressed()
+            onBackPressedCallback.handleOnBackPressed()
             return true
         }
         return super.onOptionsItemSelected(item)

diff --git a/app/src/main/java/com/example/movietime/CinemaActivity.kt b/app/src/main/java/com/example/movietime/CinemaActivity.kt
@@ -97,7 +97,7 @@ class CinemaActivity : MyTemplateActivity() {
         val mainButton: TextView = findViewById(R.id.cinemaButton)
         mainButton.setBackgroundResource(R.drawable.top_buttons_clicked)
         mainButton.setOnClickListener {
-            onBackPressed()
+            onBackPressedCallback.handleOnBackPressed()
         }
         mainButton.text = "אישור"
         val dateButton: TextView = findViewById(R.id.dateButton)

diff --git a/app/src/main/java/com/example/movietime/DateActivity.kt b/app/src/main/java/com/example/movietime/DateActivity.kt
@@ -187,7 +187,7 @@ class DateActivity : MyTemplateActivity() {
         mainButton.setBackgroundResource(R.drawable.top_buttons_clicked)
         mainButton.text = "אישור"
         mainButton.setOnClickListener {
-            onBackPressed()
+            onBackPressedCallback.handleOnBackPressed()
         }
         val cinemaButton: TextView = findViewById(R.id.cinemaButton)
         val movieButton: TextView = findViewById(R.id.movieButton)

diff --git a/app/src/main/java/com/example/movietime/MainActivity.kt b/app/src/main/java/com/example/movietime/MainActivity.kt
@@ -8,6 +8,8 @@ import android.os.Bundle
 import android.view.Gravity
 import android.view.View
 import android.widget.*
+import androidx.activity.OnBackPressedCallback
+import java.time.LocalDateTime
 
 
 class MainActivity : MyTemplateActivity() {
@@ -71,7 +73,18 @@ class MainActivity : MyTemplateActivity() {
                 DateActivity.checkScreening(screening)
             }.toSet()
 
+            if (filteredDateScreenings.isEmpty()) {
+                DateActivity.selectedDays.clear()
+                DateActivity.selectedDays.add(LocalDateTime.now().plusDays(1).dayOfMonth)
+                DateActivity.restarted = false
+                DateActivity.selectedDatStr = "מחר"
+                filteredDateScreenings = allScreenings.filter { screening ->
+                    DateActivity.checkScreening(screening)
+                }.toSet()
+            }
+
             filteredScreenings = filteredDateScreenings.toList()
+            prevFilteredScreenings = filteredScreenings
         }
     }
 
@@ -123,9 +136,10 @@ class MainActivity : MyTemplateActivity() {
         grid.removeAllViewsInLayout()
         var i = 1
         val notFound: TextView = findViewById(R.id.noMovieFound)
-        if (filteredScreenings.isEmpty())
+        if (filteredScreenings.isEmpty()) {
             notFound.visibility = TextView.VISIBLE
-        else
+            return
+        } else
             notFound.visibility = TextView.INVISIBLE
 
         var prevDay = filteredScreenings.elementAt(0).dateTime.dayOfMonth
@@ -176,13 +190,16 @@ class MainActivity : MyTemplateActivity() {
     }
 
     private var backPressedTime: Long = 0
-    override fun onBackPressed() {
-        if (backPressedTime + 2000 > System.currentTimeMillis()) {
-            this.finishAffinity()
-        } else {
-            Toast.makeText(baseContext, "לחץ שנית בכדי לסגור את האפליקציה", Toast.LENGTH_SHORT)
-                .show()
-            backPressedTime = System.currentTimeMillis()
+
+    override val onBackPressedCallback = object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+            if (backPressedTime + 2000 > System.currentTimeMillis()) {
+                finishAffinity()
+            } else {
+                Toast.makeText(baseContext, "לחץ שנית בכדי לסגור את האפליקציה", Toast.LENGTH_SHORT)
+                    .show()
+                backPressedTime = System.currentTimeMillis()
+            }
         }
     }
 

diff --git a/app/src/main/java/com/example/movietime/MovieActivity.kt b/app/src/main/java/com/example/movietime/MovieActivity.kt
@@ -56,7 +56,7 @@ class MovieActivity : MyTemplateActivity() {
         val movieButton: TextView = findViewById(R.id.movieButton)
         movieButton.setBackgroundResource(R.drawable.top_buttons_clicked)
         movieButton.setOnClickListener {
-            onBackPressed()
+            onBackPressedCallback.handleOnBackPressed()
         }
         movieButton.text = "אישור"
 

diff --git a/app/src/main/java/com/example/movietime/MyTemplateActivity.kt b/app/src/main/java/com/example/movietime/MyTemplateActivity.kt
@@ -1,16 +1,25 @@
 package com.example.movietime
 
 import android.content.Intent
+import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.widget.ProgressBar
+import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 
 open class MyTemplateActivity : AppCompatActivity() {
 
-    override fun onBackPressed() {
-        finish()
-        overridePendingTransition(0, 0)
+    open val onBackPressedCallback = object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+            finish()
+            overridePendingTransition(0, 0)
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        onBackPressedDispatcher.addCallback(this, onBackPressedCallback)
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
@@ -25,7 +34,7 @@ open class MyTemplateActivity : AppCompatActivity() {
                 MainActivity.resetToDefault()
                 MainActivity.filter()
                 recreate()
-                item.actionView.postDelayed({ item.actionView = null }, 1)
+                (item.actionView as ProgressBar).postDelayed({ item.actionView = null }, 1)
                 true
             }
             R.id.action_about -> {