Skip to content
This repository was archived by the owner on Jan 10, 2025. It is now read-only.

Commit 172e922

Browse files
Merge pull request #570 from googlesamples/NavigationAdvancedSample
Adds Navigation advanced sample
2 parents afd7a9c + 54f4d44 commit 172e922

File tree

94 files changed

+3608
-16
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+3608
-16
lines changed

.circleci/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ jobs:
8686
environment:
8787
PROJECT_DIR: NavigationBasicSample
8888
<<: *test_sample
89+
test_navigation_advanced_sample:
90+
environment:
91+
PROJECT_DIR: NavigationAdvancedSample
92+
<<: *test_sample
8993
test_paging_sample:
9094
environment:
9195
PROJECT_DIR: PagingSample
@@ -116,6 +120,7 @@ workflows:
116120
- test_rx_java_sample_kotlin
117121
- test_github_browser_sample
118122
# no tests - test_navigation_basic_sample
123+
- test_navigation_advanced_sample
119124
- test_paging_sample
120125
- test_paging_network_sample
121126
- test_persistence_content_provider_sample

BasicRxJavaSample/versions.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
**/
2323
ext.deps = [:]
2424
def versions = [:]
25-
versions.android_gradle_plugin = "3.3.0"
25+
versions.android_gradle_plugin = '3.3.1'
2626
versions.apache_commons = "2.5"
2727
versions.arch_core = "2.0.0"
2828
versions.atsl_rules = "1.1.0-alpha4"
@@ -159,6 +159,8 @@ navigation.runtime = "androidx.navigation:navigation-runtime:$versions.navigatio
159159
navigation.runtime_ktx = "androidx.navigation:navigation-runtime-ktx:$versions.navigation"
160160
navigation.fragment = "androidx.navigation:navigation-fragment:$versions.navigation"
161161
navigation.fragment_ktx = "androidx.navigation:navigation-fragment-ktx:$versions.navigation"
162+
navigation.ui = "androidx.navigation:navigation-ui:$versions.navigation"
163+
navigation.ui_ktx = "androidx.navigation:navigation-ui-ktx:$versions.navigation"
162164
navigation.safe_args_plugin = "androidx.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
163165
deps.navigation = navigation
164166

BasicRxJavaSampleKotlin/versions.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
**/
2323
ext.deps = [:]
2424
def versions = [:]
25-
versions.android_gradle_plugin = "3.3.0"
25+
versions.android_gradle_plugin = '3.3.1'
2626
versions.apache_commons = "2.5"
2727
versions.arch_core = "2.0.0"
2828
versions.atsl_rules = "1.1.0-alpha4"
@@ -159,6 +159,8 @@ navigation.runtime = "androidx.navigation:navigation-runtime:$versions.navigatio
159159
navigation.runtime_ktx = "androidx.navigation:navigation-runtime-ktx:$versions.navigation"
160160
navigation.fragment = "androidx.navigation:navigation-fragment:$versions.navigation"
161161
navigation.fragment_ktx = "androidx.navigation:navigation-fragment-ktx:$versions.navigation"
162+
navigation.ui = "androidx.navigation:navigation-ui:$versions.navigation"
163+
navigation.ui_ktx = "androidx.navigation:navigation-ui-ktx:$versions.navigation"
162164
navigation.safe_args_plugin = "androidx.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
163165
deps.navigation = navigation
164166

BasicSample/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ buildscript {
2525
// NOTE: Do not place your application dependencies here; they belong
2626
// in the individual module build.gradle files
2727
}
28+
repositories {
29+
google()
30+
}
2831
}
2932

3033
allprojects {

BasicSample/versions.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
**/
2323
ext.deps = [:]
2424
def versions = [:]
25-
versions.android_gradle_plugin = "3.3.0"
25+
versions.android_gradle_plugin = '3.3.1'
2626
versions.apache_commons = "2.5"
2727
versions.arch_core = "2.0.0"
2828
versions.atsl_rules = "1.1.0-alpha4"
@@ -159,6 +159,8 @@ navigation.runtime = "androidx.navigation:navigation-runtime:$versions.navigatio
159159
navigation.runtime_ktx = "androidx.navigation:navigation-runtime-ktx:$versions.navigation"
160160
navigation.fragment = "androidx.navigation:navigation-fragment:$versions.navigation"
161161
navigation.fragment_ktx = "androidx.navigation:navigation-fragment-ktx:$versions.navigation"
162+
navigation.ui = "androidx.navigation:navigation-ui:$versions.navigation"
163+
navigation.ui_ktx = "androidx.navigation:navigation-ui-ktx:$versions.navigation"
162164
navigation.safe_args_plugin = "androidx.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
163165
deps.navigation = navigation
164166

GithubBrowserSample/versions.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
**/
2323
ext.deps = [:]
2424
def versions = [:]
25-
versions.android_gradle_plugin = "3.3.0"
25+
versions.android_gradle_plugin = '3.3.1'
2626
versions.apache_commons = "2.5"
2727
versions.arch_core = "2.0.0"
2828
versions.atsl_rules = "1.1.0-alpha4"
@@ -159,6 +159,8 @@ navigation.runtime = "androidx.navigation:navigation-runtime:$versions.navigatio
159159
navigation.runtime_ktx = "androidx.navigation:navigation-runtime-ktx:$versions.navigation"
160160
navigation.fragment = "androidx.navigation:navigation-fragment:$versions.navigation"
161161
navigation.fragment_ktx = "androidx.navigation:navigation-fragment-ktx:$versions.navigation"
162+
navigation.ui = "androidx.navigation:navigation-ui:$versions.navigation"
163+
navigation.ui_ktx = "androidx.navigation:navigation-ui-ktx:$versions.navigation"
162164
navigation.safe_args_plugin = "androidx.navigation:navigation-safe-args-gradle-plugin:$versions.navigation"
163165
deps.navigation = navigation
164166

NavigationAdvancedSample/.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
*.iml
2+
.gradle
3+
/local.properties
4+
/.idea
5+
.DS_Store
6+
/build
7+
/captures
8+
.externalNativeBuild
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#
2+
# Copyright (C) 2019 The Android Open Source Project
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
# GOOGLE SAMPLE PACKAGING DATA
17+
#
18+
# This file is used by Google as part of our samples packaging process.
19+
# End users may safely ignore this file. It has no relevance to other systems.
20+
---
21+
# Values: {DRAFT | PUBLISHED | INTERNAL | DEPRECATED | SUPERCEDED}
22+
status: PUBLISHED
23+
24+
# Optional, put additional explanation here for DEPRECATED or SUPERCEDED.
25+
# statusNote:
26+
27+
# See http://go/sample-categories
28+
technologies: [Android]
29+
categories: [Architecture]
30+
languages: [Kotlin]
31+
solutions: [Mobile]
32+
33+
# May be omitted if unpublished
34+
github: googlesamples/android-architecture-components
35+
36+
# Values: BEGINNER | INTERMEDIATE | ADVANCED | EXPERT
37+
level: INTERMEDIATE
38+
39+
# Default: apache2. May be omitted for most samples.
40+
# Alternatives: apache2-android (for AOSP)
41+
license: apache2

NavigationAdvancedSample/.idea/runConfigurations/app.xml

Lines changed: 55 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

NavigationAdvancedSample/.idea/runConfigurations/deeplink.xml

Lines changed: 55 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# How to become a contributor and submit your own code
2+
3+
## Contributor License Agreements
4+
5+
We'd love to accept your sample apps and patches! Before we can take them, we
6+
have to jump a couple of legal hurdles.
7+
8+
Please fill out either the individual or corporate Contributor License Agreement (CLA).
9+
10+
* If you are an individual writing original source code and you're sure you
11+
own the intellectual property, then you'll need to sign an [individual CLA]
12+
(https://cla.developers.google.com).
13+
* If you work for a company that wants to allow you to contribute your work,
14+
then you'll need to sign a [corporate CLA]
15+
(https://cla.developers.google.com).
16+
* Please make sure you sign both, Android and Google CLA
17+
18+
Follow either of the two links above to access the appropriate CLA and
19+
instructions for how to sign and return it. Once we receive it, we'll be able to
20+
accept your pull requests.
21+
22+
## Contributing A Patch
23+
24+
1. Submit an issue describing your proposed change to the repo in question.
25+
1. The repo owner will respond to your issue promptly.
26+
1. If your proposed change is accepted, and you haven't already done so, sign a
27+
Contributor License Agreement (see details above).
28+
1. Fork the desired repo, develop and test your code changes.
29+
1. Ensure that your code adheres to the existing style in the sample to which
30+
you are contributing. Refer to the
31+
[Android Code Style Guide]
32+
(https://source.android.com/source/code-style.html) for the
33+
recommended coding standards for this organization.
34+
1. Ensure that your code has an appropriate set of unit tests which all pass.
35+
1. Submit a pull request.

0 commit comments

Comments
 (0)