diff --git a/.editorconfig b/.editorconfig index f2b2897b..427cbcf1 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,6 +1,6 @@ root=true -[*.{kt,kts}] +[*] charset=utf-8 end_of_line=lf insert_final_newline=false @@ -10,6 +10,12 @@ max_line_length=120 indent_size=2 indent_style=space +[*.{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 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 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 9cec0432..26635550 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,13 +1,13 @@ [versions] -quickie = "1.4.1" +quickie = "1.4.2" 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.1.2" -kotlin = "1.6.20" +androidGradle = "7.2.0" +kotlin = "1.6.21" appcompat = "1.4.1" @@ -17,11 +17,11 @@ cameraView = "1.0.0-alpha32" barcodeScanning = "17.0.2" barcodeScanningGms = "18.0.0" -materialDesign = "1.5.0" +materialDesign = "1.6.0" -detekt = "1.19.0" +detekt = "1.20.0" gradleVersions = "0.42.0" -dokka = "1.6.10" +dokka = "1.6.21" junit = "5.8.2" 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 @@ - + 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/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