diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index b774c4bc44a0116ead0d2182d76a79fcec035292..4a47f2600b02f8968e05abb956c7b3641d7d423d 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -2,23 +2,8 @@
<project version="4">
<component name="deploymentTargetDropDown">
<value>
- <entry key="ScanActivity">
- <State />
- </entry>
<entry key="app">
<State>
- <targetSelectedWithDropDown>
- <Target>
- <type value="QUICK_BOOT_TARGET" />
- <deviceKey>
- <Key>
- <type value="VIRTUAL_DEVICE_PATH" />
- <value value="C:\Users\ASUS\.android\avd\Pixel_7_API_31.avd" />
- </Key>
- </deviceKey>
- </Target>
- </targetSelectedWithDropDown>
- <timeTargetWasSelectedWithDropDown value="2024-04-01T07:28:26.326300300Z" />
<targetsSelectedWithDialog>
<Target>
<type value="QUICK_BOOT_TARGET" />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ed80158b39dd898b0cc721966de1398880dc2863..40dd2cd9471830b545e5d48baf5c6967aea8212a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -151,7 +151,9 @@ dependencies {
implementation("org.apache.poi:poi:5.2.5")
implementation("org.apache.poi:poi-ooxml:5.2.5")
+ implementation("androidx.core:core-splashscreen:1.0.1")
implementation("com.androidplot:androidplot-core:1.5.10")
+
}
kapt {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c5ac1b1b316889f8294e7641ea5dddee5bc53f6d..0f9839a49d2343fbe5b7e42d569895b3b08055a1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,7 +29,7 @@
<activity
android:name=".LoginActivity"
android:exported="true"
- android:theme="@style/login"
+ android:theme="@style/Theme.SplashTheme"
>
<intent-filter>
@@ -44,7 +44,8 @@
</activity>
<activity android:name=".ScanActivity"
- android:exported="false">
+ android:exported="false"
+ >
</activity>
<meta-data
@@ -55,7 +56,8 @@
android:name="androidx.core.content.FileProvider"
android:authorities="JWR.provider"
android:exported="false"
- android:grantUriPermissions="true">
+ android:grantUriPermissions="true"
+ >
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
diff --git a/app/src/main/java/com/example/pbd_jwr/LoginActivity.kt b/app/src/main/java/com/example/pbd_jwr/LoginActivity.kt
index 2e183a2b9d12873b0aa9ebe904fc57e129574f8a..238340df6670d7b737518fe7c570958537cd6867 100644
--- a/app/src/main/java/com/example/pbd_jwr/LoginActivity.kt
+++ b/app/src/main/java/com/example/pbd_jwr/LoginActivity.kt
@@ -11,6 +11,7 @@ import android.widget.CheckBox
import android.widget.TextView
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import com.example.pbd_jwr.databinding.ActivityLoginBinding
import com.example.pbd_jwr.encryptedSharedPref.EncryptedSharedPref
import com.example.pbd_jwr.network.NetworkCallbackImplementation
@@ -40,12 +41,15 @@ class LoginActivity : AppCompatActivity() {
private lateinit var connectivityManager: ConnectivityManager
private lateinit var networkCallback: NetworkCallbackImplementation
override fun onCreate(savedInstanceState: Bundle?) {
-
super.onCreate(savedInstanceState)
+ installSplashScreen()
sharedPreferences = EncryptedSharedPref.create(applicationContext,"login")
// Check if the user credential is already stored
+ connectivityManager = getSystemService(CONNECTIVITY_SERVICE) as ConnectivityManager
+ networkCallback = NetworkCallbackImplementation(this)
+ registerNetworkCallback()
if (isLoggedIn()) {
// If the user credential is stored, login and start the MainActivity
@@ -58,9 +62,8 @@ class LoginActivity : AppCompatActivity() {
}
- connectivityManager = getSystemService(CONNECTIVITY_SERVICE) as ConnectivityManager
- networkCallback = NetworkCallbackImplementation(this)
- registerNetworkCallback()
+
+
binding = ActivityLoginBinding.inflate(layoutInflater)
setContentView(binding.root)
@@ -97,11 +100,20 @@ class LoginActivity : AppCompatActivity() {
}
}
+ override fun onResume() {
+ super.onResume()
+ registerNetworkCallback()
+ }
+
+ override fun onPause() {
+ super.onPause()
+ unregisterNetworkCallback()
+ }
+
override fun onDestroy() {
super.onDestroy()
- if(!isLoggedIn()){
- unregisterNetworkCallback()
- }
+
+ unregisterNetworkCallback()
}
private fun isLoggedIn(): Boolean {
diff --git a/app/src/main/java/com/example/pbd_jwr/MainActivity.kt b/app/src/main/java/com/example/pbd_jwr/MainActivity.kt
index 00560396bf89523e192b33c1de981917aa829429..a1fe06724a23b6bbd0b61a1aca05b97ccdd42294 100644
--- a/app/src/main/java/com/example/pbd_jwr/MainActivity.kt
+++ b/app/src/main/java/com/example/pbd_jwr/MainActivity.kt
@@ -30,6 +30,7 @@ import com.example.pbd_jwr.ui.transaction.TransactionViewModel
import com.google.android.material.floatingactionbutton.FloatingActionButton
import org.json.JSONObject
import java.util.Date
+import kotlin.math.roundToInt
class MainActivity : AppCompatActivity() {
@@ -44,13 +45,10 @@ class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+
val serviceIntent = Intent(this, JWTValidationService::class.java)
startService(serviceIntent)
- connectivityManager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
- networkCallback = NetworkCallbackImplementation(this)
- registerNetworkCallback()
-
sharedPreferences = EncryptedSharedPref.create(applicationContext,"login")
sharedPreferencesEditor = sharedPreferences.edit()
binding = ActivityMainBinding.inflate(layoutInflater)
@@ -114,6 +112,17 @@ class MainActivity : AppCompatActivity() {
}
+ override fun onStart() {
+ super.onStart()
+
+ }
+
+ override fun onResume() {
+ super.onResume()
+ connectivityManager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+ networkCallback = NetworkCallbackImplementation(this)
+ registerNetworkCallback()
+ }
private fun isLocationPermissionGranted(): Boolean {
return ContextCompat.checkSelfPermission(
this,
@@ -162,12 +171,15 @@ class MainActivity : AppCompatActivity() {
editor.apply()
}
+ override fun onPause() {
+ super.onPause()
+ unregisterNetworkCallback()
+ }
+
override fun onDestroy() {
super.onDestroy()
val serviceIntent = Intent(this, JWTValidationService::class.java)
stopService(serviceIntent)
- unregisterNetworkCallback()
-
}
private fun registerNetworkCallback() {
@@ -194,7 +206,7 @@ class MainActivity : AppCompatActivity() {
val category = "expense"
val price = itemObject.getDouble("price")
val qty = itemObject.getInt("qty")
- val amount = qty * price
+ val amount = (qty * price * 1000).roundToInt() / 1000.0
val latitude = 6.8915
val longitude = 107.6107
val location = "Latitude: $latitude, Longitude: $longitude"
diff --git a/app/src/main/java/com/example/pbd_jwr/ui/transaction/TransactionViewModel.kt b/app/src/main/java/com/example/pbd_jwr/ui/transaction/TransactionViewModel.kt
index 587eb0f2feadc65e402940bb7314159a369259e0..4c61748cc2d3faf8e9405c369fb04aa41c0008b5 100644
--- a/app/src/main/java/com/example/pbd_jwr/ui/transaction/TransactionViewModel.kt
+++ b/app/src/main/java/com/example/pbd_jwr/ui/transaction/TransactionViewModel.kt
@@ -29,6 +29,8 @@ class TransactionViewModel(application: Application) : AndroidViewModel(applicat
return repository.getAllTransactions()
}
+
+
fun addTransaction(transaction: Transaction) {
viewModelScope.launch(Dispatchers.IO) {
try {
diff --git a/app/src/main/res/drawable/bondo_man_24.xml b/app/src/main/res/drawable/bondo_man_24.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bdbb2f4e185dfe8689998850687a9372d6d7f8b3
--- /dev/null
+++ b/app/src/main/res/drawable/bondo_man_24.xml
@@ -0,0 +1,14 @@
+<vector android:height="24dp" android:tint="#B29F7A"
+ android:viewportHeight="48" android:viewportWidth="48"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <group
+ android:scaleY="0.75"
+ android:scaleX="0.75"
+ android:pivotX="60"
+ android:pivotY="60"
+ >
+ <path android:fillColor="@android:color/white" android:pathData="M10.1,15.9l1.42,-1.42C8.79,12.05 7,10.41 7,8.85C7,7.8 7.8,7 8.85,7c1.11,0 1.54,0.65 2.68,2h0.93c1.12,-1.31 1.53,-2 2.68,-2c0.87,0 1.55,0.54 1.77,1.32c0.35,-0.04 0.68,-0.06 1,-0.06c0.36,0 0.7,0.03 1.03,0.08C18.7,6.43 17.13,5 15.15,5c-0.12,0 -0.23,0.03 -0.35,0.04C14.92,4.71 15,4.37 15,4c0,-1.66 -1.34,-3 -3,-3S9,2.34 9,4c0,0.37 0.08,0.71 0.2,1.04C9.08,5.03 8.97,5 8.85,5C6.69,5 5,6.69 5,8.85C5,11.27 7.04,13.16 10.1,15.9z"/>
+ <path android:fillColor="@android:color/white" android:pathData="M22.5,16.24c-0.32,-0.18 -0.66,-0.29 -1,-0.35c0.07,-0.1 0.15,-0.18 0.21,-0.28c1.08,-1.87 0.46,-4.18 -1.41,-5.26c-2.09,-1.21 -4.76,-0.39 -8.65,0.9l0.52,1.94c3.47,-1.14 5.79,-1.88 7.14,-1.1c0.91,0.53 1.2,1.61 0.68,2.53c-0.56,0.96 -1.33,1 -3.07,1.32l-0.47,0.81c0.58,1.62 0.97,2.33 0.39,3.32c-0.53,0.91 -1.61,1.2 -2.53,0.68c-0.06,-0.03 -0.11,-0.09 -0.17,-0.13c-0.3,0.67 -0.64,1.24 -1.03,1.73c0.07,0.04 0.13,0.09 0.2,0.14c1.87,1.08 4.18,0.46 5.26,-1.41c0.06,-0.1 0.09,-0.21 0.14,-0.32c0.22,0.27 0.48,0.51 0.8,0.69c1.43,0.83 3.27,0.34 4.1,-1.1S23.93,17.06 22.5,16.24z"/>
+ <path android:fillColor="@android:color/white" android:pathData="M12.32,14.01c-0.74,3.58 -1.27,5.95 -2.62,6.73c-0.91,0.53 -2,0.24 -2.53,-0.68c-0.56,-0.96 -0.2,-1.66 0.39,-3.32L7.1,15.93c-1.7,-0.31 -2.5,-0.33 -3.07,-1.32c-0.53,-0.91 -0.24,-2 0.68,-2.53c0.09,-0.05 0.19,-0.08 0.29,-0.11c-0.35,-0.56 -0.64,-1.17 -0.82,-1.85c-0.16,0.07 -0.32,0.14 -0.48,0.23c-1.87,1.08 -2.49,3.39 -1.41,5.26c0.06,0.1 0.14,0.18 0.21,0.28c-0.34,0.06 -0.68,0.17 -1,0.35c-1.43,0.83 -1.93,2.66 -1.1,4.1s2.66,1.93 4.1,1.1c0.32,-0.18 0.58,-0.42 0.8,-0.69c0.05,0.11 0.08,0.22 0.14,0.32c1.08,1.87 3.39,2.49 5.26,1.41c2.09,-1.21 2.71,-3.93 3.55,-7.94L12.32,14.01z"/>
+ </group>
+</vector>
diff --git a/app/src/main/res/drawable/bondo_man_24_2.xml b/app/src/main/res/drawable/bondo_man_24_2.xml
new file mode 100644
index 0000000000000000000000000000000000000000..289165ab5a222c0497e54bdc20735328e75fa90f
--- /dev/null
+++ b/app/src/main/res/drawable/bondo_man_24_2.xml
@@ -0,0 +1,14 @@
+<vector android:height="200dp" android:tint="#B29F7A"
+ android:viewportHeight="24" android:viewportWidth="24"
+ android:width="200dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <group
+ android:scaleY="0.65"
+ android:scaleX="0.65"
+ android:pivotX="12"
+ android:pivotY="11"
+ >
+ <path android:fillColor="@android:color/white" android:pathData="M10.1,15.9l1.42,-1.42C8.79,12.05 7,10.41 7,8.85C7,7.8 7.8,7 8.85,7c1.11,0 1.54,0.65 2.68,2h0.93c1.12,-1.31 1.53,-2 2.68,-2c0.87,0 1.55,0.54 1.77,1.32c0.35,-0.04 0.68,-0.06 1,-0.06c0.36,0 0.7,0.03 1.03,0.08C18.7,6.43 17.13,5 15.15,5c-0.12,0 -0.23,0.03 -0.35,0.04C14.92,4.71 15,4.37 15,4c0,-1.66 -1.34,-3 -3,-3S9,2.34 9,4c0,0.37 0.08,0.71 0.2,1.04C9.08,5.03 8.97,5 8.85,5C6.69,5 5,6.69 5,8.85C5,11.27 7.04,13.16 10.1,15.9z"/>
+ <path android:fillColor="@android:color/white" android:pathData="M22.5,16.24c-0.32,-0.18 -0.66,-0.29 -1,-0.35c0.07,-0.1 0.15,-0.18 0.21,-0.28c1.08,-1.87 0.46,-4.18 -1.41,-5.26c-2.09,-1.21 -4.76,-0.39 -8.65,0.9l0.52,1.94c3.47,-1.14 5.79,-1.88 7.14,-1.1c0.91,0.53 1.2,1.61 0.68,2.53c-0.56,0.96 -1.33,1 -3.07,1.32l-0.47,0.81c0.58,1.62 0.97,2.33 0.39,3.32c-0.53,0.91 -1.61,1.2 -2.53,0.68c-0.06,-0.03 -0.11,-0.09 -0.17,-0.13c-0.3,0.67 -0.64,1.24 -1.03,1.73c0.07,0.04 0.13,0.09 0.2,0.14c1.87,1.08 4.18,0.46 5.26,-1.41c0.06,-0.1 0.09,-0.21 0.14,-0.32c0.22,0.27 0.48,0.51 0.8,0.69c1.43,0.83 3.27,0.34 4.1,-1.1S23.93,17.06 22.5,16.24z"/>
+ <path android:fillColor="@android:color/white" android:pathData="M12.32,14.01c-0.74,3.58 -1.27,5.95 -2.62,6.73c-0.91,0.53 -2,0.24 -2.53,-0.68c-0.56,-0.96 -0.2,-1.66 0.39,-3.32L7.1,15.93c-1.7,-0.31 -2.5,-0.33 -3.07,-1.32c-0.53,-0.91 -0.24,-2 0.68,-2.53c0.09,-0.05 0.19,-0.08 0.29,-0.11c-0.35,-0.56 -0.64,-1.17 -0.82,-1.85c-0.16,0.07 -0.32,0.14 -0.48,0.23c-1.87,1.08 -2.49,3.39 -1.41,5.26c0.06,0.1 0.14,0.18 0.21,0.28c-0.34,0.06 -0.68,0.17 -1,0.35c-1.43,0.83 -1.93,2.66 -1.1,4.1s2.66,1.93 4.1,1.1c0.32,-0.18 0.58,-0.42 0.8,-0.69c0.05,0.11 0.08,0.22 0.14,0.32c1.08,1.87 3.39,2.49 5.26,1.41c2.09,-1.21 2.71,-3.93 3.55,-7.94L12.32,14.01z"/>
+ </group>
+</vector>
diff --git a/app/src/main/res/drawable/bondo_man_icon.xml b/app/src/main/res/drawable/bondo_man_icon.xml
new file mode 100644
index 0000000000000000000000000000000000000000..60b0fe76918d2df8bf6bcff7a76f2d2fd628149f
--- /dev/null
+++ b/app/src/main/res/drawable/bondo_man_icon.xml
@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:tint="#B29F7A"
+ android:viewportHeight="24" android:viewportWidth="24"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M10.1,15.9l1.42,-1.42C8.79,12.05 7,10.41 7,8.85C7,7.8 7.8,7 8.85,7c1.11,0 1.54,0.65 2.68,2h0.93c1.12,-1.31 1.53,-2 2.68,-2c0.87,0 1.55,0.54 1.77,1.32c0.35,-0.04 0.68,-0.06 1,-0.06c0.36,0 0.7,0.03 1.03,0.08C18.7,6.43 17.13,5 15.15,5c-0.12,0 -0.23,0.03 -0.35,0.04C14.92,4.71 15,4.37 15,4c0,-1.66 -1.34,-3 -3,-3S9,2.34 9,4c0,0.37 0.08,0.71 0.2,1.04C9.08,5.03 8.97,5 8.85,5C6.69,5 5,6.69 5,8.85C5,11.27 7.04,13.16 10.1,15.9z"/>
+ <path android:fillColor="@android:color/white" android:pathData="M22.5,16.24c-0.32,-0.18 -0.66,-0.29 -1,-0.35c0.07,-0.1 0.15,-0.18 0.21,-0.28c1.08,-1.87 0.46,-4.18 -1.41,-5.26c-2.09,-1.21 -4.76,-0.39 -8.65,0.9l0.52,1.94c3.47,-1.14 5.79,-1.88 7.14,-1.1c0.91,0.53 1.2,1.61 0.68,2.53c-0.56,0.96 -1.33,1 -3.07,1.32l-0.47,0.81c0.58,1.62 0.97,2.33 0.39,3.32c-0.53,0.91 -1.61,1.2 -2.53,0.68c-0.06,-0.03 -0.11,-0.09 -0.17,-0.13c-0.3,0.67 -0.64,1.24 -1.03,1.73c0.07,0.04 0.13,0.09 0.2,0.14c1.87,1.08 4.18,0.46 5.26,-1.41c0.06,-0.1 0.09,-0.21 0.14,-0.32c0.22,0.27 0.48,0.51 0.8,0.69c1.43,0.83 3.27,0.34 4.1,-1.1S23.93,17.06 22.5,16.24z"/>
+ <path android:fillColor="@android:color/white" android:pathData="M12.32,14.01c-0.74,3.58 -1.27,5.95 -2.62,6.73c-0.91,0.53 -2,0.24 -2.53,-0.68c-0.56,-0.96 -0.2,-1.66 0.39,-3.32L7.1,15.93c-1.7,-0.31 -2.5,-0.33 -3.07,-1.32c-0.53,-0.91 -0.24,-2 0.68,-2.53c0.09,-0.05 0.19,-0.08 0.29,-0.11c-0.35,-0.56 -0.64,-1.17 -0.82,-1.85c-0.16,0.07 -0.32,0.14 -0.48,0.23c-1.87,1.08 -2.49,3.39 -1.41,5.26c0.06,0.1 0.14,0.18 0.21,0.28c-0.34,0.06 -0.68,0.17 -1,0.35c-1.43,0.83 -1.93,2.66 -1.1,4.1s2.66,1.93 4.1,1.1c0.32,-0.18 0.58,-0.42 0.8,-0.69c0.05,0.11 0.08,0.22 0.14,0.32c1.08,1.87 3.39,2.49 5.26,1.41c2.09,-1.21 2.71,-3.93 3.55,-7.94L12.32,14.01z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 56c42e0c7051e6dd658cc6c99478980b6024b947..700bd6ed75b2ecab1eb3df65ab9fe6894d83ef2f 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -87,7 +87,7 @@
app:layout_constraintTop_toBottomOf="@id/rememberMe"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
- android:theme="@style/login"
+ android:theme="@style/Theme.login"
android:text="@string/login"
android:layout_marginTop="20dp"
android:fontFamily="@font/press_start_2p"
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index 83ff0c3dcdffc35eb4be43f36ff586d6f624a02f..dd4238dd9d29ae2b34101781e10132b85ecbaee9 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -4,21 +4,11 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".ui.dashboard.DashboardFragment"
- android:paddingBottom="60dp"
- >
+ tools:context="ui.dashboard.DashboardFragment">
- <TextView
- android:id="@+id/text_dashboard"
+ <com.androidplot.pie.PieChart
+ android:id="@+id/pieChart"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
- android:layout_marginEnd="8dp"
- android:textAlignment="center"
- android:textSize="20sp"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+ android:layout_height="match_parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 6f3b755bf50c6b03d8714a9c6184705e6a08389f..b459ca01196e023d0f2becacc47cf5ec20f799a6 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,6 @@
<?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" />
+ <background android:drawable="@color/white" />
+ <foreground android:drawable="@drawable/bondo_man_24_2" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 6f3b755bf50c6b03d8714a9c6184705e6a08389f..b459ca01196e023d0f2becacc47cf5ec20f799a6 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,6 +1,6 @@
<?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" />
+ <background android:drawable="@color/white" />
+ <foreground android:drawable="@drawable/bondo_man_24_2" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index d20581de288ee77cd3c3a7dc55364e311b43cfa1..73cff43a4b0ee6861bd8de3b262b58509fac2966 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -23,7 +23,7 @@
<item name="android:textSize">10sp</item>
</style>
- <style name="login" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+ <style name="Theme.login" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<item name="colorPrimary">@color/gold</item>
<item name="colorOnPrimary">@color/white</item>
<item name="colorSecondary">@color/gold</item>
@@ -35,4 +35,20 @@
<!-- Customize your theme here. -->
<item name="android:navigationBarColor">#FFFFFF</item>
</style>
+
+ <style name="Theme.App.Starting" parent="Theme.SplashScreen">
+ <!-- Set the splash screen background, animated icon, and animation
+ duration. -->
+ <item name="windowSplashScreenBackground">@color/gold</item>
+
+ <!-- Use windowSplashScreenAnimatedIcon to add a drawable or an animated
+ drawable. One of these is required. -->
+ <!-- <item name="windowSplashScreenAnimatedIcon">@drawable/...</item>-->
+ <!-- Required for animated icons. -->
+ <item name="windowSplashScreenAnimationDuration">1000</item>
+
+ <!-- Set the theme of the Activity that directly follows your splash
+ screen. This is required. -->
+ <item name="postSplashScreenTheme">@style/Theme.login</item>
+ </style>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/splash.xml b/app/src/main/res/values/splash.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ffc4eec61c2e04ad27e5f928fee4abcf7afe22ce
--- /dev/null
+++ b/app/src/main/res/values/splash.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <style name="Theme.SplashTheme" parent="Theme.SplashScreen">
+ <!-- Set the splash screen background, animated icon, and animation
+ duration. -->
+ <item name="windowSplashScreenBackground">@color/white</item>
+
+ <!-- Use windowSplashScreenAnimatedIcon to add a drawable or an animated
+ drawable. One of these is required. -->
+ <item name="windowSplashScreenAnimatedIcon">@drawable/bondo_man_24</item>
+ <!-- Required for animated icons. -->
+ <item name="windowSplashScreenAnimationDuration">500</item>
+
+ <!-- Set the theme of the Activity that directly follows your splash
+ screen. This is required. -->
+ <item name="postSplashScreenTheme">@style/Theme.login</item>
+ </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f58d63363b810c20e6b1d9441ac281e949a6308d..ac7b33750df4664a157a31eb98f884917b729ce0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
<resources>
- <string name="app_name">PBD-JWR</string>
+ <string name="app_name">BondoMan</string>
<string name="title_transaction">Transaction</string>
<string name="title_dashboard">Dashboard</string>
<string name="title_settings">Settings</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 986051b73f88d8ad2264fb08ea92be6f44eee2a2..9f84b3a904fb7eb0bf54168233718ef989dbb880 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -15,6 +15,8 @@
<!-- Customize your theme here. -->
<item name="android:navigationBarColor">#000000</item>
<item name="actionBarTheme">@style/ThemeOverlay.Actionbar</item>
+
+
</style>
<style name="ThemeOverlay.Actionbar" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar" >
@@ -29,7 +31,7 @@
<item name="android:textSize">10sp</item>
</style>
- <style name="login" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+ <style name="Theme.login" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<item name="colorPrimary">@color/gold</item>
<item name="colorOnPrimary">@color/white</item>
<item name="colorSecondary">@color/gold</item>
@@ -40,6 +42,9 @@
<item name="android:windowLightStatusBar">true</item>
<!-- Customize your theme here. -->
<item name="android:navigationBarColor">#FFFFFF</item>
+
</style>
+
+
</resources>
\ No newline at end of file