Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
1c5d294
[Jetchat] Moves to Scaffold and Compose drawer content
JoseAlcerreca Oct 26, 2020
1594539
[Jetchat] Adds new drawer and fixes back handling and navigation events
JoseAlcerreca Oct 27, 2020
66c5237
[Jetchat] Adds KI to README
JoseAlcerreca Oct 30, 2020
da5f4b7
[Jetchat] spotless and comments
JoseAlcerreca Oct 30, 2020
474dc79
[Owl] Migrates to navigation-compose
JoseAlcerreca Oct 30, 2020
42dadcc
Adressing comments
JoseAlcerreca Nov 3, 2020
eb9c08b
Adressing comments
JoseAlcerreca Nov 3, 2020
88db781
Syntax
JoseAlcerreca Nov 3, 2020
67b00c8
Navigation cleanup, safe arguments
JoseAlcerreca Nov 5, 2020
2cb58c2
[Owl] Initial nav tests
JoseAlcerreca Nov 5, 2020
73657aa
Test cleanup
JoseAlcerreca Nov 6, 2020
779cf9e
Enable R8 for all sample apps
christofferqa Nov 11, 2020
7080aaf
Merge pull request #284 from christofferqa/enable_r8
chrisbanes Nov 12, 2020
3fd0412
[JetNews] Move AppDrawer Composable from JetnewsApp.kt to AppDrawer.kt
takahirom Nov 12, 2020
eca468c
Merge pull request #285 from takahirom/takahirom/move-app-drawer
yrezgui Nov 19, 2020
8dbf05b
Merge remote-tracking branch 'github/dev_alpha08' into dev_owl_naviga…
JoseAlcerreca Nov 20, 2020
97ed758
Reverts navigation abstraction and fixes tests
JoseAlcerreca Nov 20, 2020
3bc7c1f
Enables tests for Owl in GHA
JoseAlcerreca Nov 20, 2020
d984804
Adressing review comments
JoseAlcerreca Nov 20, 2020
0ea81d8
Spotless ~_~
JoseAlcerreca Nov 20, 2020
b3aa476
Replaces popBackStack with navigateUp
JoseAlcerreca Nov 24, 2020
cb1cf99
Merge pull request #287 from JoseAlcerreca/dev_owl_navigation_alpha08
JoseAlcerreca Nov 24, 2020
0b1326a
Fixes text opacity in JetchatAppBar
JoseAlcerreca Nov 25, 2020
e7e9a99
Merge pull request #292 from JoseAlcerreca/jetchat_fix_channel_name
JoseAlcerreca Nov 25, 2020
1b34722
[Jetnews] Bump to alpha08
yrezgui Nov 26, 2020
abf3745
[Jetnews] Remove old dependency
yrezgui Nov 26, 2020
785214a
[Jetnews] Use single name imports
yrezgui Nov 26, 2020
0ac866c
[Jetnews] Use single name imports
yrezgui Nov 26, 2020
4d15971
[Jetnews] Fix mistakes
yrezgui Nov 26, 2020
dfc05cf
[Jetnews] Update snapshot to 6995125
yrezgui Nov 27, 2020
7b5f131
[Rally] Updates to snapshot 6995125
JoseAlcerreca Nov 27, 2020
9d00eae
[Jetnews] Update testing dependency imports
yrezgui Nov 30, 2020
b7f9f5e
[Jetnews] Apply Spotless changes
yrezgui Nov 30, 2020
2ce683c
[Jetnews] Ignore tests causing CI issue
yrezgui Nov 30, 2020
4f03f82
[Jetchat] Updates to build 6995125
JoseAlcerreca Nov 30, 2020
f4541f8
Merge branch 'dev_alpha08' into rally_alpha08
yrezgui Nov 30, 2020
2b9965e
[Crane] Update to snapshot 6995125
JolandaVerhoef Nov 30, 2020
25297ff
[Jetchat] Moves to ComposeView.setContent and spotless
JoseAlcerreca Nov 30, 2020
0d0af95
[Jetchat] spotless again
JoseAlcerreca Nov 30, 2020
c524526
Merge branch 'jetchat_alpha08' into dev_jetchat_androidview
JoseAlcerreca Nov 30, 2020
160b32a
[Jetchat] Bad use of ComposeView.setContent
JoseAlcerreca Nov 30, 2020
ce476e0
Merge branch 'jetchat_alpha08' into dev_jetchat_androidview
JoseAlcerreca Nov 30, 2020
2161dbe
Lint: ambient naming
JoseAlcerreca Nov 30, 2020
f23955a
Update to snapshot 6994167.
nickbutcher Nov 25, 2020
467c062
Migrate to accompanist-insets.
nickbutcher Nov 25, 2020
9431ca2
Update to snapshot 7001724.
nickbutcher Nov 30, 2020
6c3e43c
Spotless.
nickbutcher Nov 30, 2020
7e93cad
Merge pull request #297 from JoseAlcerreca/jetchat_alpha08
JoseAlcerreca Dec 1, 2020
d7617b0
Merge branch 'jetchat_alpha08' into dev_jetchat_androidview
JoseAlcerreca Dec 1, 2020
855c628
Merge branch 'jetchat_alpha08' into dev_jetchat_androidview
JoseAlcerreca Dec 1, 2020
717dad8
Removes known issue from README as it was fixed
JoseAlcerreca Dec 1, 2020
c6a0740
Merge branch 'dev_jetchat_androidview' of github.com:JoseAlcerreca/co…
JoseAlcerreca Dec 1, 2020
bf3ffb0
Merge branch 'dev_alpha08' into nb/js_alpha08
nickbutcher Dec 1, 2020
f4fa9b2
Merge pull request #299 from android/nb/js_alpha08
nickbutcher Dec 1, 2020
852df71
[Owl] Update to snapshot 7001724.
nickbutcher Dec 1, 2020
726120b
[Jetnews] Upgrade to 7001724 snapshot
yrezgui Dec 1, 2020
1cd4dca
Update to Compose SNAPSHOT 7001724 (#303)
chrisbanes Dec 2, 2020
014e01a
[Jetsurvey] Updating to alpha08
florina-muntenescu Dec 2, 2020
f74451d
Fix default modifier on CourseListItem.
nickbutcher Dec 2, 2020
c88ca96
Merge branch 'dev_alpha08' into nb/owl_alpha08
nickbutcher Dec 2, 2020
532bc1f
Fix tests.
nickbutcher Dec 2, 2020
c9f8bc7
Merge branch 'nb/owl_alpha08' of github.com:android/compose-samples i…
nickbutcher Dec 2, 2020
b2db25d
Merge pull request #302 from android/nb/owl_alpha08
nickbutcher Dec 2, 2020
2212b42
Merge branch 'dev_alpha08' into fm/jetsurvey_alpha08
yrezgui Dec 2, 2020
88e8a96
Merge branch 'dev_alpha08' into rally_alpha08
yrezgui Dec 2, 2020
f08f54b
Merge branch 'dev_alpha08' into jetnews_alpha08
yrezgui Dec 2, 2020
b215d98
Merge pull request #294 from yrezgui/jetnews_alpha08
yrezgui Dec 2, 2020
98d77d9
Merge branch 'dev_alpha08' into fm/jetsurvey_alpha08
yrezgui Dec 2, 2020
62f7bd2
Merge pull request #304 from android/fm/jetsurvey_alpha08
yrezgui Dec 2, 2020
293e8ae
Merge branch 'dev_alpha08' into dev_jetchat_androidview
yrezgui Dec 2, 2020
a32e296
Merge branch 'dev_alpha08' into rally_alpha08
yrezgui Dec 2, 2020
4954d07
Merge branch 'dev_alpha08' into jv/cr_alpha08
yrezgui Dec 2, 2020
14c05d8
Merge pull request #295 from JoseAlcerreca/rally_alpha08
yrezgui Dec 2, 2020
760f796
Merge branch 'dev_alpha08' into jv/cr_alpha08
yrezgui Dec 2, 2020
356a528
Merge branch 'dev_alpha08' into dev_jetchat_androidview
yrezgui Dec 2, 2020
5c6b069
[Crane] Fix review comments
JolandaVerhoef Dec 3, 2020
28b262f
Merge pull request #298 from android/jv/cr_alpha08
JolandaVerhoef Dec 3, 2020
a8d2462
[Jetchat] Moved back to LiveData
JoseAlcerreca Dec 3, 2020
18219a0
Removes confusing comment
JoseAlcerreca Dec 3, 2020
d4b97ad
[Crane] Add Maps KTX library and adding Maps package within <queries>…
arriolac Dec 3, 2020
d4884aa
Spotless
JoseAlcerreca Dec 3, 2020
f658d03
Merge pull request #301 from JoseAlcerreca/dev_jetchat_androidview
JoseAlcerreca Dec 3, 2020
64b4d98
[Jetchat] Update to be edge-to-edge and add animated IME support (#306)
chrisbanes Dec 3, 2020
6df7995
[All] Update to Compose 1.0.0-alpha08
yrezgui Dec 3, 2020
3ec9bca
Upgrade to Java 11
yrezgui Dec 3, 2020
993bb2e
Upgrade to Java 11 for all samples
yrezgui Dec 3, 2020
c94b625
Merge pull request #307 from yrezgui/dev_alpha08
yrezgui Dec 3, 2020
487c636
[All] Upgrade samples to AGP 7.0.0-alpha02
yrezgui Dec 3, 2020
65777ad
Update all GitHub actions to use Java 11
yrezgui Dec 3, 2020
03965b2
Merge pull request #310 from yrezgui/agp-update
yrezgui Dec 3, 2020
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
Prev Previous commit
Next Next commit
[Owl] Initial nav tests
Change-Id: I6fb4a08ee99b96438dc28d25b91abd32f9e0dbc6
  • Loading branch information
JoseAlcerreca committed Nov 5, 2020
commit 2cb58c28ca4a078601b04b2c576bf980967997d6
112 changes: 112 additions & 0 deletions Owl/app/src/androidTest/java/com/example/owl/ui/NavigationTest.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
/*
* Copyright 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.example.owl.ui

import androidx.activity.ComponentActivity
import androidx.compose.runtime.Providers
import androidx.test.platform.app.InstrumentationRegistry
import androidx.ui.test.createAndroidComposeRule
import androidx.ui.test.onNodeWithLabel
import androidx.ui.test.onNodeWithSubstring
import androidx.ui.test.performClick
import com.example.owl.R
import com.example.owl.model.courses
import com.example.owl.ui.fakes.ProvideTestImageLoader
import com.example.owl.ui.utils.AmbientBackDispatcher
import org.junit.Rule
import org.junit.Test

/**
* Checks that the navigation flows in the app are correct.
*/
class NavigationTest {

@get:Rule
val composeTestRule = createAndroidComposeRule<ComponentActivity>()
lateinit var activity: ComponentActivity

private fun startActivity(startDestination: String? = null) {
composeTestRule.activityRule.scenario.onActivity {
activity = it
}
composeTestRule.setContent {
Providers(AmbientBackDispatcher provides activity.onBackPressedDispatcher) {
ProvideTestImageLoader {
if (startDestination == null) {
NavGraph()
} else {
NavGraph(startDestination)
}
}
}
}
}

@Test
fun firstScreenIsOnboarding() {
// When the app is open
startActivity()
// The first screen should be the onboarding screen.
// Assert that the FAB label for the onboarding screen exists:
composeTestRule.onNodeWithLabel(getOnboardingFabLabel()).assertExists()
}

@Test
fun onboardingToCourses() {
// Given the app in the onboarding screen
startActivity()

// Navigate to the next screen by clicking on the FAB
val fabLabel = getOnboardingFabLabel()
composeTestRule.onNodeWithLabel(fabLabel).performClick()

// The first course should be shown
composeTestRule.onNodeWithSubstring(courses.first().name).assertExists()
}

@Test
fun coursesToDetail() {
// Given the app in the courses screen
startActivity(MainDestinations.Courses.route)

// Navigate to the first course
composeTestRule.onNodeWithSubstring(courses.first().name).performClick()

// Assert navigated to the course details
composeTestRule.onNodeWithSubstring(getCourseDesc().take(15)).assertExists()
}

@Test
fun coursesToDetailAndBack() {
coursesToDetail()
composeTestRule.runOnUiThread {
activity.onBackPressed()
}

// The first course should be shown
composeTestRule.onNodeWithSubstring(courses.first().name).assertExists()
}

private fun getOnboardingFabLabel(): String {
return InstrumentationRegistry.getInstrumentation().targetContext.resources
.getString(R.string.continue_to_courses)
}
private fun getCourseDesc(): String {
return InstrumentationRegistry.getInstrumentation().targetContext.resources
.getString(R.string.course_desc)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
/*
* Copyright 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.example.owl.ui.fakes

import android.graphics.Color
import android.graphics.drawable.ColorDrawable
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Providers
import coil.ImageLoader
import coil.annotation.ExperimentalCoilApi
import coil.bitmap.BitmapPool
import coil.decode.DataSource
import coil.memory.MemoryCache
import coil.request.DefaultRequestOptions
import coil.request.Disposable
import coil.request.ImageRequest
import coil.request.ImageResult
import coil.request.SuccessResult
import com.example.owl.ui.utils.AmbientImageLoader

@OptIn(ExperimentalCoilApi::class)
@Composable
fun ProvideTestImageLoader(content: @Composable () -> Unit) {

// From https://coil-kt.github.io/coil/image_loaders/
val loader = object : ImageLoader {
private val drawable = ColorDrawable(Color.BLACK)

private val disposable = object : Disposable {
override val isDisposed get() = true
override fun dispose() {}
override suspend fun await() {}
}

override val bitmapPool: BitmapPool = BitmapPool(0)

override val defaults: DefaultRequestOptions = DefaultRequestOptions()
override val memoryCache: MemoryCache
get() = TODO("Not yet implemented")

override fun enqueue(request: ImageRequest): Disposable {
// Always call onStart before onSuccess.
request.target?.onStart(drawable)
request.target?.onSuccess(drawable)
return disposable
}

override suspend fun execute(request: ImageRequest): ImageResult {
return SuccessResult(
drawable = drawable,
request = request,
metadata = ImageResult.Metadata(
memoryCacheKey = MemoryCache.Key(""),
isSampled = false,
dataSource = DataSource.MEMORY_CACHE,
isPlaceholderMemoryCacheKeyPresent = false
)
)
}

override fun shutdown() { }
}
Providers(AmbientImageLoader provides loader, children = content)
}
1 change: 1 addition & 0 deletions Owl/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="androidx.activity.ComponentActivity" />
</application>

</manifest>
37 changes: 37 additions & 0 deletions Owl/app/src/main/java/com/example/owl/ui/NavGraph.kt
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,18 @@
package com.example.owl.ui

import android.os.Bundle
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.navigation.NavHostController
import androidx.navigation.NavType
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.navArgument
import androidx.navigation.compose.navigate
import androidx.navigation.compose.rememberNavController
import com.example.owl.ui.course.CourseDetails
import com.example.owl.ui.courses.Courses
import com.example.owl.ui.onboarding.Onboarding

open class Destination(open val route: String)
open class DestinationSingleArg(
Expand Down Expand Up @@ -57,3 +65,32 @@ class MainActions(navController: NavHostController) {
navController.popBackStack()
}
}

@Composable
fun NavGraph(startDestination: String = MainDestinations.Onboarding.route) {
val navController = rememberNavController()

val actions = remember(navController) { MainActions(navController) }
NavHost(
navController = navController,
startDestination = startDestination
) {
composable(MainDestinations.Onboarding.route) {
Onboarding(onboardingComplete = actions.onboardingComplete)
}
composable(MainDestinations.Courses.route) {
Courses(selectCourse = actions.selectCourse)
}
composable(
MainDestinations.CourseDetail.route,
arguments = MainDestinations.CourseDetail.args
) { backStackEntry ->
val arguments = requireNotNull(backStackEntry.arguments)
CourseDetails(
courseId = MainDestinations.CourseDetail.getArgFromBundle(arguments),
selectCourse = actions.selectCourse,
upPress = actions.upPress
)
}
}
}
33 changes: 1 addition & 32 deletions Owl/app/src/main/java/com/example/owl/ui/OwlApp.kt
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,6 @@ package com.example.owl.ui
import androidx.activity.OnBackPressedDispatcher
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Providers
import androidx.compose.runtime.remember
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
import com.example.owl.ui.course.CourseDetails
import com.example.owl.ui.courses.Courses
import com.example.owl.ui.onboarding.Onboarding
import com.example.owl.ui.utils.AmbientBackDispatcher
import com.example.owl.ui.utils.ProvideDisplayInsets
import com.example.owl.ui.utils.ProvideImageLoader
Expand All @@ -36,31 +29,7 @@ fun OwlApp(backDispatcher: OnBackPressedDispatcher) {
Providers(AmbientBackDispatcher provides backDispatcher) {
ProvideDisplayInsets {
ProvideImageLoader {
val navController = rememberNavController()

val actions = remember(navController) { MainActions(navController) }
NavHost(
navController = navController,
startDestination = MainDestinations.Onboarding.route
) {
composable(MainDestinations.Onboarding.route) {
Onboarding(onboardingComplete = actions.onboardingComplete)
}
composable(MainDestinations.Courses.route) {
Courses(selectCourse = actions.selectCourse)
}
composable(
MainDestinations.CourseDetail.route,
arguments = MainDestinations.CourseDetail.args
) { backStackEntry ->
val arguments = requireNotNull(backStackEntry.arguments)
CourseDetails(
courseId = MainDestinations.CourseDetail.getArgFromBundle(arguments),
selectCourse = actions.selectCourse,
upPress = actions.upPress
)
}
}
NavGraph()
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,10 @@ fun FeaturedCourse(
shape = MaterialTheme.shapes.medium
) {
ConstraintLayout(
modifier = Modifier.clickable(
onClick = { selectCourse(course.id) }
)
modifier = Modifier
.clickable(
onClick = { selectCourse(course.id) }
)
) {
val (image, avatar, subject, name, steps, icon) = createRefs()
NetworkImage(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.drawLayer
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.semantics.accessibilityLabel
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.ui.tooling.preview.Preview
Expand All @@ -80,9 +82,14 @@ fun Onboarding(onboardingComplete: () -> Unit) {
topBar = { AppBar() },
backgroundColor = MaterialTheme.colors.primarySurface,
floatingActionButton = {
val fabLabel = stringResource(id = R.string.continue_to_courses)
FloatingActionButton(
onClick = onboardingComplete,
modifier = Modifier.navigationBarsPadding()
modifier = Modifier
.navigationBarsPadding()
.semantics {
accessibilityLabel = fabLabel
}
) {
Icon(Icons.Rounded.Explore)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ fun NetworkImage(
)
}

private val AmbientImageLoader = staticAmbientOf<ImageLoader> {
val AmbientImageLoader = staticAmbientOf<ImageLoader> {
error("No loader provided")
}

Expand Down
1 change: 1 addition & 0 deletions Owl/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

<!-- Onboarding -->
<string name="choose_topics_that_interest_you">Choose topics that interest you</string>
<string name="continue_to_courses">Continue to courses</string>

<!-- Courses -->
<string name="my_courses">My Courses</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,15 @@ object Libs {
const val snapshot = ""
const val version = "1.0.0-alpha06"

const val runtime = "androidx.compose.runtime:runtime:$version"
const val animation = "androidx.compose.animation:animation:$version"
const val foundation = "androidx.compose.foundation:foundation:$version"
const val layout = "androidx.compose.foundation:foundation-layout:$version"
const val ui = "androidx.compose.ui:ui:$version"
const val iconsExtended = "androidx.compose.material:material-icons-extended:$version"
const val material = "androidx.compose.material:material:$version"
const val animation = "androidx.compose.animation:animation:$version"
const val runtime = "androidx.compose.runtime:runtime:$version"
const val tooling = "androidx.ui:ui-tooling:$version"
const val iconsExtended = "androidx.compose.material:material-icons-extended:$version"
const val ui = "androidx.compose.ui:ui:$version"
const val uiTest = "androidx.ui:ui-test:$version"
}

object Test {
Expand Down