diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 44a9e73b..ffa7aca1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -62,15 +62,15 @@ - - + + $email" - about_email.text = Html.fromHtml(href) - about_email.movementMethod = LinkMovementMethod.getInstance() - } - - private fun setupCopyright() { - val versionName = BuildConfig.VERSION_NAME - val year = Calendar.getInstance().get(Calendar.YEAR) - val copyrightText = String.format(getString(R.string.copyright), versionName, year) - about_copyright.text = copyrightText - } - - private fun setupRateUs() { - /*if (config.isFirstRun) { - about_rate_us.visibility = View.GONE - } else { - about_rate_us.setOnClickListener { - val uri = Uri.parse("market://details?id=$packageName") - try { - startActivity(Intent(Intent.ACTION_VIEW, uri)) - } catch (ignored: ActivityNotFoundException) { - startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getStoreUrl()))) - } - } - }*/ - } - - fun setupInvite() { - about_invite.setOnClickListener { - val text = String.format(getString(R.string.share_text), getString(R.string.app_name), getStoreUrl()) - Intent().apply { - action = Intent.ACTION_SEND - putExtra(Intent.EXTRA_SUBJECT, getString(R.string.app_name)) - putExtra(Intent.EXTRA_TEXT, text) - type = "text/plain" - startActivity(Intent.createChooser(this, getString(R.string.invite_via))) - } - } - } - - fun setupLicense() { - about_license.setOnClickListener { - val intent = Intent(applicationContext, LicenseActivity::class.java) - startActivity(intent) - } - } - - fun setupFacebook() { - about_facebook.setOnClickListener { - var link = "https://www.facebook.com/simplemobiletools" - try { - packageManager.getPackageInfo("com.facebook.katana", 0) - link = "fb://page/150270895341774" - } catch (ignored: Exception) { - } - - startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(link))) - } - } - - fun setupGPlus() { - about_gplus.setOnClickListener { - val link = "https://plus.google.com/communities/104880861558693868382" - startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(link))) - } - } - - private fun getStoreUrl() = "https://play.google.com/store/apps/details?id=$packageName" -} \ No newline at end of file diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/LicenseActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/LicenseActivity.kt deleted file mode 100644 index dad4210a..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/LicenseActivity.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.simplemobiletools.camera.activities - -import android.content.Intent -import android.net.Uri -import android.os.Bundle -import com.simplemobiletools.camera.R -import kotlinx.android.synthetic.main.activity_license.* - -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_glide_title.setOnClickListener { openUrl(R.string.glide_url) } - license_filepicker_title.setOnClickListener { openUrl(R.string.filepicker_url) } - } - - private fun openUrl(id: Int) { - val url = resources.getString(id) - val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url)) - startActivity(browserIntent) - } -} diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt index e1293f19..01b0e642 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt @@ -1,6 +1,5 @@ package com.simplemobiletools.camera.activities -import android.content.Intent import android.os.Bundle import android.view.Menu import android.view.MenuItem @@ -10,6 +9,8 @@ import com.simplemobiletools.commons.dialogs.FilePickerDialog import com.simplemobiletools.commons.extensions.getBasePath import com.simplemobiletools.commons.extensions.getHumanReadablePath import com.simplemobiletools.commons.extensions.updateTextColors +import com.simplemobiletools.commons.helpers.LICENSE_GLIDE +import com.simplemobiletools.commons.helpers.LICENSE_KOTLIN import kotlinx.android.synthetic.main.activity_settings.* class SettingsActivity : SimpleActivity() { @@ -39,13 +40,11 @@ class SettingsActivity : SimpleActivity() { } override fun onOptionsItemSelected(item: MenuItem): Boolean { - return when (item.itemId) { - R.id.about -> { - startActivity(Intent(applicationContext, AboutActivity::class.java)) - true - } + when (item.itemId) { + R.id.about -> startAboutActivity(R.string.app_name, LICENSE_KOTLIN or LICENSE_GLIDE, BuildConfig.VERSION_NAME) else -> super.onOptionsItemSelected(item) } + return true } private fun setupSavePhotosFolder() { diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml deleted file mode 100644 index a26f39e1..00000000 --- a/app/src/main/res/layout/activity_about.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/activity_license.xml deleted file mode 100644 index fca5ba23..00000000 --- a/app/src/main/res/layout/activity_license.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 38196738..a807e61f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -13,11 +13,8 @@ Wir benötigen Zugriff auf das Mirkofon um Videos aufnehmen zu können Keine Galerie App verfügbar Keine gültige Auflösung mit gewähltem Seitenverhältnis gefunden, nutze maximale Auflösung - OK - Einstellungen - Dunkles Design Save photos and videos to Erzwinge 16:9 Format Zeige eine Vorschau des Photos nach der Aufnahme @@ -26,25 +23,6 @@ Kein Limit Auslösegeräusch - - Über - Weitere einfache Apps und Quellcode findest du auf:\nhttp://simplemobiletools.com - Sende Vorschläge und Feedback an: - Drittanbieterlizenzen - Lade Freunde ein - Hey, wirf mal einen Blick auf %1$s: %2$s - Einladen via - Bewerte uns im Play Store - Folge uns: - v %1$s\nCopyright © Simple Mobile Tools %2$d - - - Diese App nutzt die folgenden Drittanbieterbibliotheken, die mein Leben einfacher machen. Danke. - Drittanbieterlizenzen - Kotlin (Programmiersprache) - Glide (Bilder laden und zwischenspeichern) - Simple File Picker (filepicker dialog) - A camera with flash, zoom and no ads. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 41037498..75e4a9f1 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -13,11 +13,8 @@ Se necesita el permiso de micrófono para grabar vídeos No hay disponible una aplicación de galería Resolución no válida con la proporción de aspecto seleccionada, usando máxima resolución - Ok - Opciones - Tema oscuro Guardar fotografías y vídeos en Usar proporción de aspecto 16:9 Show a photo preview after capturing @@ -26,30 +23,11 @@ Sin límite Sonido del obturador - - Acerca de Simple Camera - Más aplicaciones simples y su código fuente en:\nhttp://simplemobiletools.com - Envíe sus comentarios y sugerencias a: - Licencias de terceros - Invitar a amigos - Hola, venga y échele un vistazo a %1$s en %2$s - Invitar vía - Evalúenos en Google Play Store - Síganos: - v %1$s\nCopyright © Simple Mobile Tools %2$d - - - 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) - Glide (image loading and caching) - Simple File Picker (filepicker dialog) - Una cámara con flash, zoom y sin anuncios. - La cámara se puede usar para realizar tanto fotografías como para grabar vídeos. Usted puede conmutar entre la cámara delantera y trasera, modificar la ruta de guardado y establecer el límite de resolución. Se puede activar y desactivar el flash, hacer zoom... Mientras se graba un vídeo el flash puede ser usado como una linterna. + La cámara se puede usar para realizar tanto fotografías como para grabar vídeos. Usted puede conmutar entre la cámara delantera y trasera, modificar la ruta de guardado y establecer el límite de resolución. Se puede activar y desactivar el flash, hacer zoom… Mientras se graba un vídeo el flash puede ser usado como una linterna. Si usted quiere lanzar esta aplicación presionando el botón físico de cámara, puede que tenga que deshabilitar la aplicación nativa de cámara (Ajustes -> Aplicaciones -> Cámara -> Deshabilitar). diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d4f252f1..bed238e1 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -13,11 +13,8 @@ Nous avons besoin de l\'autorisation sur l\'audio pour enregistrer des vidéos Pas d\'application album disponible Pas de résolution valide trouvé avec le ratio sélectionné; utilisation de la résolution maximale - OK - Paramètres - Thème sombre Sauvegarder les photos et vidéos vers Ratio 16:9 Apercevoir la photo après la prise @@ -26,25 +23,6 @@ aucun Son de l\'obturateur - - À propos - Plus d\'application simple et code source sur :\nhttp://simplemobiletools.com - Envoyer votre retour ou suggestions à : - <u > Licence des parties tièrces</u> - <u >Inviter des amis</u> - Hey, regardes ça %1$s sur %2$s - Inviter via - <u >Notez-nous sur le Play Store</u> - Suivez nous : - v %1$s\nCopyright © Simple Mobile Tools %2$d - - - Cette application utilise les librairies tierces suivantes pour me simplifier la vie. Merci. - Licence des parties tièrces - Kotlin (langage de programmation) - Glide (chargement et mise en cache d\'image) - Sélecteur simple de fichier (dialogue filepicker) - Un appareil photo avec flash, zoom et pas de publicité. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index bf6fef7c..78f5a696 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -13,11 +13,8 @@ È necessario l\'accesso al microfono per registrare i video Nessuna app galleria disponibile No valid resolution with selected aspect ratio found, using max resolution - OK - Impostazioni - Tema scuro Save photos and videos to Forza proporzione 16:9 Show a photo preview after capturing @@ -26,25 +23,6 @@ nessuno Suono otturatore - - Informazioni - Altre semplici app e codici sorgenti in:\nhttp://simplemobiletools.com - Invia la tua opinione o i tuoi suggerimenti a: - Licenze di terze parti - Invite friends - Hey, come check out %1$s at %2$s - Invite via - Dacci un voto sul Play Store - Seguici: - v %1$s\nCopyright © Simple Mobile Tools %2$d - - - Questa app usa le seguenti librerie di terze parti per semplificarmi la vita. Grazie. - Licenze di terze parti - Kotlin (programming language) - Glide (image loading and caching) - Simple File Picker (filepicker dialog) - A camera with flash, zoom and no ads. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 65ff6544..023d7b47 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -13,11 +13,8 @@ ビデオを記録するためにオーディオのアクセス許可が必要です 利用可能なギャラリーアプリがありません 選択したアスペクト比で有効な解像度が見つかりません。最大解像度を使用しています - OK - 設定 - ダークテーマ 写真とビデオの保存先 強制的に 16:9 レシオにする キャプチャ後に写真のプレビューを表示 @@ -26,25 +23,6 @@ なし シャッター音 - - アプリについて - もっとシンプルなアプリとソースコードは:\nhttp://simplemobiletools.com - ご意見やご提案を送信してください: - サードパーティー ライセンス - 友達を招待 - %2$s で %1$s を確認してください - 招待... - Play ストアで評価してください - フォローしてください: - v %1$s\nCopyright © Simple Mobile Tools %2$d - - - このアプリは、私の暮らしにゆとりを持たせるために、次のサードパーティのライブラリーを使用しています。 ありがとうございます。 - サードパーティー ライセンス - Kotlin (プログラミング言語) - Glide (イメージ ローディングとキャッシング) - Simple File Picker (ファイルピッカー ダイアログ) - フラッシュ、ズーム付きのカメラ。広告はありません。 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index e466a604..8430c83e 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -13,11 +13,8 @@ Mums reikia audio leidimo, kad įrašyti vaizdo bylas Nėra galerijos programėlės Nerasta tinkamos raiškos su with pasirinktu kraštinių santykiu, naudojant maksimalią raišką - Gerai - Nustatymai - Tamsi tema Išsaugoti nuotraukas ir vaizdo įrašus į Naudoti 16:9 santykį Show a photo preview after capturing @@ -26,25 +23,6 @@ nieko Užrakto garsas - - Apie - Daugiau paprastų programėlių ir atviras kodas čia:\nhttp://simplemobiletools.com - Siųsti savo grįžtamąjį ryšį arba pasiūlymus čia: - Trečiųjų šalių licenzijos - Pakvieskite draugus - Ei, ateikite čia ir patikrinkite %1$s čia %2$s - Pakviesti per - Įvertinti mus google play parduotuvėje - Sekti mus: - v %1$s\nVisos teisės saugomos © Simple Mobile Tools %2$d - - - Ši programėlė naudoja sekančias trečiųjų šyalių bibliotekas, kad palengvinti man gyvenimą. Ačiū. - Trečiųjų šalių licenzijos - Kotlin (programming language) - Glide (image loading and caching) - Simple File Picker (filepicker dialog) - A camera with flash, zoom and no ads. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index c2e1f371..16bdc2ac 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -13,11 +13,8 @@ Necessitamos da permissão de áudio para gravar os vídeos Nenhuma aplicação de galeria disponível Nenhuma resolução encontrada que seja compatível com o rácio selecionado, a utilizar a resolução máxima - OK - Definições - Tema escuro Guardar fotos e vídeos em Utilizar rácio 16:9 Mostrar pré-visualização após a captura @@ -26,25 +23,6 @@ sem limite Som do obturador - - Acerca - Mais aplicações Simple e código fonte em:\nhttp://simplemobiletools.com - Envie os seus comentários ou sugestões para: - Licenças de terceiros - Convidar amigos - Olá, experimenta %1$s em %2$s - Convidar via - Avalie-nos na Play Store - Siga-nos: - V %1$s\nCopyright © Simple Mobile Tools %2$d - - - Esta aplicação usa as seguintes bibliotecas de terceiros para facilitar a minha vida. Obrigado. - Licenças de terceiros - Kotlin (linguagem de programação) - Glide (carregamento e cache de imagens) - Simple File Picker (diálogo de seleção de ficheiros) - Uma câmara com flash, zoom e sem anúncios. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index de018d00..66b169f3 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -13,11 +13,8 @@ Нам нужно аудио разрешение для записи видео Нет доступного приложения-галереи Для выбранного соотношения сторон не существует подходящего разрешения. Будет использовано максимально возможное - OK - Настройки - Темная тема Сохранять фото и видео в Принудительное соотношение сторон 16:9 Показывать сделанное фото @@ -26,25 +23,6 @@ нет Звук затвора - - О приложении - Больше простых приложений и исходные коды на:\nhttp://simplemobiletools.com - Отправить отзывы или предложения - Лицензии третьих сторон - Предложить другу - Попробуй %1$s по ссылке %2$s - Предложить с помощью - Оценить нас в Google Play - Подписаться на нас: - v %1$s\nCopyright © Simple Mobile Tools %2$d - - - Это приложение использует следующие библиотеки сторонних разработчиков, чтобы облегчить мой труд. Спасибо. - Лицензии третьих сторон - Kotlin (язык программирования) - Glide (загрузка изображения и кэширование) - Simple File Picker (диалог выбора файла) - Камера со вспышкой и зумом. Без рекламы. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 22a9fde8..465d1951 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -13,11 +13,8 @@ För att spela in video krävs ljudrättigheter Ingen galleri-app finns tillgänglig No valid resolution with selected aspect ratio found, using max resolution - OK - Inställningar - Mörkt tema Save photos and videos to Tvinga 16:9-förhållande Show a photo preview after capturing @@ -26,25 +23,6 @@ inga Slutarljud - - Om - Fler enkla appar och källkod här:\nhttp://simplemobiletools.com - Skicka feedback och förslag till: - Tredjepartslicenser - Invite friends - Hey, come check out %1$s at %2$s - Invite via - Betygsätt oss i Play Butiken - Följ oss: - v %1$s\nCopyright © Simple Mobile Tools %2$d - - - Denna app använder följande tredjepartsbibliotek för att göra mitt liv enklare. Tack. - Tredjepartslicenser - Kotlin (programming language) - Glide (image loading and caching) - Simple File Picker (filepicker dialog) - A camera with flash, zoom and no ads. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1df7511f..197b499a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -13,11 +13,8 @@ We need the audio permission for recording videos No gallery app available No valid resolution with selected aspect ratio found, using max resolution - OK - Settings - Dark theme Save photos and videos to Use 16:9 ratio Show a photo preview after capturing @@ -26,32 +23,6 @@ none Shutter sound - - About - More simple apps and source code at:\nhttp://simplemobiletools.com - Send your feedback or suggestions to: - hello@simplemobiletools.com - Third party licences - Invite friends - Hey, come check out %1$s at %2$s - Invite via - Rate us in the Play Store - Follow us: - v %1$s\nCopyright © Simple Mobile Tools %2$d - - - 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 - Glide (image loading and caching) - Copyright 2014 Google, Inc. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n\n1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n\n2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\n\nTHIS SOFTWARE IS PROVIDED BY GOOGLE, INC. ``AS IS\'\' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE, INC. OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - https://github.com/bumptech/glide - 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 - A camera with flash, zoom and no ads.