sduduzog 7 жил өмнө
parent
commit
809340924b

+ 1 - 1
app/src/main/java/com/sduduzog/slimlauncher/MainActivity.kt

@@ -51,10 +51,10 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
     }
 
     override fun onBackPressed() {
+        onBackPressedListener?.onBackPressed()
         if (currentLabel != label)
             super.onBackPressed()
         else onBackPressedListener?.onBackPress()
-        onBackPressedListener?.onBackPressed()
     }
 
     override fun onNavigated(controller: NavController, destination: NavDestination) {

+ 6 - 2
app/src/main/java/com/sduduzog/slimlauncher/ui/main/MainFragment.kt

@@ -186,8 +186,12 @@ class MainFragment : Fragment(), MainActivity.OnBackPressedListener {
     }
 
     private fun doBounceAnimation(targetView: View) {
-        targetView.animate().translationYBy(-20f).withEndAction {
-            targetView.animate().translationYBy(20f).duration = 300
+        targetView.animate()
+                .setStartDelay(500)
+                .translationYBy(-20f).withEndAction {
+            targetView.animate()
+                    .setStartDelay(0)
+                    .translationYBy(20f).duration = 100
         }.duration = 100
     }
 

+ 2 - 0
app/src/main/java/com/sduduzog/slimlauncher/ui/main/notes/NoteFragment.kt

@@ -3,6 +3,7 @@ package com.sduduzog.slimlauncher.ui.main.notes
 
 import android.content.Context
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -83,6 +84,7 @@ class NoteFragment : Fragment(), MainActivity.OnBackPressedListener {
     }
 
     override fun onBackPressed() {
+        Log.d("NoteFragment", "on back pressed")
         saveNote()
     }
 

+ 1 - 1
app/src/main/java/com/sduduzog/slimlauncher/ui/main/notes/NotesListFragment.kt

@@ -63,7 +63,7 @@ class NotesListFragment : Fragment() {
     private fun showFabAnimation(targetView: View) {
         targetView.scaleX = 0f
         targetView.scaleY = 0f
-        targetView.animate().scaleY(1f).scaleX(1f).duration = 1000
+        targetView.animate().scaleY(1f).scaleX(1f).duration = 100
         // Animate fab
     }
 }