Merge pull request #250 from SecUSo/development

Update to version 4.6.4
SecUSo · Sep 9, 2024 · 060ced6 · 060ced6
2 parents cb3d309 + f719624
commit 060ced6
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 6 deletions.
diff --git 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
diff --git 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/.../main/java/com/secuso/privacyfriendlycodescanner/qrscanner/ui/adapter/DeleteActionMode.kt b/.../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)
     }
 }
diff --git 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" />
 
                     <Button
@@ -112,8 +115,13 @@
                         android:layout_marginBottom="2dp"
                         android:text="@string/raw_data"
                         android:textColor="?attr/colorAccent"
+                        app:layout_constrainedWidth="true"
                         app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent" />
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="1.0"
+                        app:layout_constraintStart_toEndOf="@+id/textView"
+                        app:layout_constraintTop_toBottomOf="@+id/textViewTimestamp"
+                        app:layout_constraintVertical_bias="1.0" />
 
                 </androidx.constraintlayout.widget.ConstraintLayout>