diff options
Diffstat (limited to '')
| -rw-r--r-- | app/build.gradle | 34 | ||||
| -rw-r--r-- | app/src/main/java/ml/docilealligator/infinityforreddit/activities/SearchActivity.java | 13 | ||||
| -rw-r--r-- | app/src/main/res/values/attr.xml | 3 |
3 files changed, 23 insertions, 27 deletions
diff --git a/app/build.gradle b/app/build.gradle index 38d105dc..d735d376 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,7 +46,7 @@ dependencies { implementation 'androidx.biometric:biometric:1.2.0-alpha03' implementation 'androidx.browser:browser:1.3.0' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.0-beta02' + implementation 'androidx.constraintlayout:constraintlayout:2.1.0' def lifecycleVersion = "2.2.0" implementation "androidx.lifecycle:lifecycle-common-java8:2.3.1" implementation "androidx.lifecycle:lifecycle-livedata:$lifecycleVersion" @@ -57,13 +57,13 @@ dependencies { implementation "androidx.paging:paging-runtime:$pagingVersion" implementation "androidx.paging:paging-guava:$pagingVersion" implementation 'androidx.preference:preference:1.1.1' + implementation 'androidx.recyclerview:recyclerview:1.2.1' def roomVersion = "2.3.0" implementation "androidx.room:room-runtime:$roomVersion" annotationProcessor "androidx.room:room-compiler:$roomVersion" - implementation 'androidx.startup:startup-runtime:1.0.0' - implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01' + implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01' implementation 'androidx.work:work-runtime:2.5.0' - implementation 'com.google.android.material:material:1.3.0-rc01' + implementation 'com.google.android.material:material:1.3.0' /** ExoPlayer **/ def exoplayerVersion = "2.10.8" @@ -105,7 +105,7 @@ dependencies { annotationProcessor "org.greenrobot:eventbus-annotation-processor:$eventbusVersion" // TransactionTooLargeException avoidance - implementation 'com.github.livefront:bridge:v1.3.0' + implementation 'com.github.livefront:bridge:v2.0.2' // Bundle-saving without boilerplate // NOTE: Deprecated @@ -115,16 +115,16 @@ dependencies { // Object to JSON // NOTE: Replace with Squareup's Moshi? - implementation 'com.google.code.gson:gson:2.8.6' + implementation 'com.google.code.gson:gson:2.8.8' // Java library for zip files and streams - implementation 'net.lingala.zip4j:zip4j:2.7.0' + implementation 'net.lingala.zip4j:zip4j:2.9.0' // IO functionality - implementation 'org.apache.commons:commons-io:1.3.2' + implementation 'commons-io:commons-io:2.5' // Crash reporting - implementation 'com.github.FunkyMuse:Crashy:1.1.0' + implementation 'com.github.FunkyMuse:Crashy:1.2.0' /**** User Interface (frontend) ****/ @@ -135,11 +135,11 @@ dependencies { annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion" implementation 'jp.wasabeef:glide-transformations:4.3.0' implementation 'com.github.santalu:aspect-ratio-imageview:1.0.9' - implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.21' - def bivVersion = "1.7.0" - implementation "com.github.Piasy.BigImageViewer:BigImageViewer:$bivVersion" - implementation "com.github.Piasy.BigImageViewer:GlideImageLoader:$bivVersion" - implementation "com.github.Piasy.BigImageViewer:GlideImageViewFactory:$bivVersion" + implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.23' + def bivVersion = "1.8.1" + implementation "com.github.piasy:BigImageViewer:$bivVersion" + implementation "com.github.piasy:GlideImageLoader:$bivVersion" + implementation "com.github.piasy:GlideImageViewFactory:$bivVersion" // Markdown def markwonVersion = "4.6.2" @@ -153,20 +153,20 @@ dependencies { implementation 'me.saket:better-link-movement-method:2.2.0' // Animations - implementation 'com.airbnb.android:lottie:3.4.4' + implementation 'com.airbnb.android:lottie:4.1.0' // Loading ProgressBar implementation 'com.lsjwzh:materialloadingprogressbar:0.5.8-RELEASE' // SearchView - implementation 'com.github.Ferfalk:SimpleSearchView:0.1.4' + implementation 'com.github.Ferfalk:SimpleSearchView:0.2.0' // Customizable TextView implementation 'com.libRG:customtextview:2.4' // Dismiss gesturing implementation 'com.r0adkll:slidableactivity:2.1.0' - implementation 'app.futured.hauler:hauler:4.0.0' + implementation 'app.futured.hauler:hauler:5.0.0' // Bottom sheet with rounded corners implementation 'com.github.Deishelon:RoundedBottomSheet:1.0.1' diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SearchActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SearchActivity.java index 66369953..c7cbf120 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SearchActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SearchActivity.java @@ -203,13 +203,13 @@ public class SearchActivity extends BaseActivity { simpleSearchView.setOnQueryTextListener(new SimpleSearchView.OnQueryTextListener() { @Override - public boolean onQueryTextSubmit(String query) { + public boolean onQueryTextSubmit(@NonNull String query) { search(query); return true; } @Override - public boolean onQueryTextChange(String newText) { + public boolean onQueryTextChange(@NonNull String newText) { if (!newText.isEmpty()) { if (subredditAutocompleteCall != null) { subredditAutocompleteCall.cancel(); @@ -384,11 +384,10 @@ public class SearchActivity extends BaseActivity { protected void onStart() { super.onStart(); simpleSearchView.showSearch(false); - simpleSearchView.getSearchEditText().requestFocus(); + simpleSearchView.requestFocus(); if (query != null) { - simpleSearchView.getSearchEditText().setText(query); - simpleSearchView.getSearchEditText().setSelection(query.length()); + simpleSearchView.setQuery(query, false); query = null; } @@ -403,13 +402,13 @@ public class SearchActivity extends BaseActivity { super.onPause(); InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); if (imm != null) { - imm.hideSoftInputFromWindow(simpleSearchView.getSearchEditText().getWindowToken(), 0); + imm.hideSoftInputFromWindow(simpleSearchView.getWindowToken(), 0); } } @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { - if (simpleSearchView.onActivityResult(requestCode, resultCode, data)) { + if (data != null && simpleSearchView.onActivityResult(requestCode, resultCode, data)) { return; } diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml index 0cfd9358..a14ca442 100644 --- a/app/src/main/res/values/attr.xml +++ b/app/src/main/res/values/attr.xml @@ -49,7 +49,4 @@ <attr name="backgroundColor" format="color"/> <attr name="cardViewBackgroundColor" format="color"/> </declare-styleable> - - <attr name="backIconAlpha"/> - <attr name="iconsAlpha"/> </resources>
\ No newline at end of file |