diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9e60fe60..fe5b0a92 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,5 +45,23 @@ jobs: - name: Setup Gradle uses: gradle/gradle-build-action@v2 + - name: Run lint check + run: bash ./gradlew lint + + - name: Upload lint result + uses: actions/upload-artifact@v4 + with: + name: lint-results-debug + path: app/build/reports/lint-results-debug.html + - name: Build the app run: bash ./gradlew build --stacktrace + + - name: Build debug apk + run: bash ./gradlew assembleDebug + + - name: Upload debug apk + uses: actions/upload-artifact@v4 + with: + name: debug-apk + path: app/build/outputs/apk/debug/*.apk \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index f4856204..f9bc55d3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { compileSdk 34 targetSdkVersion 34 multiDexEnabled true - versionCode 47 - versionName "4.6.3" + versionCode 48 + versionName "4.6.4" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' buildFeatures.dataBinding = true vectorDrawables.useSupportLibrary = true @@ -30,7 +30,7 @@ android { } android.applicationVariants.configureEach { variant -> - variant.outputs.all { + variant.outputs.configureEach { def appName = "pfa-qr-scanner" outputFileName = appName + "-${variant.name}-v${variant.versionName}.apk" } @@ -102,7 +102,7 @@ dependencies { androidTestImplementation "androidx.work:work-testing:$work_version" } -tasks.withType(Test) { +tasks.withType(Test).configureEach { testLogging { events "passed", "skipped", "failed", "standard_out" exceptionFormat "full" diff --git a/app/src/main/java/com/secuso/privacyfriendlycodescanner/qrscanner/ui/adapter/DeleteActionMode.kt b/app/src/main/java/com/secuso/privacyfriendlycodescanner/qrscanner/ui/adapter/DeleteActionMode.kt index 1e294204..a6b516c7 100644 --- a/app/src/main/java/com/secuso/privacyfriendlycodescanner/qrscanner/ui/adapter/DeleteActionMode.kt +++ b/app/src/main/java/com/secuso/privacyfriendlycodescanner/qrscanner/ui/adapter/DeleteActionMode.kt @@ -82,7 +82,6 @@ class DeleteActionMode(private val historyActivity: HistoryActivity) : ActionMod holder.binding.itemView.isChecked = false selectList.remove(s) } - Log.d("TAG", "Color" + holder.binding.itemView.cardForegroundColor + " " + holder.binding.itemView.cardBackgroundColor) ViewModelProvider(historyActivity)[HistoryViewModel::class.java].setSelectedItemCount(selectList.size) } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_result.xml b/app/src/main/res/layout/activity_result.xml index 207d52bf..2ae86980 100644 --- a/app/src/main/res/layout/activity_result.xml +++ b/app/src/main/res/layout/activity_result.xml @@ -100,7 +100,10 @@ android:text="TextView" android:textAlignment="textEnd" android:textSize="12sp" + app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toEndOf="@+id/textViewCodeType" app:layout_constraintTop_toTopOf="parent" />