From 215f11d9365d832f7db8ca03d03ef328795134e7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 7 Apr 2022 23:21:04 +0200 Subject: [PATCH 01/15] Update plugin android-application to v7.1.3 (#37) Co-authored-by: Renovate Bot --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9cec0432..2f3b2781 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ androidconfig-compileSdk = "31" androidconfig-targetSdk = "31" androidconfig-buildTools = "31.0.0" -androidGradle = "7.1.2" +androidGradle = "7.1.3" kotlin = "1.6.20" appcompat = "1.4.1" From b0f105600f75a9842defbccbf986352bbc6bfdd2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 14 Apr 2022 18:05:08 +0200 Subject: [PATCH 02/15] Update plugin kotlin-dokka to v1.6.20 (#39) Co-authored-by: Renovate Bot --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2f3b2781..f712617d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -21,7 +21,7 @@ materialDesign = "1.5.0" detekt = "1.19.0" gradleVersions = "0.42.0" -dokka = "1.6.10" +dokka = "1.6.20" junit = "5.8.2" From 23dc1cd19717ab4fed42ca80d307cf44b551f3a8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Apr 2022 12:45:44 +0200 Subject: [PATCH 03/15] Update dependency io.gitlab.arturbosch.detekt:detekt-formatting to v1.20.0 (#41) Co-authored-by: Renovate Bot --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f712617d..108ee69f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,7 +19,7 @@ barcodeScanningGms = "18.0.0" materialDesign = "1.5.0" -detekt = "1.19.0" +detekt = "1.20.0" gradleVersions = "0.42.0" dokka = "1.6.20" From 82222a540749edc9acbfee863866f57fd15909c3 Mon Sep 17 00:00:00 2001 From: Thomas Wirth Date: Sat, 16 Apr 2022 00:05:11 +0200 Subject: [PATCH 04/15] Reformat code --- .../io/github/g00fy2/quickie/QRScannerActivity.kt | 3 ++- .../quicksettingstile/QuickieTileService.kt | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/quickie/src/main/kotlin/io/github/g00fy2/quickie/QRScannerActivity.kt b/quickie/src/main/kotlin/io/github/g00fy2/quickie/QRScannerActivity.kt index 41bef1fc..03a3c3b2 100644 --- a/quickie/src/main/kotlin/io/github/g00fy2/quickie/QRScannerActivity.kt +++ b/quickie/src/main/kotlin/io/github/g00fy2/quickie/QRScannerActivity.kt @@ -92,7 +92,8 @@ internal class QRScannerActivity : AppCompatActivity() { .setTargetResolution(Size(1280, 720)) .build() .also { - it.setAnalyzer(analysisExecutor, + it.setAnalyzer( + analysisExecutor, QRCodeAnalyzer( barcodeFormats = barcodeFormats, onSuccess = { barcode -> diff --git a/sample/src/main/kotlin/io/github/g00fy2/quickiesample/quicksettingstile/QuickieTileService.kt b/sample/src/main/kotlin/io/github/g00fy2/quickiesample/quicksettingstile/QuickieTileService.kt index b235dd0e..656b50a6 100644 --- a/sample/src/main/kotlin/io/github/g00fy2/quickiesample/quicksettingstile/QuickieTileService.kt +++ b/sample/src/main/kotlin/io/github/g00fy2/quickiesample/quicksettingstile/QuickieTileService.kt @@ -28,9 +28,11 @@ class QuickieTileService : TileService() { override fun onClick() { super.onClick() - startActivityAndCollapse(Intent(this, MainActivity::class.java).apply { - addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) - putExtra(MainActivity.OPEN_SCANNER, true) - }) + startActivityAndCollapse( + Intent(this, MainActivity::class.java).apply { + addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + putExtra(MainActivity.OPEN_SCANNER, true) + } + ) } } \ No newline at end of file From 104ada55377323549c0bad83ae569a4d06746c1a Mon Sep 17 00:00:00 2001 From: Thomas Wirth Date: Sat, 16 Apr 2022 03:47:44 +0200 Subject: [PATCH 05/15] Use latest ubuntu and java 17 on gh actions --- .github/workflows/{android.yml => build.yml} | 26 ++++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) rename .github/workflows/{android.yml => build.yml} (60%) diff --git a/.github/workflows/android.yml b/.github/workflows/build.yml similarity index 60% rename from .github/workflows/android.yml rename to .github/workflows/build.yml index 1be4eb75..876db237 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Android CI +name: Build on: push: @@ -13,36 +13,52 @@ on: jobs: detekt: name: Run detekt - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: 'zulu' + java-version: '17' - name: Run detekt with ktlint run: ./gradlew detektBundledDebug detektUnbundledDebug unit_tests: name: Run unit tests - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: 'zulu' + java-version: '17' - name: Run bundled and unbundled unit tests run: ./gradlew test build_bundled: name: Build bundled debug - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: 'zulu' + java-version: '17' - name: Build debug bundled sample app run: ./gradlew :sample:assembleBundledDebug build_unbundled: name: Build unbundled debug - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: 'zulu' + java-version: '17' - name: Build debug unbundled sample app run: ./gradlew :sample:assembleUnbundledDebug \ No newline at end of file From c31cb2620f54d63d2ecce47c281e3e6ce27be6b0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 19 Apr 2022 19:47:54 +0200 Subject: [PATCH 06/15] Update plugin kotlin-androidGradle to v1.6.21 (#42) Co-authored-by: Renovate Bot --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 108ee69f..00545f5a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ androidconfig-targetSdk = "31" androidconfig-buildTools = "31.0.0" androidGradle = "7.1.3" -kotlin = "1.6.20" +kotlin = "1.6.21" appcompat = "1.4.1" From 9554221c6e873c65c382dc0c85bfcbda5917a04d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Apr 2022 20:48:46 +0200 Subject: [PATCH 07/15] Update plugin kotlin-dokka to v1.6.21 (#43) Co-authored-by: Renovate Bot --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 00545f5a..5fea2d58 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -21,7 +21,7 @@ materialDesign = "1.5.0" detekt = "1.20.0" gradleVersions = "0.42.0" -dokka = "1.6.20" +dokka = "1.6.21" junit = "5.8.2" From bd2beb5d3a5fc874f763fce87b9535b6fead1887 Mon Sep 17 00:00:00 2001 From: Thomas Wirth Date: Mon, 2 May 2022 22:45:51 +0200 Subject: [PATCH 08/15] Update editorconfig --- .editorconfig | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.editorconfig b/.editorconfig index f2b2897b..011aac6b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,15 +1,21 @@ root=true -[*.{kt,kts}] +[*] charset=utf-8 end_of_line=lf insert_final_newline=false -max_line_length=120 - indent_size=2 indent_style=space +max_line_length=120 + +[*.{kt,kts}] ij_kotlin_name_count_to_use_star_import=2147483647 ij_kotlin_name_count_to_use_star_import_for_members=2147483647 -ij_kotlin_imports_layout=*,java.**,javax.**,kotlin.**,^ \ No newline at end of file +ij_kotlin_imports_layout=*,java.**,javax.**,kotlin.**,^ + +[*.xml] +ij_continuation_indent_size = 4 +ij_xml_keep_line_breaks = true +ij_xml_space_inside_empty_tag = false \ No newline at end of file From ccda3a9275ece451b32f5064d1b0dcf16468337e Mon Sep 17 00:00:00 2001 From: Thomas Wirth Date: Mon, 2 May 2022 22:46:33 +0200 Subject: [PATCH 09/15] Camera feature in manifest changed to not-required --- quickie/src/main/AndroidManifest.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/quickie/src/main/AndroidManifest.xml b/quickie/src/main/AndroidManifest.xml index 5e72bbe4..9a068c24 100644 --- a/quickie/src/main/AndroidManifest.xml +++ b/quickie/src/main/AndroidManifest.xml @@ -2,7 +2,9 @@ - + From 885a8a8207c85f6a906100ee299c92e1baabaef9 Mon Sep 17 00:00:00 2001 From: Thomas Wirth Date: Wed, 4 May 2022 23:57:46 +0200 Subject: [PATCH 10/15] Reorder editorconfig entries --- .editorconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index 011aac6b..427cbcf1 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,11 +5,11 @@ charset=utf-8 end_of_line=lf insert_final_newline=false +max_line_length=120 + indent_size=2 indent_style=space -max_line_length=120 - [*.{kt,kts}] ij_kotlin_name_count_to_use_star_import=2147483647 ij_kotlin_name_count_to_use_star_import_for_members=2147483647 From 139e871658bec1d2eb503948104a36c87f27d543 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 5 May 2022 01:00:18 +0200 Subject: [PATCH 11/15] Update dependency com.google.android.material:material to v1.6.0 (#45) Co-authored-by: Renovate Bot --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5fea2d58..86494ecf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,7 +17,7 @@ cameraView = "1.0.0-alpha32" barcodeScanning = "17.0.2" barcodeScanningGms = "18.0.0" -materialDesign = "1.5.0" +materialDesign = "1.6.0" detekt = "1.20.0" gradleVersions = "0.42.0" From d55f7bfdc656f0bc62ce6aed698ae8f21a7a6ab7 Mon Sep 17 00:00:00 2001 From: Thomas Wirth Date: Thu, 5 May 2022 03:11:04 +0200 Subject: [PATCH 12/15] Use default Material3 theme and colors in sample app --- sample/src/main/AndroidManifest.xml | 2 +- sample/src/main/res/values-night/themes.xml | 17 ----------------- sample/src/main/res/values/colors.xml | 7 ------- sample/src/main/res/values/themes.xml | 17 ----------------- 4 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 sample/src/main/res/values-night/themes.xml delete mode 100644 sample/src/main/res/values/themes.xml diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index 00b0e70e..c68fab23 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -8,7 +8,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:supportsRtl="true" - android:theme="@style/Theme.QRScannerSample"> + android:theme="@style/Theme.Material3.DayNight"> - - - \ No newline at end of file diff --git a/sample/src/main/res/values/colors.xml b/sample/src/main/res/values/colors.xml index 9c4359f3..27a87dc1 100644 --- a/sample/src/main/res/values/colors.xml +++ b/sample/src/main/res/values/colors.xml @@ -1,11 +1,4 @@ - #FFBB86FC - #FF6200EE - #FF3700B3 - #FF03DAC5 - #FF018786 - #FF000000 - #FFFFFFFF #3DDC84 \ No newline at end of file diff --git a/sample/src/main/res/values/themes.xml b/sample/src/main/res/values/themes.xml deleted file mode 100644 index 79f3d17f..00000000 --- a/sample/src/main/res/values/themes.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - \ No newline at end of file From 8014057a51af2672da239139622c77a587761dd9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 May 2022 00:15:40 +0200 Subject: [PATCH 13/15] Update androidGradle to v7.2.0 (#46) Co-authored-by: Renovate Bot --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 86494ecf..5c8ed504 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ androidconfig-compileSdk = "31" androidconfig-targetSdk = "31" androidconfig-buildTools = "31.0.0" -androidGradle = "7.1.3" +androidGradle = "7.2.0" kotlin = "1.6.21" appcompat = "1.4.1" From 6692e68ab12bd482a4d6d209f3321cb707c77d01 Mon Sep 17 00:00:00 2001 From: Thomas Wirth Date: Wed, 25 May 2022 00:45:43 +0200 Subject: [PATCH 14/15] Update to target sdk 32 --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5c8ed504..096b339f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,9 +2,9 @@ quickie = "1.4.1" androidconfig-minSdk = "21" -androidconfig-compileSdk = "31" -androidconfig-targetSdk = "31" -androidconfig-buildTools = "31.0.0" +androidconfig-compileSdk = "32" +androidconfig-targetSdk = "32" +androidconfig-buildTools = "32.0.0" androidGradle = "7.2.0" kotlin = "1.6.21" From e541e4b6668d29d03164f7ebdc7d496099a9b18f Mon Sep 17 00:00:00 2001 From: Thomas Wirth Date: Wed, 25 May 2022 01:22:13 +0200 Subject: [PATCH 15/15] Bump version to 1.4.2 --- README.md | 4 ++-- gradle/libs.versions.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b3b248b0..9e4bfcf9 100644 --- a/README.md +++ b/README.md @@ -18,10 +18,10 @@ There are two different flavors available on `mavenCentral()`: | V3 model is used (faster, more accurate) | currently V1 model will be downloaded ```kotlin // bundled: -implementation("io.github.g00fy2.quickie:quickie-bundled:1.4.1") +implementation("io.github.g00fy2.quickie:quickie-bundled:1.4.2") // unbundled: -implementation("io.github.g00fy2.quickie:quickie-unbundled:1.4.1") +implementation("io.github.g00fy2.quickie:quickie-unbundled:1.4.2") ``` ## Quick Start diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 096b339f..26635550 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -quickie = "1.4.1" +quickie = "1.4.2" androidconfig-minSdk = "21" androidconfig-compileSdk = "32"