Skip to content
Open
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
6 changes: 2 additions & 4 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ plugins {
id(BuildPlugins.ANDROID_APPLICATION_PLUGIN)
id(BuildPlugins.KOTLIN_ANDROID_PLUGIN)
id(BuildPlugins.KOTLIN_PARCELABLE_PLUGIN)
id(BuildPlugins.KOTLIN_KAPT)
id(BuildPlugins.DAGGER_HILT)
id(BuildPlugins.ktLint)
id(BuildPlugins.KOTLIN_KAPT)
}

// def preDexEnabled = "true" == System.getProperty("pre-dex", "true")
Expand Down Expand Up @@ -82,7 +82,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion = Lib.Androidx.composeVersion
kotlinCompilerExtensionVersion = Lib.Androidx.COMPOSE_COMPILER_VERSION
}

packagingOptions {
Expand All @@ -104,7 +104,6 @@ android {

// Required for annotation processing plugins like Dagger
kapt {
generateStubs = true
correctErrorTypes = true
}

Expand Down Expand Up @@ -142,7 +141,6 @@ dependencies {
/*DI*/
api(Lib.Di.hilt)
api(Lib.Di.hiltNavigationCompose)
api(Lib.Di.viewmodel)
kapt(Lib.Di.hiltCompiler)
kapt(Lib.Di.hiltAndroidCompiler)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import androidx.core.view.WindowCompat
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.rememberNavController
import com.google.accompanist.insets.ProvideWindowInsets
import dagger.hilt.android.AndroidEntryPoint
import com.mutualmobile.praxis.navigator.ComposeNavigator
import com.mutualmobile.praxis.navigator.PraxisRoute
import com.mutualmobile.praxis.uionboarding.nav.onboardingNavigation
import com.praxis.feat.authentication.nav.authNavGraph
import dagger.hilt.android.AndroidEntryPoint
import javax.inject.Inject

@AndroidEntryPoint
Expand All @@ -34,16 +33,14 @@ class OnboardingActivity : AppCompatActivity() {
composeNavigator.handleNavigationCommands(navController)
}

ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
NavHost(
navController = navController,
startDestination = PraxisRoute.OnBoarding.name,
) {
onboardingNavigation(
composeNavigator = composeNavigator,
)
authNavGraph()
}
NavHost(
navController = navController,
startDestination = PraxisRoute.OnBoarding.name,
) {
onboardingNavigation(
composeNavigator = composeNavigator,
)
authNavGraph()
}


Expand Down
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ buildscript {
classpath(BuildPlugins.KOTLIN_GRADLE_PLUGIN)
classpath(kotlin("serialization", version = Lib.Kotlin.KOTLIN_VERSION))
classpath(BuildPlugins.KTLINT_GRADLE_PLUGIN)
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repositories {
jcenter()
mavenCentral()
}

plugins {
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/AppVersions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ object AppVersions {
const val versionCode = versionMajor * 10000 + versionMinor * 100 + versionPatch
const val versionName = "$versionMajor.$versionMinor.$versionPatch"

const val COMPILE_SDK = 31
const val COMPILE_SDK = 33
const val MIN_SDK = 21
const val TARGET_SDK = 31
const val TARGET_SDK = 33
const val APPLICATION_ID = "com.mutualmobile.praxis"
}
Loading