From f4db0c789895ebe244be4c1299da57cff9f23505 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 19 Nov 2016 14:49:04 +0100 Subject: [PATCH] remove Butterknife --- app/build.gradle | 4 ---- .../gallery/activities/LicenseActivity.kt | 1 - app/src/main/res/layout/activity_license.xml | 14 -------------- app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-pt-rPT/strings.xml | 1 - app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values-zh/strings.xml | 1 - app/src/main/res/values/strings.xml | 3 --- build.gradle | 1 - 12 files changed, 30 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fc40446c4..f50f01405 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'com.android.application' -apply plugin: 'android-apt' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' @@ -40,7 +39,6 @@ dependencies { compile 'com.android.support:appcompat-v7:24.0.0' compile 'com.android.support:design:24.0.0' compile 'com.github.bumptech.glide:glide:3.7.0' - compile 'com.jakewharton:butterknife:8.0.1' compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0' compile 'com.theartofdev.edmodo:android-image-cropper:2.3.1' compile 'com.booking:rtlviewpager:1.0.1' @@ -48,8 +46,6 @@ dependencies { compile 'com.simplemobiletools:filepicker:1.4.5@aar' compile 'com.bignerdranch.android:recyclerview-multiselect:0.2' compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - - apt 'com.jakewharton:butterknife-compiler:8.0.1' } buildscript { diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/LicenseActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/LicenseActivity.kt index e390964f0..f30508a39 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/LicenseActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/LicenseActivity.kt @@ -11,7 +11,6 @@ class LicenseActivity : SimpleActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_license) - license_butterknife_title.setOnClickListener { openUrl(R.string.butterknife_url) } license_subsampling_title.setOnClickListener { openUrl(R.string.subsampling_url) } license_glide_title.setOnClickListener { openUrl(R.string.glide_url) } license_cropper_title.setOnClickListener { openUrl(R.string.cropper_url) } diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/activity_license.xml index 2d00046df..7e033e335 100644 --- a/app/src/main/res/layout/activity_license.xml +++ b/app/src/main/res/layout/activity_license.xml @@ -17,20 +17,6 @@ android:layout_height="wrap_content" android:text="@string/notice"/> - - - - Diese App nutzt die folgenden Drittanbieterbilbiotheken, die mein Leben einfacher machen. Danke. Drittanbieterlizenzen - Butter Knife (View Injector) Subsampling Scale Image View (zoomable imageviews) Glide (Bilder laden und zwischenspeichern) Android Image Cropper diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 18e825df9..4a734ffdd 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -115,7 +115,6 @@ Esta aplicación usa las siguientes bibliotecas de terceros que hacen mi vida más fácil. Gracias. Licencias de terceros - Butter Knife (view injector) Subsampling Scale Image View (zoomable imageviews) Glide (image loading and caching) Android Image Cropper diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d6e020ec4..41320630e 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -115,7 +115,6 @@ Questa app usa le seguenti librerie di terze parti per semplificarmi la vita. Grazie. Licenze di terze parti - Butter Knife (view injector) PhotoView (zoomable imageviews) Glide (image loading and caching) Android Image Cropper diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 93c2ff4a7..ef5b3c1e0 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -115,7 +115,6 @@ このアプリは、私の人生を容易にするために、次のサードパーティのライブラリーを使用しています。 ありがとうございます。 サードパーティー ライセンス - Butter Knife (ビュー インジェクター) Subsampling Scale Image View (ズーム可能イメージビュー) Glide (イメージ ローディングとキャッシング) Android Image Cropper diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index f7b1a6fb6..2d37bdc57 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -115,7 +115,6 @@ Esta aplicação usa as seguintes bibliotecas de terceiros para facilitar a minha vida. Obrigado. Licenças de terceiros - Butter Knife (injetor de vistas) Subsampling Scale Image View (ampliação de imagens) Glide (carregamento e cache de imagens) Android Image Cropper diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 764b38867..1a82e136e 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -115,7 +115,6 @@ Denna app använder följande tredjepartsbibliotek för att göra mitt liv enklare. Tack. Tredjepartslicenser - Butter Knife (view injector) Subsampling Scale Image View (zoomable imageviews) Glide (image loading and caching) Android Image Cropper diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 0a9041039..7597eeefd 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -116,7 +116,6 @@ This app uses the following third party libraries to make my life easier. Thank you. 开放源代码 - Butter Knife (view injector) Subsampling Scale Image View (zoomable imageviews) Glide (image loading and caching) Android Image Cropper diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 424eb82bd..cb7532892 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -116,9 +116,6 @@ This app uses the following third party libraries to make my life easier. Thank you. Third party licences - Butter Knife (view injector) - Copyright 2013 Jake Wharton\n\nLicensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.You may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.See the License for the specific language governing permissions and limitations under the License. - https://github.com/JakeWharton/butterknife Subsampling Scale Image View (zoomable imageviews) Copyright 2016 David Morrissey\n\nLicensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.You may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.See the License for the specific language governing permissions and limitations under the License. https://github.com/davemorrissey/subsampling-scale-image-view diff --git a/build.gradle b/build.gradle index ffb74ece3..957c789cb 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,6 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:2.2.2' - classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files