Merge pull request #40 from estep248/dev

Dev
RayLeaf-Studios · Jul 2, 2022 · cf29f58 · cf29f58
2 parents 1e8611f + 559909e
commit cf29f58
Show file tree

Hide file tree

Showing 14 changed files with 52 additions and 54 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         minSdkVersion 23
         targetSdkVersion 30
 
-        versionCode 35
-        versionName "1.3.5"
+        versionCode 36
+        versionName "1.3.6"
 
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/src/main/java/com/pocket_plan/j7_003/data/notelist/NoteFr.kt b/app/src/main/java/com/pocket_plan/j7_003/data/notelist/NoteFr.kt
@@ -29,7 +29,6 @@ import kotlinx.android.synthetic.main.fragment_note.view.*
 import kotlinx.android.synthetic.main.row_note.view.*
 import kotlinx.android.synthetic.main.title_dialog.view.*
 import java.util.*
-import kotlin.collections.ArrayList
 import kotlin.properties.Delegates
 import kotlin.random.Random
 
@@ -342,12 +341,11 @@ class NoteFr : Fragment() {
                 myDialogView!!.etAddNoteFolder.startAnimation(animationShake)
                 return@setOnClickListener
             }
-            val moveMessage =
-                when (noteListDirs.moveDir(editFolder, spFolderPaths.selectedItemPosition)) {
-                    true -> getString(R.string.notesToastFolderMoved)
-                    else -> getString(R.string.notesCantMove)
+            if(spFolderPaths.selectedItemPosition != currentParentFolderIndex){
+                if (noteListDirs.moveDir(editFolder, spFolderPaths.selectedItemPosition)){
+                    myActivity.toast(getString(R.string.notesToastFolderMoved))
                 }
-            myActivity.toast(moveMessage)
+            }
             myAdapter.notifyDataSetChanged()
             //reload title, current folder has been edited
             myActivity.setToolbarTitle(noteListDirs.getCurrentPathName(getString(R.string.menuTitleNotes)))
@@ -714,14 +712,10 @@ class NoteAdapter(mainActivity: MainActivity, noteFr: NoteFr) :
                    containingList.removeAt(noteIndex)
                    containingList.add(0, currentNote)
                 }
+                myNoteFr.noteListDirs.adjustStackAbove(currentNote)
 
                 NoteFr.editNoteHolder = currentNote
 
-//                notePosition = myNoteFr.noteListDirs.currentList().indexOf(currentNote)
-
-//                PreferenceManager.getDefaultSharedPreferences(myActivity)
-//                    .edit().putBoolean("editingNote", true).apply()
-
                 myActivity.changeToFragment(FT.NOTE_EDITOR) as NoteEditorFr
                 myActivity.hideKeyboard()
             }

diff --git a/app/src/main/java/com/pocket_plan/j7_003/data/shoppinglist/MultiShoppingFr.kt b/app/src/main/java/com/pocket_plan/j7_003/data/shoppinglist/MultiShoppingFr.kt
@@ -23,9 +23,9 @@ import com.pocket_plan.j7_003.data.settings.SettingId
 import com.pocket_plan.j7_003.data.settings.SettingsManager
 import kotlinx.android.synthetic.main.dialog_add_item.view.*
 import kotlinx.android.synthetic.main.dialog_add_shopping_list.view.*
+import kotlinx.android.synthetic.main.drawer_layout.*
 import kotlinx.android.synthetic.main.fragment_multi_shopping.*
 import kotlinx.android.synthetic.main.fragment_multi_shopping.view.*
-import kotlinx.android.synthetic.main.drawer_layout.*
 import kotlinx.android.synthetic.main.title_dialog.view.*
 import java.util.*
 import kotlin.collections.ArrayDeque
@@ -51,7 +51,6 @@ class MultiShoppingFr : Fragment() {
     var deletedItems = ArrayList<ArrayDeque<ShoppingItem?>>()
     var activeDeletedItems = ArrayDeque<ShoppingItem?>()
 
-    lateinit var shoppingListWrapper: ShoppingListWrapper
     lateinit var shoppingFragments: ArrayList<ShoppingFr>
     private var currentpos = 0
     private lateinit var activeShoppingFr: ShoppingFr
@@ -77,7 +76,6 @@ class MultiShoppingFr : Fragment() {
         savedInstanceState: Bundle?
     ): View? {
         myActivity = activity as MainActivity
-        shoppingListWrapper = MainActivity.shoppingListWrapper
 
         //reset parameters when fragment is opened again
         shoppingFragments = ArrayList()
@@ -137,20 +135,20 @@ class MultiShoppingFr : Fragment() {
     }
 
     private fun updateTabs() {
-        if (shoppingListWrapper.size == 1) {
+        if (MainActivity.shoppingListWrapper.size == 1) {
             tabLayout.visibility = View.GONE
         } else {
             tabLayout.visibility = View.VISIBLE
         }
         tabLayout.removeAllTabs()
-        shoppingListWrapper.forEach {
+        MainActivity.shoppingListWrapper.forEach {
             tabLayout.addTab(tabLayout.newTab().setText(it.first))
         }
     }
     //initialize all necessary fragments
     private fun initializeShoppingFragments() {
         val isEmpty = deletedItems.isEmpty()
-        shoppingListWrapper.forEach {
+        MainActivity.shoppingListWrapper.forEach {
             val newFr = createShoppingFrInstance(listName = it.first, shoppingList = it.second)
             shoppingFragments.add(newFr)
 
@@ -253,20 +251,20 @@ class MultiShoppingFr : Fragment() {
         myAlertDialog?.show()
 
         //show current name
-        val oldName = shoppingListWrapper[currentpos].first
+        val oldName = MainActivity.shoppingListWrapper[currentpos].first
         myDialogView.etAddShoppingList.setText(oldName)
 
         myDialogView.btnAddShoppingList.setOnClickListener {
 
             val newName = myDialogView.etAddShoppingList.text.toString()
-            val taken = shoppingListWrapper.contains(newName)
+            val taken = MainActivity.shoppingListWrapper.contains(newName)
             if (newName.trim() == "" || taken) {
                 val animationShake =
                     AnimationUtils.loadAnimation(myActivity, R.anim.shake)
                 myDialogView.etAddShoppingList.startAnimation(animationShake)
                 return@setOnClickListener
             }
-            shoppingListWrapper.rename(oldName, newName)
+            MainActivity.shoppingListWrapper.rename(oldName, newName)
             activeShoppingFr.shoppingListName = newName
             tabLayout.getTabAt(currentpos)?.text = newName
             myAlertDialog?.dismiss()
@@ -297,15 +295,15 @@ class MultiShoppingFr : Fragment() {
 
         myDialogView.btnAddShoppingList.setOnClickListener {
             val newName = myDialogView.etAddShoppingList.text.toString()
-            val addResult = shoppingListWrapper.add(newName)
+            val addResult = MainActivity.shoppingListWrapper.add(newName)
             if (newName.trim() == "" || !addResult) {
                 val animationShake =
                     AnimationUtils.loadAnimation(myActivity, R.anim.shake)
                 myDialogView!!.etAddShoppingList.startAnimation(animationShake)
                 return@setOnClickListener
             }
 
-            val newFr = createShoppingFrInstance(newName, shoppingListWrapper.getListByName(newName)!!)
+            val newFr = createShoppingFrInstance(newName, MainActivity.shoppingListWrapper.getListByName(newName)!!)
             shoppingFragments.add(newFr)
 
             deletedItems.add(ArrayDeque())
@@ -314,7 +312,7 @@ class MultiShoppingFr : Fragment() {
             tabLayout.visibility = View.VISIBLE
 
             shoppingPager.adapter = ScreenSlidePagerAdapter(myActivity)
-            shoppingPager.currentItem = shoppingListWrapper.size - 1
+            shoppingPager.currentItem = MainActivity.shoppingListWrapper.size - 1
             myAlertDialog?.dismiss()
         }
 
@@ -333,12 +331,12 @@ class MultiShoppingFr : Fragment() {
             R.id.item_shopping_delete_list -> {
                 val titleId = R.string.shoppingDialogDeleteTitle
                 val action: () -> Unit = {
-                    shoppingListWrapper.remove(activeShoppingFr.shoppingListName)
+                    MainActivity.shoppingListWrapper.remove(activeShoppingFr.shoppingListName)
                     shoppingFragments.remove(activeShoppingFr)
                     shoppingPager.adapter = ScreenSlidePagerAdapter(myActivity)
                     //This automatically selects the tab left of the deleted tab
                     tabLayout.removeTabAt(currentpos)
-                    if (shoppingListWrapper.size == 1) {
+                    if (MainActivity.shoppingListWrapper.size == 1) {
                         tabLayout.visibility = View.GONE
                     }
                 }
@@ -559,8 +557,11 @@ class MultiShoppingFr : Fragment() {
                 spCategory.tag = categoryToSet
                 spCategory.setSelection(categoryToSet)
 
-                spItemUnit.tag = unitToSet
-                spItemUnit.setSelection(unitToSet)
+                //select unit depending on text change (user or regular template)
+                if(!unitChanged){
+                    spItemUnit.tag = unitToSet
+                    spItemUnit.setSelection(unitToSet)
+                }
 
             }
 
@@ -688,7 +689,7 @@ class MultiShoppingFr : Fragment() {
                 updateShoppingMenu()
             } else {
                 //handling adding in home
-                shoppingListWrapper[0].second.add(item)
+                MainActivity.shoppingListWrapper[0].second.add(item)
                 Toast.makeText(
                     myActivity,
                     myActivity.getString(R.string.shoppingNotificationItemAdded),
@@ -769,6 +770,7 @@ class MultiShoppingFr : Fragment() {
             .indexOf(item.suggestedUnit)
 
         addItemDialogView!!.spItemUnit.tag = unitIndex
+        //Select correct unit when opening dialog for edit
         addItemDialogView!!.spItemUnit.setSelection(unitIndex)
 
         unitChanged = false
@@ -852,7 +854,7 @@ class MultiShoppingFr : Fragment() {
     }
 
     private fun updateDeleteListIcon() {
-        myMenu.findItem(R.id.item_shopping_delete_list)?.isVisible = shoppingListWrapper.size > 1
+        myMenu.findItem(R.id.item_shopping_delete_list)?.isVisible = MainActivity.shoppingListWrapper.size > 1
     }
 
     private fun updateRemoveChecked() {
@@ -877,7 +879,7 @@ class MultiShoppingFr : Fragment() {
 
 
     private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) : FragmentStateAdapter(fa) {
-        override fun getItemCount(): Int = shoppingListWrapper.size
+        override fun getItemCount(): Int = MainActivity.shoppingListWrapper.size
 
         override fun createFragment(position: Int): Fragment {
             return this@MultiShoppingFr.shoppingFragments[position]

diff --git a/app/src/main/java/com/pocket_plan/j7_003/data/todolist/TodoFr.kt b/app/src/main/java/com/pocket_plan/j7_003/data/todolist/TodoFr.kt
@@ -530,6 +530,13 @@ class TodoTaskAdapter(activity: MainActivity, var myFragment: TodoFr) :
                 myDialogView.btnConfirm3
             )
 
+            myDialogView.etTitleAddTask.setOnKeyListener { _, keyCode, event ->
+                if (keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_DOWN) {
+                    taskConfirmButtons[listInstance.getTask(holder.bindingAdapterPosition).priority-1].performClick()
+                    true
+                } else false
+            }
+
             //Three buttons to create tasks with priorities 1-3
             taskConfirmButtons.forEachIndexed { index, button ->
                 button.setOnClickListener Button@{

diff --git a/app/src/main/java/com/pocket_plan/j7_003/system_interaction/receiver/NotificationReceiver.kt b/app/src/main/java/com/pocket_plan/j7_003/system_interaction/receiver/NotificationReceiver.kt
@@ -5,16 +5,15 @@ import android.content.Context
 import android.content.Intent
 import com.jakewharton.threetenabp.AndroidThreeTen
 import com.pocket_plan.j7_003.R
-import com.pocket_plan.j7_003.data.sleepreminder.SleepReminder
-import com.pocket_plan.j7_003.system_interaction.handler.notifications.NotificationHandler
 import com.pocket_plan.j7_003.data.birthdaylist.Birthday
 import com.pocket_plan.j7_003.data.birthdaylist.BirthdayList
 import com.pocket_plan.j7_003.data.settings.SettingId
 import com.pocket_plan.j7_003.data.settings.SettingsManager
+import com.pocket_plan.j7_003.data.sleepreminder.SleepReminder
 import com.pocket_plan.j7_003.system_interaction.handler.notifications.AlarmHandler
+import com.pocket_plan.j7_003.system_interaction.handler.notifications.NotificationHandler
 import com.pocket_plan.j7_003.system_interaction.handler.storage.StorageHandler
 import org.threeten.bp.LocalDate
-import kotlin.collections.ArrayList
 
 
 class NotificationReceiver : BroadcastReceiver() {
@@ -120,7 +119,7 @@ class NotificationReceiver : BroadcastReceiver() {
         NotificationHandler.createNotification(
             "Birthday Notification", context.resources.getString(R.string.birthdayNotificationTitleUpc),
             101, context.resources.getString(R.string.birthdayNotificationTitleUpc),
-            context.resources.getString(R.string.birthdayNotificationSingleUpcText, birthday.name, birthday.daysToRemind),
+            context.resources.getString(R.string.birthdayNotificationSingleUpcText, birthday.name, birthday.daysToRemind, context.resources.getQuantityString(R.plurals.dayIn, birthday.daysToRemind)),
             R.drawable.ic_action_birthday, "birthdays", context
         )
     }

diff --git a/app/src/main/res/layout/fragment_settings_notes.xml b/app/src/main/res/layout/fragment_settings_notes.xml
@@ -140,7 +140,6 @@
                     android:layout_height="wrap_content"
                     android:textColor="?attr/colorHint"
                     android:textSize="@dimen/font_size_small"
-                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvNoteEditorFontSize"
                     />
@@ -151,7 +150,6 @@
                     android:layout_height="wrap_content"
                     android:text="@string/settingsAppearanceSampleText"
                     android:textColor="?attr/colorOnBackGround"
-                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 

diff --git a/app/src/main/res/layout/row_note.xml b/app/src/main/res/layout/row_note.xml
@@ -54,8 +54,10 @@
                 android:layout_below="@+id/tvNoteTitle"
                 android:background="@android:color/transparent"
                 android:fontFamily="sans-serif"
-                android:padding="10dp"
                 android:textColor="?attr/colorOnBackGroundTask"
+                android:paddingHorizontal="10dp"
+                android:paddingBottom="10dp"
+                android:paddingTop="6dp"
                 app:layout_constraintTop_toBottomOf="@id/tvNoteTitle"
                 app:layout_constraintStart_toStartOf="parent"
                 android:textSize="@dimen/font_size_small" />
@@ -73,9 +75,5 @@
                 app:layout_constraintTop_toTopOf="@+id/icon_folder" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-
-
     </androidx.cardview.widget.CardView>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -22,7 +22,7 @@
     <string name="birthdayNotificationMultText">Heute haben %1$d Leute Geburtstag!</string>
     <string name="birthdayNotificationMultUpcText">%1$d Geburtstage stehen bevor!</string>
     <string name="birthdayNotificationSingleText">Heute hat %1$s Geburtstag!</string>
-    <string name="birthdayNotificationSingleUpcText">In %2$d Tagen hat %1$s Geburtstag!</string>
+    <string name="birthdayNotificationSingleUpcText">In %2$d %3$s hat %1$s Geburtstag!</string>
     <string name="birthdayNotificationTitle">Geburtstage</string>
     <string name="birthdayNotificationTitleUpc">Bevorstehende Geburtstage</string>
     <string name="birthdayOldBornIn">" alt, geboren "</string>
@@ -120,7 +120,7 @@
     <string name="settingsAppearanceResetHint">Deine Daten wie Notizen usw. werden dabei nicht gelöscht.</string>
     <string name="settingsAppearanceResetTitle">Alle Einstellungen zurücksetzen?</string>
     <string name="settingsAppearanceResetToDefault">Alle Einstellungen zurücksetzen</string>
-    <string name="settingsAppearanceSampleText">Beispiel Text</string>
+    <string name="settingsAppearanceSampleText">Beispiel</string>
     <string name="settingsAppearanceShakeHomeExplanation">Wenn es eine oder mehr Aufgaben mit Priorität 1 gibt, bewegt sich das Aufgaben Icon, sobald du das Home Panel öffnest.</string>
     <string name="settingsAppearanceShakeTask">Animation für Todo-Erinnerung in Home</string>
     <string name="settingsAppearanceShapes">Formen</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -20,7 +20,7 @@
     <string name="birthdayNotificationMultText" tools:ignore="PluralsCandidate">¡Hoy hay %1$d cumpleaños!</string>
     <string name="birthdayNotificationMultUpcText">¡Se acercan %1$d cumpleaños!</string>
     <string name="birthdayNotificationSingleText">¡Es el cumpleaños de %1$s!</string>
-    <string name="birthdayNotificationSingleUpcText">¡El cumpleaños de %1$s se acerca en %2$d días!</string>
+    <string name="birthdayNotificationSingleUpcText">¡El cumpleaños de %1$s se acerca en %2$d %3$s!</string>
     <string name="birthdayNotificationTitle">Cumpleaños</string>
     <string name="birthdayNotificationTitleUpc">Próximos cumpleaños</string>
     <string name="birthdayOldBornIn">" viejo, nacido en "</string>
@@ -108,7 +108,7 @@
     <string name="settingsAppearanceResetHint">Esto no borrará ninguno de tus datos, como las notas, etc.</string>
     <string name="settingsAppearanceResetTitle">¿Restablecer todos los ajustes por defecto?</string>
     <string name="settingsAppearanceResetToDefault">Restablecer todos los ajustes por defecto</string>
-    <string name="settingsAppearanceSampleText">Texto de ejemplo</string>
+    <string name="settingsAppearanceSampleText">Ejemplo</string>
     <string name="settingsAppearanceShakeHomeExplanation">Si hay 1 o más tareas con prioridad 1, el icono de la tarea se moverá cada vez que abra el panel de inicio.</string>
     <string name="settingsAppearanceShakeTask">Agitar el recordatorio de la tarea en casa</string>
     <string name="settingsAppearanceShapes">Formas</string>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -20,7 +20,7 @@
     <string name="birthdayNotificationMultText" tools:ignore="PluralsCandidate">Il y a %1$d anniversaires aujourd\'hui !</string>
     <string name="birthdayNotificationMultUpcText">%1$d anniversaires sont à venir !</string>
     <string name="birthdayNotificationSingleText">C\'est l\'anniversaire de %1$s !</string>
-    <string name="birthdayNotificationSingleUpcText">L\'anniversaire de %1$s arrive dans %2$d jours !</string>
+    <string name="birthdayNotificationSingleUpcText">L\'anniversaire de %1$s arrive dans %2$d %3$s!</string>
     <string name="birthdayNotificationTitle">Anniversaires</string>
     <string name="birthdayNotificationTitleUpc">Anniversaires à venir</string>
     <string name="birthdayOldBornIn">âgé de ", né en "</string>
@@ -108,7 +108,7 @@
     <string name="settingsAppearanceResetHint">Cela ne supprimera aucune de vos données, comme vos notes, etc.</string>
     <string name="settingsAppearanceResetTitle">Réinitialiser tous les paramètres par défaut ?</string>
     <string name="settingsAppearanceResetToDefault">Réinitialiser tous les paramètres par défaut</string>
-    <string name="settingsAppearanceSampleText">Exemple de texte</string>
+    <string name="settingsAppearanceSampleText">Exemple</string>
     <string name="settingsAppearanceShakeHomeExplanation">S\'il y a une ou plusieurs tâches de priorité 1, l\'icône de la tâche se déplace lorsque vous ouvrez le panneau d\'accueil.</string>
     <string name="settingsAppearanceShakeTask">Secouer le rappel de tâche dans le panneau d\'accueil</string>
     <string name="settingsAppearanceShapes">Formes</string>