From 3e99f73732265f68f66d98d91c8481e21d4e7272 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 20 Nov 2016 23:54:14 +0100 Subject: [PATCH] adding Kotlin and Stetho licenses --- .../notes/activities/LicenseActivity.kt | 3 ++ app/src/main/res/layout/activity_license.xml | 29 +++++++++++++++++++ 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 ++++ 9 files changed, 50 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/LicenseActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/LicenseActivity.kt index 124bd5b1..f571548c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/LicenseActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/LicenseActivity.kt @@ -11,7 +11,10 @@ class LicenseActivity : SimpleActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_license) + + license_kotlin_title.setOnClickListener { openUrl(R.string.kotlin_url) } license_ambilwarna_title.setOnClickListener { openUrl(R.string.ambilwarna_url) } + license_stetho_title.setOnClickListener { openUrl(R.string.stetho_url) } } private fun openUrl(id: Int) { diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/activity_license.xml index 2db912a3..df372cc3 100644 --- a/app/src/main/res/layout/activity_license.xml +++ b/app/src/main/res/layout/activity_license.xml @@ -13,10 +13,25 @@ android:padding="@dimen/activity_margin"> + + + + + + + + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 98b30004..4797f2be 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -46,6 +46,8 @@ Diese App nutzt die folgenden Drittanbieterbibliotheken, die mein Leben einfacher machen. Danke. Drittanbieterlizenzen + Kotlin (Programmiersprache) AmbilWarna (Color Picker) + Stetho (debugging databases) diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 4561fb71..1f610e3c 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -46,6 +46,8 @@ Esta aplicación usa las siguientes librerías de terceros para hacerme la vida más fácil. Gracias. Licencias de terceros + Kotlin (Lenguaje de programación) AmbilWarna (Selector de colores) + Stetho (debugging databases) diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 5dff2a2f..0039766e 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -46,6 +46,8 @@ Questa app usa le seguenti librerie di terze parti per semplificarmi la vita. Grazie. Licenze di terze parti + Kotlin (programming language) AmbilWarna (color picker) + Stetho (debugging databases) diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 0d2dba72..df1c3b0d 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -46,6 +46,8 @@ このアプリは、私の暮らしにゆとりを持たせるために、次のサードパーティのライブラリーを使用しています。 ありがとうございます。 サードパーティー ライセンス + Kotlin (プログラミング言語) AmbilWarna (カラー ピッカー) + Stetho (debugging databases) diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 9d2a2871..0feebbf7 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -46,6 +46,8 @@ Esta aplicação usa as seguintes bibliotecas de terceiros para facilitar a minha vida. Obrigado. Licenças de terceiros + Kotlin (linguagem de programação) AmbilWarna (seletor de cores) + Stetho (debugging databases) diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 0fdb39e9..ae191098 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -46,6 +46,8 @@ Denna app använder följande tredjepartsbibliotek för att göra mitt liv enklare. Tack. Tredjepartslicenser + Kotlin (programming language) AmbilWarna (color picker) + Stetho (debugging databases) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1c5f8842..2023c9fa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -47,8 +47,14 @@ This app uses the following third party libraries to make my life easier. Thank you. Third party licences + Kotlin (programming language) + Copyright 2010 - 2016 JetBrains s.r.o.\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/JetBrains/kotlin AmbilWarna (color picker) 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. https://github.com/yukuku/ambilwarna + Stetho (debugging databases) + BSD License\n\nFor Stetho software\n\nCopyright (c) 2015, Facebook, Inc. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without modification,\nare permitted provided that the following conditions are met:\n\n * Redistributions of source code must retain the above copyright notice, this\n list of conditions and the following disclaimer.\n\n * Redistributions in binary form must reproduce the above copyright notice,\n this list of conditions and the following disclaimer in the documentation\n and/or other materials provided with the distribution.\n\n * Neither the name Facebook nor the names of its contributors may be used to\n endorse or promote products derived from this software without specific\n prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\nWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR\nANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\nLOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON\nANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\nSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + https://github.com/facebook/stetho