From 16294a8edae788ecb46846baddb08da5ac084867 Mon Sep 17 00:00:00 2001
From: Thomas <trbiv@proton.me>
Date: Sun, 20 Oct 2024 22:13:43 -0500
Subject: [PATCH] tweaks

---
 wallet_app/android/.idea/other.xml            | 22 +++++++++++++++++++
 .../{datasource => coins}/CoinGeckoApi.kt     |  4 ++--
 .../{repository => coins}/CoinRepository.kt   |  4 +---
 .../example/walletapp/di/RetrofitClient.kt    |  2 +-
 .../com/example/walletapp/model/Account.kt    |  6 ++---
 .../java/com/example/walletapp/model/Token.kt |  8 +++----
 .../java/com/example/walletapp/model/User.kt  | 17 +++++++++-----
 .../walletapp/ui/account/CoinViewModel.kt     |  2 +-
 .../walletapp/ui/account/WalletScreen.kt      |  3 ++-
 9 files changed, 47 insertions(+), 21 deletions(-)
 rename wallet_app/android/app/src/main/java/com/example/walletapp/data/{datasource => coins}/CoinGeckoApi.kt (92%)
 rename wallet_app/android/app/src/main/java/com/example/walletapp/data/{repository => coins}/CoinRepository.kt (73%)

diff --git a/wallet_app/android/.idea/other.xml b/wallet_app/android/.idea/other.xml
index 94c96f63..56676a75 100644
--- a/wallet_app/android/.idea/other.xml
+++ b/wallet_app/android/.idea/other.xml
@@ -25,6 +25,17 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2160" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="Lenovo" />
+          <option name="codename" value="TB370FU" />
+          <option name="id" value="TB370FU" />
+          <option name="manufacturer" value="Lenovo" />
+          <option name="name" value="Tab P12" />
+          <option name="screenDensity" value="340" />
+          <option name="screenX" value="1840" />
+          <option name="screenY" value="2944" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="31" />
           <option name="brand" value="samsung" />
@@ -245,6 +256,17 @@
           <option name="screenX" value="1812" />
           <option name="screenY" value="2176" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="q6q" />
+          <option name="id" value="q6q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-F956B" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1856" />
+          <option name="screenY" value="2160" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="30" />
           <option name="brand" value="google" />
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/data/datasource/CoinGeckoApi.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/data/coins/CoinGeckoApi.kt
similarity index 92%
rename from wallet_app/android/app/src/main/java/com/example/walletapp/data/datasource/CoinGeckoApi.kt
rename to wallet_app/android/app/src/main/java/com/example/walletapp/data/coins/CoinGeckoApi.kt
index c09d25a8..e38fcde1 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/data/datasource/CoinGeckoApi.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/data/coins/CoinGeckoApi.kt
@@ -1,4 +1,4 @@
-package com.example.walletapp.data.datasource
+package com.example.walletapp.data.coins
 
 import retrofit2.Response
 import retrofit2.http.GET
@@ -17,4 +17,4 @@ interface CoinGeckoApi {
         @Query("ids") ids: String, // Comma-separated token IDs
         @Query("vs_currencies") vsCurrencies: String // Comma-separated currency codes
     ): GetTokenPriceResponse
-}
+}
\ No newline at end of file
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/data/repository/CoinRepository.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/data/coins/CoinRepository.kt
similarity index 73%
rename from wallet_app/android/app/src/main/java/com/example/walletapp/data/repository/CoinRepository.kt
rename to wallet_app/android/app/src/main/java/com/example/walletapp/data/coins/CoinRepository.kt
index 45f7561c..bc648bd6 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/data/repository/CoinRepository.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/data/coins/CoinRepository.kt
@@ -1,10 +1,8 @@
-package com.example.walletapp.data.repository
+package com.example.walletapp.data.coins
 
 import com.example.walletapp.di.RetrofitClient
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import retrofit2.Response
-import com.example.walletapp.data.datasource.GetTokenPriceResponse
 
 class CoinRepository {
     suspend fun getTokenPrices(
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/di/RetrofitClient.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/di/RetrofitClient.kt
index 1a5078e3..26d1e47b 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/di/RetrofitClient.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/di/RetrofitClient.kt
@@ -1,6 +1,6 @@
 package com.example.walletapp.di
 
-import com.example.walletapp.data.datasource.CoinGeckoApi
+import com.example.walletapp.data.coins.CoinGeckoApi
 
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/model/Account.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/model/Account.kt
index bd90c779..d731d921 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/model/Account.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/model/Account.kt
@@ -1,5 +1,5 @@
 package com.example.walletapp.model
 
-class Account {
-    var address: String = ""
-}
\ No newline at end of file
+data class Account (
+    val address: String
+)
\ No newline at end of file
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/model/Token.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/model/Token.kt
index 30c7d2d6..8125bcc1 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/model/Token.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/model/Token.kt
@@ -1,6 +1,6 @@
 package com.example.walletapp.model
 
-class Token {
-    var address: String = ""
-    var symbol: String = ""
-}
\ No newline at end of file
+class Token (
+    val address: String,
+    val symbol: String
+)
\ No newline at end of file
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/model/User.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/model/User.kt
index 628d9d14..209bd1e3 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/model/User.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/model/User.kt
@@ -1,13 +1,18 @@
 package com.example.walletapp.model
 
-class User {
-    private var accounts: Array<Account> = emptyArray();
+data class User (
+    val accounts: Array<Account>
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
 
-    fun hasAccount(): Boolean {
-        return accounts.isNotEmpty()
+        other as User
+
+        return accounts.contentEquals(other.accounts)
     }
 
-    fun getAccounts(): Array<Account> {
-        return accounts
+    override fun hashCode(): Int {
+        return accounts.contentHashCode()
     }
 }
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/ui/account/CoinViewModel.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/ui/account/CoinViewModel.kt
index 3b20a6ff..5da80a20 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/ui/account/CoinViewModel.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/ui/account/CoinViewModel.kt
@@ -6,7 +6,7 @@ import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.launch
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.State
-import com.example.walletapp.data.repository.CoinRepository
+import com.example.walletapp.data.coins.CoinRepository
 
 class CoinViewModel : ViewModel() {
     private val repository = CoinRepository()
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/ui/account/WalletScreen.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/ui/account/WalletScreen.kt
index ea9468ab..f8004a0b 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/ui/account/WalletScreen.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/ui/account/WalletScreen.kt
@@ -94,8 +94,9 @@ fun Wallet(modifier: Modifier, onNewTokenPress: () -> Unit, onReceivePress: () -
     val prices by coinViewModel.prices
     val errorMessage by coinViewModel.errorMessage
 
+    // TODO: 
     LaunchedEffect(Unit) {
-        coinViewModel.getTokenPrices(ids = "starknet,ethereum", vsCurrencies = "usd")  // Fetch starknet and bitcoin prices in USD
+        coinViewModel.getTokenPrices(ids = "starknet,ethereum", vsCurrencies = "usd")
     }
 
     LaunchedEffect (Unit){