Skip to content

Commit d52076e

Browse files
committed
Set the watermark
1 parent 06d67ea commit d52076e

File tree

8 files changed

+85
-62
lines changed

8 files changed

+85
-62
lines changed

AdaptiveNavigationSample/README.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,23 @@ The core changes to an existing codebase are:
88
- Pass the `Arrangement.Vertical` value to the `navigationItemVerticalArrangement` parameter in the `NavigationSuiteScaffold` declaration.
99

1010
## Screenshot
11-
![Animation of the Navigation Suite Scaffold changing arrangement based on user's choice](/resources/scaffold_animated.gif)
11+
![Animation of the Navigation Suite Scaffold changing arrangement based on user's choice](/resources/scaffold_animated.gif)
12+
13+
### License
14+
15+
```
16+
Copyright 2025 The Android Open Source Project
17+
18+
Licensed under the Apache License, Version 2.0 (the "License");
19+
you may not use this file except in compliance with the License.
20+
You may obtain a copy of the License at
21+
22+
https://www.apache.org/licenses/LICENSE-2.0
23+
24+
Unless required by applicable law or agreed to in writing, software
25+
distributed under the License is distributed on an "AS IS" BASIS,
26+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
27+
See the License for the specific language governing permissions and
28+
limitations under the License.
29+
30+
```

AdaptiveNavigationSample/app/src/androidTest/java/com/google/sample/adaptivenavigationsample/ExampleInstrumentedTest.kt

Lines changed: 0 additions & 24 deletions
This file was deleted.

AdaptiveNavigationSample/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<application
65
android:allowBackup="true"

AdaptiveNavigationSample/app/src/main/java/com/google/sample/adaptivenavigationsample/MainActivity.kt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
package com.google.sample.adaptivenavigationsample
22

3+
/*
4+
* Copyright 2025 The Android Open Source Project
5+
*
6+
* Licensed under the Apache License, Version 2.0 (the "License");
7+
* you may not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* https://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*/
18+
319
import android.os.Bundle
420
import android.widget.RadioGroup
521
import androidx.activity.ComponentActivity

AdaptiveNavigationSample/app/src/main/java/com/google/sample/adaptivenavigationsample/ui/theme/Color.kt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
package com.google.sample.adaptivenavigationsample.ui.theme
22

3+
/*
4+
* Copyright 2025 The Android Open Source Project
5+
*
6+
* Licensed under the Apache License, Version 2.0 (the "License");
7+
* you may not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* https://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*/
18+
319
import androidx.compose.ui.graphics.Color
420

521
val Purple80 = Color(0xFFD0BCFF)

AdaptiveNavigationSample/app/src/main/java/com/google/sample/adaptivenavigationsample/ui/theme/Theme.kt

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
package com.google.sample.adaptivenavigationsample.ui.theme
22

3-
import android.app.Activity
3+
/*
4+
* Copyright 2025 The Android Open Source Project
5+
*
6+
* Licensed under the Apache License, Version 2.0 (the "License");
7+
* you may not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* https://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*/
18+
419
import android.os.Build
520
import androidx.compose.foundation.isSystemInDarkTheme
621
import androidx.compose.material3.MaterialTheme
Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,27 @@
11
package com.google.sample.adaptivenavigationsample.ui.theme
22

3+
/*
4+
* Copyright 2025 The Android Open Source Project
5+
*
6+
* Licensed under the Apache License, Version 2.0 (the "License");
7+
* you may not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* https://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*/
18+
319
import androidx.compose.material3.Typography
420
import androidx.compose.ui.text.TextStyle
521
import androidx.compose.ui.text.font.FontFamily
622
import androidx.compose.ui.text.font.FontWeight
723
import androidx.compose.ui.unit.sp
824

9-
// Set of Material typography styles to start with
1025
val Typography = Typography(
1126
bodyLarge = TextStyle(
1227
fontFamily = FontFamily.Default,
@@ -15,20 +30,4 @@ val Typography = Typography(
1530
lineHeight = 24.sp,
1631
letterSpacing = 0.5.sp
1732
)
18-
/* Other default text styles to override
19-
titleLarge = TextStyle(
20-
fontFamily = FontFamily.Default,
21-
fontWeight = FontWeight.Normal,
22-
fontSize = 22.sp,
23-
lineHeight = 28.sp,
24-
letterSpacing = 0.sp
25-
),
26-
labelSmall = TextStyle(
27-
fontFamily = FontFamily.Default,
28-
fontWeight = FontWeight.Medium,
29-
fontSize = 11.sp,
30-
lineHeight = 16.sp,
31-
letterSpacing = 0.5.sp
32-
)
33-
*/
3433
)

AdaptiveNavigationSample/app/src/test/java/com/google/sample/adaptivenavigationsample/ExampleUnitTest.kt

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)