Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to version 4.6.4 #250

Merged
merged 4 commits into from
Sep 9, 2024
Merged

Update to version 4.6.4 #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7224045
Fix `activity_result` layout in some edge cases
udenr Sep 9, 2024
8c3512d
Merge pull request #249 from SecUSo/231-fonts-problem
udenr Sep 9, 2024
cf906a3
Bump version to 4.6.4 (48)
udenr Sep 9, 2024
f719624
Update ci workflow
udenr Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
}
Expand Down Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion .../main/java/com/secuso/privacyfriendlycodescanner/qrscanner/ui/adapter/DeleteActionMode.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
10 changes: 9 additions & 1 deletion app/src/main/res/layout/activity_result.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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>

Expand Down
Loading