From f27321056b1f8b136aad9cd42d4b2a7447b9b3e3 Mon Sep 17 00:00:00 2001 From: Altonss <66519591+altonss@users.noreply.github.com> Date: Tue, 17 Sep 2024 16:00:32 +0200 Subject: [PATCH] Fix flexbox dependency --- app/build.gradle | 2 +- app/src/main/res/layout/list_item_trip.xml | 4 +++- app/witness.gradle | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 269d5e217..508fd8df8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -124,7 +124,7 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.12.13' implementation 'com.github.omadahealth:swipy:1.2.3' implementation 'de.cketti.library.changelog:ckchangelog:1.2.2' - implementation 'com.google.android:flexbox:0.3.2' + implementation 'com.google.android.flexbox:flexbox:3.0.0' implementation 'com.mikepenz:materialdrawer:6.1.1' implementation 'com.mikepenz:aboutlibraries:6.2.0' implementation "com.mikepenz:fastadapter:$fastadapterVersion" diff --git a/app/src/main/res/layout/list_item_trip.xml b/app/src/main/res/layout/list_item_trip.xml index 1d14bc5a6..62e7dd2d6 100644 --- a/app/src/main/res/layout/list_item_trip.xml +++ b/app/src/main/res/layout/list_item_trip.xml @@ -88,7 +88,9 @@ app:flexWrap="wrap" app:layout_constraintStart_toStartOf="@+id/fromLocation" app:layout_constraintEnd_toEndOf="@+id/fromLocation" - app:layout_constraintTop_toBottomOf="@+id/fromLocation"> + app:layout_constraintTop_toBottomOf="@+id/fromLocation" + app:alignItems="stretch" + app:alignContent="stretch"> diff --git a/app/witness.gradle b/app/witness.gradle index cd8dc30dc..29acabf9c 100644 --- a/app/witness.gradle +++ b/app/witness.gradle @@ -89,7 +89,7 @@ dependencyVerification { 'com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:2.0:accessibility-test-framework-2.0.jar:cdf16ef8f5b8023d003ce3cc1b0d51bda737762e2dab2fedf43d1c4292353f7f', 'com.google.android.material:material:1.0.0:material-1.0.0.aar:7680e381a3c03798d999b2e441caadd8a56a0a808e108024a67af9fe26c11adc', 'com.google.android.material:material:1.5.0:material-1.5.0.aar:b14dc96f95085f26f36aab703b2f791d136b71e91d5e80f0a0364531074a69c7', - 'com.google.android:flexbox:0.3.2:flexbox-0.3.2.aar:610a6a00695e873b4b6b785b7dce1c60f6a5964044b6d093b4d1060cbf13c278', + 'com.google.android.flexbox:flexbox:3.0.0:flexbox-3.0.0.aar:5e19500486fd7c8e2e8c7aad6bbba9c8d0ada7057c6b32b9b5c61439814e7574', 'com.google.auto.value:auto-value-annotations:1.6.3:auto-value-annotations-1.6.3.jar:0e951fee8c31f60270bc46553a8586001b7b93dbb12aec06373aa99a150392c0', 'com.google.auto:auto-common:0.10:auto-common-0.10.jar:b876b5fddaceeba7d359667f6c4fb8c6f8658da1ab902ffb79ec9a415deede5f', 'com.google.code.findbugs:jsr305:2.0.1:jsr305-2.0.1.jar:1e7f53fa5b8b5c807e986ba335665da03f18d660802d8bf061823089d1bee468',