From adfbbced988548fa5c7f58f16521f380fe0ffde0 Mon Sep 17 00:00:00 2001
From: Natthan Krish <natthankrish@Neos-MacBook-Pro.local>
Date: Mon, 1 Apr 2024 22:40:01 +0700
Subject: [PATCH] fix: develop conflict
---
.../bondoman/activities/EditTransaction.kt | 30 -------------------
.../bondoman/activities/LoginActivity.kt | 1 +
.../bondoman/fragments/TransaksiFragment.kt | 4 +--
app/src/main/res/anim/slide_down.xml | 13 ++++----
app/src/main/res/layout/activity_login.xml | 4 ---
5 files changed, 11 insertions(+), 41 deletions(-)
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 8aa7a63..0d9e375 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 e9be341..8ed2971 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 62a7478..b68f710 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 6f1bc1f..dd5f914 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 5a86c3b..115690c 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
--
GitLab