diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0105dde7a17b5881fa13bfc0fb72289e6bdaba37..bfce828dde64304855a8f45c60ee8ad4be8fce21 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,20 +12,24 @@
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
- android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.BondoMan"
tools:targetApi="31">
<activity
android:name=".activities.LoginActivity"
- android:exported="true"> <!-- Make sure to set exported="true" -->
+ android:exported="true"
+ android:windowSoftInputMode="adjustResize"> <!-- Make sure to set exported="true" -->
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name=".activities.AddTransaction" />
- <activity android:name=".activities.EditTransaction" />
+ <activity
+ android:name=".activities.AddTransaction"
+ android:theme="@style/Theme.BondoMan.ActionBar"/>
+ <activity
+ android:name=".activities.EditTransaction"
+ android:theme="@style/Theme.BondoMan.ActionBar"/>
<activity
android:name=".activities.MainActivity"
android:exported="true"
diff --git a/app/src/main/java/com/example/bondoman/activities/AddTransaction.kt b/app/src/main/java/com/example/bondoman/activities/AddTransaction.kt
index d5748fa8c9f4df0c45032732e11dd775bb02c8f7..64d11bd16dfd86e5b8e6763f5c8163da21134719 100644
--- a/app/src/main/java/com/example/bondoman/activities/AddTransaction.kt
+++ b/app/src/main/java/com/example/bondoman/activities/AddTransaction.kt
@@ -86,6 +86,11 @@ class AddTransaction : AppCompatActivity() {
}
+ override fun onBackPressed() {
+ super.onBackPressed()
+ finish()
+ }
+
companion object {
const val TITLE = "TITLE"
const val TYPE = "TYPE"
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 e34ca17fb406259e11cdd7575d120e578b108835..3218e5da3cd1442968e31001f77895541a1bd4f7 100644
--- a/app/src/main/java/com/example/bondoman/activities/EditTransaction.kt
+++ b/app/src/main/java/com/example/bondoman/activities/EditTransaction.kt
@@ -95,6 +95,11 @@ class EditTransaction() : AppCompatActivity() {
}
+ override fun onBackPressed() {
+ super.onBackPressed()
+ finish()
+ }
+
override fun onStart() {
super.onStart()
val filter = IntentFilter("com.example.bondoman.TOKEN_EXPIRED")
@@ -118,4 +123,5 @@ class EditTransaction() : AppCompatActivity() {
isReceiverRegistered = false
}
}
+
}
\ 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 bd52792a1e592a8a93c8bbe898bd2eb1d022685d..8ed2971de92abec9d984a6786f6fb6fa8089e737 100644
--- a/app/src/main/java/com/example/bondoman/activities/LoginActivity.kt
+++ b/app/src/main/java/com/example/bondoman/activities/LoginActivity.kt
@@ -1,16 +1,23 @@
package com.example.bondoman.activities
+import android.animation.ObjectAnimator
import android.app.Dialog
import android.content.Intent
import android.graphics.Color
import android.graphics.drawable.ColorDrawable
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
+import android.os.Handler
+import android.util.DisplayMetrics
+import android.view.animation.Animation
+import android.view.animation.AnimationUtils
+import android.view.animation.TranslateAnimation
import android.util.Log
import android.widget.Button
import android.widget.EditText
+import android.widget.ImageView
import android.widget.Toast
-import androidx.core.view.isVisible
+import androidx.cardview.widget.CardView
import androidx.lifecycle.lifecycleScope
import com.airbnb.lottie.LottieAnimationView
import com.example.bondoman.R
@@ -19,6 +26,7 @@ import com.example.bondoman.lib.SecurePreferences
import com.example.bondoman.repositories.AuthRepository
import com.example.bondoman.retrofits.Retro
import kotlinx.coroutines.launch
+import kotlin.math.log
class LoginActivity : AppCompatActivity() {
private lateinit var email : EditText
@@ -31,6 +39,40 @@ class LoginActivity : AppCompatActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_login)
+ Handler().postDelayed({
+ // Transition to the login screen after SPLASH_DURATION
+ val cardLogin = findViewById<CardView>(R.id.login_card)
+ val logo = findViewById<ImageView>(R.id.imageView)
+
+ val slideUpAnimation = AnimationUtils.loadAnimation(this@LoginActivity, R.anim.slide_up)
+ val finalY = cardLogin.y + (cardLogin.height - logo.height) / 2
+
+ val animatorY = ObjectAnimator.ofFloat(logo, "translationY", 0f + logo.height, finalY)
+ animatorY.duration = 600
+
+ animatorY.start()
+ cardLogin.startAnimation(slideUpAnimation)
+ cardLogin.visibility = CardView.VISIBLE
+ }, 1000)
+
+
+ Handler().postDelayed({
+ // Transition to the login screen after SPLASH_DURATION
+ val cardLogin = findViewById<CardView>(R.id.login_card)
+ val logo = findViewById<ImageView>(R.id.imageView)
+
+ val slideUpAnimation = AnimationUtils.loadAnimation(this@LoginActivity, R.anim.slide_up)
+ val finalY = cardLogin.y + (cardLogin.height - logo.height) / 2
+
+ val animatorY = ObjectAnimator.ofFloat(logo, "translationY", 0f + logo.height, finalY)
+ animatorY.duration = 600
+
+ animatorY.start()
+ cardLogin.startAnimation(slideUpAnimation)
+ cardLogin.visibility = CardView.VISIBLE
+ }, 1000)
+
+
val securePreferences = SecurePreferences(this)
loginRepository = AuthRepository(securePreferences)
if(securePreferences.getToken() != null){
diff --git a/app/src/main/java/com/example/bondoman/fragments/TwibbonFragment.kt b/app/src/main/java/com/example/bondoman/fragments/TwibbonFragment.kt
index 186730e5ed5fbb0bf0d5d7213371f969ebaa5fb7..d3bea777cb6c5294354d6a937dd1182cd63d2660 100644
--- a/app/src/main/java/com/example/bondoman/fragments/TwibbonFragment.kt
+++ b/app/src/main/java/com/example/bondoman/fragments/TwibbonFragment.kt
@@ -186,7 +186,7 @@ class TwibbonFragment : Fragment() {
val bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.size)
// Rotate the bitmap if necessary
- return rotateBitmap(bitmap, 90f, true)
+ return rotateBitmap(bitmap, 0f, true)
}
diff --git a/app/src/main/res/anim/slide_down.xml b/app/src/main/res/anim/slide_down.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dd5f914d5569462d0cd3e7633f937fb00e294322
--- /dev/null
+++ b/app/src/main/res/anim/slide_down.xml
@@ -0,0 +1,10 @@
+<!-- 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="100%p"
+ android:toYDelta="0"
+ android:duration="500" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_morph.xml b/app/src/main/res/anim/slide_morph.xml
new file mode 100644
index 0000000000000000000000000000000000000000..96353fd82b58e719905de0262feb6666889a831c
--- /dev/null
+++ b/app/src/main/res/anim/slide_morph.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+ <translate
+ android:fromYDelta="50%p"
+ android:toYDelta="0"
+ android:duration="500" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_up.xml b/app/src/main/res/anim/slide_up.xml
new file mode 100644
index 0000000000000000000000000000000000000000..22dbcee13e1cfad038b8039dbae7bf6144398c68
--- /dev/null
+++ b/app/src/main/res/anim/slide_up.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+ <translate
+ 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 71c76d74c544fa1ed1dde3c2f296854d2911686c..115690c103b163558e111b8c5ab9e9073f9b0792 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -6,125 +6,130 @@
android:layout_height="match_parent"
tools:context=".activities.LoginActivity"
android:paddingHorizontal="20dp"
+ android:layout_gravity="center"
>
-
- <ImageView
- android:id="@+id/imageView"
- android:layout_width="266dp"
- android:layout_height="94dp"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.495"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.113"
- app:srcCompat="@drawable/bondoman" />
-
- <androidx.cardview.widget.CardView
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginHorizontal="40dp"
- android:layout_marginEnd="8dp"
- app:cardCornerRadius="30dp"
- app:cardElevation="4dp"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/imageView"
- app:layout_constraintVertical_bias="0.1"
- app:cardBackgroundColor="@color/white">
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:gravity="center">
+ <ImageView
+ android:id="@+id/imageView"
+ android:layout_width="266dp"
+ android:layout_height="94dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:srcCompat="@drawable/bondoman"
+ />
- <LinearLayout
+ <androidx.cardview.widget.CardView
+ android:visibility="gone"
+ android:id="@+id/login_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginHorizontal="20dp"
- android:layout_marginVertical="30dp"
- android:orientation="vertical"
- >
- <TextView
- android:id="@+id/textView"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:fontFamily="@font/montserrat_600"
- android:text="Masuk"
- android:textAlignment="center"
- android:textColor="@color/black"
- android:textColorHint="@color/black"
- android:textSize="24sp"
- android:textStyle="bold" />
+ android:layout_marginHorizontal="40dp"
+ android:layout_marginEnd="8dp"
+ app:cardCornerRadius="30dp"
+ app:cardElevation="4dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/imageView"
+ app:layout_constraintVertical_bias="0.1"
+ app:cardBackgroundColor="@color/white">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginHorizontal="20dp"
+ android:layout_marginVertical="30dp"
android:orientation="vertical"
- android:layout_marginTop="12dp"
>
-
<TextView
+ android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="10dp"
- android:fontFamily="@font/montserrat_500"
- android:text="Email"
+ android:fontFamily="@font/montserrat_600"
+ android:text="Masuk"
+ android:textAlignment="center"
android:textColor="@color/black"
- android:textSize="14sp" />
- <EditText
- android:layout_width="match_parent"
- android:layout_height="40dp"
- android:id="@+id/email"
- android:background="@drawable/input_bg"
- android:layout_marginTop="10dp"
- android:paddingHorizontal="15dp"
- />
- </LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:layout_marginTop="15dp"
- >
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="10dp"
- android:fontFamily="@font/montserrat_500"
- android:text="Password"
- android:textColor="@color/black"
- android:textSize="14sp" />
- <com.google.android.material.textfield.TextInputLayout
+ android:textColorHint="@color/black"
+ android:textSize="24sp"
+ android:textStyle="bold" />
+
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:passwordToggleEnabled="true"
+ android:orientation="vertical"
+ android:layout_marginTop="12dp"
>
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:fontFamily="@font/montserrat_500"
+ android:text="Email"
+ android:textColor="@color/black"
+ android:textSize="14sp" />
<EditText
android:layout_width="match_parent"
android:layout_height="40dp"
- android:id="@+id/password"
+ android:id="@+id/email"
+ android:inputType="textEmailAddress"
android:background="@drawable/input_bg"
android:layout_marginTop="10dp"
android:paddingHorizontal="15dp"
- android:inputType="textPassword"
/>
- </com.google.android.material.textfield.TextInputLayout>
-
- </LinearLayout>
-
- <Button
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/login_button"
- android:fontFamily="@font/montserrat_700"
- android:background="@drawable/rounded_button"
- android:text="Masuk"
- android:layout_marginTop="20dp"
- android:layout_gravity="center_horizontal"
- android:textColor="@color/white"
- android:paddingHorizontal="15dp"
- />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_marginTop="15dp"
+ >
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:fontFamily="@font/montserrat_500"
+ android:text="Password"
+ android:textColor="@color/black"
+ android:textSize="14sp" />
+ <com.google.android.material.textfield.TextInputLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:passwordToggleEnabled="true"
+ >
- </LinearLayout>
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ android:id="@+id/password"
+ android:background="@drawable/input_bg"
+ android:layout_marginTop="10dp"
+ android:paddingHorizontal="15dp"
+ android:inputType="textPassword"
+ />
+ </com.google.android.material.textfield.TextInputLayout>
+ </LinearLayout>
- </androidx.cardview.widget.CardView>
+ <Button
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/login_button"
+ android:fontFamily="@font/montserrat_700"
+ android:background="@drawable/rounded_button"
+ android:text="Masuk"
+ android:layout_marginTop="20dp"
+ android:layout_gravity="center_horizontal"
+ android:textColor="@color/white"
+ android:paddingHorizontal="15dp"
+ />
+ </LinearLayout>
+ </androidx.cardview.widget.CardView>
+ </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000000000000000000000000000000000000..90f958096f81d050d55c085b7c3bad49456f9673
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@mipmap/ic_launcher_adaptive_back"/>
+ <foreground android:drawable="@mipmap/ic_launcher_adaptive_fore"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml
deleted file mode 100644
index 6f3b755bf50c6b03d8714a9c6184705e6a08389f..0000000000000000000000000000000000000000
--- a/app/src/main/res/mipmap-anydpi/ic_launcher.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
- <background android:drawable="@drawable/ic_launcher_background" />
- <foreground android:drawable="@drawable/ic_launcher_foreground" />
- <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
deleted file mode 100644
index 6f3b755bf50c6b03d8714a9c6184705e6a08389f..0000000000000000000000000000000000000000
--- a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
- <background android:drawable="@drawable/ic_launcher_background" />
- <foreground android:drawable="@drawable/ic_launcher_foreground" />
- <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4b29d827ca1033d90d44872f9134c146d605eae
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78ecd372343283f4157dcfd918ec5165bb3..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_adaptive_back.png b/app/src/main/res/mipmap-hdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..19669488f1b2f9321fa4d25c1334bc323c92fbb2
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_adaptive_back.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_adaptive_fore.png b/app/src/main/res/mipmap-hdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0de360d45608e70289265ebc229028aa7047297
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_adaptive_fore.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..a061eafe1075fd0ce86c875dd61d61375edee560
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d64e58ba64d180ce43ee13bf9a17835fbca..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_adaptive_back.png b/app/src/main/res/mipmap-mdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..75025cfd5ccc1702d5ada42072626e319bca6cbe
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_adaptive_back.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_adaptive_fore.png b/app/src/main/res/mipmap-mdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9ef358ef5cc02ae9058edd28fe0cb95da624b8c
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_adaptive_fore.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611da081676d42f6c3f78a2c91e7bcedddedb..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cb1e77b57a7749de1c599d29d2925a900f0e4a7
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a3070fe34c611c42c0d3ad3013a0dce358be0..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_adaptive_back.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..9784f16c882653abeb055d62e5e36fc0fa0da47d
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_adaptive_back.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0fb2bad6c415c6ef100993417cd6976abeb1dda
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..306bee97676b123152540ca62099e8cab4e35c77
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77f9f036a47549d47db79c16788749dca10..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..04ef206c8607696ac2bb082bb1b46afe648f59f7
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 0000000000000000000000000000000000000000..af76f857184b1b9875b027d8012f2bd5316ebf22
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9287f5083623b375139afb391af71cc533a7dd37..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b4c57c762057a25c07099f9fc0705b5b70acdae
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index aa7d6427e6fa1074b79ccd52ef67ac15c5637e85..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..66a5487a223c9db9c415a840b4451379ec15b214
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 0000000000000000000000000000000000000000..d05040e94bdcfe478b88f41ecd5433c5687c7750
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9126ae37cbc3587421d6889eadd1d91fbf1994d4..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ