Skip to content

Commit

Permalink
Merge pull request #332 from googlecodelabs/gurupreet/theming_codelab…
Browse files Browse the repository at this point in the history
…_m3_end

Material 3 theming codelab end.
  • Loading branch information
Gurupreet authored May 4, 2023
2 parents 7ff5663 + 2f103ac commit 72190c3
Show file tree
Hide file tree
Showing 74 changed files with 3,087 additions and 21 deletions.
11 changes: 9 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
.idea/*
**/.DS_Store
*.iml
.gradle
/local
/.idea/*
.DS_Store
build/
/captures
.externalNativeBuild
local.properties
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ val paragraphsPost1 = listOf(
Paragraph(
ParagraphType.CodeBlock,
"include ':app'\n" +
"include ':features:module1'\n" +
"include ':features:module2'\n" +
"include ':features:module3'\n" +
"include ':features:module4'"
"include ':features:module1'\n" +
"include ':features:module2'\n" +
"include ':features:module3'\n" +
"include ':features:module4'"
),
Paragraph(
ParagraphType.Text,
Expand Down Expand Up @@ -701,8 +701,8 @@ val paragraphsPost5 = listOf(
Paragraph(
ParagraphType.CodeBlock,
"public inline fun <T, R> Iterable<T>.map(transform: (T) -> R): List<R> {\n" +
" return mapTo(ArrayList<R>(collectionSizeOrDefault(10)), transform)\n" +
"}",
" return mapTo(ArrayList<R>(collectionSizeOrDefault(10)), transform)\n" +
"}",
listOf(
Markup(MarkupType.Bold, 7, 13),
Markup(MarkupType.Bold, 88, 97)
Expand Down Expand Up @@ -746,8 +746,8 @@ val paragraphsPost5 = listOf(
Paragraph(
ParagraphType.CodeBlock,
"public fun <T, R> Sequence<T>.map(transform: (T) -> R): Sequence<R>{ \n" +
" return TransformingSequence(this, transform)\n" +
"}",
" return TransformingSequence(this, transform)\n" +
"}",
listOf(Markup(MarkupType.Bold, 85, 105))
),
Paragraph(
Expand All @@ -766,9 +766,9 @@ val paragraphsPost5 = listOf(
Paragraph(
ParagraphType.CodeBlock,
"public inline fun <T> Sequence<T>.first(predicate: (T) -> Boolean): T {\n" +
" for (element in this) if (predicate(element)) return element\n" +
" throw NoSuchElementException(“Sequence contains no element matching the predicate.”)\n" +
"}"
" for (element in this) if (predicate(element)) return element\n" +
" throw NoSuchElementException(“Sequence contains no element matching the predicate.”)\n" +
"}"
),
Paragraph(
ParagraphType.Text,
Expand All @@ -781,7 +781,7 @@ val paragraphsPost5 = listOf(
Paragraph(
ParagraphType.CodeBlock,
"internal class TransformingIndexedSequence<T, R> \n" +
"constructor(private val sequence: Sequence<T>, private val transformer: (Int, T) -> R) : Sequence<R> {",
"constructor(private val sequence: Sequence<T>, private val transformer: (Int, T) -> R) : Sequence<R> {",
listOf(
Markup(
MarkupType.Bold,
Expand All @@ -793,12 +793,12 @@ val paragraphsPost5 = listOf(
Paragraph(
ParagraphType.CodeBlock,
"override fun iterator(): Iterator<R> = object : Iterator<R> {\n" +
"\n" +
" override fun next(): R {\n" +
" return transformer(checkIndexOverflow(index++), iterator.next())\n" +
" }\n" +
"\n" +
"}",
"\n" +
" override fun next(): R {\n" +
" return transformer(checkIndexOverflow(index++), iterator.next())\n" +
" }\n" +
"\n" +
"}",
listOf(
Markup(MarkupType.Bold, 83, 89),
Markup(MarkupType.Bold, 107, 118)
Expand Down Expand Up @@ -1024,4 +1024,4 @@ val posts: List<Post> =
post3.copy(id = "post8"),
post4.copy(id = "post9"),
post5.copy(id = "post10")
)
)
10 changes: 10 additions & 0 deletions ThemingCodelab/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
*.iml
.gradle
/local.properties
/.idea/*
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
local.properties
88 changes: 88 additions & 0 deletions ThemingCodelab/ASSETS_LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
All font files are licensed under the SIL OPEN FONT LICENSE license. All other files are licensed under the Apache 2 license.


SIL OPEN FONT LICENSE
Version 1.1 - 26 February 2007

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting — in part or in whole — any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
28 changes: 28 additions & 0 deletions ThemingCodelab/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# How to Contribute

We'd love to accept your patches and contributions to this project. There are
just a few small guidelines you need to follow.

## Contributor License Agreement

Contributions to this project must be accompanied by a Contributor License
Agreement. You (or your employer) retain the copyright to your contribution,
this simply gives us permission to use and redistribute your contributions as
part of the project. Head over to <https://cla.developers.google.com/> to see
your current agreements on file or to sign a new one.

You generally only need to submit a CLA once, so if you've already submitted one
(even if it was for a different project), you probably don't need to do it
again.

## Code reviews

All submissions, including submissions by project members, require review. We
use GitHub pull requests for this purpose. Consult
[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
information on using pull requests.

## Community Guidelines

This project follows [Google's Open Source Community
Guidelines](https://opensource.google.com/conduct/).
Loading

0 comments on commit 72190c3

Please sign in to comment.