Skip to content

Commit

Permalink
PERA-1353 :: Clean up Raj's work
Browse files Browse the repository at this point in the history
  • Loading branch information
michaeltchuang committed Dec 24, 2024
1 parent 0e36369 commit 2a63ae9
Show file tree
Hide file tree
Showing 12 changed files with 429 additions and 290 deletions.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ import androidx.navigation.NavController
import androidx.navigation.NavGraphBuilder
import androidx.navigation.compose.composable
import androidx.navigation.toRoute
import co.algorand.app.ui.screens.DiscoverScreen
import co.algorand.app.ui.screens.home.AccountsScreen
import co.algorand.app.ui.screens.NftsScreen
import co.algorand.app.ui.screens.SettingsScreen
import co.algorand.app.ui.screens.home.AccountsScreen
import co.algorand.app.ui.widgets.snackbar.SnackBarLayout
import co.algorand.app.ui.widgets.snackbar.SnackbarViewModel
import com.algorand.common.account.ui.screens.RecoverAccountInfoScreen
import org.koin.compose.viewmodel.koinNavViewModel
import org.koin.core.annotation.KoinExperimentalAPI

Expand All @@ -45,11 +45,12 @@ fun NavGraphBuilder.getBottomNavigationGraph(
composable<Discover> {
val backStackEntry = remember(it) { navController.getBackStackEntry<Discover>() }
val sharedViewModel: SnackbarViewModel = koinNavViewModel(viewModelStoreOwner = backStackEntry)
DiscoverScreen(
tag = backStackEntry.toRoute<Discover>().details.name,
navController = navController,
snackbarViewModel = sharedViewModel,
)
// DiscoverScreen(
// tag = backStackEntry.toRoute<Discover>().details.name,
// navController = navController,
// snackbarViewModel = sharedViewModel,
// )
RecoverAccountInfoScreen()
SnackBarLayout(sharedViewModel, snackbarHostState)
}
composable<Collectibles> {
Expand Down
22 changes: 22 additions & 0 deletions wallet-sdk/src/commonMain/composeResources/drawable/ic_close.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<!--
~ Copyright 2022 Pera Wallet, LDA
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License
-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#00000000"
android:pathData="M18,6L12,12M12,12L6,18M12,12L18,18M12,12L6,6"
android:strokeWidth="2" />
</vector>
27 changes: 27 additions & 0 deletions wallet-sdk/src/commonMain/composeResources/drawable/ic_key.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<!--
~ Copyright 2022 Pera Wallet, LDA
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License
-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<group>
<clip-path
android:pathData="M0,0h24v24h-24z"/>
<path
android:fillColor="#00000000"
android:pathData="M10.8285,13.1317C9.2664,11.5696 6.7338,11.5696 5.1717,13.1317C3.6096,14.6938 3.6096,17.2265 5.1717,18.7886C6.7338,20.3506 9.2664,20.3506 10.8285,18.7886C12.3906,17.2265 12.3906,14.6938 10.8285,13.1317ZM10.8285,13.1317L14.3641,9.5962M16.839,7.1213L18.9603,5M16.839,7.1213L20.0209,10.3033M16.839,7.1213L14.3641,9.5962M14.3641,9.5962L17.5461,12.7781"
android:strokeWidth="2"
android:strokeColor="#ff8888"/>
</group>
</vector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<!--
~ Copyright 2022 Pera Wallet, LDA
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License
-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#00000000"
android:pathData="M15.5,19L8.5,12L15.5,5"
android:strokeWidth="2"
android:strokeColor="#ff8866"/>
</vector>
Loading

0 comments on commit 2a63ae9

Please sign in to comment.