From b653b5096d5cf232bc88006581b4e85f49c99e4e Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Wed, 7 Aug 2019 23:05:05 +0200 Subject: [PATCH] remove butterknife from gradle --- app/build.gradle | 5 ----- .../androidaps/plugins/common/SubscriberFragment.java | 10 ---------- .../maintenance/activities/LogSettingActivity.kt | 2 +- .../plugins/pump/medtronic/MedtronicFragment.kt | 6 ++++-- build.gradle | 1 - 5 files changed, 5 insertions(+), 19 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3335387f40..4f7aad9121 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,7 +16,6 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'com.google.gms.google-services' apply plugin: 'io.fabric' apply plugin: 'jacoco-android' -apply plugin: 'com.jakewharton.butterknife' apply plugin: 'de.undercouch.download' @@ -29,7 +28,6 @@ ext { ormLiteVersion = "4.46" powermockVersion = "1.7.3" dexmakerVersion = "1.2" - butterknifeVersion = "10.1.0" } @@ -272,9 +270,6 @@ dependencies { implementation 'org.mozilla:rhino:1.7.7.2' - implementation "com.jakewharton:butterknife:${butterknifeVersion}" - annotationProcessor "com.jakewharton:butterknife-compiler:${butterknifeVersion}" - implementation 'com.github.DavidProdinger:weekdays-selector:1.1.0' testImplementation "junit:junit:4.12" diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/common/SubscriberFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/common/SubscriberFragment.java index 1cf6a35f7d..4e6f07671d 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/common/SubscriberFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/common/SubscriberFragment.java @@ -2,12 +2,9 @@ package info.nightscout.androidaps.plugins.common; import androidx.fragment.app.Fragment; -import butterknife.Unbinder; import info.nightscout.androidaps.MainApp; abstract public class SubscriberFragment extends Fragment { - protected Unbinder unbinder; - @Override public void onPause() { super.onPause(); @@ -21,12 +18,5 @@ abstract public class SubscriberFragment extends Fragment { updateGUI(); } - @Override public synchronized void onDestroyView() { - super.onDestroyView(); - if (unbinder != null) - unbinder.unbind(); - } - - protected abstract void updateGUI(); } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/LogSettingActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/LogSettingActivity.kt index 981e3557ee..f47bb03513 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/LogSettingActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/LogSettingActivity.kt @@ -40,7 +40,7 @@ class LogSettingActivity : NoSplashActivity() { (baseView.findViewById(R.id.logsettings_description) as TextView).text = element.name val enabled = baseView.findViewById(R.id.logsettings_visibility) enabled.isChecked = element.enabled - enabled.setOnClickListener { v -> element.setEnabled(enabled.isChecked) } + enabled.setOnClickListener { element.setEnabled(enabled.isChecked) } } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt index 1804f273b2..2efafde16c 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt @@ -8,7 +8,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import butterknife.OnClick import com.squareup.otto.Subscribe import info.nightscout.androidaps.MainApp import info.nightscout.androidaps.R @@ -36,7 +35,10 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin import info.nightscout.androidaps.queue.Callback import info.nightscout.androidaps.queue.events.EventQueueChanged -import info.nightscout.androidaps.utils.* +import info.nightscout.androidaps.utils.DateUtil +import info.nightscout.androidaps.utils.FabricPrivacy +import info.nightscout.androidaps.utils.SetWarnColor +import info.nightscout.androidaps.utils.T import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.Disposable diff --git a/build.gradle b/build.gradle index 58540aaac2..3e31750d82 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,6 @@ buildscript { // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files - classpath "com.jakewharton:butterknife-gradle-plugin:$butterknifeVersion" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } }