diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a1fd2442e6d4e8cc20603bd6cc8a0461dc9c6e94..2227d9b31ffb77ba7037604df029a436ae68e0fd 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("kotlin-kapt")
+ id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
}
android {
@@ -50,6 +51,14 @@ dependencies {
implementation("com.github.PhilJay:MPAndroidChart:v3.1.0")
implementation("com.google.android.material:material:1.11.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+ implementation("com.google.android.gms:play-services-maps:18.2.0")
+ implementation("com.google.android.gms:play-services-location:21.2.0")
+ implementation("androidx.camera:camera-core:1.3.2")
+ implementation("androidx.camera:camera-camera2:1.3.2")
+ implementation("androidx.camera:camera-lifecycle:1.3.2")
+ implementation("androidx.camera:camera-view:1.3.2")
+ implementation("androidx.exifinterface:exifinterface:1.3.7")
+ implementation("com.squareup.okhttp3:okhttp:4.9.3")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
@@ -89,8 +98,8 @@ dependencies {
// Kotlin components
implementation ("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20")
- api ("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
- api ("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1")
+ api ("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
+ api ("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
//DataBinding
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e53f2de20d9ab02a31d7164600506b4a2d7821fc..b178ced007c8bd0cb61ff60377acf662ad7a7f03 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,9 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.CAMERA" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <uses-feature android:name="android.hardware.camera.any" />
+
<application
android:allowBackup="true"
android:icon="@mipmap/ic_primary_logo"
@@ -11,6 +16,18 @@
android:roundIcon="@mipmap/ic_primary_logo_round"
android:supportsRtl="true"
android:theme="@style/Theme.NerbOS">
+
+ <meta-data
+ android:name="com.google.android.geo.API_KEY"
+ android:value="AIzaSyBdVOQUHGOg7TS74kPCzoEtDDlGGZHpAEs" />
+
+ <activity
+ android:name=".MapsActivity"
+ android:exported="false"
+ android:label="@string/title_activity_maps" />
+
+ <service android:name=".service.NetworkManagerService" />
+
<service
android:name=".service.TokenCheckService"
android:enabled="true"
@@ -22,10 +39,10 @@
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
-
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
+
<activity
android:name=".MainActivity"
android:exported="true" />
diff --git a/app/src/main/java/com/example/nerbos/MainActivity.kt b/app/src/main/java/com/example/nerbos/MainActivity.kt
index 0210a8538e1ec1a059665380e651cda251d6990d..6d8eeeff1eb15860623002c357be67c0256fa461 100644
--- a/app/src/main/java/com/example/nerbos/MainActivity.kt
+++ b/app/src/main/java/com/example/nerbos/MainActivity.kt
@@ -3,7 +3,6 @@ package com.example.nerbos
import android.content.Intent
import android.content.res.Configuration
import android.os.Bundle
-import android.view.View
import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment
import com.example.nerbos.databinding.ActivityMainBinding
@@ -11,7 +10,7 @@ import com.example.nerbos.fragments.scan.ScanFragment
import com.example.nerbos.fragments.statistic.StatisticFragment
import com.example.nerbos.fragments.transaction.TransactionFragment
import com.example.nerbos.fragments.user.UserFragment
-import com.example.nerbos.service.NetworkManager
+import com.example.nerbos.service.NetworkManagerService
import com.example.nerbos.service.TokenCheckService
class MainActivity : AppCompatActivity() {
@@ -31,15 +30,17 @@ class MainActivity : AppCompatActivity() {
private var selectedItemId: Int = R.id.transaction
internal lateinit var binding: ActivityMainBinding
- internal lateinit var networkManager: NetworkManager
+ internal var networkManagerService: NetworkManagerService = NetworkManagerService()
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+ instance = this
binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root)
setSupportActionBar(binding.toolbar)
- networkManager = NetworkManager(this)
+ // Start the NetworkManagerService to monitor network changes
+ startService(Intent(this, NetworkManagerService::class.java))
// Start the TokenCheckService to check token validity
val serviceIntent = Intent(this, TokenCheckService::class.java)
@@ -56,6 +57,11 @@ class MainActivity : AppCompatActivity() {
selectMenuItem(selectedItemId)
}
+ override fun onDestroy() {
+ super.onDestroy()
+ instance = null
+ }
+
private fun setupNavigation() {
if (resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) {
binding.bottomNavigationView?.setOnItemSelectedListener { item ->
@@ -94,11 +100,6 @@ class MainActivity : AppCompatActivity() {
super.onSaveInstanceState(outState)
}
- override fun onDestroy() {
- super.onDestroy()
- networkManager.unregisterNetworkCallback()
- }
-
fun getCurrentFragmentId(): Int {
return selectedItemId
}
@@ -111,8 +112,11 @@ class MainActivity : AppCompatActivity() {
return fragmentTitles[id] ?: R.string.navbar_transaction
}
- fun showActionBarAndNavBar() {
- supportActionBar?.show()
- binding.bottomNavigationView?.visibility ?: View.VISIBLE
+ companion object {
+ private var instance: MainActivity? = null
+
+ fun getInstance(): MainActivity? {
+ return instance
+ }
}
}
diff --git a/app/src/main/java/com/example/nerbos/MapsActivity.kt b/app/src/main/java/com/example/nerbos/MapsActivity.kt
new file mode 100644
index 0000000000000000000000000000000000000000..d4ccc07f8f2b97f2bbf2647fb5aab32968e20445
--- /dev/null
+++ b/app/src/main/java/com/example/nerbos/MapsActivity.kt
@@ -0,0 +1,73 @@
+package com.example.nerbos
+
+import android.Manifest
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.graphics.Camera
+import android.location.Address
+import android.location.Geocoder
+import android.location.Location
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import android.util.Log
+import android.widget.ImageView
+import android.widget.TextView
+import android.widget.Toast
+import androidx.core.app.ActivityCompat
+
+import com.google.android.gms.maps.CameraUpdateFactory
+import com.google.android.gms.maps.GoogleMap
+import com.google.android.gms.maps.OnMapReadyCallback
+import com.google.android.gms.maps.SupportMapFragment
+import com.google.android.gms.maps.model.LatLng
+import com.google.android.gms.maps.model.MarkerOptions
+import com.example.nerbos.databinding.ActivityMapsBinding
+import com.google.android.gms.location.FusedLocationProviderClient
+import com.google.android.gms.location.LocationServices
+import com.google.android.gms.maps.model.Marker
+import java.util.Locale
+
+class MapsActivity : AppCompatActivity(), OnMapReadyCallback {
+
+ private lateinit var mMap: GoogleMap
+ private lateinit var binding: ActivityMapsBinding
+ private lateinit var location: Address
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+
+ binding = ActivityMapsBinding.inflate(layoutInflater)
+ setContentView(binding.root)
+
+ // Obtain the SupportMapFragment and get notified when the map is ready to be used.
+ val mapFragment = supportFragmentManager
+ .findFragmentById(R.id.map) as SupportMapFragment
+ mapFragment.getMapAsync(this)
+
+ val myIntent = intent
+ val locationName : String? = myIntent.getStringExtra("locationName")
+ val geocoder = Geocoder(this, Locale.getDefault())
+ val address = geocoder.getFromLocationName(locationName!!, 1)
+ if (address != null) {
+ location = address[0]
+ }
+
+ // Navigation
+ findViewById<ImageView>(R.id.backButton).setOnClickListener {
+ val mainIntent: Intent = Intent(this, MainActivity::class.java)
+ startActivity(mainIntent)
+ finish()
+ }
+
+ }
+
+ override fun onMapReady(googleMap: GoogleMap) {
+ mMap = googleMap
+ mMap.uiSettings.isZoomControlsEnabled = true
+ val currentLatLong : LatLng = LatLng(location.latitude,location.longitude)
+ val markerOptions = MarkerOptions().position(currentLatLong).title("Current Location")
+ mMap.addMarker(markerOptions)
+ mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(currentLatLong, 15f))
+ }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/nerbos/fragments/network/NoInternetFragment.kt b/app/src/main/java/com/example/nerbos/fragments/network/NoInternetFragment.kt
index a0a708b71e17e81c03052a2ef88d21f1fe43e474..e9b20570df7e347dda7865b4d0dbeda2820e50d5 100644
--- a/app/src/main/java/com/example/nerbos/fragments/network/NoInternetFragment.kt
+++ b/app/src/main/java/com/example/nerbos/fragments/network/NoInternetFragment.kt
@@ -26,7 +26,7 @@ class NoInternetFragment : Fragment() {
binding.closeButton.setOnClickListener {
val mainActivity = requireActivity() as MainActivity
- mainActivity.networkManager.handleCloseButtonClick()
+ mainActivity.networkManagerService.handleCloseButtonClick(mainActivity)
}
}
diff --git a/app/src/main/java/com/example/nerbos/fragments/scan/ScanFragment.kt b/app/src/main/java/com/example/nerbos/fragments/scan/ScanFragment.kt
index 7161de166dfce509711fa63ec72839a9684b2105..a47dea4cf9aba8010a01534612431e3c9afd6cb6 100644
--- a/app/src/main/java/com/example/nerbos/fragments/scan/ScanFragment.kt
+++ b/app/src/main/java/com/example/nerbos/fragments/scan/ScanFragment.kt
@@ -1,33 +1,86 @@
package com.example.nerbos.fragments.scan
+import android.Manifest
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.Matrix
+import android.location.Geocoder
import android.os.Bundle
-import androidx.fragment.app.Fragment
+import android.os.Handler
+import android.os.Looper
+import android.provider.MediaStore
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import android.widget.EditText
+import android.widget.ImageButton
+import android.widget.ImageView
+import android.widget.RadioGroup
+import android.widget.Toast
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AlertDialog
+import androidx.camera.core.CameraSelector
+import androidx.camera.core.ImageCapture
+import androidx.camera.core.ImageCaptureException
+import androidx.camera.core.Preview
+import androidx.camera.lifecycle.ProcessCameraProvider
+import androidx.camera.view.PreviewView
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
+import androidx.exifinterface.media.ExifInterface
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
import com.example.nerbos.R
+import com.example.nerbos.model.Transaction
+import com.example.nerbos.model.TransactionCategory
+import com.example.nerbos.service.Authentication
+import com.example.nerbos.viewmodel.TransactionViewModel
+import com.google.android.gms.location.FusedLocationProviderClient
+import com.google.android.gms.location.LocationServices
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.MultipartBody
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.Response
+import org.json.JSONException
+import org.json.JSONObject
+import java.io.File
+import java.io.IOException
+import java.util.Locale
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
-// TODO: Rename parameter arguments, choose names that match
-// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-private const val ARG_PARAM1 = "param1"
-private const val ARG_PARAM2 = "param2"
-
-/**
- * A simple [Fragment] subclass.
- * Use the [ScanFragment.newInstance] factory method to
- * create an instance of this fragment.
- */
class ScanFragment : Fragment() {
- // TODO: Rename and change types of parameters
- private var param1: String? = null
- private var param2: String? = null
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- arguments?.let {
- param1 = it.getString(ARG_PARAM1)
- param2 = it.getString(ARG_PARAM2)
- }
+ private lateinit var previewView: PreviewView
+ private lateinit var cameraExecutor: ExecutorService
+ private lateinit var imageCapture: ImageCapture
+ private lateinit var fusedLocationProviderClient: FusedLocationProviderClient
+ private lateinit var geocoder: Geocoder
+ private var fragmentContext: Context? = null
+
+ private val requestCameraPermissionCode = Manifest.permission.CAMERA
+ private val uploadURL: String by lazy {
+ requireContext().getString(R.string.backend_api_scan)
+ }
+
+ override fun onAttach(context: Context) {
+ super.onAttach(context)
+ fragmentContext = context
+ }
+
+ override fun onDetach() {
+ super.onDetach()
+ fragmentContext = null
}
override fun onCreateView(
@@ -35,26 +88,370 @@ class ScanFragment : Fragment() {
savedInstanceState: Bundle?
): View? {
// Inflate the layout for this fragment
- return inflater.inflate(R.layout.fragment_scan, container, false)
- }
-
- companion object {
- /**
- * Use this factory method to create a new instance of
- * this fragment using the provided parameters.
- *
- * @param param1 Parameter 1.
- * @param param2 Parameter 2.
- * @return A new instance of fragment Scan.
- */
- // TODO: Rename and change types and number of parameters
- @JvmStatic
- fun newInstance(param1: String, param2: String) =
- ScanFragment().apply {
- arguments = Bundle().apply {
- putString(ARG_PARAM1, param1)
- putString(ARG_PARAM2, param2)
+ val view = inflater.inflate(R.layout.fragment_scan, container, false)
+ previewView = view.findViewById(R.id.previewView)
+ return view
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ cameraExecutor = Executors.newSingleThreadExecutor()
+ fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(requireContext())
+ geocoder = Geocoder(requireContext(), Locale.getDefault())
+
+ if (allPermissionsGranted()) {
+ startCamera()
+ } else {
+ requestCameraPermission.launch(requestCameraPermissionCode)
+ }
+
+ view.findViewById<ImageButton>(R.id.captureButton).setOnClickListener {
+ takePicture()
+ }
+
+ view.findViewById<ImageButton>(R.id.galleryButton).setOnClickListener {
+ dispatchGalleryIntent()
+ }
+ }
+
+ private fun allPermissionsGranted() = ContextCompat.checkSelfPermission(
+ requireContext(),
+ Manifest.permission.CAMERA
+ ) == PackageManager.PERMISSION_GRANTED
+
+ private fun startCamera() {
+ val cameraProviderFuture = ProcessCameraProvider.getInstance(requireContext())
+
+ cameraProviderFuture.addListener({
+ val cameraProvider: ProcessCameraProvider = cameraProviderFuture.get()
+
+ val preview = Preview.Builder()
+ .build()
+ .also {
+ it.setSurfaceProvider(previewView.surfaceProvider)
+ }
+
+ imageCapture = ImageCapture.Builder().build()
+
+ val cameraSelector = CameraSelector.DEFAULT_BACK_CAMERA
+
+ try {
+ cameraProvider.unbindAll()
+ cameraProvider.bindToLifecycle(this, cameraSelector, preview, imageCapture)
+ } catch (e: Exception) {
+ e.printStackTrace()
+ }
+
+ }, ContextCompat.getMainExecutor(requireContext()))
+ }
+
+ private fun takePicture() {
+ val imageCapture = imageCapture
+
+ // Create output file to hold the captured image
+ val externalFilesDirs = requireContext().getExternalFilesDirs(null)
+ val photoFile = File(externalFilesDirs.firstOrNull(), "${System.currentTimeMillis()}.jpg")
+
+ // Setup image capture metadata
+ val outputOptions = ImageCapture.OutputFileOptions.Builder(photoFile).build()
+
+ // Capture the image
+ imageCapture.takePicture(
+ outputOptions,
+ ContextCompat.getMainExecutor(requireContext()),
+ object : ImageCapture.OnImageSavedCallback {
+ override fun onError(exc: ImageCaptureException) {
+ Toast.makeText(requireContext(), "Error capturing image: ${exc.message}", Toast.LENGTH_SHORT).show()
+ }
+
+ override fun onImageSaved(output: ImageCapture.OutputFileResults) {
+ // Image captured successfully, read orientation metadata
+ val savedUri = photoFile.toUri()
+ val imageBitmap = BitmapFactory.decodeFile(savedUri.path)
+ val rotatedBitmap = savedUri.path?.let {
+ rotateImageIfRequired(imageBitmap,
+ it
+ )
+ }
+ showImagePopup(rotatedBitmap)
+ }
+ })
+ }
+
+ private fun rotateImageIfRequired(bitmap: Bitmap, path: String): Bitmap {
+ val ei = ExifInterface(path)
+ val orientation = ei.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL)
+
+ return when (orientation) {
+ ExifInterface.ORIENTATION_ROTATE_90 -> rotateImage(bitmap, 90f)
+ ExifInterface.ORIENTATION_ROTATE_180 -> rotateImage(bitmap, 180f)
+ ExifInterface.ORIENTATION_ROTATE_270 -> rotateImage(bitmap, 270f)
+ else -> bitmap
+ }
+ }
+
+ private fun rotateImage(source: Bitmap, angle: Float): Bitmap {
+ val matrix = Matrix()
+ matrix.postRotate(angle)
+ return Bitmap.createBitmap(source, 0, 0, source.width, source.height, matrix, true)
+ }
+
+ private fun dispatchGalleryIntent() {
+ val galleryIntent = Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI)
+ requestGallery.launch(galleryIntent)
+ }
+
+ private fun showImagePopup(imageBitmap: Bitmap?) {
+ if (imageBitmap != null) {
+ MaterialAlertDialogBuilder(requireContext())
+ .setTitle("Use this picture?")
+ .setPositiveButton("Yes") { dialog, _ ->
+ val imageFile = File.createTempFile("image", ".jpg", requireContext().cacheDir)
+ imageBitmap.compress(Bitmap.CompressFormat.JPEG, 100, imageFile.outputStream())
+ uploadImageToServer(imageFile) { success, message ->
+ if (success) {
+ showToastOnUIThread(message.toString())
+ } else {
+ showToastOnUIThread(message.toString())
+ }
+ }
+ dialog.dismiss()
+ }
+ .setNegativeButton("No") { dialog, _ ->
+ showToastOnUIThread("Scan cancelled")
+ dialog.dismiss()
+ }
+ .setView(ImageView(requireContext()).apply {
+ setImageBitmap(imageBitmap)
+ adjustViewBounds = true
+ })
+ .show()
+ .apply {
+ getButton(AlertDialog.BUTTON_POSITIVE)?.setTextColor(ContextCompat.getColor(requireContext(), R.color.white))
+ getButton(AlertDialog.BUTTON_NEGATIVE)?.setTextColor(ContextCompat.getColor(requireContext(), R.color.white))
+ }
+ } else {
+ Toast.makeText(requireContext(), "Failed to load image", Toast.LENGTH_SHORT).show()
+ }
+ }
+
+ @Suppress("DEPRECATION")
+ private fun showTransactionInputDialog(callback: (String, String, String) -> Unit) {
+ val dialogView = LayoutInflater.from(requireContext()).inflate(R.layout.add_scan_transaction, null)
+ val nameInput = dialogView.findViewById<EditText>(R.id.nameInput)
+ val locationInput = dialogView.findViewById<EditText>(R.id.locationInput)
+ val transactionTypeRadioGroup = dialogView.findViewById<RadioGroup>(R.id.transactionTypeRadioGroup)
+ val mapButton = dialogView.findViewById<ImageButton>(R.id.mapButton)
+
+ transactionTypeRadioGroup.check(R.id.incomeRadioButton)
+ mapButton.setOnClickListener {
+ if (ActivityCompat.checkSelfPermission(
+ requireContext(),
+ Manifest.permission.ACCESS_FINE_LOCATION
+ ) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(
+ requireContext(),
+ Manifest.permission.ACCESS_COARSE_LOCATION
+ ) != PackageManager.PERMISSION_GRANTED
+ ) {
+ ActivityCompat.requestPermissions(requireActivity(), arrayOf(Manifest.permission.ACCESS_FINE_LOCATION), 1)
+ return@setOnClickListener
+ }
+ fusedLocationProviderClient.lastLocation.addOnSuccessListener (requireActivity()){
+ location ->
+ if (location != null) {
+ val address = geocoder.getFromLocation(location.latitude, location.longitude, 1)
+ locationInput.setText(address!![0].getAddressLine(0))
+ } else {
+ Toast.makeText(requireContext(), "Failed to get location", Toast.LENGTH_SHORT)
+ .show()
+ }
+ }
+ }
+
+ val dialog = AlertDialog.Builder(requireContext())
+ .setTitle("Transaction Input")
+ .setView(dialogView)
+ .setPositiveButton("OK") { _, _ ->
+ val name = nameInput.text.toString()
+ val location = locationInput.text.toString()
+ val transactionType = when (transactionTypeRadioGroup.checkedRadioButtonId) {
+ R.id.incomeRadioButton -> "Income"
+ R.id.outcomeRadioButton -> "Outcome"
+ else -> ""
+ }
+ if (name.isNotEmpty() && location.isNotEmpty() && transactionType.isNotEmpty()) {
+ callback(name, location, transactionType)
+ } else {
+ // Display error message if any field is empty
+ Toast.makeText(requireContext(), "Please fill in all fields", Toast.LENGTH_SHORT).show()
+ // Show the dialog again to allow the user to fill in missing fields
+ showTransactionInputDialog(callback)
+ }
+ }
+ .setNegativeButton("Cancel") { dialog, _ ->
+ dialog.dismiss()
+ }
+ .create()
+
+ dialog.show()
+
+ dialog.getButton(AlertDialog.BUTTON_POSITIVE)?.setTextColor(ContextCompat.getColor(requireContext(), R.color.white))
+ dialog.getButton(AlertDialog.BUTTON_NEGATIVE)?.setTextColor(ContextCompat.getColor(requireContext(), R.color.white))
+ }
+
+ private fun showTransactionConfirmationDialog(responseBody: String?, transactionName: String, selectedTransactionType: String, totalNominal: Float, location: String, callback: (Boolean) -> Unit) {
+ val builder = AlertDialog.Builder(requireContext())
+ builder.setTitle("Confirm Transaction Details")
+
+ // Parse the JSON response body to extract item details
+ val itemDetails = StringBuilder()
+ calculateTotalNominal(responseBody)?.let {
+ try {
+ val jsonObject = JSONObject(responseBody.toString())
+ val itemsArray = jsonObject.getJSONObject("items").getJSONArray("items")
+ for (i in 0 until itemsArray.length()) {
+ val itemObject = itemsArray.getJSONObject(i)
+ val name = itemObject.getString("name")
+ val qty = itemObject.getInt("qty")
+ val price = itemObject.getDouble("price").toFloat()
+ itemDetails.append("$name: $qty x $price\n")
}
+ } catch (e: JSONException) {
+ e.printStackTrace()
}
+ }
+
+ val transactionTypeMessage = if (selectedTransactionType == "Income") "income" else "outcome"
+ val message = "Transaction Name: $transactionName\n\n$itemDetails\nTotal Nominal: $totalNominal\n\nThis transaction will be added as an $transactionTypeMessage with location: $location.\n\nDo you want to proceed?"
+ builder.setMessage(message)
+
+ builder.setPositiveButton("Yes") { dialog, _ ->
+ callback(true)
+ dialog.dismiss()
+ }
+
+ builder.setNegativeButton("No") { dialog, _ ->
+ callback(false)
+ dialog.dismiss()
+ }
+
+ val dialog = builder.create()
+ dialog.show()
+
+ dialog.getButton(AlertDialog.BUTTON_POSITIVE)?.setTextColor(ContextCompat.getColor(requireContext(), R.color.white))
+ dialog.getButton(AlertDialog.BUTTON_NEGATIVE)?.setTextColor(ContextCompat.getColor(requireContext(), R.color.white))
+ }
+
+ private fun uploadImageToServer(imageFile: File, callback: (Boolean, String?) -> Unit) {
+ showTransactionInputDialog { name, location, transactionType ->
+ val authentication = Authentication(requireContext())
+ val token = authentication.getToken()
+ val client = OkHttpClient()
+
+ val requestBody = MultipartBody.Builder()
+ .setType(MultipartBody.FORM)
+ .addFormDataPart("file", imageFile.name, imageFile.asRequestBody("image/*".toMediaTypeOrNull()))
+ .build()
+
+ val request = Request.Builder()
+ .url(uploadURL)
+ .header("Authorization", "Bearer $token")
+ .post(requestBody)
+ .build()
+
+ client.newCall(request).enqueue(object : Callback {
+ override fun onResponse(call: Call, response: Response) {
+ if (response.isSuccessful) {
+ // Parse the response body to extract transaction items and calculate total nominal
+ val responseBody = response.body?.string()
+ val totalNominal = calculateTotalNominal(responseBody)
+
+ // Run on UI thread to show transaction confirmation dialog
+ requireActivity().runOnUiThread {
+ showTransactionConfirmationDialog(responseBody, name, transactionType, totalNominal ?: 0f, location) { confirmed ->
+ if (confirmed) {
+ // Create a single transaction and add it to the database
+ totalNominal?.let { nominal ->
+ val transaction = Transaction(
+ userID = authentication.getNim(),
+ name = name,
+ category = if (transactionType == "Income") TransactionCategory.INCOME else TransactionCategory.OUTCOME,
+ nominal = nominal,
+ location = location
+ )
+ addTransactionToDatabase(transaction)
+ callback(true, "Transaction added successfully")
+ } ?: run {
+ callback(false, "Failed to calculate total nominal")
+ }
+ } else {
+ callback(false, "Transaction cancelled")
+ }
+ }
+ }
+ } else {
+ callback(false, "Failed to upload image. Please try again later.")
+ }
+ }
+
+ override fun onFailure(call: Call, e: IOException) {
+ showToastOnUIThread("Failed to upload image: ${e.message}")
+ callback(false, e.message)
+ }
+ })
+ }
+ }
+
+ private fun calculateTotalNominal(responseBody: String?): Float? {
+ var totalNominal: Float? = null
+ try {
+ val jsonObject = JSONObject(responseBody.toString())
+ val itemsArray = jsonObject.getJSONObject("items").getJSONArray("items")
+ totalNominal = 0f
+ for (i in 0 until itemsArray.length()) {
+ val itemObject = itemsArray.getJSONObject(i)
+ val qty = itemObject.getInt("qty")
+ val price = itemObject.getDouble("price").toFloat()
+ totalNominal += qty * price
+ }
+ } catch (e: JSONException) {
+ e.printStackTrace()
+ }
+ return totalNominal
+ }
+
+ private fun addTransactionToDatabase(transaction: Transaction) {
+ val transactionViewModel = ViewModelProvider(requireActivity())[TransactionViewModel::class.java]
+ transactionViewModel.addTransaction(transaction)
+ }
+
+ private fun showToastOnUIThread(message: String) {
+ Handler(Looper.getMainLooper()).post {
+ Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
+ }
+ }
+
+ private val requestCameraPermission =
+ registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
+ if (isGranted) {
+ startCamera()
+ } else {
+ // Handle the case where the user denied the permission
+ Toast.makeText(requireContext(), "Camera permission denied", Toast.LENGTH_SHORT).show()
+ }
+ }
+
+ private val requestGallery = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+ if (result.resultCode == Activity.RESULT_OK) {
+ val imageUri = result.data?.data
+ val inputStream = requireContext().contentResolver.openInputStream(imageUri!!)
+ val imageBitmap = BitmapFactory.decodeStream(inputStream)
+ showImagePopup(imageBitmap)
+ }
+ }
+
+ override fun onDestroy() {
+ super.onDestroy()
+ cameraExecutor.shutdown()
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/nerbos/fragments/transaction/TransactionAdapter.kt b/app/src/main/java/com/example/nerbos/fragments/transaction/TransactionAdapter.kt
index a2a9c178c266735d43c209a65dc6e3c8eaaef612..ae9cd893897417f02840a5358385352c0f221772 100644
--- a/app/src/main/java/com/example/nerbos/fragments/transaction/TransactionAdapter.kt
+++ b/app/src/main/java/com/example/nerbos/fragments/transaction/TransactionAdapter.kt
@@ -19,6 +19,7 @@ class TransactionAdapter() : RecyclerView.Adapter<TransactionAdapter.Transaction
// Create ViewHolder Class
private var transactionList : List<Transaction> = emptyList<Transaction>()
var onItemClick: ((Transaction) -> Unit)? = null
+ var onLocationClick: ((String) -> Unit)? = null
class TransactionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView){
val name: TextView = itemView.findViewById(R.id.transactionName)
val date: TextView = itemView.findViewById(R.id.transactionDate)
@@ -54,6 +55,10 @@ class TransactionAdapter() : RecyclerView.Adapter<TransactionAdapter.Transaction
holder.itemView.setOnClickListener{
onItemClick?.invoke(transactionList[position])
}
+
+ holder.location.setOnClickListener {
+ onLocationClick?.invoke(holder.location.text.toString())
+ }
}
@SuppressLint("NotifyDataSetChanged")
fun setData(transactions: List<Transaction>){
diff --git a/app/src/main/java/com/example/nerbos/fragments/transaction/TransactionFragment.kt b/app/src/main/java/com/example/nerbos/fragments/transaction/TransactionFragment.kt
index 14b0558317ff5d3a1d459d7ec05c5061e134296f..3a82a2c30bcd5f0fcc1dee02f6209844a1aca870 100644
--- a/app/src/main/java/com/example/nerbos/fragments/transaction/TransactionFragment.kt
+++ b/app/src/main/java/com/example/nerbos/fragments/transaction/TransactionFragment.kt
@@ -1,7 +1,13 @@
package com.example.nerbos.fragments.transaction
+import android.Manifest
import android.app.AlertDialog
import android.app.Dialog
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.location.Address
+import android.location.Geocoder
+import android.location.Location
import android.os.Bundle
import android.text.TextUtils
import android.util.Log
@@ -17,17 +23,24 @@ import android.widget.RadioButton
import android.widget.RadioGroup
import android.widget.TextView
import android.widget.Toast
+import androidx.core.app.ActivityCompat
import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
+import com.example.nerbos.MapsActivity
import com.example.nerbos.R
import com.example.nerbos.model.Transaction
import com.example.nerbos.model.TransactionCategory
import com.example.nerbos.viewmodel.TransactionViewModel
import com.example.nerbos.service.Authentication
import com.example.nerbos.service.Utils
+import com.google.android.gms.location.FusedLocationProviderClient
+import com.google.android.gms.location.LocationServices
+import com.google.android.gms.maps.CameraUpdateFactory
+import com.google.android.gms.maps.model.LatLng
+import java.util.Locale
// TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -45,6 +58,10 @@ class TransactionFragment : Fragment() {
private var param2: String? = null
private lateinit var transactionViewModel: TransactionViewModel
private lateinit var authentication: Authentication
+ private var currentLocation: Location? = null
+ private lateinit var fusedLocationProviderClient: FusedLocationProviderClient
+ private lateinit var geocoder: Geocoder
+ private val permissionCode = 1
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -52,6 +69,8 @@ class TransactionFragment : Fragment() {
param1 = it.getString(ARG_PARAM1)
param2 = it.getString(ARG_PARAM2)
}
+ fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(requireContext())
+ geocoder = Geocoder(requireContext(), Locale.getDefault())
}
override fun onCreateView(
@@ -67,6 +86,7 @@ class TransactionFragment : Fragment() {
recyclerView.layoutManager = LinearLayoutManager(context)
recyclerView.adapter = transactionAdapter
transactionAdapter.onItemClick = { transaction -> showModifyTransactionDialog(transaction)}
+ transactionAdapter.onLocationClick = {location -> showLocationOnMap(location)}
// Transaction View Model
transactionViewModel = ViewModelProvider(this)[TransactionViewModel::class.java]
@@ -82,6 +102,12 @@ class TransactionFragment : Fragment() {
return view
}
+ private fun showLocationOnMap(location: String) {
+ val mapIntent = Intent(requireActivity(), MapsActivity::class.java)
+ mapIntent.putExtra("locationName", location)
+ startActivity(mapIntent)
+ }
+
private fun showAddTransactionDialog() {
val dialog = Dialog(requireContext())
@@ -102,6 +128,14 @@ class TransactionFragment : Fragment() {
dialog.dismiss()
}
+ dialog.findViewById<EditText>(R.id.locationInput).setOnClickListener {
+ // TODO: Buat percabangan kalau ada internet
+ if (true){
+ val etLocation= dialog.findViewById<EditText>(R.id.locationInput)
+ etLocation.setText(getAddressName())
+ }
+ }
+
dialog.show()
dialog.window!!.setBackgroundDrawableResource(R.drawable.round_corner_transparent)
dialog.window!!.attributes = layoutParams
@@ -214,6 +248,36 @@ class TransactionFragment : Fragment() {
}
}
+ private fun setLocation(){
+ if (ActivityCompat.checkSelfPermission(
+ requireContext(),
+ Manifest.permission.ACCESS_FINE_LOCATION
+ ) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(
+ requireContext(),
+ Manifest.permission.ACCESS_COARSE_LOCATION
+ ) != PackageManager.PERMISSION_GRANTED
+ ) {
+ ActivityCompat.requestPermissions(requireActivity(), arrayOf(android.Manifest.permission.ACCESS_FINE_LOCATION), permissionCode)
+ return
+ }
+ fusedLocationProviderClient.lastLocation.addOnSuccessListener (requireActivity()){
+ location ->
+ currentLocation = location
+ }
+ }
+
+ private fun getAddressName() : String{
+ // Hanya set otomatis jika mendapatkan permission, jika tidak input lokasi string
+ setLocation()
+ return if (currentLocation!=null){
+ // Geocode to get the address string
+ val address = geocoder.getFromLocation(currentLocation!!.latitude, currentLocation!!.longitude, 1)
+ address!![0].getAddressLine(0)
+ } else {
+ ""
+ }
+ }
+
private fun inputCheck(name: String, nominal:Float, location:String): Boolean {
return !(TextUtils.isEmpty(name) || TextUtils.isEmpty(location) || (nominal<0) )
}
diff --git a/app/src/main/java/com/example/nerbos/service/Authentication.kt b/app/src/main/java/com/example/nerbos/service/Authentication.kt
index 62cde4837bfdccf20a592ff3b52445bf623e1450..ca362b71f0e9ecefbb3d227e2b12bc23aaee4016 100644
--- a/app/src/main/java/com/example/nerbos/service/Authentication.kt
+++ b/app/src/main/java/com/example/nerbos/service/Authentication.kt
@@ -84,7 +84,7 @@ class Authentication(private val context: Context) {
return email.toInt()
}
- private fun getToken(): String {
+ internal fun getToken(): String {
val sharedPreferences : SharedPreferences =
context.getSharedPreferences(context.getString(R.string.preferences), Context.MODE_PRIVATE)
return sharedPreferences.getString(context.getString(R.string.token), "") ?: ""
diff --git a/app/src/main/java/com/example/nerbos/service/NetworkManager.kt b/app/src/main/java/com/example/nerbos/service/NetworkManager.kt
deleted file mode 100644
index fd3ccb05debea779fb897d3577c18a523e11e348..0000000000000000000000000000000000000000
--- a/app/src/main/java/com/example/nerbos/service/NetworkManager.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.example.nerbos.service
-
-import android.content.Context
-import android.net.ConnectivityManager
-import android.net.Network
-import android.view.View
-import android.widget.Toast
-import com.example.nerbos.MainActivity
-import com.example.nerbos.R
-import com.example.nerbos.fragments.network.NoInternetFragment
-
-class NetworkManager(private val context: Context) {
-
- private val connectivityManager: ConnectivityManager =
- context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
- private var isInternetAvailable = false
-
- private val networkCallback = object : ConnectivityManager.NetworkCallback() {
- override fun onAvailable(network: Network) {
- isInternetAvailable = true
- handleNetworkChanges()
- }
-
- override fun onLost(network: Network) {
- isInternetAvailable = false
- handleNetworkChanges()
- }
- }
-
- init {
- // Register network callback to monitor network changes
- connectivityManager.registerDefaultNetworkCallback(networkCallback)
- }
-
- fun unregisterNetworkCallback() {
- // Unregister the network callback when the activity is destroyed
- connectivityManager.unregisterNetworkCallback(networkCallback)
- }
-
- private fun handleNetworkChanges() {
- val mainActivity = context as MainActivity
- val currentFragmentId = mainActivity.getCurrentFragmentId()
-
- if (!isInternetAvailable) {
- // If not connected to the internet, show NoInternetFragment and hide ActionBar and BottomNavigationView
- mainActivity.runOnUiThread {
- Toast.makeText(context, "No internet connection", Toast.LENGTH_SHORT).show()
- showNoInternetFragment(mainActivity)
- hideActionBarAndNavBar(mainActivity)
- }
- } else {
- // If internet is available and NoInternetFragment is visible, replace with the appropriate fragment and show ActionBar and BottomNavigationView
- if (mainActivity.supportFragmentManager.findFragmentById(R.id.frameLayout) is NoInternetFragment) {
- Toast.makeText(context, "Connected to the internet", Toast.LENGTH_SHORT).show()
- mainActivity.runOnUiThread {
- mainActivity.replaceFragment(mainActivity.getFragmentFromId(currentFragmentId)) // Reinflate the previous fragment
- mainActivity.supportActionBar?.title =
- context.getString(mainActivity.getTitleFromId(currentFragmentId)) // Reinflate the previous fragment's title
- mainActivity.showActionBarAndNavBar()
- }
- }
- }
- }
-
- private fun showNoInternetFragment(mainActivity: MainActivity) {
- // Show NoInternetFragment
- mainActivity.replaceFragment(NoInternetFragment())
- }
-
- private fun hideActionBarAndNavBar(mainActivity: MainActivity) {
- mainActivity.supportActionBar?.hide()
- mainActivity.binding.bottomNavigationView?.visibility ?: View.GONE
- }
-
- fun handleCloseButtonClick() {
- val mainActivity = context as MainActivity
- val currentFragmentId = mainActivity.getCurrentFragmentId()
- mainActivity.runOnUiThread {
- mainActivity.replaceFragment(mainActivity.getFragmentFromId(currentFragmentId))
- mainActivity.supportActionBar?.title = context.getString(mainActivity.getTitleFromId(currentFragmentId))
- mainActivity.showActionBarAndNavBar()
- }
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/nerbos/service/NetworkManagerService.kt b/app/src/main/java/com/example/nerbos/service/NetworkManagerService.kt
new file mode 100644
index 0000000000000000000000000000000000000000..efe66c38c960c6785b01b9462555458bad58f0cd
--- /dev/null
+++ b/app/src/main/java/com/example/nerbos/service/NetworkManagerService.kt
@@ -0,0 +1,121 @@
+package com.example.nerbos.service
+
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.content.res.Configuration
+import android.net.ConnectivityManager
+import android.net.Network
+import android.os.Binder
+import android.os.Handler
+import android.os.IBinder
+import android.os.Looper
+import android.view.View
+import android.widget.Toast
+import com.example.nerbos.MainActivity
+import com.example.nerbos.R
+import com.example.nerbos.fragments.network.NoInternetFragment
+
+class NetworkManagerService : Service() {
+
+ private lateinit var connectivityManager: ConnectivityManager
+ private val binder = LocalBinder()
+
+ inner class LocalBinder : Binder()
+
+ override fun onBind(intent: Intent?): IBinder {
+ return binder
+ }
+
+ override fun onCreate() {
+ super.onCreate()
+ connectivityManager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+ startNetworkMonitoring()
+ }
+
+ private fun startNetworkMonitoring() {
+ val handler = Handler(Looper.getMainLooper())
+ handler.post {
+ connectivityManager.registerDefaultNetworkCallback(object : ConnectivityManager.NetworkCallback() {
+ override fun onAvailable(network: Network) {
+ handler.post {
+ showNetworkToast("Connected to the internet")
+ handleNetworkChanges(true)
+ }
+ }
+
+ override fun onLost(network: Network) {
+ handler.post {
+ showNetworkToast("No internet connection")
+ handleNetworkChanges(false)
+ }
+ }
+ })
+ }
+ }
+
+ private fun showNetworkToast(message: String) {
+ // Use application context for Toast since services don't have UI context
+ Toast.makeText(applicationContext, message, Toast.LENGTH_SHORT).show()
+ }
+
+ fun handleNetworkChanges(isInternetAvailable: Boolean) {
+ val mainActivity = MainActivity.getInstance()
+
+ if (mainActivity != null) {
+ val currentFragmentId = mainActivity.getCurrentFragmentId()
+ val fragmentManager = mainActivity.supportFragmentManager
+
+ if (!isInternetAvailable) {
+ // If not connected to the internet, show NoInternetFragment and hide ActionBar and BottomNavigationView
+ mainActivity.runOnUiThread {
+ showNoInternetFragment(mainActivity)
+ hideActionBarAndNavBar(mainActivity)
+ }
+ } else {
+ // If internet is available and NoInternetFragment is visible, replace with the appropriate fragment and show ActionBar and BottomNavigationView
+ if (fragmentManager.findFragmentById(R.id.frameLayout) is NoInternetFragment) {
+ mainActivity.runOnUiThread {
+ mainActivity.replaceFragment(
+ mainActivity.getFragmentFromId(currentFragmentId),
+ ) // Reinflate the previous fragment
+ mainActivity.supportActionBar?.title = applicationContext.getString(mainActivity.getTitleFromId(currentFragmentId)) // Reinflate the previous fragment's title
+ showActionBarAndNavBar(mainActivity)
+ }
+ }
+ }
+ }
+ }
+
+ private fun showNoInternetFragment(mainActivity: MainActivity) {
+ // Show NoInternetFragment
+ val noInternetFragment = NoInternetFragment()
+ mainActivity.replaceFragment(noInternetFragment)
+ }
+
+ private fun hideActionBarAndNavBar(mainActivity: MainActivity) {
+ mainActivity.supportActionBar?.hide()
+ mainActivity.binding.bottomNavigationView?.visibility = View.GONE
+ mainActivity.binding.navigationView?.visibility = View.GONE
+ }
+
+ private fun showActionBarAndNavBar(mainActivity: MainActivity) {
+ mainActivity.supportActionBar?.show()
+ if (mainActivity.resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) {
+ mainActivity.binding.bottomNavigationView?.visibility = View.VISIBLE
+ } else {
+ mainActivity.binding.navigationView?.visibility = View.VISIBLE
+ }
+ }
+
+ fun handleCloseButtonClick(mainActivity: MainActivity) {
+ val currentFragmentId = mainActivity.getCurrentFragmentId()
+ mainActivity.runOnUiThread {
+ mainActivity.replaceFragment(
+ mainActivity.getFragmentFromId(currentFragmentId),
+ ) // Reinflate the previous fragment
+ mainActivity.supportActionBar?.title = mainActivity.getString(mainActivity.getTitleFromId(currentFragmentId)) // Reinflate the previous fragment's title
+ }
+ showActionBarAndNavBar(mainActivity)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
new file mode 100644
index 0000000000000000000000000000000000000000..15e0dcca3b0376164ca26f1b1648fe223aa976f8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_back.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+
+ <path android:fillColor="@android:color/white" android:pathData="M11.67,3.87L9.9,2.1 0,12l9.9,9.9 1.77,-1.77L3.54,12z"/>
+
+</vector>
diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml
new file mode 100644
index 0000000000000000000000000000000000000000..827f664a41139e37d9f993860a71e7afeac921b6
--- /dev/null
+++ b/app/src/main/res/layout/activity_maps.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.constraintlayout.widget.ConstraintLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context=".MapsActivity"
+ >
+
+ <fragment
+ xmlns:map="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/map"
+ android:name="com.google.android.gms.maps.SupportMapFragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ map:layout_constraintTop_toTopOf="parent"
+ />
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="24sp"
+ android:textColor="@color/white"
+ android:background="@color/base_bg"
+ android:text="@string/maps"
+ android:paddingTop = "5dp"
+ android:paddingStart="40dp"
+ android:paddingEnd="10dp"
+ android:paddingBottom="10dp"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toEndOf="@id/backButton"
+ />
+
+ <ImageView
+ android:id="@+id/backButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="10dp"
+ android:paddingBottom="5dp"
+ android:src="@drawable/ic_back"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/add_scan_transaction.xml b/app/src/main/res/layout/add_scan_transaction.xml
new file mode 100644
index 0000000000000000000000000000000000000000..520807875ceb101da97dbe6549a6fc14b4f58ee0
--- /dev/null
+++ b/app/src/main/res/layout/add_scan_transaction.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:padding="16dp">
+
+ <EditText
+ android:id="@+id/nameInput"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/name"
+ android:inputType="text"
+ android:autofillHints="Transaction Name" />
+
+ <RadioGroup
+ android:id="@+id/transactionTypeRadioGroup"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:orientation="horizontal">
+
+ <RadioButton
+ android:id="@+id/incomeRadioButton"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="@string/income" />
+
+ <RadioButton
+ android:id="@+id/outcomeRadioButton"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="@string/outcome" />
+
+ </RadioGroup>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:orientation="horizontal">
+
+ <EditText
+ android:id="@+id/locationInput"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:autofillHints="Location Name"
+ android:hint="@string/location"
+ android:inputType="text"
+ android:layout_marginEnd="20dp"
+ tools:ignore="NestedWeights" />
+
+ <ImageButton
+ android:id="@+id/mapButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:contentDescription="@string/maps"
+ android:background="@color/transparent"
+ app:srcCompat="@android:drawable/ic_dialog_map" />
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_scan.xml b/app/src/main/res/layout/fragment_scan.xml
index 193a7384f6056c7253520fb441d76721006f1626..3d5bb3139356fbef43e87b7008307190a98e0070 100644
--- a/app/src/main/res/layout/fragment_scan.xml
+++ b/app/src/main/res/layout/fragment_scan.xml
@@ -3,14 +3,66 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/primary_bg"
tools:context=".fragments.scan.ScanFragment">
- <!-- TODO: Update blank fragment layout -->
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Scan Fragment"
- android:textSize="26dp"
- android:layout_gravity="center" />
+ <LinearLayout
+ android:id="@+id/scanVerticalLayout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ tools:ignore="UselessParent">
+
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="50dp" />
+
+ <androidx.camera.view.PreviewView
+ android:id="@+id/previewView"
+ android:layout_width="300dp"
+ android:layout_height="400dp"
+ android:layout_gravity="center" />
+
+ <LinearLayout
+ android:id="@+id/scanHorizontalLayout"
+ android:layout_width="300dp"
+ android:layout_height="160dp"
+ android:layout_gravity="center"
+ android:orientation="horizontal">
+
+ <ImageButton
+ android:id="@+id/captureButton"
+ android:layout_width="75dp"
+ android:layout_height="75dp"
+ android:layout_gravity="center"
+ android:background="@drawable/round_corner_button_weak"
+ android:contentDescription="@string/capture_button"
+ android:scaleType="fitCenter"
+ android:src="@android:drawable/ic_menu_camera"
+ tools:ignore="RedundantDescriptionCheck" />
+
+ <Space
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1" />
+
+ <ImageButton
+ android:id="@+id/galleryButton"
+ android:layout_width="75dp"
+ android:layout_height="75dp"
+ android:layout_gravity="center"
+ android:background="@drawable/round_corner_button_weak"
+ android:contentDescription="@string/gallery_button"
+ android:scaleType="fitCenter"
+ android:src="@android:drawable/ic_menu_gallery"
+ tools:ignore="RedundantDescriptionCheck" />
+
+ </LinearLayout>
+
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="125dp" />
+
+ </LinearLayout>
</FrameLayout>
\ 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 d24b88164be10aa73318877cbc1fdb3b3b62c087..8238883239e177aab6c1d4abf47882760207137a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -23,6 +23,7 @@
<string name="backend_api_login">https://pbd-backend-2024.vercel.app/api/auth/login</string>
<string name="backend_api_token">https://pbd-backend-2024.vercel.app/api/auth/token</string>
+ <string name="backend_api_scan">https://pbd-backend-2024.vercel.app/api/bill/upload</string>
<string name="ok">OK</string>
<string name="welcome">Welcome!</string>
@@ -46,10 +47,16 @@
<string name="delete_success">Transaction successfully deleted</string>
<string name="income">Income</string>
<string name="outcome">Outcome</string>
+ <string name="title_activity_maps">MapsActivity</string>
+ <string name="maps">Maps</string>
<string name="network_sensing_string">No Internet Connection Please check your connection and try again.</string>
<string name="close_button">Close Button</string>
+
<string name="pie_chart_title">Income vs Outcome Chart</string>
<string name="language_code">id</string>
<string name="country_code">ID</string>
+ <string name="capture_button">Capture Button</string>
+ <string name="gallery_button">Gallery Button</string>
+
</resources>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 98de0e48fee24c2754decc4211bfc712e0299e5f..1764a12d184f94f866991078a28422563e8d4935 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,4 +2,5 @@
plugins {
id("com.android.application") version "8.3.1" apply false
id("org.jetbrains.kotlin.android") version "1.9.22" apply false
+ id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin") version "2.0.1" apply false
}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 3c5031eb7d63f785752b1914cc8692a453d1cc63..2e7e7ed807f16f684be27f3b0959e2342e346381 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,5 @@ kotlin.code.style=official
# Enables namespacing of each library's R class so that its R class includes only the
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+org.gradle.configuration-cache=true
\ No newline at end of file