Skip to content

Commit 429d42b

Browse files
committed
First update, apply personal customization (README, app name, copyright, ...)
1 parent f7ba2f0 commit 429d42b

Some content is hidden

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

60 files changed

+791
-604
lines changed

.github/workflows/Check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: actions/checkout@v2
1616

1717
- name: Copy CI gradle.properties
18-
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
18+
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
1919

2020
- name: Set up JDK 11
2121
uses: actions/setup-java@v1

.gitignore

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,11 @@ proguard-project.txt
3333

3434
# Android Studio/IDEA
3535
*.iml
36-
.idea
36+
.idea/.name
37+
.idea/assetWizardSettings.xml
38+
.idea/compiler.xml
39+
.idea/jarRepositories.xml
40+
.idea/gradle.xml
41+
.idea/misc.xml
42+
.idea/vcs.xml
43+
.idea/workspace.xml

.idea/codeStyles/Project.xml

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

.idea/codeStyles/codeStyleConfig.xml

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

.idea/copyright/AOSP.xml

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

.idea/copyright/opatry.xml

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

.idea/copyright/profiles_settings.xml

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

.idea/inspectionProfiles/ktlint.xml

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

.idea/inspectionProfiles/profiles_settings.xml

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

.idea/saveactions_settings.xml

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

README-template.md

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

README.md

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,23 @@
1-
# Template repository
1+
# 🐱 Kitty adoption app - Week #1
22

3-
Template repository for the Jetpack Compose [#AndroidDevChallenge](https://developer.android.com/dev-challenge).
3+
[![Workflow result](https://github.com/opatry/android-dev-challenge-compose-week1/workflows/Check/badge.svg)](https://github.com/opatry/android-dev-challenge-compose-week1/actions/workflows/Check.yaml)
44

5-
## Getting started
6-
Copy this repository by pressing the "Use this template" button in Github.
7-
Clone your repository and open it in the latest [Android Studio (Canary build)](https://developer.android.com/studio/preview).
5+
## :scroll: Description
6+
<!--- Describe your app in one or two sentences -->
87

9-
## Submission requirements
10-
- Follow the challenge description on the project website: [developer.android.com/dev-challenge](https://developer.android.com/dev-challenge)
11-
- All UI should be written using Jetpack Compose
12-
- The Github Actions workflow should complete successfully
13-
- Include two screenshots of your submission in the [results](results) folder. The names should be
14-
screenshot_1.png and screenshot_2.png.
15-
- Include a screen record of your submission in the [results](results) folder. The name should be
16-
video.mp4
17-
- Replace the contents of [README.md](README.md) with the contents of [README-template.md](README-template.md) and fill out the template.
188

19-
## Code formatting
20-
The CI uses [Spotless](https://github.com/diffplug/spotless) to check if your code is formatted correctly and contains the right licenses.
21-
Internally, Spotless uses [ktlint](https://github.com/pinterest/ktlint) to check the formatting of your code.
22-
To set up ktlint correctly with Android Studio, follow one of the [listed setup options](https://github.com/pinterest/ktlint#-with-intellij-idea).
9+
## :bulb: Motivation and Context
10+
<!--- Optionally point readers to interesting parts of your submission. -->
11+
<!--- What are you especially proud of? -->
2312

24-
Before committing your code, run `./gradlew app:spotlessApply` to automatically format your code.
13+
14+
## :camera_flash: Screenshots
15+
16+
<img src="/results/screenshot_1.png" width="260">&emsp;<img src="/results/screenshot_2.png" width="260">
17+
18+
## Credits
19+
20+
Launcher icon by [svgrepo.com](https://www.svgrepo.com/).
2521

2622
## License
2723
```
@@ -38,4 +34,4 @@ distributed under the License is distributed on an "AS IS" BASIS,
3834
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
3935
See the License for the specific language governing permissions and
4036
limitations under the License.
41-
```
37+
```

app/build.gradle

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
/*
2+
* Copyright (c) 2021 Olivier Patry
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining
5+
* a copy of this software and associated documentation files (the "Software"),
6+
* to deal in the Software without restriction, including without limitation
7+
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
8+
* and/or sell copies of the Software, and to permit persons to whom the Software
9+
* is furnished to do so, subject to the following conditions:
10+
*
11+
* The above copyright notice and this permission notice shall be included in
12+
* all copies or substantial portions of the Software.
13+
*
14+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15+
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
16+
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
17+
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
18+
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
19+
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
20+
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
*/
22+
123
plugins {
224
id 'com.android.application'
325
id 'kotlin-android'
@@ -7,7 +29,7 @@ android {
729
compileSdkVersion 30
830

931
defaultConfig {
10-
applicationId "com.example.androiddevchallenge"
32+
applicationId "net.opatry.adoptacat"
1133
minSdkVersion 23
1234
targetSdkVersion 30
1335
versionCode 1

app/src/androidTest/java/com/example/androiddevchallenge/ExampleInstrumentedTest.kt

Lines changed: 0 additions & 38 deletions
This file was deleted.
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/*
2+
* Copyright (c) 2021 Olivier Patry
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining
5+
* a copy of this software and associated documentation files (the "Software"),
6+
* to deal in the Software without restriction, including without limitation
7+
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
8+
* and/or sell copies of the Software, and to permit persons to whom the Software
9+
* is furnished to do so, subject to the following conditions:
10+
*
11+
* The above copyright notice and this permission notice shall be included in
12+
* all copies or substantial portions of the Software.
13+
*
14+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15+
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
16+
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
17+
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
18+
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
19+
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
20+
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
*/
22+
package net.opatry.adoptacat
23+
24+
import androidx.compose.ui.test.junit4.createAndroidComposeRule
25+
import androidx.test.ext.junit.runners.AndroidJUnit4
26+
import org.junit.Rule
27+
import org.junit.Test
28+
import org.junit.runner.RunWith
29+
30+
/**
31+
* Instrumented test, which will execute on an Android device.
32+
*
33+
* See [testing documentation](http://d.android.com/tools/testing).
34+
*/
35+
@RunWith(AndroidJUnit4::class)
36+
class ExampleInstrumentedTest {
37+
@get:Rule
38+
val composeTestRule = createAndroidComposeRule<MainActivity>()
39+
40+
@Test
41+
fun sampleTest() {
42+
// Add instrumented tests here
43+
}
44+
}

app/src/main/AndroidManifest.xml

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!--
3-
Copyright 2020 The Android Open Source Project
4-
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
5-
in compliance with the License. You may obtain a copy of the License at
6-
http://www.apache.org/licenses/LICENSE-2.0
7-
Unless required by applicable law or agreed to in writing, software distributed under the License
8-
is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
9-
or implied. See the License for the specific language governing permissions and limitations under
10-
the License.
3+
Copyright (c) 2021 Olivier Patry
4+
5+
Permission is hereby granted, free of charge, to any person obtaining
6+
a copy of this software and associated documentation files (the "Software"),
7+
to deal in the Software without restriction, including without limitation
8+
the rights to use, copy, modify, merge, publish, distribute, sublicense,
9+
and/or sell copies of the Software, and to permit persons to whom the Software
10+
is furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
17+
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
18+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
19+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
20+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
21+
OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1122
-->
1223

1324
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
14-
package="com.example.androiddevchallenge">
25+
package="net.opatry.adoptacat">
1526

1627
<application
1728
android:allowBackup="true"
@@ -20,7 +31,7 @@
2031
android:supportsRtl="true"
2132
android:theme="@style/Theme.AndroidDevChallenge">
2233
<activity
23-
android:name="com.example.androiddevchallenge.MainActivity"
34+
android:name="net.opatry.adoptacat.MainActivity"
2435
android:label="@string/app_name"
2536
android:theme="@style/Theme.AndroidDevChallenge.NoActionBar">
2637
<intent-filter>
17.8 KB
Loading

0 commit comments

Comments
 (0)