Add :core:model, and move to :core:ui

Jaehwa-Noh · Jun 18, 2024 · 17c2252 · 17c2252
1 parent b042b33
commit 17c2252
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 23 deletions.
diff --git a/Compose-Flight-Search-App/core/ui/build.gradle.kts b/Compose-Flight-Search-App/core/ui/build.gradle.kts
@@ -19,10 +19,15 @@ android {
 }
 
 dependencies {
+    api(projects.core.model)
+
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.compose.runtime)
+    implementation(libs.androidx.material3)
+    implementation(libs.androidx.ui.tooling.preview)
+
+    implementation(projects.core.designsystem)
 
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.appcompat)
-    implementation(libs.material)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)

diff --git a/...pp/ui/flight/FlightItemCardUiComponent.kt → ...re/ui/flight/FlightItemCardUiComponent.kt b/...pp/ui/flight/FlightItemCardUiComponent.kt → ...re/ui/flight/FlightItemCardUiComponent.kt
@@ -1,4 +1,4 @@
-package com.example.flightsearchapp.ui.flight
+package com.example.flightsearchapp.core.ui.flight
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -23,9 +23,9 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.stateDescription
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.example.flightsearchapp.ui.AirportInfoUiComponent
-import com.example.flightsearchapp.ui.model.Flight
-import com.example.flightsearchapp.ui.theme.FlightSearchAppTheme
+import com.example.flightsearchapp.core.designsystem.theme.FlightSearchAppTheme
+import com.example.flightsearchapp.core.model.Flight
+import com.example.flightsearchapp.core.ui.AirportInfoUiComponent
 
 @Composable
 fun FlightItemCardUiComponent(

diff --git a/...p/core/ui/src/main/kotlin/com/example/flightsearchapp/core/ui/flight/FlightsListScreen.kt b/...p/core/ui/src/main/kotlin/com/example/flightsearchapp/core/ui/flight/FlightsListScreen.kt
@@ -6,7 +6,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import com.example.flightsearchapp.core.designsystem.theme.FlightSearchAppTheme
-import com.example.flightsearchapp.core.ui.model.Flight
+import com.example.flightsearchapp.core.model.Flight
 import com.example.flightsearchapp.core.ui.uistate.SearchScreenUiState
 import com.example.flightsearchapp.core.ui.uistate.ShowFlightUiState
 

diff --git a/...gestion/SuggestionsListItemUiComponent.kt → ...gestion/SuggestionsListItemUiComponent.kt b/...gestion/SuggestionsListItemUiComponent.kt → ...gestion/SuggestionsListItemUiComponent.kt
@@ -1,12 +1,12 @@
-package com.example.flightsearchapp.ui.suggestion
+package com.example.flightsearchapp.core.ui.suggestion
 
 import androidx.compose.foundation.clickable
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import com.example.flightsearchapp.ui.AirportInfoUiComponent
-import com.example.flightsearchapp.ui.model.SuggestionAirport
-import com.example.flightsearchapp.ui.theme.FlightSearchAppTheme
+import com.example.flightsearchapp.core.designsystem.theme.FlightSearchAppTheme
+import com.example.flightsearchapp.core.model.SuggestionAirport
+import com.example.flightsearchapp.core.ui.AirportInfoUiComponent
 
 @Composable
 fun SuggestionsListItemUiComponent(

diff --git a/...pp/ui/suggestion/SuggestionsListScreen.kt → ...re/ui/suggestion/SuggestionsListScreen.kt b/...pp/ui/suggestion/SuggestionsListScreen.kt → ...re/ui/suggestion/SuggestionsListScreen.kt
@@ -1,4 +1,4 @@
-package com.example.flightsearchapp.ui.suggestion
+package com.example.flightsearchapp.core.ui.suggestion
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -8,8 +8,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.example.flightsearchapp.ui.model.SuggestionAirport
-import com.example.flightsearchapp.ui.theme.FlightSearchAppTheme
+import com.example.flightsearchapp.core.designsystem.theme.FlightSearchAppTheme
+import com.example.flightsearchapp.core.model.SuggestionAirport
 
 @Composable
 fun SuggestionsListScreen(

diff --git a/...ore/ui/src/main/kotlin/com/example/flightsearchapp/core/ui/uistate/SearchScreenUiState.kt b/...ore/ui/src/main/kotlin/com/example/flightsearchapp/core/ui/uistate/SearchScreenUiState.kt
@@ -0,0 +1,11 @@
+package com.example.flightsearchapp.core.ui.uistate
+
+import com.example.flightsearchapp.core.model.Flight
+import com.example.flightsearchapp.core.model.SuggestionAirport
+
+sealed interface SearchScreenUiState {
+    data class ShowFavorite(val results: List<Flight>) : SearchScreenUiState
+    data class ShowSuggests(val results: List<SuggestionAirport>) :
+        SearchScreenUiState
+    data object Init : SearchScreenUiState
+}
diff --git a/.../core/ui/src/main/kotlin/com/example/flightsearchapp/core/ui/uistate/ShowFlightUiState.kt b/.../core/ui/src/main/kotlin/com/example/flightsearchapp/core/ui/uistate/ShowFlightUiState.kt
@@ -1,6 +1,6 @@
 package com.example.flightsearchapp.core.ui.uistate
 
-import com.example.flightsearchapp.core.ui.model.Flight
+import com.example.flightsearchapp.core.model.Flight
 
 sealed interface ShowFlightUiState {
     data object Clear : ShowFlightUiState

diff --git a/...App/core/ui/src/main/kotlin/com/example/flightsearchapp/ui/uistate/SearchScreenUiState.kt b/...App/core/ui/src/main/kotlin/com/example/flightsearchapp/ui/uistate/SearchScreenUiState.kt