From 67a30b92f62550e6f46c583e13849c0ae464c57d Mon Sep 17 00:00:00 2001 From: Amine Bou Date: Sat, 7 Apr 2018 17:19:41 +0200 Subject: [PATCH] Cleaning. --- app/build.gradle | 24 +++++++++---------- .../settings/SettingsActivity.java | 13 ++++++---- .../bou/readerforselfoss/utils/Config.kt | 2 +- .../bou/readerforselfoss/utils/HttpUtils.kt | 2 +- .../utils/ScrollAwareFABBehavior.kt | 1 + app/src/main/res/layout/activity_login.xml | 1 + app/src/main/res/layout/fragment_article.xml | 3 --- app/src/main/res/menu/reader_menu.xml | 6 ++--- build.gradle | 4 ++-- 9 files changed, 29 insertions(+), 27 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b6c1ff2..6daf2f7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -120,20 +120,20 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" // Android Support - implementation 'com.android.support:appcompat-v7:27.1.0' - implementation 'com.android.support:design:27.1.0' - implementation 'com.android.support:recyclerview-v7:27.1.0' - implementation 'com.android.support:support-v4:27.1.0' - implementation 'com.android.support:support-vector-drawable:27.1.0' - implementation 'com.android.support:customtabs:27.1.0' - implementation 'com.android.support:cardview-v7:27.1.0' + implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'com.android.support:design:27.1.1' + implementation 'com.android.support:recyclerview-v7:27.1.1' + implementation 'com.android.support:support-v4:27.1.1' + implementation 'com.android.support:support-vector-drawable:27.1.1' + implementation 'com.android.support:customtabs:27.1.1' + implementation 'com.android.support:cardview-v7:27.1.1' implementation 'com.android.support.constraint:constraint-layout:1.0.2' // Firebase + crashlytics - implementation 'com.google.firebase:firebase-core:12.0.0' - implementation 'com.google.firebase:firebase-config:12.0.0' - implementation 'com.google.firebase:firebase-invites:12.0.0' - implementation('com.crashlytics.sdk.android:crashlytics:2.9.0@aar') { + implementation 'com.google.firebase:firebase-core:12.0.1' + implementation 'com.google.firebase:firebase-config:12.0.1' + implementation 'com.google.firebase:firebase-invites:12.0.1' + implementation('com.crashlytics.sdk.android:crashlytics:2.9.1@aar') { transitive = true } @@ -181,7 +181,7 @@ dependencies { // Pager implementation 'me.relex:circleindicator:1.2.2@aar' - implementation 'androidx.core:core-ktx:0.2' + implementation 'androidx.core:core-ktx:0.3' } diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java b/app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java index 91b1102..aa9fce3 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java @@ -249,7 +249,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity { addPreferencesFromResource(R.xml.pref_debug); setHasOptionsMenu(true); - SharedPreferences pref = getActivity().getSharedPreferences(Config.Companion.getSettingsName(), Context.MODE_PRIVATE); + SharedPreferences pref = getActivity().getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE); final String id = pref.getString("unique_id", "..."); final Preference identifier = findPreference("debug_identifier"); @@ -259,11 +259,14 @@ public class SettingsActivity extends AppCompatPreferenceActivity { identifier.setOnPreferenceClickListener(new OnPreferenceClickListener() { @Override public boolean onPreferenceClick(Preference preference) { - ClipData clip = ClipData.newPlainText("Selfoss unique id", id); - clipboard.setPrimaryClip(clip); + if (clipboard != null) { + ClipData clip = ClipData.newPlainText("Selfoss unique id", id); + clipboard.setPrimaryClip(clip); - Toast.makeText(getActivity(), R.string.unique_id_to_clipboard, Toast.LENGTH_LONG).show(); - return true; + Toast.makeText(getActivity(), R.string.unique_id_to_clipboard, Toast.LENGTH_LONG).show(); + return true; + } + return false; } }); identifier.setTitle(id); diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/Config.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/Config.kt index 07a075f..ae86b59 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/Config.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/Config.kt @@ -26,7 +26,7 @@ class Config(c: Context) { get() = settings.getString("httpPassword", "") companion object { - val settingsName = "paramsselfoss" + const val settingsName = "paramsselfoss" fun logoutAndRedirect( c: Context, diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/HttpUtils.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/HttpUtils.kt index 788e1e7..0fdc31c 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/HttpUtils.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/HttpUtils.kt @@ -7,7 +7,7 @@ import javax.net.ssl.SSLContext import javax.net.ssl.TrustManager import javax.net.ssl.X509TrustManager -fun getUnsafeHttpClient() = +fun getUnsafeHttpClient(): OkHttpClient.Builder = try { // Create a trust manager that does not validate certificate chains val trustAllCerts = arrayOf(object : X509TrustManager { diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ScrollAwareFABBehavior.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ScrollAwareFABBehavior.kt index 721663b..54f8490 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ScrollAwareFABBehavior.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ScrollAwareFABBehavior.kt @@ -11,6 +11,7 @@ class ScrollAwareFABBehavior( attrs: AttributeSet ) : CoordinatorLayout.Behavior() { + override fun onStartNestedScroll( coordinatorLayout: CoordinatorLayout, child: FloatingActionButton, diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3221284..9913044 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -115,6 +115,7 @@ android:visibility="gone"> + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" /> \ No newline at end of file diff --git a/build.gradle b/build.gradle index c068089..9f64143 100644 --- a/build.gradle +++ b/build.gradle @@ -38,9 +38,9 @@ project.ext.preDexLibs = !project.hasProperty('disablePreDex') subprojects { project.plugins.whenPluginAdded { plugin -> - if ("com.android.build.gradle.AppPlugin".equals(plugin.class.name)) { + if ("com.android.build.gradle.AppPlugin" == plugin.class.name) { project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs - } else if ("com.android.build.gradle.LibraryPlugin".equals(plugin.class.name)) { + } else if ("com.android.build.gradle.LibraryPlugin" == plugin.class.name) { project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs } }