mirror of
https://github.com/SimpleMobileTools/Simple-Notes.git
synced 2025-04-26 13:08:46 +02:00
remove Butterknife
This commit is contained in:
tibbi
parent
29d679ece0
commit
4f81180977
@ -1,5 +1,4 @@
|
||||
apply plugin: 'com.android.application'
|
||||
apply plugin: 'android-apt'
|
||||
apply plugin: 'kotlin-android'
|
||||
apply plugin: 'kotlin-android-extensions'
|
||||
|
||||
@ -34,13 +33,10 @@ android {
|
||||
|
||||
dependencies {
|
||||
compile 'com.android.support:appcompat-v7:23.4.0'
|
||||
compile 'com.jakewharton:butterknife:8.0.1'
|
||||
compile 'com.github.yukuku:ambilwarna:2.0.1'
|
||||
compile 'com.android.support:design:23.4.0'
|
||||
compile 'com.facebook.stetho:stetho:1.4.1'
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||
|
||||
apt 'com.jakewharton:butterknife-compiler:8.0.1'
|
||||
}
|
||||
|
||||
buildscript {
|
||||
|
||||
@ -11,7 +11,6 @@ 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_ambilwarna_title.setOnClickListener { openUrl(R.string.ambilwarna_url) }
|
||||
}
|
||||
|
||||
|
||||
@ -11,8 +11,6 @@ import android.view.View
|
||||
import android.view.WindowManager
|
||||
import android.view.inputmethod.InputMethodManager
|
||||
import android.widget.EditText
|
||||
import butterknife.ButterKnife
|
||||
import butterknife.OnClick
|
||||
import com.simplemobiletools.notes.R
|
||||
import com.simplemobiletools.notes.Utils
|
||||
import com.simplemobiletools.notes.databases.DBHelper
|
||||
@ -30,11 +28,11 @@ class MainActivity : SimpleActivity(), OpenNoteDialog.OpenNoteListener {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.activity_main)
|
||||
ButterKnife.bind(this)
|
||||
|
||||
mDb = DBHelper.newInstance(applicationContext)
|
||||
mNotes = mDb.getNotes()
|
||||
updateSelectedNote(config.currentNoteId)
|
||||
notes_fab.setOnClickListener { displayNewNoteDialog() }
|
||||
}
|
||||
|
||||
override fun onResume() {
|
||||
@ -116,8 +114,7 @@ class MainActivity : SimpleActivity(), OpenNoteDialog.OpenNoteListener {
|
||||
Utils.updateWidget(applicationContext)
|
||||
}
|
||||
|
||||
@OnClick(R.id.notes_fab)
|
||||
fun fabClicked(view: View) {
|
||||
fun displayNewNoteDialog() {
|
||||
val newNoteView = layoutInflater.inflate(R.layout.new_note, null)
|
||||
|
||||
AlertDialog.Builder(this).apply {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ScrollView
|
||||
android:id="@+id/license_holder"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/license_holder"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
@ -17,20 +17,6 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/notice"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/license_butterknife_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="@dimen/activity_margin"
|
||||
android:text="@string/butterknife_title"
|
||||
android:textColor="@color/colorPrimary"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/license_butterknife_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/butterknife_text"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/license_ambilwarna_title"
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@ -46,6 +46,6 @@
|
||||
<!-- License -->
|
||||
<string name="notice">Diese App nutzt die folgenden Drittanbieterbibliotheken, die mein Leben einfacher machen. Danke.</string>
|
||||
<string name="third_party_licences">Drittanbieterlizenzen</string>
|
||||
<string name="butterknife_title"><u>Butter Knife (View Injector)</u></string>
|
||||
<string name="ambilwarna_title"><u>AmbilWarna (Color Picker)</u></string>
|
||||
|
||||
</resources>
|
||||
|
||||
@ -46,7 +46,6 @@
|
||||
<!-- License -->
|
||||
<string name="notice">Questa app usa le seguenti librerie di terze parti per semplificarmi la vita. Grazie.</string>
|
||||
<string name="third_party_licences">Licenze di terze parti</string>
|
||||
<string name="butterknife_title"><u>Butter Knife (view injector)</u></string>
|
||||
<string name="ambilwarna_title"><u>AmbilWarna (color picker)</u></string>
|
||||
|
||||
</resources>
|
||||
|
||||
@ -46,7 +46,6 @@
|
||||
<!-- License -->
|
||||
<string name="notice">このアプリは、私の暮らしにゆとりを持たせるために、次のサードパーティのライブラリーを使用しています。 ありがとうございます。</string>
|
||||
<string name="third_party_licences">サードパーティー ライセンス</string>
|
||||
<string name="butterknife_title"><u>Butter Knife (ビュー インジェクター)</u></string>
|
||||
<string name="ambilwarna_title"><u>AmbilWarna (カラー ピッカー)</u></string>
|
||||
|
||||
</resources>
|
||||
|
||||
@ -46,6 +46,6 @@
|
||||
<!-- License -->
|
||||
<string name="notice">Esta aplicação usa as seguintes bibliotecas de terceiros para facilitar a minha vida. Obrigado.</string>
|
||||
<string name="third_party_licences">Licenças de terceiros</string>
|
||||
<string name="butterknife_title"><u>Butter Knife (injetor de vistas)</u></string>
|
||||
<string name="ambilwarna_title"><u>AmbilWarna (seletor de cores)</u></string>
|
||||
|
||||
</resources>
|
||||
|
||||
@ -46,7 +46,6 @@
|
||||
<!-- License -->
|
||||
<string name="notice">Denna app använder följande tredjepartsbibliotek för att göra mitt liv enklare. Tack.</string>
|
||||
<string name="third_party_licences">Tredjepartslicenser</string>
|
||||
<string name="butterknife_title"><u>Butter Knife (view injector)</u></string>
|
||||
<string name="ambilwarna_title"><u>AmbilWarna (color picker)</u></string>
|
||||
|
||||
</resources>
|
||||
|
||||
@ -47,9 +47,6 @@
|
||||
<!-- License -->
|
||||
<string name="notice">This app uses the following third party libraries to make my life easier. Thank you.</string>
|
||||
<string name="third_party_licences">Third party licences</string>
|
||||
<string name="butterknife_title"><u>Butter Knife (view injector)</u></string>
|
||||
<string name="butterknife_text" translatable="false">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.</string>
|
||||
<string name="butterknife_url" translatable="false">https://github.com/JakeWharton/butterknife</string>
|
||||
<string name="ambilwarna_title"><u>AmbilWarna (color picker)</u></string>
|
||||
<string name="ambilwarna_text" translatable="false">Copyright 2009-2015 Yuku\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.</string>
|
||||
<string name="ambilwarna_url" translatable="false">https://github.com/yukuku/ambilwarna</string>
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user