[86c6krz1a]

README.md

@@ -69,7 +69,7 @@ peer_android_frontend/
 The UI acts as a composition of three distinct layers:
 1.  **Stateful Components (Screens)**: Composition roots (e.g., `LoginScreen`) responsible for Dependency Injection, ViewModel creation, and state collection.
 2.  **Stateless Components**: Complex UI compositions (e.g., `LoginPage`) that define the layout and behavioral contracts. They are pure functions receiving state and event callbacks.
-3.  **View Components**: Reusable, atomic building blocks (e.g., `ConnectionButton`, `DesignOutlinedButton`) shared across the application.
+3.  **View Components**: Reusable, atomic building blocks (e.g., `DesignTextField`, `DesignButton`) shared across the application.
 
 ## 🚀 Build & Setup
 

ads/ui/src/main/kotlin/eu/peernetwork/ads/ui/checkout/CheckoutError.kt

@@ -1,6 +1,5 @@
 package eu.peernetwork.ads.ui.checkout
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues

ads/ui/src/main/kotlin/eu/peernetwork/ads/ui/overview/OverviewError.kt

@@ -13,10 +13,12 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.tooling.preview.Preview
@@ -31,11 +33,21 @@ fun OverviewError(
     Column(modifier = Modifier.fillMaxSize()
         .padding(horizontal = 16.dp)
         .padding(vertical = 12.dp)) {
-        Box(modifier = Modifier.padding(bottom = 10.dp)
-            .fillMaxWidth()
-            .height(48.dp)
-            .clip(CircleShape)
-            .background(MaterialTheme.colorScheme.surfaceContainerLowest))
+        Box(
+            contentAlignment = Alignment.CenterStart,
+            modifier = Modifier.padding(bottom = 10.dp)
+                .fillMaxWidth()
+                .height(48.dp)
+                .clip(CircleShape)
+                .background(MaterialTheme.colorScheme.surfaceContainerLowest)
+                .padding(horizontal = 20.dp)
+        ) {
+            CompositionLocalProvider(
+                LocalTextStyle provides MaterialTheme.typography.bodySmall.copy(
+                    color = MaterialTheme.colorScheme.error
+                )
+            ) { updatedContent() }
+        }
         Box(modifier = Modifier.fillMaxWidth()
             .height(48.dp)
             .clip(CircleShape)
@@ -52,20 +64,14 @@ fun OverviewError(
             .clip(RoundedCornerShape(24.dp))
             .background(MaterialTheme.colorScheme.surfaceContainerLowest)
             .padding(16.dp)
-        ) {
-            CompositionLocalProvider(
-                LocalTextStyle provides MaterialTheme.typography.bodySmall.copy(
-                    color = MaterialTheme.colorScheme.error
-                )
-            ) { updatedContent() }
-        }
+        )
     }
 }
 
 @Preview
 @Composable
 fun PreviewOverviewError() {
     DesignTheme(isDarkMode = true) {
-        OverviewError {}
+        OverviewError { Text("Error occurred!...") }
     }
 }

app/build.gradle.kts

@@ -6,8 +6,8 @@ plugins {
 android {
     ndkVersion = "26.1.10909125"
     defaultConfig {
-        versionCode = 38
-        versionName = "1.11.0"
+        versionCode = 39
+        versionName = "1.11.1"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary = true
@@ -25,8 +25,8 @@ android {
             isMinifyEnabled = false
             applicationIdSuffix = ".debug"
             versionNameSuffix = "-DEBUG"
-            buildConfigField("String", "BASE_URL", "\"https://backend.peerapp.eu\"")
-            buildConfigField("String", "MEDIA_URL", "\"https://media.peerapp.eu\"")
+            buildConfigField("String", "BASE_URL", "\"https://getpeer.eu\"")
+            buildConfigField("String", "MEDIA_URL", "\"https://media.getpeer.eu\"")
             buildConfigField("boolean", "USE_SYSTEM_THEME", "false")
             buildConfigField("String","PRIVACY_POLICY_URL","\"https://www.freeprivacypolicy.com/live/02865c3a-79db-4baf-9ca1-7d91e2cf1724\"")
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")

app/src/main/kotlin/eu/peernetwork/app/interactor/NavigationInteractor.kt

@@ -7,12 +7,13 @@ import androidx.navigation.NavHostController
 import eu.peernetwork.ads.ui.article.ArticleNavigator
 import eu.peernetwork.blog.ui.post.PostNavigator
 import eu.peernetwork.user.ui.user.UserNavigator
+import eu.peernetwork.wallet.ui.transactions.TransactionsNavigator
 import java.net.URLEncoder
 
 class NavigationInteractor(
     private val context: Context,
     private val controller: NavHostController
-) : PostNavigator, ArticleNavigator, UserNavigator {
+) : PostNavigator, ArticleNavigator, UserNavigator, TransactionsNavigator {
     override fun navigate(route: PostNavigator.Route) {
         when(route) {
             is PostNavigator.Route.Profile -> {
@@ -84,4 +85,28 @@ class NavigationInteractor(
             }
         }
     }
+
+    override fun navigate(route: TransactionsNavigator.Route) {
+        when(route) {
+            is TransactionsNavigator.Route.Profile -> {
+                controller.navigate("profile/${route.id}") {
+                    launchSingleTop = true
+                }
+            }
+            is TransactionsNavigator.Route.Search -> {
+                val encoded = URLEncoder.encode(route.query, "UTF-8")
+                controller.navigate("search/${route.type}/$encoded") {
+                    launchSingleTop = true
+                }
+            }
+            is TransactionsNavigator.Route.Link -> {
+                val url = if (!route.url.startsWith("http")) {
+                    "https://${route.url}"
+                } else {
+                    route.url
+                }
+                context.startActivity(Intent(Intent.ACTION_VIEW, url.toUri()))
+            }
+        }
+    }
 }

app/src/main/kotlin/eu/peernetwork/app/ui/content/Content.kt

@@ -14,7 +14,7 @@ import eu.peernetwork.core.ui.component.UiComponentProvider
 import eu.peernetwork.social.ui.connection.Connection
 import eu.peernetwork.wallet.ui.balance.Balance
 import eu.peernetwork.wallet.ui.confirmation.Confirmation
-import eu.peernetwork.wallet.ui.service.Service
+import eu.peernetwork.wallet.ui.dashboard.Dashboard
 
 interface Content : ApplicationProvider {
     fun settingsEvent(): SettingsEvent
@@ -36,7 +36,7 @@ interface Content : ApplicationProvider {
         Confirmation,
         Screen,
         Detail,
-        Service,
+        Dashboard,
         Balance,
         Checkout,
         Boost

app/src/main/kotlin/eu/peernetwork/app/ui/content/ContentModule.kt

@@ -19,7 +19,7 @@ import eu.peernetwork.core.ui.factory.UiBuilderFactory
 import eu.peernetwork.social.ui.connection.Connection
 import eu.peernetwork.wallet.ui.balance.Balance
 import eu.peernetwork.wallet.ui.confirmation.Confirmation
-import eu.peernetwork.wallet.ui.service.Service
+import eu.peernetwork.wallet.ui.dashboard.Dashboard
 
 @Module
 object ContentModule {
@@ -100,9 +100,9 @@ object ContentModule {
     @Content.Scope
     @Provides
     @IntoMap
-    @UiBuilder(Service.Builder::class)
+    @UiBuilder(Dashboard.Builder::class)
     fun provideServiceBuilder(component: Content.Component): UiComponent.Builder {
-        return Service.Builder(component)
+        return Dashboard.Builder(component)
     }
 
     @Provides

app/src/main/kotlin/eu/peernetwork/app/ui/feed/Feed.kt

@@ -15,7 +15,7 @@ import eu.peernetwork.core.ui.component.UiComponentProvider
 import eu.peernetwork.social.ui.connection.Connection
 import eu.peernetwork.wallet.ui.balance.Balance
 import eu.peernetwork.wallet.ui.confirmation.Confirmation
-import eu.peernetwork.wallet.ui.service.Service
+import eu.peernetwork.wallet.ui.dashboard.Dashboard
 
 interface Feed : ApplicationProvider {
     fun settingsEvent(): SettingsEvent
@@ -37,7 +37,7 @@ interface Feed : ApplicationProvider {
         Timeline,
         Connection,
         Confirmation,
-        Service,
+        Dashboard,
         Balance,
         Checkout,
         Screen {

app/src/main/kotlin/eu/peernetwork/app/ui/feed/FeedModule.kt

@@ -24,7 +24,7 @@ import eu.peernetwork.core.ui.factory.UiViewModelFactory
 import eu.peernetwork.social.ui.connection.Connection
 import eu.peernetwork.wallet.ui.balance.Balance
 import eu.peernetwork.wallet.ui.confirmation.Confirmation
-import eu.peernetwork.wallet.ui.service.Service
+import eu.peernetwork.wallet.ui.dashboard.Dashboard
 import javax.inject.Provider
 
 @Module
@@ -129,9 +129,9 @@ object FeedModule {
     @Feed.Scope
     @Provides
     @IntoMap
-    @UiBuilder(Service.Builder::class)
+    @UiBuilder(Dashboard.Builder::class)
     fun provideServiceBuilder(component: Feed.Component): UiComponent.Builder {
-        return Service.Builder(component)
+        return Dashboard.Builder(component)
     }
 
     @Provides

app/src/main/kotlin/eu/peernetwork/app/ui/onboarding/OnboardingScreen.kt

@@ -19,7 +19,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
 import eu.peernetwork.app.model.Properties
 import eu.peernetwork.core.ui.component.UiComponentProvider
-import eu.peernetwork.core.ui.design.compose.DesignError
+import eu.peernetwork.core.ui.design.material.DesignError
 import eu.peernetwork.core.ui.design.luna.DesignStream
 import eu.peernetwork.core.ui.design.luna.DesignStreamState
 import eu.peernetwork.core.ui.extension.builder

app/src/main/kotlin/eu/peernetwork/app/ui/profile/Profile.kt

@@ -21,7 +21,7 @@ import eu.peernetwork.social.ui.report.Report
 import eu.peernetwork.user.ui.user.User
 import eu.peernetwork.wallet.ui.balance.Balance
 import eu.peernetwork.wallet.ui.confirmation.Confirmation
-import eu.peernetwork.wallet.ui.service.Service
+import eu.peernetwork.wallet.ui.dashboard.Dashboard as WalletDashboard
 
 interface Profile : ApplicationProvider {
     fun settingsEvent(): SettingsEvent
@@ -49,7 +49,7 @@ interface Profile : ApplicationProvider {
         Dashboard,
         Boost,
         Balance,
-        Service,
+        WalletDashboard,
         Checkout,
         Feed,
         Report,

app/src/main/kotlin/eu/peernetwork/app/ui/profile/ProfileModule.kt

@@ -26,7 +26,7 @@ import eu.peernetwork.social.ui.report.Report
 import eu.peernetwork.user.ui.user.User
 import eu.peernetwork.wallet.ui.balance.Balance
 import eu.peernetwork.wallet.ui.confirmation.Confirmation
-import eu.peernetwork.wallet.ui.service.Service
+import eu.peernetwork.wallet.ui.dashboard.Dashboard as WalletDashboard
 
 @Module
 object ProfileModule {
@@ -179,9 +179,9 @@ object ProfileModule {
     @Profile.Scope
     @Provides
     @IntoMap
-    @UiBuilder(Service.Builder::class)
-    fun provideServiceBuilder(component: Profile.Component): UiComponent.Builder {
-        return Service.Builder(component)
+    @UiBuilder(WalletDashboard.Builder::class)
+    fun provideWalletDashboardBuilder(component: Profile.Component): UiComponent.Builder {
+        return WalletDashboard.Builder(component)
     }
 
     @Provides

app/src/main/kotlin/eu/peernetwork/app/ui/renderer/BalanceRenderer.kt

@@ -37,7 +37,7 @@ import eu.peernetwork.core.ui.design.luna.DesignStreamState
 import eu.peernetwork.core.ui.theme.PeerAppRed
 import eu.peernetwork.wallet.ui.R
 import eu.peernetwork.wallet.ui.balance.BalanceScreen
-import eu.peernetwork.wallet.ui.service.ServiceScreen
+import eu.peernetwork.wallet.ui.dashboard.DashboardScreen
 import javax.inject.Inject
 
 class BalanceRenderer @Inject constructor(
@@ -80,7 +80,7 @@ class BalanceRenderer @Inject constructor(
         content: @Composable ((State<DesignStreamState<UiCharge>>, () -> Unit) -> Unit)
     ) {
         val updatedContent by rememberUpdatedState(content)
-        ServiceScreen(
+        DashboardScreen(
             provider = provider,
             viewModelStoreOwner = viewModelStoreOwner
         ) { service, action ->

app/src/main/kotlin/eu/peernetwork/app/ui/search/Search.kt

@@ -17,7 +17,7 @@ import eu.peernetwork.social.ui.search.tag.Tag
 import eu.peernetwork.social.ui.search.title.Title
 import eu.peernetwork.wallet.ui.balance.Balance
 import eu.peernetwork.wallet.ui.confirmation.Confirmation
-import eu.peernetwork.wallet.ui.service.Service
+import eu.peernetwork.wallet.ui.dashboard.Dashboard
 
 interface Search : ApplicationProvider {
     fun settingsEvent(): SettingsEvent
@@ -42,7 +42,7 @@ interface Search : ApplicationProvider {
         Connection,
         Confirmation,
         Boost,
-        Service,
+        Dashboard,
         Balance,
         Checkout,
         Screen

app/src/main/kotlin/eu/peernetwork/app/ui/search/SearchModule.kt

@@ -23,7 +23,7 @@ import eu.peernetwork.social.ui.search.tag.Tag
 import eu.peernetwork.social.ui.search.title.Title
 import eu.peernetwork.wallet.ui.balance.Balance
 import eu.peernetwork.wallet.ui.confirmation.Confirmation
-import eu.peernetwork.wallet.ui.service.Service
+import eu.peernetwork.wallet.ui.dashboard.Dashboard
 
 @Module
 object SearchModule {
@@ -136,9 +136,9 @@ object SearchModule {
     @Search.Scope
     @Provides
     @IntoMap
-    @UiBuilder(Service.Builder::class)
+    @UiBuilder(Dashboard.Builder::class)
     fun provideServiceBuilder(component: Search.Component): UiComponent.Builder {
-        return Service.Builder(component)
+        return Dashboard.Builder(component)
     }
 
     @Provides

app/src/main/kotlin/eu/peernetwork/app/ui/wallet/Wallet.kt

@@ -3,12 +3,14 @@ package eu.peernetwork.app.ui.wallet
 import android.content.Context
 import eu.peernetwork.app.provider.ApplicationProvider
 import eu.peernetwork.app.ui.profile.Profile
+import eu.peernetwork.app.ui.search.Search
 import eu.peernetwork.app.ui.settings.SettingsEvent
 import eu.peernetwork.core.ui.component.UiComponent
 import eu.peernetwork.core.ui.component.UiComponentProvider
 import eu.peernetwork.social.ui.search.member.Member
-import eu.peernetwork.wallet.ui.overview.Overview
-import eu.peernetwork.wallet.ui.service.Service
+import eu.peernetwork.wallet.ui.balance.Balance
+import eu.peernetwork.wallet.ui.dashboard.Dashboard
+import eu.peernetwork.wallet.ui.transactions.Transactions
 import eu.peernetwork.wallet.ui.transfer.Transfer
 
 interface Wallet : ApplicationProvider {
@@ -23,7 +25,15 @@ interface Wallet : ApplicationProvider {
         dependencies = [ Wallet::class ],
         modules = [ WalletModule::class ]
     )
-    interface Component : Wallet, Overview, Transfer, Member, Profile, Service, UiComponentProvider
+    interface Component : Wallet,
+        Transfer,
+        Member,
+        Profile,
+        Balance,
+        Dashboard,
+        Transactions,
+        Search,
+        UiComponentProvider
 
     class Builder(private val dependency: Wallet): UiComponent.DefaultBuilder<Wallet, Component>() {
         override fun build(context: Context): Component {