Skip to content

Commit 2c848db

Browse files
committed
Merge branch 'main' of https://github.com/apl-devs/AppIntro
2 parents 8c564a1 + e635ec9 commit 2c848db

45 files changed

Lines changed: 860 additions & 345 deletions

Some content is hidden

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

.github/FUNDING.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# These are supported funding model platforms
2+
3+
github: AppIntro

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 30 deletions
This file was deleted.
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
name: Bug report
3+
about: Create a report for an issue or a bug with AppIntro
4+
---
5+
6+
<!--
7+
Please fill in the below fields with some data to help us best diagnose the issue.
8+
The more specific you are, the better! You can help a lot by not making us ask these questions.
9+
Any HTML comment like this will be stripped when rendering markdown, no need to delete them.
10+
If an issue does not have the following template filled out, it will be closed without discussion.
11+
-->
12+
13+
## 🐛 Describe the bug
14+
<!-- A clear and concise description of what the bug is. -->
15+
16+
## ⚠️ Current behavior
17+
<!-- A clear and concise description of what you expected to happen. -->
18+
19+
## ✅ Expected behavior
20+
<!-- A clear and concise description of what you expected to happen. -->
21+
22+
## 💣 Steps to reproduce
23+
<!-- How we can reproduce the behavior: -->
24+
25+
## 📷 Screenshots
26+
<!-- If applicable, add screenshots to help explain your problem. -->
27+
28+
## 📑 Your Code
29+
<!-- Please provide as more information as possible to let us reproduce the issue. Ideally either: -->
30+
<!-- A project reproducer -->
31+
<!-- Your Kotlin/Java/XML Relevant files -->
32+
<!-- The Stacktrace of the crash/failure -->
33+
<!-- The LogCat of your problme -->
34+
35+
## 📱 Tech info
36+
- AppIntro Version: <!-- e.g. 6.1.0 -->
37+
- Device: <!-- e.g. Nexus One -->
38+
- Android OS Version: <!-- e.g. 7.1.1 -->

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Questions
4+
url: https://github.com/AppIntro/AppIntro/discussions/new
5+
about: Ask questions about AppIntro and get support for your problems.
6+
- name: Slack Chat
7+
url: https://kotlinlang.slack.com/archives/C019SH1RMBN
8+
about: Join the 'appintro' channel on KotlinLang Slack to chat with other AppIntro developers.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea or a new feature for AppIntro
4+
---
5+
6+
## ⚠️ Is your feature request related to a problem? Please describe
7+
<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
8+
9+
## 💡 Describe the solution you'd like
10+
<!-- A clear and concise description of what you want to happen. -->
11+
12+
## 🤚 Do you want to develop this feature yourself?
13+
<!-- Put an `x` symbol into braces of desired choice. -->
14+
- [ ] Yes
15+
- [ ] No

.github/workflows/pre-merge.yml

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Pre Merge Checks
22
on:
33
push:
44
branches:
5-
- 'master'
5+
- 'main'
66
pull_request:
77
branches:
88
- '*'
@@ -16,13 +16,12 @@ jobs:
1616
- name: Checkout Repo
1717
uses: actions/checkout@v2
1818

19-
- name: Cache Gradle Folders
20-
uses: actions/cache@v2
19+
- name: Setup Java
20+
uses: actions/setup-java@v2
2121
with:
22-
path: |
23-
~/.gradle/caches/
24-
~/.gradle/wrapper/
25-
key: cache-gradle
22+
distribution: 'adopt'
23+
java-version: '11'
24+
cache: 'gradle'
2625

2726
- name: Run ktlint
2827
run: ./gradlew ktlintCheck
@@ -35,13 +34,12 @@ jobs:
3534
- name: Checkout Repo
3635
uses: actions/checkout@v2
3736

38-
- name: Cache Gradle Folders
39-
uses: actions/cache@v2
37+
- name: Setup Java
38+
uses: actions/setup-java@v2
4039
with:
41-
path: |
42-
~/.gradle/caches/
43-
~/.gradle/wrapper/
44-
key: cache-gradle
40+
distribution: 'adopt'
41+
java-version: '11'
42+
cache: 'gradle'
4543

4644
- name: Run detekt
4745
run: ./gradlew detekt
@@ -54,13 +52,12 @@ jobs:
5452
- name: Checkout Repo
5553
uses: actions/checkout@v2
5654

57-
- name: Cache Gradle Folders
58-
uses: actions/cache@v2
55+
- name: Setup Java
56+
uses: actions/setup-java@v2
5957
with:
60-
path: |
61-
~/.gradle/caches/
62-
~/.gradle/wrapper/
63-
key: cache-gradle
58+
distribution: 'adopt'
59+
java-version: '11'
60+
cache: 'gradle'
6461

6562
- name: Run lint
6663
run: ./gradlew lint
@@ -73,13 +70,12 @@ jobs:
7370
- name: Checkout Repo
7471
uses: actions/checkout@v2
7572

76-
- name: Cache Gradle Folders
77-
uses: actions/cache@v2
73+
- name: Setup Java
74+
uses: actions/setup-java@v2
7875
with:
79-
path: |
80-
~/.gradle/caches/
81-
~/.gradle/wrapper/
82-
key: cache-gradle
76+
distribution: 'adopt'
77+
java-version: '11'
78+
cache: 'gradle'
8379

8480
- name: Run all the tests
8581
run: ./gradlew test
@@ -93,12 +89,15 @@ jobs:
9389
experimental: [false]
9490
name: ["stable"]
9591
include:
96-
- agp: 4.2.+
92+
- agp: 7.1.0-beta02
9793
experimental: true
98-
name: AGP-4.2.+
99-
- kotlin: 1.4.30+
94+
name: AGP-7.1.+
95+
- agp: 7.2.0-alpha03
10096
experimental: true
101-
name: kotlin-EAP-1.4.30+
97+
name: AGP-7.2.+
98+
- kotlin: 1.6.0-RC
99+
experimental: true
100+
name: Kotlin-EAP
102101

103102
runs-on: [ubuntu-latest]
104103
continue-on-error: ${{ matrix.experimental }}
@@ -112,13 +111,12 @@ jobs:
112111
- name: Checkout Repo
113112
uses: actions/checkout@v2
114113

115-
- name: Cache Gradle Folders
116-
uses: actions/cache@v2
114+
- name: Setup Java
115+
uses: actions/setup-java@v2
117116
with:
118-
path: |
119-
~/.gradle/caches/
120-
~/.gradle/wrapper/
121-
key: cache-gradle
117+
distribution: 'adopt'
118+
java-version: '11'
119+
cache: 'gradle'
122120

123121
- name: Build the Debug APK
124122
run: ./gradlew assembleDebug

CHANGELOG.md

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,36 @@
11
# Change Log
22

3+
## Version 6.2.0 *(2022-01-17)*
4+
5+
This is a new minor release of AppIntro. This library comes with several new features (see below) and bugfixes.
6+
7+
### Summary of Changes
8+
9+
* We deprecated `AppIntroFragment.newInstance` in favor of `AppIntroFragment.createInstance`. This was needed in order
10+
to support passing color resources instead of color int, to tackle scenarios such as configuration changes and dark mode [#979].
11+
* Target SDK is now 31
12+
* We exposed a couple of properties/methods on the public API that were requested by the community ([#960] and [#959])
13+
* We added some Java examples for our Java users [#953]
14+
15+
### Enhancements 🎁
16+
17+
* [#959] Add @JvmOverloads on goToNextSlide
18+
* [#960] Expose a protected property for slidesNumber
19+
* [#979] Fix #926: Add color resource parameters
20+
* [#993] Make description scrollable
21+
22+
### Bugfixes 🐛
23+
24+
* [#934] Fix ProgressIndicatorController in RTL
25+
26+
### Dependency updates 📦
27+
28+
* Java version to 11
29+
* Kotlin to 1.6.10
30+
* AGP to 7.0.3
31+
* Androidx Appcompat to 1.4.0
32+
* ConstraintLayout to 2.1.2
33+
334
## Version 6.1.0 *(2021-02-03)*
435

536
This is a new minor release of AppIntro. This library comes with several new features (see below) and several bugfixes.
@@ -127,7 +158,7 @@ To get a deeper overview of the breaking changes, please read the [migration doc
127158

128159
### Library Internals ⚙️
129160

130-
* [#774] Move from Travis to Github Actions
161+
* [#774] Move from Travis to GitHub Actions
131162
* [#768] Refactor Transformers to use a sealed class
132163
* [#766] Add missing @Res annotations
133164
* [#765] Remove `I` prefix from interface names
@@ -304,5 +335,11 @@ Previous release notes can be found here: [releases]
304335
[#908]: https://github.com/AppIntro/AppIntro/pull/908
305336
[#919]: https://github.com/AppIntro/AppIntro/pull/919
306337
[#922]: https://github.com/AppIntro/AppIntro/pull/922
338+
[#934]: https://github.com/AppIntro/AppIntro/pull/934
339+
[#953]: https://github.com/AppIntro/AppIntro/pull/953
340+
[#959]: https://github.com/AppIntro/AppIntro/pull/959
341+
[#960]: https://github.com/AppIntro/AppIntro/pull/960
342+
[#979]: https://github.com/AppIntro/AppIntro/pull/979
343+
[#993]: https://github.com/AppIntro/AppIntro/pull/993
307344
[releases]: https://github.com/AppIntro/AppIntro/releases?after=v5.0.0
308345

0 commit comments

Comments
 (0)