Merge pull request #33 from tal-sitton/remove-toasts-prints

removed prints and now the reset button turns into refresh when pressed
tal-sitton · Sep 15, 2022 · 1ea22ca · 1ea22ca
2 parents 81355f2 + 096b840
commit 1ea22ca
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 24 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/example/firstkotlinapp/MainActivity.kt b/app/src/main/java/com/example/firstkotlinapp/MainActivity.kt
@@ -77,8 +77,7 @@ class MainActivity : MyTemplateActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        Utils.showToast(this, "onCreate")
-        val scrl: ScrollView = findViewById(R.id.scrl)
+        scrl = findViewById(R.id.scrl)
         scrl.smoothScrollTo(0, 0)
 
         JSONUtils.jsonToList(this)
@@ -153,7 +152,7 @@ class MainActivity : MyTemplateActivity() {
         if (backPressedTime + 2000 > System.currentTimeMillis()) {
             this.finishAffinity()
         } else {
-            Toast.makeText(baseContext, "Press the back button again to exit", Toast.LENGTH_SHORT)
+            Toast.makeText(baseContext, "לחץ שנית בכדי לסגור את האפליקציה", Toast.LENGTH_SHORT)
                 .show()
             backPressedTime = System.currentTimeMillis()
         }

diff --git a/app/src/main/java/com/example/firstkotlinapp/MyTemplateActivity.kt b/app/src/main/java/com/example/firstkotlinapp/MyTemplateActivity.kt
@@ -3,6 +3,7 @@ package com.example.firstkotlinapp
 import android.content.Intent
 import android.view.Menu
 import android.view.MenuItem
+import android.widget.ProgressBar
 import androidx.appcompat.app.AppCompatActivity
 
 open class MyTemplateActivity : AppCompatActivity() {
@@ -20,9 +21,11 @@ open class MyTemplateActivity : AppCompatActivity() {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             R.id.action_reset -> {
+                item.actionView = ProgressBar(this)
                 MainActivity.resetToDefault()
                 MainActivity.filter()
                 recreate()
+                item.actionView.postDelayed({ item.actionView = null }, 1)
                 true
             }
             R.id.action_about -> {

diff --git a/app/src/main/java/com/example/firstkotlinapp/Utils.kt b/app/src/main/java/com/example/firstkotlinapp/Utils.kt
@@ -71,9 +71,7 @@ class Utils {
             targetCinemas.forEach { cinema ->
                 url += "${cinema.location.longitude},${cinema.location.latitude};"
             }
-            url = url.dropLast(1)
-            println("URL: $url")
-            return url
+            return url.dropLast(1)
         }
 
     }