From 701fb8f0e93ed25dbfcdd6eb67b08dcf4aad6c37 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 20 Nov 2016 17:45:02 +0100 Subject: [PATCH] replace butterknife license with the BigNerdRanch multiselector --- app/build.gradle | 4 ---- .../filemanager/activities/LicenseActivity.kt | 2 +- app/src/main/res/layout/activity_license.xml | 8 ++++---- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-pt-rPT/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values/strings.xml | 6 +++--- build.gradle | 1 - 11 files changed, 14 insertions(+), 19 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 83bef67c..25a68d8c 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' @@ -39,14 +38,11 @@ android { dependencies { compile 'com.android.support:appcompat-v7:23.4.0' compile 'com.android.support:design:23.4.0' - compile 'com.jakewharton:butterknife:8.0.1' compile 'com.github.bumptech.glide:glide:3.7.0' compile 'com.simplemobiletools:filepicker:1.5.0@aar' compile 'com.simplemobiletools:fileproperties:1.0.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/filemanager/activities/LicenseActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/LicenseActivity.kt index 77a40eb2..8adc5b26 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/LicenseActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/LicenseActivity.kt @@ -11,7 +11,7 @@ class LicenseActivity : SimpleActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_license) - license_butterknife_title.setOnClickListener { openUrl(R.string.butterknife_url) } + license_multiselect_title.setOnClickListener { openUrl(R.string.multiselect_url) } license_filepicker_title.setOnClickListener { openUrl(R.string.filepicker_url) } license_fileproperties_title.setOnClickListener { openUrl(R.string.fileproperties_url) } } diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/activity_license.xml index ca18b08d..1ac75e25 100644 --- a/app/src/main/res/layout/activity_license.xml +++ b/app/src/main/res/layout/activity_license.xml @@ -18,18 +18,18 @@ android:text="@string/notice"/> + android:text="@string/multiselect_text"/> Diese App nutzt die folgenden Drittanbieter Bibliotheken, die mir mein Leben einfacher machen. Vielen Dank. Drittanbieter Lizenzen - Butter Knife (View Injector) + RecyclerView MultiSelect (selecting multiple list items) Simple File Picker (filepicker dialog) Simple File Properties (properties dialog) diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 065d24dd..2d4a4cbf 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -67,7 +67,7 @@ Esta aplicación usa las siguientes librerías de terceros para hacerme la vida más fácil. Gracias. Licencias de terceros - Butter Knife (view injector) + RecyclerView MultiSelect (selecting multiple list items) Simple File Picker (filepicker dialog) Simple File Properties (properties dialog) diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 18059451..30a5bee5 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -67,7 +67,7 @@ Questa app usa le seguenti librerie di terze parti per semplificarmi la vita. Grazie. Licenze di terze parti - Butter Knife (view injector) + RecyclerView MultiSelect (selecting multiple list items) Simple File Picker (filepicker dialog) Simple File Properties (properties dialog) diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 5218d262..dedb221c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -67,7 +67,7 @@ このアプリは、私の人生を容易にするために、次のサードパーティのライブラリーを使用しています。 ありがとうございます。 サードパーティー ライセンス - Butter Knife (ビュー インジェクター) + RecyclerView MultiSelect (selecting multiple list items) Simple File Picker (filepicker dialog) Simple File Properties (properties dialog) diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 92e996a0..6659cacc 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -67,7 +67,7 @@ Esta aplicação usa as seguintes bibliotecas de terceiros para facilitar a minha vida. Obrigado. Licenças de terceiros - Butter Knife (injetor de vistas) + RecyclerView MultiSelect (selecting multiple list items) Simple File Picker (diálogo de seleção de ficheiros) Simple File Properties (diálogo de propriedades) diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 5df885e3..b3746aef 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -67,7 +67,7 @@ Denna app använder följande tredjepartsbibliotek för att göra mitt liv enklare. Tack. Tredjepartslicenser - Butter Knife (view injector) + RecyclerView MultiSelect (selecting multiple list items) Simple File Picker (filepicker dialog) Simple File Properties (properties dialog) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cc9bf0a8..8c0c0e65 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -68,9 +68,9 @@ 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 + RecyclerView MultiSelect (selecting multiple list items) + The MIT License (MIT)\n\nCopyright (c) 2014 Big Nerd Ranch\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: \n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. \n\nTHE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + https://github.com/bignerdranch/recyclerview-multiselect Simple File Picker (filepicker dialog) Copyright 2016 SimpleMobileTools\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/SimpleMobileTools/Simple-File-Picker diff --git a/build.gradle b/build.gradle index 803ef01b..c20bca14 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