Accredited Portuguese (Portugal) translator

OmGodse · OmGodse · commit 5062e61fae82 · 2021-12-09T23:43:25.000+05:30
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -16,9 +16,9 @@
 15. 🇸🇪 Swedish by Erik Lindström
 16. 🇷🇺 Russian by Denis Bondarenko
 17. 🇫🇷 French by Arnaud Dieumegard
-18. 🇧🇷 Brazilian Portuguese by [fabianski7](https://github.com/fabianski7)
-19. 🇳🇴 Norwegian by Fredrik Magnussen
-20. 🇵🇭 Tagalog by Isaiah Collins Abetong
-21. 🇩🇪 German by Maximilian Braunschmied, [jonas-haeusler](https://github.com/jonas-haeusler)
-22. 🇿🇭 Chinese
-    * Simplified by [Austin Huang](https://github.com/austinhuang0131)
+18. 🇧🇷 Portuguese (Brazil) by [fabianski7](https://github.com/fabianski7)
+19. 🇵🇹 Portuguese (Portugal) by [joaopmatos](https://github.com/joaopmatos)
+20. 🇳🇴 Norwegian by Fredrik Magnussen
+21. 🇵🇭 Tagalog by Isaiah Collins Abetong
+22. 🇨🇳 Chinese (Simplified) by [Austin Huang](https://github.com/austinhuang0131)
+23. 🇩🇪 German by Maximilian Braunschmied, [jonas-haeusler](https://github.com/jonas-haeusler)
diff --git a/README.md b/README.md
@@ -5,11 +5,6 @@ Maybe the developer views developing a beautiful user interface as the realm of
 
 Well, Notally is none of these things. It's extremely light, minimalistic and elegant. There are minimal dependencies and lines of code. (All without compromising on readability)
 
-### Components
-* Room
-* Navigation Component
-* Architecture Components (LiveData and ViewModel)
-
 ### Features
 * Auto save
 * Dark mode
@@ -18,7 +13,7 @@ Well, Notally is none of these things. It's extremely light, minimalistic and el
 * Create lists to stay on track
 * Support for Lollipop devices and up
 * Pin notes to always keep them at the top
-* APK size of 1.3 MB (1.7 MB Uncompressed)
+* APK size of 1.3 MB (1.7 MB uncompressed)
 * Add labels to your notes for quick organisation
 * Archive notes to keep them around, but out of your way
 * Export notes as plain text, XML, JSON, HTML or PDF files with formatting
@@ -29,9 +24,6 @@ Well, Notally is none of these things. It's extremely light, minimalistic and el
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="70"/>](https://f-droid.org/packages/com.omgodse.notally/)
 
 ### Translations
-The list of supported languages is present in [CONTRIBUTORS.md](CONTRIBUTORS.md)
-
-If you would like to help translate the app further, please contact me via [email](mailto:omgodseapps@gmail.com) or open a pull request.
+All [translations](CONTRIBUTORS.md) are crowd sourced. To contribute or point out any errors, please contact me via [email](mailto:omgodseapps@gmail.com) or open a pull request.
 
-### Screenshots
 <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="250"/><img src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="250"/><img src="fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" width="250"/>
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,9 +12,9 @@ android {
         applicationId "com.omgodse.notally"
         minSdk 21
         targetSdk 30
-        versionCode 39
-        versionName "4.4"
-        resConfigs "en", "ca", "cs", "da", "de", "es", "fr", "hu", "in", "it", "ja", "nb", "nl", "pl", "pt-rBR", "ru", "sk", "sv", "tl", "tr", "uk", "zh-rCN"
+        versionCode 40
+        versionName "4.5"
+        resConfigs "en", "ca", "cs", "da", "de", "es", "fr", "hu", "in", "it", "ja", "nb", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "sk", "sv", "tl", "tr", "uk", "zh-rCN"
         vectorDrawables.generatedDensities = []
     }
 
@@ -37,15 +37,18 @@ android {
 
     buildFeatures { viewBinding true }
 
-    packagingOptions { exclude "DebugProbesKt.bin" }
+    packagingOptions {
+        exclude "DebugProbesKt.bin"
+        exclude "META-INF/**.version"
+        exclude "kotlin/**.kotlin_builtins"
+    }
 }
 
 dependencies {
     final def navVersion = "2.3.5"
     final def roomVersion = "2.3.0"
 
     implementation "androidx.preference:preference-ktx:1.1.1"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0"
 
     kapt "androidx.room:room-compiler:$roomVersion"
     implementation "androidx.room:room-ktx:$roomVersion"
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -18,5 +18,5 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+-renamesourcefileattribute SourceFile
 -keep class ** implements org.ocpsoft.prettytime.TimeUnit
diff --git a/app/src/main/java/com/omgodse/notally/fragments/Labels.kt b/app/src/main/java/com/omgodse/notally/fragments/Labels.kt
@@ -97,9 +97,6 @@ class Labels : Fragment(), ItemListener {
     private fun displayAddLabelDialog() {
         val dialogBinding = DialogInputBinding.inflate(layoutInflater)
 
-        dialogBinding.edit.inputType = InputType.TYPE_TEXT_FLAG_CAP_WORDS
-        dialogBinding.edit.filters = arrayOf()
-
         val dialog = MaterialAlertDialogBuilder(requireContext())
             .setView(dialogBinding.root)
             .setTitle(R.string.add_label)
diff --git a/app/src/main/java/com/omgodse/notally/fragments/Settings.kt b/app/src/main/java/com/omgodse/notally/fragments/Settings.kt
@@ -4,8 +4,12 @@ import android.app.Activity
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.view.View
+import android.text.InputFilter
+import android.text.method.DigitsKeyListener
+import android.view.inputmethod.EditorInfo
+import android.widget.EditText
 import androidx.fragment.app.activityViewModels
+import androidx.preference.EditTextPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -17,8 +21,8 @@ class Settings : PreferenceFragmentCompat() {
 
     private val model: BaseNoteModel by activityViewModels()
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        setPreferencesFromResource(R.xml.settings, rootKey)
 
         findPreference<Preference>(R.string.exportBackupKey)?.setOnPreferenceClickListener {
             val intent = Intent(Intent.ACTION_CREATE_DOCUMENT)
@@ -37,10 +41,6 @@ class Settings : PreferenceFragmentCompat() {
             return@setOnPreferenceClickListener true
         }
 
-        bindPreferenceToLink(R.string.githubKey, "https://github.com/OmGodse/Notally")
-
-        bindPreferenceToLink(R.string.rateKey, "https://play.google.com/store/apps/details?id=com.omgodse.notally")
-
         val libraries = arrayOf("Room", "Pretty Time", "Material Components for Android")
         findPreference<Preference>(R.string.librariesKey)?.setOnPreferenceClickListener {
             MaterialAlertDialogBuilder(requireContext())
@@ -57,17 +57,23 @@ class Settings : PreferenceFragmentCompat() {
             return@setOnPreferenceClickListener true
         }
 
-        findPreference<Preference>(R.string.maxItemsToDisplayInListKey)?.setOnPreferenceChangeListener { preference, newValue ->
-            return@setOnPreferenceChangeListener newValue.toString().isNotEmpty()
+        val bind = { editText: EditText ->
+            val maxLength = InputFilter.LengthFilter(1)
+            editText.filters = arrayOf(maxLength)
+            editText.inputType = EditorInfo.TYPE_CLASS_NUMBER
+            editText.keyListener = DigitsKeyListener.getInstance("123456789")
         }
 
-        findPreference<Preference>(R.string.maxLinesToDisplayInNoteKey)?.setOnPreferenceChangeListener { preference, newValue ->
-            return@setOnPreferenceChangeListener newValue.toString().isNotEmpty()
-        }
-    }
+        val maxItems = findPreference<EditTextPreference>(R.string.maxItemsToDisplayInListKey)
+        val maxLines = findPreference<EditTextPreference>(R.string.maxLinesToDisplayInNoteKey)
 
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.settings, rootKey)
+        maxItems?.setOnBindEditTextListener(bind)
+        maxLines?.setOnBindEditTextListener(bind)
+
+        val onChange = Preference.OnPreferenceChangeListener { preference, newValue -> newValue.toString().isNotEmpty() }
+
+        maxItems?.onPreferenceChangeListener = onChange
+        maxLines?.onPreferenceChangeListener = onChange
     }
 
 
@@ -89,13 +95,6 @@ class Settings : PreferenceFragmentCompat() {
         startActivity(intent)
     }
 
-    private fun bindPreferenceToLink(keyId: Int, link: String) {
-        findPreference<Preference>(keyId)?.setOnPreferenceClickListener {
-            openLink(link)
-            return@setOnPreferenceClickListener true
-        }
-    }
-
     private fun <T> findPreference(id: Int): T? = findPreference(getString(id))
 
     companion object {
diff --git a/app/src/main/java/com/omgodse/notally/helpers/OperationsParent.kt b/app/src/main/java/com/omgodse/notally/helpers/OperationsParent.kt
@@ -3,7 +3,6 @@ package com.omgodse.notally.helpers
 import android.content.Context
 import android.content.DialogInterface
 import android.content.Intent
-import android.text.InputType
 import android.view.LayoutInflater
 import androidx.core.util.forEach
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -35,76 +34,72 @@ interface OperationsParent {
     fun shareNote(title: String?, items: List<ListItem>?) = shareNote(title, items.getBody())
 
 
-    fun labelNote(labels: List<String>, previousLabels: HashSet<String>, onLabelsUpdated: (labels: HashSet<String>) -> Unit) {
-        val checkedLabels = getCheckedLabels(labels, previousLabels)
+    fun labelNote(labels: List<String>, previousLabels: HashSet<String>, onUpdated: (labels: HashSet<String>) -> Unit) {
+        val checkedLabels = labels.map { label -> previousLabels.contains(label) }.toBooleanArray()
 
         val inflater = LayoutInflater.from(accessContext())
         val addLabel = AddLabelBinding.inflate(inflater).root
 
-        val alertDialogBuilder = MaterialAlertDialogBuilder(accessContext())
-        alertDialogBuilder.setTitle(R.string.labels)
-        alertDialogBuilder.setNegativeButton(R.string.cancel, null)
+        val builder = MaterialAlertDialogBuilder(accessContext())
+            .setTitle(R.string.labels)
+            .setNegativeButton(R.string.cancel, null)
 
         if (labels.isNotEmpty()) {
-            alertDialogBuilder.setMultiChoiceItems(labels.toTypedArray(), checkedLabels, null)
-            alertDialogBuilder.setPositiveButton(R.string.save, null)
-        } else alertDialogBuilder.setView(addLabel)
+            builder.setMultiChoiceItems(labels.toTypedArray(), checkedLabels, null)
+            builder.setPositiveButton(R.string.save, null)
+        } else builder.setView(addLabel)
 
-        val dialog = alertDialogBuilder.create()
-        dialog.show()
+        val dialog = builder.create()
 
         addLabel.setOnClickListener {
             dialog.dismiss()
-            displayAddLabelDialog(previousLabels, onLabelsUpdated)
+            displayAddLabelDialog(previousLabels, onUpdated)
         }
 
-        dialog.getButton(DialogInterface.BUTTON_POSITIVE)?.setOnClickListener {
-            val selectedLabels = HashSet<String>()
-            dialog.listView.checkedItemPositions.forEach { key, value ->
-                if (value) {
-                    val label = labels[key]
-                    selectedLabels.add(label)
+        dialog.setOnShowListener {
+            dialog.getButton(DialogInterface.BUTTON_POSITIVE)?.setOnClickListener {
+                val selectedLabels = HashSet<String>()
+                dialog.listView.checkedItemPositions.forEach { key, value ->
+                    if (value) {
+                        val label = labels[key]
+                        selectedLabels.add(label)
+                    }
                 }
+                dialog.dismiss()
+                onUpdated(selectedLabels)
             }
-            dialog.dismiss()
-            onLabelsUpdated(selectedLabels)
         }
+
+        dialog.show()
     }
 
-    private fun displayAddLabelDialog(previousLabels: HashSet<String>, onLabelsUpdated: (labels: HashSet<String>) -> Unit) {
+    private fun displayAddLabelDialog(previousLabels: HashSet<String>, onUpdated: (labels: HashSet<String>) -> Unit) {
         val inflater = LayoutInflater.from(accessContext())
         val binding = DialogInputBinding.inflate(inflater)
 
-        binding.edit.inputType = InputType.TYPE_TEXT_FLAG_CAP_WORDS
-        binding.edit.filters = arrayOf()
-
-        val dialogBuilder = MaterialAlertDialogBuilder(accessContext())
-        dialogBuilder.setTitle(R.string.add_label)
-        dialogBuilder.setView(binding.root)
-        dialogBuilder.setNegativeButton(R.string.cancel, null)
-        dialogBuilder.setPositiveButton(R.string.save, null)
-
-        val dialog = dialogBuilder.show()
-        binding.edit.requestFocus()
-
-        dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener {
-            val value = binding.edit.text.toString().trim()
-            if (value.isNotEmpty()) {
-                val label = Label(value)
-                insertLabel(label) { success ->
-                    if (success) {
-                        dialog.dismiss()
-                        labelNote(listOf(value), previousLabels, onLabelsUpdated)
-                    } else binding.root.error = accessContext().getString(R.string.label_exists)
-                }
-            } else dialog.dismiss()
+        val dialog = MaterialAlertDialogBuilder(accessContext())
+            .setTitle(R.string.add_label)
+            .setView(binding.root)
+            .setNegativeButton(R.string.cancel, null)
+            .setPositiveButton(R.string.save, null)
+            .create()
+
+        dialog.setOnShowListener {
+            binding.edit.requestFocus()
+            dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener {
+                val value = binding.edit.text.toString().trim()
+                if (value.isNotEmpty()) {
+                    val label = Label(value)
+                    insertLabel(label) { success ->
+                        if (success) {
+                            dialog.dismiss()
+                            labelNote(listOf(value), previousLabels, onUpdated)
+                        } else binding.root.error = accessContext().getString(R.string.label_exists)
+                    }
+                } else dialog.dismiss()
+            }
         }
-    }
-
-    companion object {
 
-        private fun getCheckedLabels(labels: List<String>, previousLabels: HashSet<String>): BooleanArray {
-            return labels.map { label -> previousLabels.contains(label) }.toBooleanArray()
-        }
+        dialog.show()
     }
 }
diff --git a/app/src/main/res/layout/dialog_input.xml b/app/src/main/res/layout/dialog_input.xml
@@ -15,7 +15,5 @@
         android:id="@android:id/edit"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:digits="123456789"
-        android:inputType="number"
-        android:maxLength="1" />
+        android:inputType="textCapWords" />
 </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
@@ -17,15 +17,15 @@
     <string name="delete_all">Apagar todas</string>
     <string name="delete_forever">Apagar para sempre</string>
 
-    <!-- Chooser dialog hints -->
-    <string name="view_note">Ver nota…</string>
-    <string name="share_note">Partilhar nota…</string>
-
     <!-- Pinning -->
     <string name="pin">Afixar</string>
     <string name="unpin">Desafixar</string>
     <string name="pinned">Afixado</string>
 
+    <!-- Chooser dialog hints -->
+    <string name="view_note">Ver nota…</string>
+    <string name="share_note">Partilhar nota…</string>
+
     <!-- Dialogs -->
     <string name="save">Guardar</string>
     <string name="edit">Editar</string>
@@ -84,27 +84,20 @@
     <string name="light">Claro</string>
     <string name="follow_system">Seguir o sistema</string>
 
-
     <string name="date_format">Formato da data</string>
     <string name="none">Nenhum</string>
     <string name="relative">Relativo</string>
     <string name="absolute">Absoluto</string>
 
-    <string name="card_type">Tipo de cartão</string>
-    <string name="flat">Plano</string>
-    <string name="elevated">Elevado</string>
-
     <string name="content_density">Densidade do conteúdo</string>
     <string name="max_items_to_display">Máximo de itens para serem exibidos nas listas</string>
     <string name="max_lines_to_display">Máximo de linhas para serem exibidos nas notas</string>
 
-    <string name="show_date_created">Mostrar em que foi criado</string>
-
     <string name="backup">Backup</string>
     <string name="export_backup">Exportar backup</string>
     <string name="import_backup">Importar backup</string>
 
     <string name="about">Sobre</string>
     <string name="libraries">Bibliotecas</string>
     <string name="rate">Avaliar esta aplicação</string>
-</resources>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -133,7 +133,5 @@
     <string name="exportBackupKey" translatable="false">exportBackup</string>
     <string name="importBackupKey" translatable="false">importBackup</string>
 
-    <string name="rateKey" translatable="false">rate</string>
-    <string name="githubKey" translatable="false">github</string>
     <string name="librariesKey" translatable="false">libraries</string>
 </resources>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
diff --git a/build.gradle b/build.gradle
diff --git a/fastlane/metadata/android/en-US/changelogs/40.txt b/fastlane/metadata/android/en-US/changelogs/40.txt
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
