Skip to content
Snippets Groups Projects
Commit adfbbced authored by Natthan Krish's avatar Natthan Krish
Browse files

fix: develop conflict

parent f90db787
4 merge requests!27Develop,!21Feat/animation,!20Feat/animation,!19Feat/animation
...@@ -126,34 +126,4 @@ class EditTransaction() : AppCompatActivity() { ...@@ -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
...@@ -17,6 +17,7 @@ import android.widget.Button ...@@ -17,6 +17,7 @@ import android.widget.Button
import android.widget.EditText import android.widget.EditText
import android.widget.ImageView import android.widget.ImageView
import android.widget.Toast import android.widget.Toast
import androidx.cardview.widget.CardView
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.airbnb.lottie.LottieAnimationView import com.airbnb.lottie.LottieAnimationView
import com.example.bondoman.R import com.example.bondoman.R
......
...@@ -64,7 +64,7 @@ class TransaksiFragment : Fragment() { ...@@ -64,7 +64,7 @@ class TransaksiFragment : Fragment() {
val addButton: FloatingActionButton = view.findViewById(R.id.add_button) val addButton: FloatingActionButton = view.findViewById(R.id.add_button)
addButton.setOnClickListener { addButton.setOnClickListener {
startActivityForResult(Intent(requireContext(), AddTransaction::class.java), newTransactionRequestCode) startActivityForResult(Intent(requireContext(), AddTransaction::class.java), newTransactionRequestCode)
getActivity()?.overridePendingTransition(R.anim.slide_up, 0); requireActivity().overridePendingTransition(R.anim.slide_up, 0);
} }
return view return view
...@@ -72,7 +72,7 @@ class TransaksiFragment : Fragment() { ...@@ -72,7 +72,7 @@ class TransaksiFragment : Fragment() {
fun itemEditRequest(intent: Intent) { fun itemEditRequest(intent: Intent) {
startActivityForResult(intent, editTransactionRequestCode) 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?) { override fun onActivityResult(requestCode: Int, resultCode: Int, intentData: Intent?) {
......
<?xml version="1.0" encoding="utf-8"?> <!-- slide_up.xml -->
<set xmlns:android="http://schemas.android.com/apk/res/android"> <set xmlns:android="http://schemas.android.com/apk/res/android"
android:fillAfter="true"
android:interpolator="@android:anim/accelerate_interpolator">
<translate <translate
android:fromYDelta="0" android:fromYDelta="100%p"
android:toYDelta="100%p" android:toYDelta="0"
android:duration="500"/> android:duration="500" />
</set> </set>
\ No newline at end of file
...@@ -132,8 +132,4 @@ ...@@ -132,8 +132,4 @@
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
</LinearLayout> </LinearLayout>
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment