Skip to content

Commit

Permalink
Wallet app cleanup (#98)
Browse files Browse the repository at this point in the history
* refactor file structure, begin refactoring app flow

* add .idea to gitignore

* adding navigation

* make create account and import account composable screens instead of activities

* refactor everything to composable routes

* more routes

* correct routing
  • Loading branch information
trbutler4 authored Oct 18, 2024
1 parent 93477d5 commit a4445f6
Show file tree
Hide file tree
Showing 35 changed files with 1,124 additions and 1,727 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ lightclientservice/local.properties
lightclientservice/.idea

**/*.so

**/.idea/*
3 changes: 3 additions & 0 deletions wallet_app/android/.idea/deploymentTargetSelector.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions wallet_app/android/app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
import kotlinx.serialization.serializer
import java.util.Properties

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.jetbrains.kotlin.android)
id("kotlin-kapt")
id("org.jmailen.kotlinter")
kotlin("plugin.serialization") version "2.0.21"
}

android {
namespace = "com.example.walletapp"
compileSdk = 34

dataBinding {
enable = true
}


buildFeatures {
compose = true
buildConfig = true
Expand Down Expand Up @@ -63,10 +70,21 @@ android {
}
dependencies {

// Navigation stuff
implementation(libs.androidx.navigation.compose.v283)
implementation(libs.androidx.navigation.compose.v283)
implementation(libs.androidx.navigation.fragment)
implementation(libs.androidx.navigation.ui)
implementation(libs.androidx.navigation.dynamic.features.fragment)
androidTestImplementation(libs.androidx.navigation.testing)

implementation("com.swmansion.starknet:starknet:0.12.1@aar"){
isTransitive = true
}

// for data binding
implementation(libs.common)

implementation(libs.androidx.core.ktx)
implementation(libs.androidx.appcompat)
implementation(libs.material)
Expand Down
22 changes: 7 additions & 15 deletions wallet_app/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
android:networkSecurityConfig="@xml/network_security_config"
tools:targetApi="31">
<activity
android:name=".MainActivity"
android:name=".ui.MainActivity"
android:theme="@style/Theme.Walletapp"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand All @@ -25,14 +26,14 @@
</intent-filter>
</activity>
<activity
android:name=".SendActivity"
android:name=".ui.transfer.SendActivity"
android:exported="true"
android:theme="@style/Theme.Walletapp"/>
<activity
android:name=".ReceiverActivity"
android:name=".ui.transfer.ReceiverActivity"
android:exported="true"
android:theme="@style/Theme.Walletapp"/>
<activity android:name=".AddTokenActivity"
<activity android:name=".ui.account.AddTokenActivity"
android:exported="true"
android:theme="@style/Theme.Walletapp"/>

Expand All @@ -48,30 +49,21 @@
android:exported="true"
android:theme="@style/Theme.Walletapp"/>

<activity android:name=".ui.activity.CreateAccountActivity"
android:exported="true"
android:theme="@style/Theme.Walletapp"/>


<activity android:name=".ui.activity.AccountInfoActivity"
android:exported="true"
android:theme="@style/Theme.Walletapp"/>


<activity android:name=".CreatePinActivity"
<activity android:name=".ui.onboarding.CreatePinActivity"
android:exported="true"
android:theme="@style/Theme.Walletapp"/>


<activity android:name=".WalletActivity"
<activity android:name=".ui.account.WalletActivity"
android:exported="true"
android:theme="@style/Theme.Walletapp"/>


<activity android:name=".ImportExistingKeyActivity"
android:exported="true"
android:theme="@style/Theme.Walletapp"/>

</application>

</manifest>

This file was deleted.

Loading

0 comments on commit a4445f6

Please sign in to comment.