diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d12966aba5e61a24de16cb5f426c95aa45495a71..87d10c63772379b42789e6083516912e9b3ad501 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,6 +13,7 @@ <uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.INTERNET" /> <application diff --git a/app/src/main/java/com/example/bondoman/MainActivity.kt b/app/src/main/java/com/example/bondoman/MainActivity.kt index 7c096ed0618b98d3d44c285a0c9994b6908325e0..819230c1780eb8e0dbf4ff449918994180350d4f 100644 --- a/app/src/main/java/com/example/bondoman/MainActivity.kt +++ b/app/src/main/java/com/example/bondoman/MainActivity.kt @@ -18,6 +18,7 @@ import androidx.navigation.findNavController import androidx.navigation.fragment.NavHostFragment import com.example.bondoman.services.JWTExpiry import android.widget.Toast +import androidx.appcompat.app.AlertDialog import androidx.core.content.ContentProviderCompat.requireContext import androidx.lifecycle.lifecycleScope import com.example.bondoman.retrofit.data.TransactionDB @@ -105,7 +106,15 @@ class MainActivity : AppCompatActivity() { Toast.makeText(this, "Connected", Toast.LENGTH_SHORT).show() } ConnectivityObserver.NetworkState.DISCONNECTED -> { - Toast.makeText(this, "Disconnected", Toast.LENGTH_SHORT).show() + runOnUiThread { + AlertDialog.Builder(this) + .setTitle("Network Status") + .setMessage("Disconnected") + .setPositiveButton("OK") { dialog, _ -> + dialog.dismiss() + } + .show() + } } } } diff --git a/app/src/main/java/com/example/bondoman/helper/Xls.kt b/app/src/main/java/com/example/bondoman/helper/Xls.kt index c210f04bb96dcb59d00977a4b9e54809a2feb024..1274906bdb9a9450cb2a051c7397bb1311a3d27b 100644 --- a/app/src/main/java/com/example/bondoman/helper/Xls.kt +++ b/app/src/main/java/com/example/bondoman/helper/Xls.kt @@ -47,8 +47,8 @@ class Xls { } // Write the workbook to a file - val fileName = "transaction_list.$fileFormat" - val file = File(directory, "your_file_name.$fileFormat") + val uniqueFileName = "transaction_list_${System.currentTimeMillis()}.$fileFormat" + val file = File(directory, uniqueFileName) FileOutputStream(file).use { workbook.write(it) } diff --git a/app/src/main/res/layout/fragment_edit_transaction.xml b/app/src/main/res/layout/fragment_edit_transaction.xml index 81cb8b1d74698f526a344717ef7476fc7b9a623f..4339a789075cd8e585e4834779b9f54e69203a09 100644 --- a/app/src/main/res/layout/fragment_edit_transaction.xml +++ b/app/src/main/res/layout/fragment_edit_transaction.xml @@ -23,9 +23,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/delete" + app:backgroundTint="@color/broken_white" tools:ignore="MissingConstraints" - tools:layout_editor_absoluteX="300dp" - tools:layout_editor_absoluteY="5dp" /> + tools:layout_editor_absoluteX="290dp" + tools:layout_editor_absoluteY="-9dp" /> <LinearLayout android:layout_width="match_parent"