refactor wallet app files

keep-starknet-strange · Oct 8, 2024 · 922c3dc · 922c3dc
1 parent 37e91be
commit 922c3dc
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 38 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,10 @@
 **/.DS_Store
 
 # mdBook
-docs/book/
+docs/book/
+
+**/.gradle/*
+
+lightclientservice/app/build
+lightclientservice/target
+lightclientservice/local.properties
diff --git a/wallet_app/android/.idea/other.xml b/wallet_app/android/.idea/other.xml
diff --git a/wallet_app/android/app/src/main/AndroidManifest.xml b/wallet_app/android/app/src/main/AndroidManifest.xml
@@ -25,29 +25,29 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ui.activity.SendActivity"
+            android:name=".SendActivity"
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>
         <activity
-            android:name=".ui.activity.ReceiverActivity"
+            android:name=".ReceiverActivity"
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>
-        <activity android:name=".ui.activity.AddTokenActivity"
+        <activity android:name=".AddTokenActivity"
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>
 
-        <activity android:name=".ui.activity.AccountBalanceActivity"
+        <activity android:name=".AccountBalanceActivity"
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>
 
-        <activity android:name=".ui.activity.AccountPasswordActivity"
+        <activity android:name=".AccountPasswordActivity"
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>
-        <activity android:name=".ui.activity.RecoveryPhraseActivity"
+        <activity android:name=".RecoveryPhraseActivity"
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>
 
-        <activity android:name=".ui.activity.WalletActivity"
+        <activity android:name=".WalletActivity"
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>
     </application>

diff --git a/...app/ui/activity/AccountBalanceActivity.kt → ...ample/walletapp/AccountBalanceActivity.kt b/...app/ui/activity/AccountBalanceActivity.kt → ...ample/walletapp/AccountBalanceActivity.kt
@@ -1,6 +1,5 @@
-package com.example.walletapp.ui.activity
+package com.example.walletapp
 
-import StarknetClient
 import android.app.Activity
 import android.os.Bundle
 import android.util.Log
@@ -18,14 +17,12 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.Button
-import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.material.TextField
 import androidx.compose.material.TextFieldDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -39,21 +36,14 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.core.graphics.toColorInt
 import androidx.core.view.WindowCompat
-import androidx.lifecycle.viewmodel.compose.viewModel
 import com.example.walletapp.BuildConfig
 import com.example.walletapp.ui.theme.WalletappTheme
-import com.swmansion.starknet.data.types.Call
 import com.swmansion.starknet.data.types.Felt
-import com.swmansion.starknet.data.types.Uint256
 import com.swmansion.starknet.provider.exceptions.RpcRequestFailedException
-import com.swmansion.starknet.provider.rpc.JsonRpcProvider
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.future.await
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import java.math.BigDecimal
-import java.math.RoundingMode
 
 
 class AccountBalanceActivity : ComponentActivity() {

diff --git a/.../walletapp/ui/activity/AccountPassword.kt → .../com/example/walletapp/AccountPassword.kt b/.../walletapp/ui/activity/AccountPassword.kt → .../com/example/walletapp/AccountPassword.kt
@@ -1,4 +1,4 @@
-package com.example.walletapp.ui.activity
+package com.example.walletapp
 
 import android.app.Activity
 import android.content.Intent
@@ -27,8 +27,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.unit.dp
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.sharp.ArrowBack
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier

diff --git a/...walletapp/ui/activity/AddTokenActivity.kt → ...com/example/walletapp/AddTokenActivity.kt b/...walletapp/ui/activity/AddTokenActivity.kt → ...com/example/walletapp/AddTokenActivity.kt
@@ -1,4 +1,4 @@
-package com.example.walletapp.ui.activity
+package com.example.walletapp
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity

diff --git a/...ple/walletapp/ui/activity/MainActivity.kt → ...ava/com/example/walletapp/MainActivity.kt b/...ple/walletapp/ui/activity/MainActivity.kt → ...ava/com/example/walletapp/MainActivity.kt
@@ -1,6 +1,5 @@
-package com.example.walletapp.ui.activity
+package com.example.walletapp
 
-import StarknetClient
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle

diff --git a/...walletapp/ui/activity/ReceiverActivity.kt → ...com/example/walletapp/ReceiverActivity.kt b/...walletapp/ui/activity/ReceiverActivity.kt → ...com/example/walletapp/ReceiverActivity.kt
@@ -1,4 +1,4 @@
-package com.example.walletapp.ui.activity
+package com.example.walletapp
 
 import android.content.ClipData
 import android.content.ClipboardManager

diff --git a/...app/ui/activity/RecoveryPhraseActivity.kt → ...ample/walletapp/RecoveryPhraseActivity.kt b/...app/ui/activity/RecoveryPhraseActivity.kt → ...ample/walletapp/RecoveryPhraseActivity.kt
@@ -1,4 +1,4 @@
-package com.example.walletapp.ui.activity
+package com.example.walletapp
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle

diff --git a/...ple/walletapp/ui/activity/SendActivity.kt → ...ava/com/example/walletapp/SendActivity.kt b/...ple/walletapp/ui/activity/SendActivity.kt → ...ava/com/example/walletapp/SendActivity.kt
@@ -1,4 +1,4 @@
-package com.example.walletapp.ui.activity
+package com.example.walletapp
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity

diff --git a/...pp/android/app/src/main/StarknetClient.kt → ...a/com/example/walletapp/StarknetClient.kt b/...pp/android/app/src/main/StarknetClient.kt → ...a/com/example/walletapp/StarknetClient.kt
@@ -1,4 +1,5 @@
-import com.example.walletapp.BuildConfig
+package com.example.walletapp
+
 import com.swmansion.starknet.account.StandardAccount
 import com.swmansion.starknet.data.types.Call
 import com.swmansion.starknet.data.types.Felt
@@ -13,7 +14,7 @@ const val ETH_ERC20_ADDRESS = "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741
 class StarknetClient(private val rpcUrl: String) {
 
     private val provider = JsonRpcProvider(rpcUrl)
-    private val privateKey=BuildConfig.PRIVATE_KEY
+    private val privateKey= BuildConfig.PRIVATE_KEY
     private val accountAddress=BuildConfig.ACCOUNT_ADDRESS
 
     suspend fun deployAccount() {

diff --git a/...e/walletapp/ui/activity/WalletActivity.kt → ...a/com/example/walletapp/WalletActivity.kt b/...e/walletapp/ui/activity/WalletActivity.kt → ...a/com/example/walletapp/WalletActivity.kt
@@ -1,10 +1,8 @@
-package com.example.walletapp.ui.activity
+package com.example.walletapp
 
-import StarknetClient
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import android.service.quickaccesswallet.WalletCard
 import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
@@ -13,9 +11,6 @@ import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.hoverable
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -27,7 +22,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Button
 import androidx.compose.material.ButtonDefaults
@@ -54,7 +48,6 @@ import androidx.compose.material.icons.filled.Close
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.window.Popup
 import androidx.compose.ui.window.PopupProperties