tutorials/Android-Tutorial-Test-ShowCase
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move compose package up

Browse source
This commit is contained in:
Alex Gabor 2022-03-07 08:58:18 +02:00
parent 6ddd057e66
commit e4ac3f78b6
10 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/androidTest/java/org/fnives/test/showcase/ui/AuthComposeInstrumentedTest.kt
View file

@ -6,7 +6,7 @@ import org.fnives.test.showcase.network.mockserver.scenario.auth.AuthScenario
import org.fnives.test.showcase.testutils.MockServerScenarioSetupResetingTestRule import org.fnives.test.showcase.testutils.MockServerScenarioSetupResetingTestRule
import org.fnives.test.showcase.testutils.idling.MainDispatcherTestRule import org.fnives.test.showcase.testutils.idling.MainDispatcherTestRule
import org.fnives.test.showcase.testutils.idling.anyResourceIdling import org.fnives.test.showcase.testutils.idling.anyResourceIdling
import org.fnives.test.showcase.ui.compose.ComposeActivity import org.fnives.test.showcase.compose.ComposeActivity
import org.junit.Before import org.junit.Before
import org.junit.Rule import org.junit.Rule
import org.junit.Test import org.junit.Test

2
app/src/androidTest/java/org/fnives/test/showcase/ui/ComposeLoginRobot.kt
View file

@ -2,7 +2,7 @@ package org.fnives.test.showcase.ui
import androidx.compose.ui.test.* import androidx.compose.ui.test.*
import androidx.compose.ui.test.junit4.ComposeTestRule import androidx.compose.ui.test.junit4.ComposeTestRule
import org.fnives.test.showcase.ui.compose.screen.auth.AuthScreenTag import org.fnives.test.showcase.compose.screen.auth.AuthScreenTag
class ComposeLoginRobot( class ComposeLoginRobot(
private val composeTestRule: ComposeTestRule, private val composeTestRule: ComposeTestRule,

2
app/src/main/AndroidManifest.xml
View file

@ -26,7 +26,7 @@
<activity android:name=".ui.home.MainActivity" /> <activity android:name=".ui.home.MainActivity" />
<activity android:name=".ui.auth.AuthActivity" /> <activity android:name=".ui.auth.AuthActivity" />
<activity <activity
android:name=".ui.compose.ComposeActivity" android:name="org.fnives.test.showcase.compose.ComposeActivity"
android:configChanges="colorMode|density|fontScale|fontWeightAdjustment|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode" android:configChanges="colorMode|density|fontScale|fontWeightAdjustment|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode"
android:exported="true"> android:exported="true">
<intent-filter> <intent-filter>

4
app/src/main/java/org/fnives/test/showcase/ui/compose/ComposeActivity.kt → app/src/main/java/org/fnives/test/showcase/compose/ComposeActivity.kt
View file

@ -1,4 +1,4 @@
package org.fnives.test.showcase.ui.compose package org.fnives.test.showcase.compose
import android.os.Bundle import android.os.Bundle
import androidx.activity.compose.setContent import androidx.activity.compose.setContent
@ -6,7 +6,7 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.compose.material.MaterialTheme import androidx.compose.material.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import com.google.accompanist.insets.ProvideWindowInsets import com.google.accompanist.insets.ProvideWindowInsets
import org.fnives.test.showcase.ui.compose.screen.AppNavigation import org.fnives.test.showcase.compose.screen.AppNavigation
class ComposeActivity : AppCompatActivity() { class ComposeActivity : AppCompatActivity() {

12
app/src/main/java/org/fnives/test/showcase/ui/compose/screen/AppNavigation.kt → app/src/main/java/org/fnives/test/showcase/compose/screen/AppNavigation.kt
View file

@ -1,4 +1,4 @@
package org.fnives.test.showcase.ui.compose.screen package org.fnives.test.showcase.compose.screen
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.material.MaterialTheme import androidx.compose.material.MaterialTheme
@ -10,11 +10,11 @@ import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController import androidx.navigation.compose.rememberNavController
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import org.fnives.test.showcase.core.login.IsUserLoggedInUseCase import org.fnives.test.showcase.core.login.IsUserLoggedInUseCase
import org.fnives.test.showcase.ui.compose.screen.auth.AuthScreen import org.fnives.test.showcase.compose.screen.auth.AuthScreen
import org.fnives.test.showcase.ui.compose.screen.auth.rememberAuthScreenState import org.fnives.test.showcase.compose.screen.auth.rememberAuthScreenState
import org.fnives.test.showcase.ui.compose.screen.home.HomeScreen import org.fnives.test.showcase.compose.screen.home.HomeScreen
import org.fnives.test.showcase.ui.compose.screen.home.rememberHomeScreenState import org.fnives.test.showcase.compose.screen.home.rememberHomeScreenState
import org.fnives.test.showcase.ui.compose.screen.splash.SplashScreen import org.fnives.test.showcase.compose.screen.splash.SplashScreen
import org.koin.androidx.compose.get import org.koin.androidx.compose.get
@Composable @Composable

2
app/src/main/java/org/fnives/test/showcase/ui/compose/screen/auth/AuthScreen.kt → app/src/main/java/org/fnives/test/showcase/compose/screen/auth/AuthScreen.kt
View file

@ -1,4 +1,4 @@
package org.fnives.test.showcase.ui.compose.screen.auth package org.fnives.test.showcase.compose.screen.auth
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardActions

2
app/src/main/java/org/fnives/test/showcase/ui/compose/screen/auth/AuthScreenState.kt → app/src/main/java/org/fnives/test/showcase/compose/screen/auth/AuthScreenState.kt
View file

@ -1,4 +1,4 @@
package org.fnives.test.showcase.ui.compose.screen.auth package org.fnives.test.showcase.compose.screen.auth
import androidx.compose.runtime.* import androidx.compose.runtime.*
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope

2
app/src/main/java/org/fnives/test/showcase/ui/compose/screen/home/HomeScreen.kt → app/src/main/java/org/fnives/test/showcase/compose/screen/home/HomeScreen.kt
View file

@ -1,4 +1,4 @@
package org.fnives.test.showcase.ui.compose.screen.home package org.fnives.test.showcase.compose.screen.home
import androidx.compose.foundation.Image import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable

2
app/src/main/java/org/fnives/test/showcase/ui/compose/screen/home/HomeScreenState.kt → app/src/main/java/org/fnives/test/showcase/compose/screen/home/HomeScreenState.kt
View file

@ -1,4 +1,4 @@
package org.fnives.test.showcase.ui.compose.screen.home package org.fnives.test.showcase.compose.screen.home
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue

7
app/src/main/java/org/fnives/test/showcase/ui/compose/screen/splash/SplashScreen.kt → app/src/main/java/org/fnives/test/showcase/compose/screen/splash/SplashScreen.kt
View file

@ -1,21 +1,16 @@
package org.fnives.test.showcase.ui.compose.screen.splash package org.fnives.test.showcase.compose.screen.splash
import androidx.compose.foundation.Image import androidx.compose.foundation.Image
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.rememberDraggableState
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.colorResource import androidx.compose.ui.res.colorResource
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import org.fnives.test.showcase.R import org.fnives.test.showcase.R