Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create :network and :database api and real modules for sydney-trains feature #23

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,10 @@ dependencies {
implementation(projects.core.domain)
implementation(projects.core.model)
implementation(projects.core.network)
implementation(projects.feature.feature1)
implementation(projects.feature.sydneyTrains.database.api)
implementation(projects.feature.sydneyTrains.database.real)
implementation(projects.feature.sydneyTrains.network.api)
implementation(projects.feature.sydneyTrains.network.real)

implementation(libs.core.ktx)
implementation(libs.lifecycle.runtime.ktx)
Expand Down
25 changes: 2 additions & 23 deletions app/src/main/java/xyz/ksharma/krail/KrailApp.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,15 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.safeContentPadding
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
import xyz.ksharma.feature1.DemoScreen
import xyz.ksharma.feature1.DemoUiState
import xyz.ksharma.feature1.DemoViewModel

@Composable
internal fun KrailApp(
viewModel: DemoViewModel,
navController: NavHostController = rememberNavController()
navController: NavHostController = rememberNavController(),
) {
NavHost(
navController = navController,
Expand All @@ -28,22 +22,7 @@ internal fun KrailApp(
.safeContentPadding()
) {
composable(route = AppScreen.DemoPage.name) {
val localUiState: DemoUiState by viewModel.uiState.collectAsStateWithLifecycle()
when (val uiState = localUiState) {
DemoUiState.Loading -> Text(text = "Loading")

is DemoUiState.Success -> {
DemoScreen(
modifier = Modifier.fillMaxSize(),
demoData = uiState.demoData,
onItemClick = { id ->
println("nav to : $id screen")
},
)
}

DemoUiState.Error -> Text(text = "Something went wrong")
}
Text("Krail App")
}
}
}
6 changes: 1 addition & 5 deletions app/src/main/java/xyz/ksharma/krail/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,12 @@ import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.activity.viewModels
import dagger.hilt.android.AndroidEntryPoint
import xyz.ksharma.feature1.DemoViewModel
import xyz.ksharma.krail.design.system.theme.StartTheme

@AndroidEntryPoint
class MainActivity : ComponentActivity() {

private val viewModel: DemoViewModel by viewModels()

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

Expand All @@ -22,7 +18,7 @@ class MainActivity : ComponentActivity() {

setContent {
StartTheme {
KrailApp(viewModel = viewModel)
KrailApp()
}
}
}
Expand Down
26 changes: 0 additions & 26 deletions feature/feature1/build.gradle.kts

This file was deleted.

Binary file removed feature/feature1/src/main/kotlin/.DS_Store
Binary file not shown.
Binary file removed feature/feature1/src/main/kotlin/xyz/.DS_Store
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

36 changes: 0 additions & 36 deletions feature/feature1/src/main/res/drawable/icon_category_business.xml

This file was deleted.

18 changes: 0 additions & 18 deletions feature/feature1/src/main/res/drawable/icon_category_cards.xml

This file was deleted.

31 changes: 0 additions & 31 deletions feature/feature1/src/main/res/drawable/icon_category_cash.xml

This file was deleted.

This file was deleted.

This file was deleted.

36 changes: 0 additions & 36 deletions feature/feature1/src/main/res/drawable/icon_category_education.xml

This file was deleted.

Loading