mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-02-01 18:52:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update a bunch of libraries

Browse Source
This commit is contained in:
TacoTheDank
2020-12-26 19:05:01 -05:00
parent ceba99d11f
commit 191e22db65
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/build.gradle
View File

@@ -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'
}

2
app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
View File

@@ -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");
}
}