diff --git a/app/src/main/java/com/example/bondoman/activities/EditTransaction.kt b/app/src/main/java/com/example/bondoman/activities/EditTransaction.kt index 8aa7a6327ceede21d958c6ebcc52a55058bd8b0c..0d9e37502e65702c3cede25a6bf341780169a4a6 100644 --- a/app/src/main/java/com/example/bondoman/activities/EditTransaction.kt +++ b/app/src/main/java/com/example/bondoman/activities/EditTransaction.kt @@ -126,34 +126,4 @@ class EditTransaction() : AppCompatActivity() { } } - override fun onStart() { - super.onStart() - val filter = IntentFilter("com.example.bondoman.TOKEN_EXPIRED") - registerReceiver(tokenExpiredReceiver, filter) - isReceiverRegistered = true - } - - override fun onStop() { - super.onStop() - if (isReceiverRegistered) { - unregisterReceiver(tokenExpiredReceiver) - isReceiverRegistered = false - } - } - - override fun onDestroy() { - super.onDestroy() - if(isReceiverRegistered){ - unregisterReceiver(tokenExpiredReceiver) - stopService(tokenServiceIntent) - isReceiverRegistered = false - } - } - - override fun onBackPressed() { - super.onBackPressed() - finish() - overridePendingTransition(0, R.anim.slide_down) - } - } \ No newline at end of file diff --git a/app/src/main/java/com/example/bondoman/activities/LoginActivity.kt b/app/src/main/java/com/example/bondoman/activities/LoginActivity.kt index e9be341ff81bf42b93b846fd42ccf478e22bfa35..8ed2971de92abec9d984a6786f6fb6fa8089e737 100644 --- a/app/src/main/java/com/example/bondoman/activities/LoginActivity.kt +++ b/app/src/main/java/com/example/bondoman/activities/LoginActivity.kt @@ -17,6 +17,7 @@ import android.widget.Button import android.widget.EditText import android.widget.ImageView import android.widget.Toast +import androidx.cardview.widget.CardView import androidx.lifecycle.lifecycleScope import com.airbnb.lottie.LottieAnimationView import com.example.bondoman.R diff --git a/app/src/main/java/com/example/bondoman/fragments/TransaksiFragment.kt b/app/src/main/java/com/example/bondoman/fragments/TransaksiFragment.kt index 62a747886d6d4e87c94f359673cd1471239c572a..b68f710190fe424095b035a4a1eecf9bfcfd1090 100644 --- a/app/src/main/java/com/example/bondoman/fragments/TransaksiFragment.kt +++ b/app/src/main/java/com/example/bondoman/fragments/TransaksiFragment.kt @@ -64,7 +64,7 @@ class TransaksiFragment : Fragment() { val addButton: FloatingActionButton = view.findViewById(R.id.add_button) addButton.setOnClickListener { startActivityForResult(Intent(requireContext(), AddTransaction::class.java), newTransactionRequestCode) - getActivity()?.overridePendingTransition(R.anim.slide_up, 0); + requireActivity().overridePendingTransition(R.anim.slide_up, 0); } return view @@ -72,7 +72,7 @@ class TransaksiFragment : Fragment() { fun itemEditRequest(intent: Intent) { startActivityForResult(intent, editTransactionRequestCode) - getActivity()?.overridePendingTransition(R.anim.slide_up, 0); + requireActivity().overridePendingTransition(R.anim.slide_up, 0); } override fun onActivityResult(requestCode: Int, resultCode: Int, intentData: Intent?) { diff --git a/app/src/main/res/anim/slide_down.xml b/app/src/main/res/anim/slide_down.xml index 6f1bc1fea757912f2a7c173045ee8430159b36f4..dd5f914d5569462d0cd3e7633f937fb00e294322 100644 --- a/app/src/main/res/anim/slide_down.xml +++ b/app/src/main/res/anim/slide_down.xml @@ -1,7 +1,10 @@ -<?xml version="1.0" encoding="utf-8"?> -<set xmlns:android="http://schemas.android.com/apk/res/android"> +<!-- slide_up.xml --> +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:fillAfter="true" + android:interpolator="@android:anim/accelerate_interpolator"> + <translate - android:fromYDelta="0" - android:toYDelta="100%p" - android:duration="500"/> + android:fromYDelta="100%p" + android:toYDelta="0" + android:duration="500" /> </set> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 5a86c3bc0bac54e9b0d828482f4c3afa908a8630..115690c103b163558e111b8c5ab9e9073f9b0792 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -132,8 +132,4 @@ </androidx.cardview.widget.CardView> </LinearLayout> - - - </androidx.cardview.widget.CardView> - </androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file