From 22522a92323aeba64fac686eeb7260be5e094a61 Mon Sep 17 00:00:00 2001
From: liviaarumsari <13521094@mahasiswa.itb.ac.id>
Date: Fri, 5 Apr 2024 15:33:55 +0700
Subject: [PATCH] refactor: remove unused class, change package
---
.../java/com/example/abe/ABEApplication.kt | 4 +-
.../com/example/abe/MainActivityViewModel.kt | 2 +-
.../abe/{data/network => api}/Retrofit.kt | 2 +-
.../abe/{data/network => api}/Services.kt | 2 +-
.../abe/{data/network => api}/Types.kt | 2 +-
.../com/example/abe/connection/retrofit.kt | 52 -------------------
.../example/abe/data/{ => db}/Converters.kt | 2 +-
.../example/abe/data/{ => db}/Transaction.kt | 2 +-
.../abe/data/{ => db}/TransactionDAO.kt | 2 +-
.../abe/data/{ => db}/TransactionDatabase.kt | 2 +-
.../data/{ => db}/TransactionRepository.kt | 2 +-
.../com/example/abe/services/AuthService.kt | 4 +-
.../java/com/example/abe/services/login.kt | 12 -----
.../main/java/com/example/abe/types/data.kt | 10 ----
.../FormTransactionViewModel.kt | 5 +-
.../example/abe/ui/graph/GraphViewModel.kt | 2 +-
.../com/example/abe/ui/login/LoginActivity.kt | 7 +--
.../example/abe/ui/scanner/ScannerFragment.kt | 6 +--
.../abe/ui/scanner/ScannerViewModel.kt | 6 +--
.../ui/transactions/TransactionViewModel.kt | 4 +-
.../ui/transactions/TransactionsAdapter.kt | 2 +-
21 files changed, 29 insertions(+), 103 deletions(-)
rename app/src/main/java/com/example/abe/{data/network => api}/Retrofit.kt (99%)
rename app/src/main/java/com/example/abe/{data/network => api}/Services.kt (94%)
rename app/src/main/java/com/example/abe/{data/network => api}/Types.kt (92%)
delete mode 100644 app/src/main/java/com/example/abe/connection/retrofit.kt
rename app/src/main/java/com/example/abe/data/{ => db}/Converters.kt (89%)
rename app/src/main/java/com/example/abe/data/{ => db}/Transaction.kt (92%)
rename app/src/main/java/com/example/abe/data/{ => db}/TransactionDAO.kt (97%)
rename app/src/main/java/com/example/abe/data/{ => db}/TransactionDatabase.kt (98%)
rename app/src/main/java/com/example/abe/data/{ => db}/TransactionRepository.kt (97%)
delete mode 100644 app/src/main/java/com/example/abe/services/login.kt
delete mode 100644 app/src/main/java/com/example/abe/types/data.kt
diff --git a/app/src/main/java/com/example/abe/ABEApplication.kt b/app/src/main/java/com/example/abe/ABEApplication.kt
index d41830c..e1aad4b 100644
--- a/app/src/main/java/com/example/abe/ABEApplication.kt
+++ b/app/src/main/java/com/example/abe/ABEApplication.kt
@@ -1,8 +1,8 @@
package com.example.abe
import android.app.Application
-import com.example.abe.data.TransactionDatabase
-import com.example.abe.data.TransactionRepository
+import com.example.abe.data.db.TransactionDatabase
+import com.example.abe.data.db.TransactionRepository
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.SupervisorJob
diff --git a/app/src/main/java/com/example/abe/MainActivityViewModel.kt b/app/src/main/java/com/example/abe/MainActivityViewModel.kt
index afc842d..3c8ea5b 100644
--- a/app/src/main/java/com/example/abe/MainActivityViewModel.kt
+++ b/app/src/main/java/com/example/abe/MainActivityViewModel.kt
@@ -7,7 +7,7 @@ import android.net.Uri
import androidx.core.content.FileProvider
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import com.example.abe.data.TransactionRepository
+import com.example.abe.data.db.TransactionRepository
import com.example.abe.domain.FormatCurrencyUseCase
import com.example.abe.domain.GenerateExcelUseCase
import java.io.File
diff --git a/app/src/main/java/com/example/abe/data/network/Retrofit.kt b/app/src/main/java/com/example/abe/api/Retrofit.kt
similarity index 99%
rename from app/src/main/java/com/example/abe/data/network/Retrofit.kt
rename to app/src/main/java/com/example/abe/api/Retrofit.kt
index 2153664..5d389d6 100644
--- a/app/src/main/java/com/example/abe/data/network/Retrofit.kt
+++ b/app/src/main/java/com/example/abe/api/Retrofit.kt
@@ -1,4 +1,4 @@
-package com.example.abe.data.network
+package com.example.abe.api
import android.util.Log
import okhttp3.MediaType.Companion.toMediaTypeOrNull
diff --git a/app/src/main/java/com/example/abe/data/network/Services.kt b/app/src/main/java/com/example/abe/api/Services.kt
similarity index 94%
rename from app/src/main/java/com/example/abe/data/network/Services.kt
rename to app/src/main/java/com/example/abe/api/Services.kt
index 42eff78..a18bb1d 100644
--- a/app/src/main/java/com/example/abe/data/network/Services.kt
+++ b/app/src/main/java/com/example/abe/api/Services.kt
@@ -1,4 +1,4 @@
-package com.example.abe.data.network
+package com.example.abe.api
import okhttp3.MultipartBody
import retrofit2.Call
diff --git a/app/src/main/java/com/example/abe/data/network/Types.kt b/app/src/main/java/com/example/abe/api/Types.kt
similarity index 92%
rename from app/src/main/java/com/example/abe/data/network/Types.kt
rename to app/src/main/java/com/example/abe/api/Types.kt
index e423b33..fef0c9f 100644
--- a/app/src/main/java/com/example/abe/data/network/Types.kt
+++ b/app/src/main/java/com/example/abe/api/Types.kt
@@ -1,4 +1,4 @@
-package com.example.abe.data.network
+package com.example.abe.api
data class LoginRequest (
val email: String,
diff --git a/app/src/main/java/com/example/abe/connection/retrofit.kt b/app/src/main/java/com/example/abe/connection/retrofit.kt
deleted file mode 100644
index 03d15e5..0000000
--- a/app/src/main/java/com/example/abe/connection/retrofit.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.example.abe.connection
-
-import com.example.abe.services.LoginService
-import com.example.abe.types.LoginRequest
-import com.example.abe.types.LoginResponse
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-
-class CallBack<T> : Callback<T> {
- override fun onResponse(call: Call<T>, response: Response<T>) {
- if (response.isSuccessful) {
- // Handle successful response
- val data = response.body()
- // Process the data here
- if (data is LoginResponse) {
- // Handle LoginResponse
- println("Login successful $data")
- }
- } else {
- // Handle error response
- // Maybe use response.errorBody() to get error details
- println("Login failed")
- }
- }
-
- override fun onFailure(call: Call<T>, t: Throwable) {
- // Handle failure
- println("Failed to send request")
- }
-}
-
-class Retrofit {
-
- private val url = "https://pbd-backend-2024.vercel.app/"
- private val retrofit = Retrofit.Builder()
- .baseUrl(url)
- .addConverterFactory(GsonConverterFactory.create())
- .build()
-
- fun Login(email: String, password: String) {
- val loginService = retrofit.create(LoginService::class.java)
-
- val call: Call<LoginResponse> = loginService.login(
- LoginRequest(email, password)
- )
-
- call.enqueue(CallBack())
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/abe/data/Converters.kt b/app/src/main/java/com/example/abe/data/db/Converters.kt
similarity index 89%
rename from app/src/main/java/com/example/abe/data/Converters.kt
rename to app/src/main/java/com/example/abe/data/db/Converters.kt
index 348b048..1a8497a 100644
--- a/app/src/main/java/com/example/abe/data/Converters.kt
+++ b/app/src/main/java/com/example/abe/data/db/Converters.kt
@@ -1,4 +1,4 @@
-package com.example.abe.data
+package com.example.abe.data.db
import androidx.room.TypeConverter
import java.util.Date
diff --git a/app/src/main/java/com/example/abe/data/Transaction.kt b/app/src/main/java/com/example/abe/data/db/Transaction.kt
similarity index 92%
rename from app/src/main/java/com/example/abe/data/Transaction.kt
rename to app/src/main/java/com/example/abe/data/db/Transaction.kt
index 1f8bf16..1c22afb 100644
--- a/app/src/main/java/com/example/abe/data/Transaction.kt
+++ b/app/src/main/java/com/example/abe/data/db/Transaction.kt
@@ -1,4 +1,4 @@
-package com.example.abe.data
+package com.example.abe.data.db
import androidx.room.Entity
import androidx.room.PrimaryKey
diff --git a/app/src/main/java/com/example/abe/data/TransactionDAO.kt b/app/src/main/java/com/example/abe/data/db/TransactionDAO.kt
similarity index 97%
rename from app/src/main/java/com/example/abe/data/TransactionDAO.kt
rename to app/src/main/java/com/example/abe/data/db/TransactionDAO.kt
index 51a6724..9e69fcc 100644
--- a/app/src/main/java/com/example/abe/data/TransactionDAO.kt
+++ b/app/src/main/java/com/example/abe/data/db/TransactionDAO.kt
@@ -1,4 +1,4 @@
-package com.example.abe.data
+package com.example.abe.data.db
import androidx.lifecycle.LiveData
import androidx.room.Dao
diff --git a/app/src/main/java/com/example/abe/data/TransactionDatabase.kt b/app/src/main/java/com/example/abe/data/db/TransactionDatabase.kt
similarity index 98%
rename from app/src/main/java/com/example/abe/data/TransactionDatabase.kt
rename to app/src/main/java/com/example/abe/data/db/TransactionDatabase.kt
index 61616bf..4d54cfc 100644
--- a/app/src/main/java/com/example/abe/data/TransactionDatabase.kt
+++ b/app/src/main/java/com/example/abe/data/db/TransactionDatabase.kt
@@ -1,4 +1,4 @@
-package com.example.abe.data
+package com.example.abe.data.db
import android.content.Context
import androidx.room.Database
diff --git a/app/src/main/java/com/example/abe/data/TransactionRepository.kt b/app/src/main/java/com/example/abe/data/db/TransactionRepository.kt
similarity index 97%
rename from app/src/main/java/com/example/abe/data/TransactionRepository.kt
rename to app/src/main/java/com/example/abe/data/db/TransactionRepository.kt
index be06b77..97b9308 100644
--- a/app/src/main/java/com/example/abe/data/TransactionRepository.kt
+++ b/app/src/main/java/com/example/abe/data/db/TransactionRepository.kt
@@ -1,4 +1,4 @@
-package com.example.abe.data
+package com.example.abe.data.db
import androidx.annotation.WorkerThread
import androidx.lifecycle.LiveData
diff --git a/app/src/main/java/com/example/abe/services/AuthService.kt b/app/src/main/java/com/example/abe/services/AuthService.kt
index 6ebef0d..c74233b 100644
--- a/app/src/main/java/com/example/abe/services/AuthService.kt
+++ b/app/src/main/java/com/example/abe/services/AuthService.kt
@@ -8,8 +8,8 @@ import androidx.lifecycle.lifecycleScope
import androidx.localbroadcastmanager.content.LocalBroadcastManager
import com.example.abe.data.local.PreferenceDataStoreConstants
import com.example.abe.data.local.PreferenceDataStoreHelper
-import com.example.abe.data.network.CheckAuthResultCallback
-import com.example.abe.data.network.Retrofit
+import com.example.abe.api.CheckAuthResultCallback
+import com.example.abe.api.Retrofit
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
diff --git a/app/src/main/java/com/example/abe/services/login.kt b/app/src/main/java/com/example/abe/services/login.kt
deleted file mode 100644
index df0ba8a..0000000
--- a/app/src/main/java/com/example/abe/services/login.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.example.abe.services
-
-import com.example.abe.types.LoginRequest
-import com.example.abe.types.LoginResponse
-import retrofit2.Call
-import retrofit2.http.Body
-import retrofit2.http.POST
-
-interface LoginService {
- @POST("api/auth/login")
- fun login(@Body user: LoginRequest) : Call<LoginResponse>
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/abe/types/data.kt b/app/src/main/java/com/example/abe/types/data.kt
deleted file mode 100644
index 103119b..0000000
--- a/app/src/main/java/com/example/abe/types/data.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.example.abe.types
-
-data class LoginRequest (
- val email: String,
- val password: String
-)
-
-data class LoginResponse (
- val token: String
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/abe/ui/form_transaction/FormTransactionViewModel.kt b/app/src/main/java/com/example/abe/ui/form_transaction/FormTransactionViewModel.kt
index 4261ef4..2af76e4 100644
--- a/app/src/main/java/com/example/abe/ui/form_transaction/FormTransactionViewModel.kt
+++ b/app/src/main/java/com/example/abe/ui/form_transaction/FormTransactionViewModel.kt
@@ -1,13 +1,12 @@
package com.example.abe.ui.form_transaction
-import android.util.Log
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.map
import androidx.lifecycle.viewModelScope
-import com.example.abe.data.Transaction
-import com.example.abe.data.TransactionRepository
+import com.example.abe.data.db.Transaction
+import com.example.abe.data.db.TransactionRepository
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
diff --git a/app/src/main/java/com/example/abe/ui/graph/GraphViewModel.kt b/app/src/main/java/com/example/abe/ui/graph/GraphViewModel.kt
index c6e8745..70a98f4 100644
--- a/app/src/main/java/com/example/abe/ui/graph/GraphViewModel.kt
+++ b/app/src/main/java/com/example/abe/ui/graph/GraphViewModel.kt
@@ -2,7 +2,7 @@ package com.example.abe.ui.graph
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import com.example.abe.data.TransactionRepository
+import com.example.abe.data.db.TransactionRepository
class GraphViewModel(private val transactionRepository: TransactionRepository) : ViewModel() {
suspend fun getExpenses(user: String): Int {
diff --git a/app/src/main/java/com/example/abe/ui/login/LoginActivity.kt b/app/src/main/java/com/example/abe/ui/login/LoginActivity.kt
index e8869b7..1180d45 100644
--- a/app/src/main/java/com/example/abe/ui/login/LoginActivity.kt
+++ b/app/src/main/java/com/example/abe/ui/login/LoginActivity.kt
@@ -16,9 +16,10 @@ import com.example.abe.connection.NetworkConnectivityObserver
import com.example.abe.data.local.PreferenceDataStoreConstants.TOKEN
import com.example.abe.data.local.PreferenceDataStoreConstants.USER
import com.example.abe.data.local.PreferenceDataStoreHelper
-import com.example.abe.data.network.LoginResultCallback
-import com.example.abe.data.network.Retrofit
+import com.example.abe.api.LoginResultCallback
+import com.example.abe.api.Retrofit
import com.example.abe.databinding.ActivityLoginBinding
+import com.example.abe.api.LoginResponse
import com.example.abe.utils.isConnected
import com.google.android.material.textfield.TextInputLayout
import kotlinx.coroutines.flow.launchIn
@@ -45,7 +46,7 @@ class LoginActivity : AppCompatActivity(), LoginResultCallback {
private lateinit var preferenceDataStoreHelper: PreferenceDataStoreHelper
- override fun onSuccess(loginResponse: com.example.abe.data.network.LoginResponse) {
+ override fun onSuccess(loginResponse: LoginResponse) {
println("Login successful: $loginResponse")
lifecycleScope.launch {
diff --git a/app/src/main/java/com/example/abe/ui/scanner/ScannerFragment.kt b/app/src/main/java/com/example/abe/ui/scanner/ScannerFragment.kt
index 7988086..2378b8d 100644
--- a/app/src/main/java/com/example/abe/ui/scanner/ScannerFragment.kt
+++ b/app/src/main/java/com/example/abe/ui/scanner/ScannerFragment.kt
@@ -40,9 +40,9 @@ import com.example.abe.ABEApplication
import com.example.abe.MainActivity
import com.example.abe.R
import com.example.abe.data.local.PreferenceDataStoreConstants
-import com.example.abe.data.network.ItemsRoot
-import com.example.abe.data.network.Retrofit
-import com.example.abe.data.network.UploadResultCallback
+import com.example.abe.api.ItemsRoot
+import com.example.abe.api.Retrofit
+import com.example.abe.api.UploadResultCallback
import com.example.abe.databinding.FragmentScanBinding
import com.example.abe.utils.isConnected
import com.google.android.gms.location.FusedLocationProviderClient
diff --git a/app/src/main/java/com/example/abe/ui/scanner/ScannerViewModel.kt b/app/src/main/java/com/example/abe/ui/scanner/ScannerViewModel.kt
index 5cfd817..1d2056f 100644
--- a/app/src/main/java/com/example/abe/ui/scanner/ScannerViewModel.kt
+++ b/app/src/main/java/com/example/abe/ui/scanner/ScannerViewModel.kt
@@ -1,13 +1,13 @@
package com.example.abe.ui.scanner
import androidx.lifecycle.ViewModel
-import com.example.abe.data.TransactionRepository
+import com.example.abe.data.db.TransactionRepository
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.Dispatchers
-import com.example.abe.data.Transaction
-import com.example.abe.data.network.TransactionItem
+import com.example.abe.data.db.Transaction
+import com.example.abe.api.TransactionItem
import java.util.Date
class ScannerViewModel(private val transactionRepository: TransactionRepository):
diff --git a/app/src/main/java/com/example/abe/ui/transactions/TransactionViewModel.kt b/app/src/main/java/com/example/abe/ui/transactions/TransactionViewModel.kt
index 0439e20..ef727f5 100644
--- a/app/src/main/java/com/example/abe/ui/transactions/TransactionViewModel.kt
+++ b/app/src/main/java/com/example/abe/ui/transactions/TransactionViewModel.kt
@@ -3,8 +3,8 @@ package com.example.abe.ui.transactions
import androidx.lifecycle.LiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import com.example.abe.data.Transaction
-import com.example.abe.data.TransactionRepository
+import com.example.abe.data.db.Transaction
+import com.example.abe.data.db.TransactionRepository
class TransactionViewModel(private val transactionRepository: TransactionRepository) : ViewModel() {
diff --git a/app/src/main/java/com/example/abe/ui/transactions/TransactionsAdapter.kt b/app/src/main/java/com/example/abe/ui/transactions/TransactionsAdapter.kt
index da0124b..6acf6fc 100644
--- a/app/src/main/java/com/example/abe/ui/transactions/TransactionsAdapter.kt
+++ b/app/src/main/java/com/example/abe/ui/transactions/TransactionsAdapter.kt
@@ -11,7 +11,7 @@ import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import com.example.abe.R
-import com.example.abe.data.Transaction
+import com.example.abe.data.db.Transaction
import com.example.abe.domain.FormatCurrencyUseCase
import java.text.SimpleDateFormat
import java.util.Locale
--
GitLab