Skip to content

Commit 4815f07

Browse files
committed
refactor: small ui enhancements
1 parent 77ab267 commit 4815f07

File tree

22 files changed

+298
-118
lines changed

22 files changed

+298
-118
lines changed

build-logic/convention/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2-
import org.jetbrains.kotlin.ir.backend.js.compile
32

43
plugins {
54
`kotlin-dsl`
@@ -68,4 +67,4 @@ gradlePlugin {
6867
implementationClass = "AndroidDetektConventionPlugin"
6968
}
7069
}
71-
}
70+
}

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,5 @@ plugins {
3838
alias(libs.plugins.secrets) apply false
3939
alias(libs.plugins.android.library) apply false
4040
alias(libs.plugins.detekt) apply false
41+
alias(libs.plugins.jetbrainsKotlinAndroid) apply false
4142
}

feature/favourite/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ android {
1212

1313
dependencies {
1414
implementation(projects.core.mongodb)
15+
1516
implementation(libs.coil.compose)
1617
testImplementation(libs.kotlinx.coroutines.test)
1718
testImplementation(libs.mockk)
@@ -24,4 +25,4 @@ dependencies {
2425
testImplementation(libs.junit)
2526
testRuntimeOnly(libs.junit.vintage.engine)
2627
implementation(libs.lottie.compose)
27-
}
28+
}

feature/favourite/src/main/kotlin/com/espressodev/gptmap/feature/favourite/FavouriteNavigation.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ fun NavController.navigateToFavourite(navOptions: NavOptions? = null) {
1111
navigate(FavouriteRoute, navOptions)
1212
}
1313

14-
fun NavGraphBuilder.favouriteScreen(popUp: () -> Unit, navigateToMap: (String) -> Unit) {
14+
fun NavGraphBuilder.favouriteScreen(
15+
popUp: () -> Unit,
16+
navigateToMap: (String) -> Unit,
17+
) {
1518
composable(FavouriteRoute) {
1619
FavouriteRoute(popUp = popUp, navigateToMap = navigateToMap)
1720
}

feature/favourite/src/main/kotlin/com/espressodev/gptmap/feature/favourite/FavouriteScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import com.espressodev.gptmap.core.designsystem.R.string as AppText
5656
fun FavouriteRoute(
5757
popUp: () -> Unit,
5858
navigateToMap: (String) -> Unit,
59-
viewModel: FavouriteViewModel = hiltViewModel()
59+
viewModel: FavouriteViewModel = hiltViewModel(),
6060
) {
6161
val favourites by viewModel.favourites.collectAsStateWithLifecycle()
6262
val uiState by viewModel.uiState.collectAsStateWithLifecycle()

feature/info/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

feature/info/build.gradle.kts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
plugins {
2+
alias(libs.plugins.gptmap.android.library.compose)
3+
alias(libs.plugins.gptmap.android.feature)
4+
}
5+
6+
android {
7+
namespace = "com.espressodev.gptmap.feature.info"
8+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package com.espressodev.gptmap.feature.info
2+
3+
import androidx.test.platform.app.InstrumentationRegistry
4+
import androidx.test.ext.junit.runners.AndroidJUnit4
5+
6+
import org.junit.Test
7+
import org.junit.runner.RunWith
8+
9+
import org.junit.Assert.*
10+
11+
/**
12+
* Instrumented test, which will execute on an Android device.
13+
*
14+
* See [testing documentation](http://d.android.com/tools/testing).
15+
*/
16+
@RunWith(AndroidJUnit4::class)
17+
class ExampleInstrumentedTest {
18+
@Test
19+
fun useAppContext() {
20+
// Context of the app under test.
21+
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
22+
assertEquals("com.espressodev.gptmap.feature.info.test", appContext.packageName)
23+
}
24+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
</manifest>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.espressodev.gptmap.feature.info
2+
3+
import androidx.navigation.NavController
4+
import androidx.navigation.NavGraphBuilder
5+
import androidx.navigation.NavOptions
6+
import androidx.navigation.compose.composable
7+
8+
const val InfoRoute = "info_route"
9+
10+
fun NavController.navigateToInfo(navOptions: NavOptions? = null) {
11+
navigate(InfoRoute, navOptions)
12+
}
13+
14+
fun NavGraphBuilder.infoScreen(popUp: () -> Unit) {
15+
composable(InfoRoute) {
16+
InfoRoute(popUp = popUp)
17+
}
18+
}

0 commit comments

Comments
 (0)