Compare commits
1 Commits
01704d7191
...
c9d496d9c5
Author | SHA1 | Date | |
---|---|---|---|
c9d496d9c5 |
@ -7,9 +7,6 @@ plugins {
|
|||||||
alias(libs.plugins.android.application)
|
alias(libs.plugins.android.application)
|
||||||
alias(libs.plugins.kotlin.android)
|
alias(libs.plugins.kotlin.android)
|
||||||
alias(libs.plugins.kotlin.compose)
|
alias(libs.plugins.kotlin.compose)
|
||||||
alias(libs.plugins.hilt)
|
|
||||||
alias(libs.plugins.kotlin.serialization)
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Keystore
|
// Keystore
|
||||||
@ -91,7 +88,6 @@ dependencies {
|
|||||||
implementation(libs.hilt.android)
|
implementation(libs.hilt.android)
|
||||||
ksp(libs.hilt.compiler)
|
ksp(libs.hilt.compiler)
|
||||||
implementation(libs.hilt.navigation.compose)
|
implementation(libs.hilt.navigation.compose)
|
||||||
implementation(libs.matomo)
|
|
||||||
|
|
||||||
// Compose
|
// Compose
|
||||||
implementation(platform(libs.compose.bom))
|
implementation(platform(libs.compose.bom))
|
||||||
@ -100,16 +96,9 @@ dependencies {
|
|||||||
// Timber
|
// Timber
|
||||||
implementation(libs.timber)
|
implementation(libs.timber)
|
||||||
|
|
||||||
// Compose Navigation
|
|
||||||
implementation(libs.androidx.navigation.compose)
|
|
||||||
|
|
||||||
// Tests
|
// Tests
|
||||||
testImplementation(libs.test.junit)
|
testImplementation(libs.test.junit)
|
||||||
androidTestImplementation(libs.test.junit)
|
androidTestImplementation(libs.test.junit)
|
||||||
androidTestImplementation(libs.test.espresso)
|
androidTestImplementation(libs.test.espresso)
|
||||||
androidTestImplementation(libs.test.androidx.junit)
|
androidTestImplementation(libs.test.androidx.junit)
|
||||||
|
|
||||||
// Kotlin serialization
|
|
||||||
implementation(libs.kotlin.serialization)
|
|
||||||
|
|
||||||
}
|
}
|
@ -3,7 +3,6 @@
|
|||||||
xmlns:tools="http://schemas.android.com/tools" >
|
xmlns:tools="http://schemas.android.com/tools" >
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:name=".DemoApplication"
|
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
android:dataExtractionRules="@xml/data_extraction_rules"
|
android:dataExtractionRules="@xml/data_extraction_rules"
|
||||||
android:fullBackupContent="@xml/backup_rules"
|
android:fullBackupContent="@xml/backup_rules"
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
package fr.openium.consentium
|
|
||||||
|
|
||||||
import android.app.Application
|
|
||||||
import dagger.hilt.android.HiltAndroidApp
|
|
||||||
|
|
||||||
@HiltAndroidApp
|
|
||||||
class DemoApplication : Application() {
|
|
||||||
|
|
||||||
override fun onCreate() {
|
|
||||||
super.onCreate()
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,11 +1,9 @@
|
|||||||
package fr.openium.consentium
|
package fr.openium.consentium
|
||||||
|
|
||||||
import DemoNavGraph
|
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import androidx.activity.ComponentActivity
|
import androidx.activity.ComponentActivity
|
||||||
import androidx.activity.compose.setContent
|
import androidx.activity.compose.setContent
|
||||||
import androidx.activity.enableEdgeToEdge
|
import androidx.activity.enableEdgeToEdge
|
||||||
import androidx.compose.foundation.layout.Box
|
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.material3.Scaffold
|
import androidx.compose.material3.Scaffold
|
||||||
@ -13,28 +11,19 @@ import androidx.compose.material3.Text
|
|||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.tooling.preview.Preview
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
import androidx.navigation.compose.rememberNavController
|
|
||||||
import dagger.hilt.android.AndroidEntryPoint
|
|
||||||
import fr.openium.consentium.ui.theme.ConsentiumTheme
|
import fr.openium.consentium.ui.theme.ConsentiumTheme
|
||||||
|
|
||||||
@AndroidEntryPoint
|
|
||||||
class MainActivity : ComponentActivity() {
|
class MainActivity : ComponentActivity() {
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
enableEdgeToEdge()
|
enableEdgeToEdge()
|
||||||
setContent {
|
setContent {
|
||||||
|
|
||||||
val navHostController = rememberNavController()
|
|
||||||
|
|
||||||
ConsentiumTheme {
|
ConsentiumTheme {
|
||||||
Scaffold( modifier = Modifier.fillMaxSize() ) { paddingValues ->
|
Scaffold( modifier = Modifier.fillMaxSize() ) { innerPadding ->
|
||||||
Box(
|
Greeting(
|
||||||
modifier = Modifier
|
name = "Android",
|
||||||
.fillMaxSize()
|
modifier = Modifier.padding(innerPadding)
|
||||||
.padding(paddingValues)
|
)
|
||||||
) {
|
|
||||||
DemoNavGraph(navHostController = navHostController)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,48 +0,0 @@
|
|||||||
|
|
||||||
import androidx.compose.animation.core.tween
|
|
||||||
import androidx.compose.animation.fadeIn
|
|
||||||
import androidx.compose.animation.fadeOut
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.navigation.NavGraph.Companion.findStartDestination
|
|
||||||
import androidx.navigation.NavHostController
|
|
||||||
import androidx.navigation.compose.NavHost
|
|
||||||
import androidx.navigation.compose.composable
|
|
||||||
import androidx.navigation.compose.navigation
|
|
||||||
import fr.openium.consentium.ui.screens.main.MainScreen
|
|
||||||
import fr.openium.consentium.ui.screens.splash.SplashScreen
|
|
||||||
|
|
||||||
private const val NAV_ANIMATION_TIME = 100
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun DemoNavGraph(navHostController: NavHostController) {
|
|
||||||
|
|
||||||
NavHost(
|
|
||||||
navController = navHostController,
|
|
||||||
startDestination = Destination.Splash,
|
|
||||||
enterTransition = {
|
|
||||||
fadeIn(animationSpec = tween(NAV_ANIMATION_TIME))
|
|
||||||
},
|
|
||||||
exitTransition = {
|
|
||||||
fadeOut(animationSpec = tween(NAV_ANIMATION_TIME))
|
|
||||||
},
|
|
||||||
) {
|
|
||||||
|
|
||||||
composable<Destination.Splash> {
|
|
||||||
SplashScreen(
|
|
||||||
navigateToMain = { ->
|
|
||||||
navHostController.navigate(Destination.Main) {
|
|
||||||
popUpTo(navHostController.graph.findStartDestination().id) {
|
|
||||||
saveState = true
|
|
||||||
}
|
|
||||||
launchSingleTop = true
|
|
||||||
restoreState = true
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
composable<Destination.Main> {
|
|
||||||
MainScreen()
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,13 +0,0 @@
|
|||||||
|
|
||||||
import kotlinx.serialization.Serializable
|
|
||||||
|
|
||||||
|
|
||||||
sealed interface Destination {
|
|
||||||
|
|
||||||
@Serializable
|
|
||||||
data object Splash : Destination
|
|
||||||
|
|
||||||
@Serializable
|
|
||||||
data object Main : Destination
|
|
||||||
|
|
||||||
}
|
|
@ -1,14 +0,0 @@
|
|||||||
package fr.openium.consentium.ui.screens.main
|
|
||||||
|
|
||||||
import androidx.compose.material3.Text
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.hilt.navigation.compose.hiltViewModel
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun MainScreen(
|
|
||||||
viewModel: MainScreenViewModel = hiltViewModel()
|
|
||||||
) {
|
|
||||||
|
|
||||||
Text("Main")
|
|
||||||
|
|
||||||
}
|
|
@ -1,11 +0,0 @@
|
|||||||
package fr.openium.consentium.ui.screens.main
|
|
||||||
|
|
||||||
import androidx.lifecycle.ViewModel
|
|
||||||
import dagger.hilt.android.lifecycle.HiltViewModel
|
|
||||||
import javax.inject.Inject
|
|
||||||
|
|
||||||
@HiltViewModel
|
|
||||||
class MainScreenViewModel @Inject constructor(
|
|
||||||
) : ViewModel() {
|
|
||||||
|
|
||||||
}
|
|
@ -1,50 +0,0 @@
|
|||||||
package fr.openium.consentium.ui.screens.splash
|
|
||||||
|
|
||||||
import androidx.compose.foundation.layout.Box
|
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
|
||||||
import androidx.compose.foundation.layout.size
|
|
||||||
import androidx.compose.material3.CircularProgressIndicator
|
|
||||||
import androidx.compose.material3.Text
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
|
||||||
import androidx.compose.runtime.collectAsState
|
|
||||||
import androidx.compose.runtime.getValue
|
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import androidx.hilt.navigation.compose.hiltViewModel
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun SplashScreen(
|
|
||||||
viewModel: SplashScreenViewModel = hiltViewModel(),
|
|
||||||
navigateToMain: () -> Unit,
|
|
||||||
) {
|
|
||||||
|
|
||||||
val state by viewModel.state.collectAsState()
|
|
||||||
|
|
||||||
Text("Splash")
|
|
||||||
|
|
||||||
LaunchedEffect(Unit) {
|
|
||||||
viewModel.initMain()
|
|
||||||
}
|
|
||||||
|
|
||||||
when (val _state = state) {
|
|
||||||
|
|
||||||
is SplashScreenViewModel.State.Loading -> Box(
|
|
||||||
modifier = Modifier.fillMaxSize()
|
|
||||||
) {
|
|
||||||
CircularProgressIndicator(
|
|
||||||
modifier = Modifier
|
|
||||||
.size(200.dp)
|
|
||||||
.align(Alignment.Center)
|
|
||||||
)
|
|
||||||
//tracking matomo
|
|
||||||
}
|
|
||||||
|
|
||||||
is SplashScreenViewModel.State.Loaded -> {
|
|
||||||
navigateToMain()
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,39 +0,0 @@
|
|||||||
package fr.openium.consentium.ui.screens.splash
|
|
||||||
|
|
||||||
import androidx.lifecycle.ViewModel
|
|
||||||
import androidx.lifecycle.viewModelScope
|
|
||||||
import dagger.hilt.android.lifecycle.HiltViewModel
|
|
||||||
import kotlinx.coroutines.delay
|
|
||||||
import kotlinx.coroutines.flow.MutableStateFlow
|
|
||||||
import kotlinx.coroutines.flow.StateFlow
|
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import javax.inject.Inject
|
|
||||||
|
|
||||||
@HiltViewModel
|
|
||||||
class SplashScreenViewModel @Inject constructor(
|
|
||||||
) : ViewModel() {
|
|
||||||
|
|
||||||
private val _state = MutableStateFlow<State>(State.Loading)
|
|
||||||
val state: StateFlow<State> = _state
|
|
||||||
|
|
||||||
fun initMain() {
|
|
||||||
val delay = viewModelScope.launch {
|
|
||||||
delay(1500L)
|
|
||||||
}
|
|
||||||
viewModelScope.launch {
|
|
||||||
_state.value = State.Loading
|
|
||||||
try {
|
|
||||||
delay.join()
|
|
||||||
_state.value = State.Loaded
|
|
||||||
} catch (e: Exception) {
|
|
||||||
e.printStackTrace()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sealed interface State {
|
|
||||||
data object Loading : State
|
|
||||||
data object Loaded : State
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -15,12 +15,6 @@ plugins {
|
|||||||
// Agp
|
// Agp
|
||||||
alias(libs.plugins.android.library) apply false
|
alias(libs.plugins.android.library) apply false
|
||||||
|
|
||||||
//Hilt
|
// Hilt
|
||||||
alias(libs.plugins.hilt) apply false
|
alias(libs.plugins.hilt) apply false
|
||||||
|
|
||||||
|
|
||||||
//Kotlin serialization
|
|
||||||
alias(libs.plugins.kotlin.serialization) apply false
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
@ -51,16 +51,6 @@ kotlin = "2.0.0"
|
|||||||
ksp = "2.0.0-1.0.23"
|
ksp = "2.0.0-1.0.23"
|
||||||
junitVersion = "1.2.1"
|
junitVersion = "1.2.1"
|
||||||
|
|
||||||
# Matomo
|
|
||||||
matomo = "4.3"
|
|
||||||
|
|
||||||
# Serialization
|
|
||||||
serialization = "1.7.1"
|
|
||||||
|
|
||||||
navigationCompose = "2.8.2"
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
|
|
||||||
# AndroidX
|
# AndroidX
|
||||||
@ -91,17 +81,6 @@ compose-material3 = { group = "androidx.compose.material3", name = "material3" }
|
|||||||
# Material
|
# Material
|
||||||
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
|
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
|
||||||
|
|
||||||
# Matomo
|
|
||||||
matomo = { module = "com.github.matomo-org:matomo-sdk-android", version.ref = "matomo" }
|
|
||||||
|
|
||||||
# Kotlin serizalization
|
|
||||||
kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
|
|
||||||
|
|
||||||
# Compose navigation
|
|
||||||
androidx-navigation-common-ktx = { group = "androidx.navigation", name = "navigation-common-ktx", version.ref = "navigationCompose" }
|
|
||||||
androidx-navigation-runtime-ktx = { group = "androidx.navigation", name = "navigation-runtime-ktx", version.ref = "navigationCompose" }
|
|
||||||
androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" }
|
|
||||||
|
|
||||||
# Preferences DataStore
|
# Preferences DataStore
|
||||||
preferencesDataStore = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "preferencesDataStore" }
|
preferencesDataStore = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "preferencesDataStore" }
|
||||||
|
|
||||||
|
@ -16,8 +16,6 @@ dependencyResolutionManagement {
|
|||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven { url = uri("https://jitpack.io/") }
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user