Joren/pokesearch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add beginning of viewmodel, update nav on back gesture

Browse Source
This commit is contained in:
Joren 2024-04-29 12:10:54 +02:00
parent a2145bedc0
commit 67a89c449c
Signed by untrusted user who does not match committer: Joren
GPG Key ID: 280E33DFBC0F1B55
13 changed files with 92 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
.idea/inspectionProfiles/Project_Default.xml generated Normal file
View File

@ -0,0 +1,41 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
</profile>
</component>

1
.idea/misc.xml generated
View File

@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">

1
app/build.gradle.kts
View File

@ -65,4 +65,5 @@ dependencies {
debugImplementation(libs.androidx.ui.tooling)
debugImplementation(libs.androidx.ui.test.manifest)
implementation("androidx.navigation:navigation-compose:$nav_version")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
}

1
app/src/main/AndroidManifest.xml
View File

@ -4,6 +4,7 @@
<application
android:allowBackup="true"
android:enableOnBackInvokedCallback="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"

1
app/src/main/java/com/ti/mobpo/MainActivity.kt
View File

@ -4,6 +4,7 @@ import android.annotation.SuppressLint
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import com.ti.mobpo.ui.Navigation
import com.ti.mobpo.ui.theme.MobileSecurityTheme
class MainActivity : ComponentActivity() {

2
app/src/main/java/com/ti/mobpo/Compontents.kt → app/src/main/java/com/ti/mobpo/ui/Compontents.kt
View File

@ -1,4 +1,4 @@
package com.ti.mobpo
package com.ti.mobpo.ui
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.text.KeyboardActions

20
app/src/main/java/com/ti/mobpo/Navigation.kt → app/src/main/java/com/ti/mobpo/ui/Navigation.kt
View File

@ -1,4 +1,4 @@
package com.ti.mobpo
package com.ti.mobpo.ui
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
@ -20,16 +20,19 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.navigation.compose.rememberNavController
import com.ti.mobpo.screens.Favourites
import com.ti.mobpo.screens.PokeSearch
import com.ti.mobpo.screens.Profile
import com.ti.mobpo.ui.screens.Favourites
import com.ti.mobpo.ui.screens.PokeSearch
import com.ti.mobpo.ui.screens.PokeSearchScreen
import com.ti.mobpo.ui.screens.Profile
@Composable
@ -54,10 +57,17 @@ fun Navigation() {
route = Screen.Profile.route
),
)
var selectedItemIndex by rememberSaveable {
mutableStateOf(0)
}
val navController = rememberNavController()
val currentBackStackEntry by navController.currentBackStackEntryAsState()
val currentRoute = currentBackStackEntry?.destination?.route
val updatedSelectedIndex = items.indexOfFirst { it.route == currentRoute }
selectedItemIndex = rememberUpdatedState(updatedSelectedIndex).value
Scaffold (
bottomBar = {
NavigationBar {
@ -113,6 +123,6 @@ fun Navigation() {
@Composable
fun NavigationPreview() {
Surface {
PokeSearch()
PokeSearchScreen()
}
}

3
app/src/main/java/com/ti/mobpo/ui/PokeSearchUiState.kt Normal file
View File

@ -0,0 +1,3 @@
package com.ti.mobpo.ui
data class PokeSearchUiState(val searchQuery: String = "")

11
app/src/main/java/com/ti/mobpo/ui/PokeSearchViewModel.kt Normal file
View File

@ -0,0 +1,11 @@
package com.ti.mobpo.ui
import androidx.lifecycle.ViewModel
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
class PokeSearchViewModel : ViewModel() {
private val _uiState = MutableStateFlow(PokeSearchUiState())
val uiState: StateFlow<PokeSearchUiState> = _uiState.asStateFlow()
}

2
app/src/main/java/com/ti/mobpo/Screen.kt → app/src/main/java/com/ti/mobpo/ui/Screen.kt
View File

@ -1,4 +1,4 @@
package com.ti.mobpo
package com.ti.mobpo.ui
sealed class Screen (val route: String) {
object PokeSearch : Screen("default_screen")

2
app/src/main/java/com/ti/mobpo/screens/Favourites.kt → app/src/main/java/com/ti/mobpo/ui/screens/Favourites.kt
View File

@ -1,4 +1,4 @@
package com.ti.mobpo.screens
package com.ti.mobpo.ui.screens
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable

19
app/src/main/java/com/ti/mobpo/screens/PokeSearch.kt → app/src/main/java/com/ti/mobpo/ui/screens/PokeSearch.kt
View File

@ -1,25 +1,36 @@
package com.ti.mobpo.screens
package com.ti.mobpo.ui.screens
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.ti.mobpo.R
import com.ti.mobpo.SearchBar
import com.ti.mobpo.ui.SearchBar
import androidx.lifecycle.viewmodel.compose.viewModel
import com.ti.mobpo.ui.PokeSearchViewModel
@Composable
fun PokeSearchScreen(pokesearchViewModel: PokeSearchViewModel = viewModel()){
val pokesearchUiState by pokesearchViewModel.uiState.collectAsState()
PokeSearch()
}
@Composable
fun PokeSearch() {
Column (
verticalArrangement = Arrangement.Top,
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier.fillMaxSize().padding(20.dp)
modifier = Modifier
.fillMaxSize()
.padding(20.dp)
) {
SearchBar(stringResource(R.string.input_field_label)){ value ->
run {
@ -31,5 +42,5 @@ fun PokeSearch() {
@Preview(showBackground = true)
@Composable
fun PokeSearchApp(){
PokeSearch()
PokeSearchScreen()
}

2
app/src/main/java/com/ti/mobpo/screens/Profile.kt → app/src/main/java/com/ti/mobpo/ui/screens/Profile.kt
View File

@ -1,4 +1,4 @@
package com.ti.mobpo.screens
package com.ti.mobpo.ui.screens
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable