Skip to content

Commit 9b55fe0

Browse files
committed
Update template with personal content for Countdown timer challenge
1 parent 0a70ac1 commit 9b55fe0

File tree

47 files changed

+710
-629
lines changed

Some content is hidden

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

47 files changed

+710
-629
lines changed

.gitignore

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,13 @@ 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
44+
.idea/inspectionProfiles/profiles_settings.xml
45+
.idea/inspectionProfiles/ktlint.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/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: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
1-
# Template repository
1+
# Countdown timer - Week #2
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-week2/workflows/Check/badge.svg)](https://github.com/opatry/android-dev-challenge-compose-week2/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
86

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.
7+
TODO
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
2310

24-
Before committing your code, run `./gradlew app:spotlessApply` to automatically format your code.
11+
TODO
12+
13+
## :camera_flash: Screenshots
14+
15+
## 🌞 Light Mode
16+
List | Details | Tablet
17+
--- | --- | --- |
18+
<img src="/results/screenshot_1.png" width="260"> | <img src="/results/screenshot_2.png" width="260"> | <img src="/results/screenshot_3.png" width="520">
19+
20+
## 🌚 Dark Mode
21+
List | Details | Tablet
22+
--- | --- | --- |
23+
<img src="/results/screenshot_1_dark.png" width="260"> | <img src="/results/screenshot_2_dark.png" width="260"> | <img src="/results/screenshot_3_dark.png" width="520">
2524

2625
## License
2726
```
@@ -38,4 +37,4 @@ distributed under the License is distributed on an "AS IS" BASIS,
3837
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
3938
See the License for the specific language governing permissions and
4039
limitations under the License.
41-
```
40+
```

app/build.gradle

Lines changed: 34 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.countdowntimer"
1133
minSdkVersion 23
1234
targetSdkVersion 30
1335
versionCode 1
@@ -67,12 +89,23 @@ dependencies {
6789
implementation 'androidx.core:core-ktx:1.3.2'
6890
implementation 'androidx.appcompat:appcompat:1.2.0'
6991
implementation 'com.google.android.material:material:1.3.0'
92+
7093
implementation "androidx.activity:activity-compose:1.3.0-alpha03"
94+
7195
implementation "androidx.compose.ui:ui:$compose_version"
7296
implementation "androidx.compose.material:material:$compose_version"
7397
implementation "androidx.compose.material:material-icons-extended:$compose_version"
7498
implementation "androidx.compose.ui:ui-tooling:$compose_version"
99+
implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
100+
101+
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha02"
102+
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0'
75103
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0'
104+
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.0'
105+
106+
implementation "androidx.navigation:navigation-compose:1.0.0-alpha08"
107+
108+
implementation "dev.chrisbanes.accompanist:accompanist-coil:0.6.0"
76109

77110
testImplementation 'junit:junit:4.13.2'
78111

0 commit comments

Comments
 (0)