diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6c05b572ac319727dd3510f1b9d8c0bedf5c9278..a165ea8d65565de7fa3ab5a7e18a16b71e06e51f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -108,4 +108,4 @@ dependencies { //DataBinding kapt ("com.android.databinding:compiler:3.2.0-alpha10") -} +} \ No newline at end of file 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 0b92fd4b198c06a21bb55736270b47f77989ff65..d5eb6b35cee41e4ac9276332f93ddf6f4fc464d3 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 @@ -450,6 +450,37 @@ 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(Manifest.permission.ACCESS_FINE_LOCATION), permissionCode) + return + } + fusedLocationProviderClient.lastLocation.addOnSuccessListener (requireActivity()){ + location -> + currentLocation = location + } + } + + @Suppress("DEPRECATION") + 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 2e691dd88d10f86095472bdae4e1d6295e44dfaf..6d99233b22987aea03f53674912677ea6d34263d 100644 --- a/app/src/main/java/com/example/nerbos/service/Authentication.kt +++ b/app/src/main/java/com/example/nerbos/service/Authentication.kt @@ -150,7 +150,6 @@ class Authentication(private val context: Context) { return String(decryptedToken, Charsets.UTF_8) } - fun checkToken(callback: AuthCallback) { // check network availability if (!isNetworkAvailable()) { diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml index 0b747601e89149335c41b9ace303b1ca02ab6dfa..ccb06b56041dd0e9000a666b446190f622327549 100644 --- a/app/src/main/res/layout/activity_maps.xml +++ b/app/src/main/res/layout/activity_maps.xml @@ -17,6 +17,7 @@ android:layout_height="match_parent" map:layout_constraintTop_toTopOf="parent" /> + <TextView android:id="@+id/title" android:layout_width="match_parent" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dfc7cc405f38a0a3c3f91d166ae34a8950aad4d4..cc66f87f61f9e12f668d8f4a13303c42204bc2ea 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -21,7 +21,6 @@ <string name="android_key_store">AndroidKeyStore</string> <string name="authorization">Authorization</string> <string name="bearer">Bearer</string> - <string name="no_internet">No Internet Connection</string> <string name="server_error">Server Error</string> <string name="preferences">NosPreferences</string>