Merge pull request #8 from ENTS-H104/daffa/dev

RELEASE BETA v1.0 🤩✨

Author: daf2a

README.md

@@ -7,9 +7,6 @@
 </a>
 </div>
 
-<!-- You can make badge by read on official documentation at https://shields.io/badges -->
-
-
 <p align="center">
 <a href="#-introduction">Introduction</a> &nbsp;&bull;&nbsp;
 <a href="#-tech-stack">Tech Stack</a> &nbsp;&bull;&nbsp;
@@ -25,16 +22,15 @@ Key features include detailed mountain information, secure guide and partner boo
 
 ## 💻 Tech Stack
 
-> Framework, Library, Database, Tools, etc
-
 ![Kotlin](https://img.shields.io/badge/Kotlin-0095D5?style=for-the-badge&logo=kotlin&logoColor=white)
 ![Android Studio](https://img.shields.io/badge/Android%20Studio-3DDC84?style=for-the-badge&logo=android-studio&logoColor=white)
 ![Postman](https://img.shields.io/badge/Postman-FF6C37?style=for-the-badge&logo=postman&logoColor=white)
-![Retrofit](https://img.shields.io/badge/Retrofit-007FFF?style=for-the-badge&logo=retrofit&logoColor=white)
-![ViewPager](https://img.shields.io/badge/ViewPager-FF4081?style=for-the-badge&logo=android&logoColor=white)
-![DataStore](https://img.shields.io/badge/DataStore-FF6F00?style=for-the-badge&logo=android&logoColor=white)
-![Room](https://img.shields.io/badge/Room-007FFF?style=for-the-badge&logo=room&logoColor=white)
-![Paging 3](https://img.shields.io/badge/Paging%203-FF6F00?style=for-the-badge&logo=android&logoColor=white)
+![Retrofit](https://img.shields.io/badge/Retrofit-FF4081?style=for-the-badge&logo=android&logoColor=white)
+![ViewPager](https://img.shields.io/badge/ViewPager-0095D5?style=for-the-badge&logo=android&logoColor=white)
+![DataStore](https://img.shields.io/badge/DataStore-3DDC84?style=for-the-badge&logo=android&logoColor=white)
+![Room Dao](https://img.shields.io/badge/Room-FF6C37?style=for-the-badge&logo=android&logoColor=white)
+![Paging 3](https://img.shields.io/badge/Paging%203-FF4081?style=for-the-badge&logo=android&logoColor=white)
+![Midtrans](https://img.shields.io/badge/Midtrans-0095D5?style=for-the-badge&logo=android&logoColor=white)
 
 
 ## 📚 Reference
@@ -45,6 +41,7 @@ Key features include detailed mountain information, secure guide and partner boo
 - [DataStore](https://developer.android.com/topic/libraries/architecture/datastore)
 - [Room](https://developer.android.com/training/data-storage/room/)
 - [Paging 3](https://developer.android.com/topic/libraries/architecture/paging/v3-overview)
+- [Midtrans](https://docs.midtrans.com/reference/android-sdk)
 
 
 ## 🚩 Issue

app/build.gradle.kts

@@ -21,7 +21,10 @@ android {
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resValue("string", "google_maps_key", "AIzaSyDsbvczf_2-MgmpGzxjdrMRZPcatQI4bPA")
+        resValue("string", "payment_gateway_uuid", "dc5ce8d6-e907-44fa-8d3f-106a83dd6f22")
         buildConfigField("String", "BASE_URL", "\"https://highking.cloud/api/\"")
+        buildConfigField("String", "MIDTRANS_CLIENT_KEY", "\"SB-Mid-client-0euqacxFYGhkN5uu\"")
+        buildConfigField("String", "MIDTRANS_URL", "\"https://api.sandbox.midtrans.com/\"")
     }
 
     buildTypes {

app/release/baselineProfiles/0/app-release.dm

@@ -0,0 +1,37 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.entsh104.highking",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "1.0",
+      "outputFile": "app-release.apk"
+    }
+  ],
+  "elementType": "File",
+  "baselineProfiles": [
+    {
+      "minApi": 28,
+      "maxApi": 30,
+      "baselineProfiles": [
+        "baselineProfiles/1/app-release.dm"
+      ]
+    },
+    {
+      "minApi": 31,
+      "maxApi": 2147483647,
+      "baselineProfiles": [
+        "baselineProfiles/0/app-release.dm"
+      ]
+    }
+  ],
+  "minSdkVersionForDexing": 24
+}

app/release/baselineProfiles/1/app-release.dm

@@ -45,6 +45,7 @@ data class UserResponse(
     val updated_at: String?
 )
 
+@Parcelize
 data class MountainResponse(
     @SerializedName("mountain_uuid") val mountainId: String,
     @SerializedName("name") val name: String,
@@ -59,7 +60,7 @@ data class MountainResponse(
     @SerializedName("harga") val harga: Int,
     @SerializedName("gmaps") val gmaps: String,
     @SerializedName("total_trip_open") val totalTripOpen: Int
-)
+): Parcelable
 
 data class MountainsResponse(
     @SerializedName("status") val status: Int,

app/release/highking_v1.0_beta.apk

@@ -19,9 +19,7 @@ import com.entsh104.highking.data.model.UpdateUserRequest
 import com.entsh104.highking.data.model.UserResponse
 import com.entsh104.highking.data.model.UserUpdateApiResponse
 import com.entsh104.highking.data.source.local.SharedPreferencesManager
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody
@@ -92,9 +90,7 @@ class UserRepository(
         imageUri: Uri
     ): Result<UpdatePhotoResponse> {
         val token = prefs.getToken() ?: return Result.failure(Exception("Token not found"))
-        Log.d("UploadPhoto", "Token: $token")
         val parcelFileDescriptor = contentResolver.openFileDescriptor(imageUri, "r", null) ?: return Result.failure(Exception("Failed to open file descriptor"))
-        Log.d("UploadPhoto", "File Descriptor opened successfully")
         val inputStream = FileInputStream(parcelFileDescriptor.fileDescriptor)
         val file = File(cacheDir, contentResolver.getFileName(imageUri))
         val outputStream = FileOutputStream(file)
@@ -105,7 +101,6 @@ class UserRepository(
 
         return try {
             val response = apiService.updatePhotoUser("Bearer $token", body)
-            Log.d("UploadPhoto", "Response: ${response.message()}")
             if (response.isSuccessful) {
                 Result.success(response.body()!!)
             } else {
@@ -205,16 +200,19 @@ class UserRepository(
             Result.failure(e)
         }
     }
-//    suspend fun getMountains(): LiveData<PagingData<List<MountainResponse>>> {
-//        return Pager(
-//            config = PagingConfig(
-//                pageSize = 5
-//            ),
-//            PagingSourceFactory = {
-//                MountainPagingSource(apiService)
-//            }
-//        ).livedata
-//    }
+
+    suspend fun getMountainsLimit(): Result<List<MountainResponse>> {
+        return try {
+            val response = apiService.getMountainsLimit()
+            if (response.isSuccessful) {
+                Result.success(response.body()?.data ?: emptyList())
+            } else {
+                Result.failure(Exception(response.message()))
+            }
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
 
     suspend fun getMountainById(id: String): Result<MountainDetailResponse> {
         val token = prefs.getToken()
@@ -243,7 +241,6 @@ class UserRepository(
         }
     }
 
-
     suspend fun getOpenTripById(tripId: String): Result<OpenTripDetailResponse> {
         val token = prefs.getToken()
         return try {
@@ -300,11 +297,33 @@ class UserRepository(
         }
     }
 
-    fun saveToken(token: String) {
-        prefs.saveToken(token)
+    suspend fun getRecommendedMountains(userUid: String): Result<List<MountainResponse>> {
+        return try {
+            val response = apiService.getRecommendedMountains(userUid)
+            if (response.isSuccessful) {
+                Result.success(response.body()?.data ?: emptyList())
+            } else {
+                Result.failure(Throwable(response.message()))
+            }
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
     }
 
-    fun getToken(): String? {
-        return prefs.getToken()
+    suspend fun getRecommendedTrips(userUid: String): Result<OpenTripResponse> = withContext(Dispatchers.IO) {
+        try {
+            val response = apiService.getRecommendedTrips(userUid)
+            if (response.isSuccessful) {
+                Result.success(response.body()!!)
+            } else {
+                Result.failure(Exception(response.message()))
+            }
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
+
+    fun saveToken(token: String) {
+        prefs.saveToken(token)
     }
 }

app/release/output-metadata.json

@@ -10,6 +10,10 @@ class SharedPreferencesManager(context: Context) {
         prefs.edit().putString("token", token).apply()
     }
 
+    fun saveUserUid(uid: String) {
+        prefs.edit().putString("userUid", uid).apply()
+    }
+
     fun getToken(): String? {
         return prefs.getString("token", null)
     }

app/src/main/java/com/entsh104/highking/data/model/Response.kt

@@ -19,6 +19,7 @@ import com.entsh104.highking.data.model.UpdateUserRequest
 import com.entsh104.highking.data.model.UserApiResponse
 import com.entsh104.highking.data.model.UserResponse
 import com.entsh104.highking.data.model.UserUpdateApiResponse
+import com.entsh104.highking.ui.model.Mountain
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import retrofit2.Response
@@ -65,14 +66,23 @@ interface ApiService {
     @GET("mountains")
     suspend fun getMountains(
         @Query("page") page: Int = 1,
-        @Query("limit") size: Int = 100
+        @Query("limit") size: Int = 1000
+    ): Response<MountainsResponse>
+
+    @GET("mountains")
+    suspend fun getMountainsLimit(
+        @Query("page") page: Int = 1,
+        @Query("limit") size: Int = 10
     ): Response<MountainsResponse>
 
     @GET("mountains/{id}")
     suspend fun getMountainById(@Header("Authorization") token: String, @Path("id") id: String): Response<MountainDetailResponse>
 
     @GET("open-trips")
-    suspend fun getOpenTrips(): Response<OpenTripResponse>
+    suspend fun getOpenTrips(
+        @Query("page") page: Int = 1,
+        @Query("limit") size: Int = 10
+    ): Response<OpenTripResponse>
 
     @GET("open-trips/{open_trip_uuid}")
     suspend fun getOpenTripById(@Header("Authorization") token: String, @Path("open_trip_uuid") openTripId: String): Response<OpenTripDetailResponse>
@@ -109,4 +119,10 @@ interface ApiService {
         @Query("page") page: Int,
         @Query("limit") size: Int
     ): Response<OpenTripResponse>
+
+    @GET("/api/recommendation/mountain/{user_uid}")
+    suspend fun getRecommendedMountains(@Path("user_uid") userUid: String): Response<MountainsResponse>
+
+    @GET("/api/recommendation/open-trip/{user_uid}")
+    suspend fun getRecommendedTrips(@Path("user_uid") userId: String): Response<OpenTripResponse>
 }