diff --git a/app/build.gradle b/app/build.gradle index bc7a66f05..672504f5f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,20 +54,19 @@ dependencies { // AndroidX implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'com.google.android.material:material:1.2.1' // Third-party - implementation 'com.journeyapps:zxing-android-embedded:4.0.2@aar' - implementation 'com.google.zxing:core:3.3.0' - implementation 'org.apache.commons:commons-csv:1.5' - implementation 'com.jaredrummler:colorpicker:1.0.2' - implementation 'com.google.guava:guava:20.0' + implementation 'com.journeyapps:zxing-android-embedded:4.1.0@aar' + implementation 'com.google.zxing:core:3.4.1' + implementation 'org.apache.commons:commons-csv:1.8' + implementation 'com.jaredrummler:colorpicker:1.1.0' + implementation 'com.google.guava:guava:30.1-jre' implementation 'com.vanniktech:vntnumberpickerpreference:1.0.0' // Testing - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13.1' testImplementation 'org.robolectric:robolectric:4.0.2' } diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java index 8b46ffbc7..48ad0950f 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java @@ -446,7 +446,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity // Nothing to do, no change made } }); - dialog.show(getFragmentManager(), "color-picker-dialog"); + dialog.show(getSupportFragmentManager(), "color-picker-dialog"); } }