Skip to content

Commit

Permalink
Merge pull request #856 from ZeusWPI/fix/icon-color-and-bumps
Browse files Browse the repository at this point in the history
Fix icon color and bumps
  • Loading branch information
niknetniko authored Nov 30, 2023
2 parents 6356cce + 8bf416e commit 197f29e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -168,26 +168,26 @@ android {
}

dependencies {
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'

implementation 'androidx.core:core:1.12.0'
implementation 'androidx.media:media:1.6.0'
implementation 'androidx.fragment:fragment:1.6.1'
implementation 'androidx.media:media:1.7.0'
implementation 'androidx.fragment:fragment:1.6.2'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.preference:preference:1.2.1'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'com.google.android.material:material:1.10.0'
implementation 'androidx.browser:browser:1.6.0'
implementation 'androidx.browser:browser:1.7.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel:2.6.2'
implementation 'androidx.lifecycle:lifecycle-livedata:2.6.2'
implementation 'androidx.lifecycle:lifecycle-livedata:2.6.2'
implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.2'
implementation 'androidx.viewpager2:viewpager2:1.0.0'
implementation 'androidx.room:room-runtime:2.6.0'
annotationProcessor 'androidx.room:room-compiler:2.6.0'
implementation 'androidx.room:room-runtime:2.6.1'
annotationProcessor 'androidx.room:room-compiler:2.6.1'
implementation 'com.artemzin.rxjava:proguard-rules:1.3.3.0'
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
implementation 'com.squareup.moshi:moshi:1.15.0'
Expand All @@ -204,8 +204,8 @@ dependencies {

// Dependencies for the Play Store version.
storeImplementation 'com.google.android.gms:play-services-maps:18.2.0'
storeImplementation 'com.google.firebase:firebase-analytics:21.4.0'
storeImplementation 'com.google.firebase:firebase-crashlytics:18.5.1'
storeImplementation 'com.google.firebase:firebase-analytics:21.5.0'
storeImplementation 'com.google.firebase:firebase-crashlytics:18.6.0'
storeImplementation 'com.google.android.gms:play-services-code-scanner:16.1.0'

// Dependencies for open version.
Expand All @@ -228,7 +228,7 @@ dependencies {
testImplementation 'androidx.test.espresso:espresso-intents:3.5.1'
testImplementation 'androidx.test.espresso:espresso-contrib:3.5.1'
testImplementation 'androidx.arch.core:core-testing:2.2.0'
testImplementation 'androidx.room:room-testing:2.6.0'
testImplementation 'androidx.room:room-testing:2.6.1'
testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0'
testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.15.2'
testImplementation 'com.shazam:shazamcrest:0.11'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public boolean onMenuItemSelected(@NonNull @NotNull MenuItem menuItem) {
}

public static void registerRefreshMenu(@NonNull Fragment fragment, @NonNull RefreshViewModel viewModel) {
registerMenuProvider(fragment, R.menu.menu_resto, new int[]{R.id.action_refresh}, menuItem -> {
registerMenuProvider(fragment, R.menu.menu_refresh, new int[]{R.id.action_refresh}, menuItem -> {
if (menuItem.getItemId() == R.id.action_refresh) {
viewModel.onRefresh();
return true;
Expand Down

0 comments on commit 197f29e

Please sign in to comment.