Skip to content

Commit cf29f58

Browse files
mvnowakmvnowak
authored
Merge pull request #40 from estep248/dev
Dev
2 parents 1e8611f + 559909e commit cf29f58

File tree

14 files changed

+52
-54
lines changed

14 files changed

+52
-54
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ android {
1111
minSdkVersion 23
1212
targetSdkVersion 30
1313

14-
versionCode 35
15-
versionName "1.3.5"
14+
versionCode 36
15+
versionName "1.3.6"
1616

1717

1818
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

‎app/src/main/java/com/pocket_plan/j7_003/data/notelist/NoteFr.kt‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import kotlinx.android.synthetic.main.fragment_note.view.*
2929
import kotlinx.android.synthetic.main.row_note.view.*
3030
import kotlinx.android.synthetic.main.title_dialog.view.*
3131
import java.util.*
32-
import kotlin.collections.ArrayList
3332
import kotlin.properties.Delegates
3433
import kotlin.random.Random
3534

@@ -342,12 +341,11 @@ class NoteFr : Fragment() {
342341
myDialogView!!.etAddNoteFolder.startAnimation(animationShake)
343342
return@setOnClickListener
344343
}
345-
val moveMessage =
346-
when (noteListDirs.moveDir(editFolder, spFolderPaths.selectedItemPosition)) {
347-
true -> getString(R.string.notesToastFolderMoved)
348-
else -> getString(R.string.notesCantMove)
344+
if(spFolderPaths.selectedItemPosition != currentParentFolderIndex){
345+
if (noteListDirs.moveDir(editFolder, spFolderPaths.selectedItemPosition)){
346+
myActivity.toast(getString(R.string.notesToastFolderMoved))
349347
}
350-
myActivity.toast(moveMessage)
348+
}
351349
myAdapter.notifyDataSetChanged()
352350
//reload title, current folder has been edited
353351
myActivity.setToolbarTitle(noteListDirs.getCurrentPathName(getString(R.string.menuTitleNotes)))
@@ -714,14 +712,10 @@ class NoteAdapter(mainActivity: MainActivity, noteFr: NoteFr) :
714712
containingList.removeAt(noteIndex)
715713
containingList.add(0, currentNote)
716714
}
715+
myNoteFr.noteListDirs.adjustStackAbove(currentNote)
717716

718717
NoteFr.editNoteHolder = currentNote
719718

720-
// notePosition = myNoteFr.noteListDirs.currentList().indexOf(currentNote)
721-
722-
// PreferenceManager.getDefaultSharedPreferences(myActivity)
723-
// .edit().putBoolean("editingNote", true).apply()
724-
725719
myActivity.changeToFragment(FT.NOTE_EDITOR) as NoteEditorFr
726720
myActivity.hideKeyboard()
727721
}

‎app/src/main/java/com/pocket_plan/j7_003/data/shoppinglist/MultiShoppingFr.kt‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import com.pocket_plan.j7_003.data.settings.SettingId
2323
import com.pocket_plan.j7_003.data.settings.SettingsManager
2424
import kotlinx.android.synthetic.main.dialog_add_item.view.*
2525
import kotlinx.android.synthetic.main.dialog_add_shopping_list.view.*
26+
import kotlinx.android.synthetic.main.drawer_layout.*
2627
import kotlinx.android.synthetic.main.fragment_multi_shopping.*
2728
import kotlinx.android.synthetic.main.fragment_multi_shopping.view.*
28-
import kotlinx.android.synthetic.main.drawer_layout.*
2929
import kotlinx.android.synthetic.main.title_dialog.view.*
3030
import java.util.*
3131
import kotlin.collections.ArrayDeque
@@ -51,7 +51,6 @@ class MultiShoppingFr : Fragment() {
5151
var deletedItems = ArrayList<ArrayDeque<ShoppingItem?>>()
5252
var activeDeletedItems = ArrayDeque<ShoppingItem?>()
5353

54-
lateinit var shoppingListWrapper: ShoppingListWrapper
5554
lateinit var shoppingFragments: ArrayList<ShoppingFr>
5655
private var currentpos = 0
5756
private lateinit var activeShoppingFr: ShoppingFr
@@ -77,7 +76,6 @@ class MultiShoppingFr : Fragment() {
7776
savedInstanceState: Bundle?
7877
): View? {
7978
myActivity = activity as MainActivity
80-
shoppingListWrapper = MainActivity.shoppingListWrapper
8179

8280
//reset parameters when fragment is opened again
8381
shoppingFragments = ArrayList()
@@ -137,20 +135,20 @@ class MultiShoppingFr : Fragment() {
137135
}
138136

139137
private fun updateTabs() {
140-
if (shoppingListWrapper.size == 1) {
138+
if (MainActivity.shoppingListWrapper.size == 1) {
141139
tabLayout.visibility = View.GONE
142140
} else {
143141
tabLayout.visibility = View.VISIBLE
144142
}
145143
tabLayout.removeAllTabs()
146-
shoppingListWrapper.forEach {
144+
MainActivity.shoppingListWrapper.forEach {
147145
tabLayout.addTab(tabLayout.newTab().setText(it.first))
148146
}
149147
}
150148
//initialize all necessary fragments
151149
private fun initializeShoppingFragments() {
152150
val isEmpty = deletedItems.isEmpty()
153-
shoppingListWrapper.forEach {
151+
MainActivity.shoppingListWrapper.forEach {
154152
val newFr = createShoppingFrInstance(listName = it.first, shoppingList = it.second)
155153
shoppingFragments.add(newFr)
156154

@@ -253,20 +251,20 @@ class MultiShoppingFr : Fragment() {
253251
myAlertDialog?.show()
254252

255253
//show current name
256-
val oldName = shoppingListWrapper[currentpos].first
254+
val oldName = MainActivity.shoppingListWrapper[currentpos].first
257255
myDialogView.etAddShoppingList.setText(oldName)
258256

259257
myDialogView.btnAddShoppingList.setOnClickListener {
260258

261259
val newName = myDialogView.etAddShoppingList.text.toString()
262-
val taken = shoppingListWrapper.contains(newName)
260+
val taken = MainActivity.shoppingListWrapper.contains(newName)
263261
if (newName.trim() == "" || taken) {
264262
val animationShake =
265263
AnimationUtils.loadAnimation(myActivity, R.anim.shake)
266264
myDialogView.etAddShoppingList.startAnimation(animationShake)
267265
return@setOnClickListener
268266
}
269-
shoppingListWrapper.rename(oldName, newName)
267+
MainActivity.shoppingListWrapper.rename(oldName, newName)
270268
activeShoppingFr.shoppingListName = newName
271269
tabLayout.getTabAt(currentpos)?.text = newName
272270
myAlertDialog?.dismiss()
@@ -297,15 +295,15 @@ class MultiShoppingFr : Fragment() {
297295

298296
myDialogView.btnAddShoppingList.setOnClickListener {
299297
val newName = myDialogView.etAddShoppingList.text.toString()
300-
val addResult = shoppingListWrapper.add(newName)
298+
val addResult = MainActivity.shoppingListWrapper.add(newName)
301299
if (newName.trim() == "" || !addResult) {
302300
val animationShake =
303301
AnimationUtils.loadAnimation(myActivity, R.anim.shake)
304302
myDialogView!!.etAddShoppingList.startAnimation(animationShake)
305303
return@setOnClickListener
306304
}
307305

308-
val newFr = createShoppingFrInstance(newName, shoppingListWrapper.getListByName(newName)!!)
306+
val newFr = createShoppingFrInstance(newName, MainActivity.shoppingListWrapper.getListByName(newName)!!)
309307
shoppingFragments.add(newFr)
310308

311309
deletedItems.add(ArrayDeque())
@@ -314,7 +312,7 @@ class MultiShoppingFr : Fragment() {
314312
tabLayout.visibility = View.VISIBLE
315313

316314
shoppingPager.adapter = ScreenSlidePagerAdapter(myActivity)
317-
shoppingPager.currentItem = shoppingListWrapper.size - 1
315+
shoppingPager.currentItem = MainActivity.shoppingListWrapper.size - 1
318316
myAlertDialog?.dismiss()
319317
}
320318

@@ -333,12 +331,12 @@ class MultiShoppingFr : Fragment() {
333331
R.id.item_shopping_delete_list -> {
334332
val titleId = R.string.shoppingDialogDeleteTitle
335333
val action: () -> Unit = {
336-
shoppingListWrapper.remove(activeShoppingFr.shoppingListName)
334+
MainActivity.shoppingListWrapper.remove(activeShoppingFr.shoppingListName)
337335
shoppingFragments.remove(activeShoppingFr)
338336
shoppingPager.adapter = ScreenSlidePagerAdapter(myActivity)
339337
//This automatically selects the tab left of the deleted tab
340338
tabLayout.removeTabAt(currentpos)
341-
if (shoppingListWrapper.size == 1) {
339+
if (MainActivity.shoppingListWrapper.size == 1) {
342340
tabLayout.visibility = View.GONE
343341
}
344342
}
@@ -559,8 +557,11 @@ class MultiShoppingFr : Fragment() {
559557
spCategory.tag = categoryToSet
560558
spCategory.setSelection(categoryToSet)
561559

562-
spItemUnit.tag = unitToSet
563-
spItemUnit.setSelection(unitToSet)
560+
//select unit depending on text change (user or regular template)
561+
if(!unitChanged){
562+
spItemUnit.tag = unitToSet
563+
spItemUnit.setSelection(unitToSet)
564+
}
564565

565566
}
566567

@@ -688,7 +689,7 @@ class MultiShoppingFr : Fragment() {
688689
updateShoppingMenu()
689690
} else {
690691
//handling adding in home
691-
shoppingListWrapper[0].second.add(item)
692+
MainActivity.shoppingListWrapper[0].second.add(item)
692693
Toast.makeText(
693694
myActivity,
694695
myActivity.getString(R.string.shoppingNotificationItemAdded),
@@ -769,6 +770,7 @@ class MultiShoppingFr : Fragment() {
769770
.indexOf(item.suggestedUnit)
770771

771772
addItemDialogView!!.spItemUnit.tag = unitIndex
773+
//Select correct unit when opening dialog for edit
772774
addItemDialogView!!.spItemUnit.setSelection(unitIndex)
773775

774776
unitChanged = false
@@ -852,7 +854,7 @@ class MultiShoppingFr : Fragment() {
852854
}
853855

854856
private fun updateDeleteListIcon() {
855-
myMenu.findItem(R.id.item_shopping_delete_list)?.isVisible = shoppingListWrapper.size > 1
857+
myMenu.findItem(R.id.item_shopping_delete_list)?.isVisible = MainActivity.shoppingListWrapper.size > 1
856858
}
857859

858860
private fun updateRemoveChecked() {
@@ -877,7 +879,7 @@ class MultiShoppingFr : Fragment() {
877879

878880

879881
private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) : FragmentStateAdapter(fa) {
880-
override fun getItemCount(): Int = shoppingListWrapper.size
882+
override fun getItemCount(): Int = MainActivity.shoppingListWrapper.size
881883

882884
override fun createFragment(position: Int): Fragment {
883885
return this@MultiShoppingFr.shoppingFragments[position]

‎app/src/main/java/com/pocket_plan/j7_003/data/todolist/TodoFr.kt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,13 @@ class TodoTaskAdapter(activity: MainActivity, var myFragment: TodoFr) :
530530
myDialogView.btnConfirm3
531531
)
532532

533+
myDialogView.etTitleAddTask.setOnKeyListener { _, keyCode, event ->
534+
if (keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_DOWN) {
535+
taskConfirmButtons[listInstance.getTask(holder.bindingAdapterPosition).priority-1].performClick()
536+
true
537+
} else false
538+
}
539+
533540
//Three buttons to create tasks with priorities 1-3
534541
taskConfirmButtons.forEachIndexed { index, button ->
535542
button.setOnClickListener Button@{

‎app/src/main/java/com/pocket_plan/j7_003/system_interaction/receiver/NotificationReceiver.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@ import android.content.Context
55
import android.content.Intent
66
import com.jakewharton.threetenabp.AndroidThreeTen
77
import com.pocket_plan.j7_003.R
8-
import com.pocket_plan.j7_003.data.sleepreminder.SleepReminder
9-
import com.pocket_plan.j7_003.system_interaction.handler.notifications.NotificationHandler
108
import com.pocket_plan.j7_003.data.birthdaylist.Birthday
119
import com.pocket_plan.j7_003.data.birthdaylist.BirthdayList
1210
import com.pocket_plan.j7_003.data.settings.SettingId
1311
import com.pocket_plan.j7_003.data.settings.SettingsManager
12+
import com.pocket_plan.j7_003.data.sleepreminder.SleepReminder
1413
import com.pocket_plan.j7_003.system_interaction.handler.notifications.AlarmHandler
14+
import com.pocket_plan.j7_003.system_interaction.handler.notifications.NotificationHandler
1515
import com.pocket_plan.j7_003.system_interaction.handler.storage.StorageHandler
1616
import org.threeten.bp.LocalDate
17-
import kotlin.collections.ArrayList
1817

1918

2019
class NotificationReceiver : BroadcastReceiver() {
@@ -120,7 +119,7 @@ class NotificationReceiver : BroadcastReceiver() {
120119
NotificationHandler.createNotification(
121120
"Birthday Notification", context.resources.getString(R.string.birthdayNotificationTitleUpc),
122121
101, context.resources.getString(R.string.birthdayNotificationTitleUpc),
123-
context.resources.getString(R.string.birthdayNotificationSingleUpcText, birthday.name, birthday.daysToRemind),
122+
context.resources.getString(R.string.birthdayNotificationSingleUpcText, birthday.name, birthday.daysToRemind, context.resources.getQuantityString(R.plurals.dayIn, birthday.daysToRemind)),
124123
R.drawable.ic_action_birthday, "birthdays", context
125124
)
126125
}

‎app/src/main/res/layout/fragment_settings_notes.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@
140140
android:layout_height="wrap_content"
141141
android:textColor="?attr/colorHint"
142142
android:textSize="@dimen/font_size_small"
143-
app:layout_constraintBottom_toBottomOf="parent"
144143
app:layout_constraintStart_toStartOf="parent"
145144
app:layout_constraintTop_toBottomOf="@id/tvNoteEditorFontSize"
146145
/>
@@ -151,7 +150,6 @@
151150
android:layout_height="wrap_content"
152151
android:text="@string/settingsAppearanceSampleText"
153152
android:textColor="?attr/colorOnBackGround"
154-
app:layout_constraintBottom_toBottomOf="parent"
155153
app:layout_constraintEnd_toEndOf="parent"
156154
app:layout_constraintTop_toTopOf="parent" />
157155

‎app/src/main/res/layout/row_note.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,10 @@
5454
android:layout_below="@+id/tvNoteTitle"
5555
android:background="@android:color/transparent"
5656
android:fontFamily="sans-serif"
57-
android:padding="10dp"
5857
android:textColor="?attr/colorOnBackGroundTask"
58+
android:paddingHorizontal="10dp"
59+
android:paddingBottom="10dp"
60+
android:paddingTop="6dp"
5961
app:layout_constraintTop_toBottomOf="@id/tvNoteTitle"
6062
app:layout_constraintStart_toStartOf="parent"
6163
android:textSize="@dimen/font_size_small" />
@@ -73,9 +75,5 @@
7375
app:layout_constraintTop_toTopOf="@+id/icon_folder" />
7476

7577
</androidx.constraintlayout.widget.ConstraintLayout>
76-
77-
78-
79-
8078
</androidx.cardview.widget.CardView>
8179
</androidx.cardview.widget.CardView>

‎app/src/main/res/values-de/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<string name="birthdayNotificationMultText">Heute haben %1$d Leute Geburtstag!</string>
2323
<string name="birthdayNotificationMultUpcText">%1$d Geburtstage stehen bevor!</string>
2424
<string name="birthdayNotificationSingleText">Heute hat %1$s Geburtstag!</string>
25-
<string name="birthdayNotificationSingleUpcText">In %2$d Tagen hat %1$s Geburtstag!</string>
25+
<string name="birthdayNotificationSingleUpcText">In %2$d %3$s hat %1$s Geburtstag!</string>
2626
<string name="birthdayNotificationTitle">Geburtstage</string>
2727
<string name="birthdayNotificationTitleUpc">Bevorstehende Geburtstage</string>
2828
<string name="birthdayOldBornIn">" alt, geboren "</string>
@@ -120,7 +120,7 @@
120120
<string name="settingsAppearanceResetHint">Deine Daten wie Notizen usw. werden dabei nicht gelöscht.</string>
121121
<string name="settingsAppearanceResetTitle">Alle Einstellungen zurücksetzen?</string>
122122
<string name="settingsAppearanceResetToDefault">Alle Einstellungen zurücksetzen</string>
123-
<string name="settingsAppearanceSampleText">Beispiel Text</string>
123+
<string name="settingsAppearanceSampleText">Beispiel</string>
124124
<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>
125125
<string name="settingsAppearanceShakeTask">Animation für Todo-Erinnerung in Home</string>
126126
<string name="settingsAppearanceShapes">Formen</string>

‎app/src/main/res/values-es/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<string name="birthdayNotificationMultText" tools:ignore="PluralsCandidate">¡Hoy hay %1$d cumpleaños!</string>
2121
<string name="birthdayNotificationMultUpcText">¡Se acercan %1$d cumpleaños!</string>
2222
<string name="birthdayNotificationSingleText">¡Es el cumpleaños de %1$s!</string>
23-
<string name="birthdayNotificationSingleUpcText">¡El cumpleaños de %1$s se acerca en %2$d días!</string>
23+
<string name="birthdayNotificationSingleUpcText">¡El cumpleaños de %1$s se acerca en %2$d %3$s!</string>
2424
<string name="birthdayNotificationTitle">Cumpleaños</string>
2525
<string name="birthdayNotificationTitleUpc">Próximos cumpleaños</string>
2626
<string name="birthdayOldBornIn">" viejo, nacido en "</string>
@@ -108,7 +108,7 @@
108108
<string name="settingsAppearanceResetHint">Esto no borrará ninguno de tus datos, como las notas, etc.</string>
109109
<string name="settingsAppearanceResetTitle">¿Restablecer todos los ajustes por defecto?</string>
110110
<string name="settingsAppearanceResetToDefault">Restablecer todos los ajustes por defecto</string>
111-
<string name="settingsAppearanceSampleText">Texto de ejemplo</string>
111+
<string name="settingsAppearanceSampleText">Ejemplo</string>
112112
<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>
113113
<string name="settingsAppearanceShakeTask">Agitar el recordatorio de la tarea en casa</string>
114114
<string name="settingsAppearanceShapes">Formas</string>

‎app/src/main/res/values-fr/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<string name="birthdayNotificationMultText" tools:ignore="PluralsCandidate">Il y a %1$d anniversaires aujourd\'hui !</string>
2121
<string name="birthdayNotificationMultUpcText">%1$d anniversaires sont à venir !</string>
2222
<string name="birthdayNotificationSingleText">C\'est l\'anniversaire de %1$s !</string>
23-
<string name="birthdayNotificationSingleUpcText">L\'anniversaire de %1$s arrive dans %2$d jours !</string>
23+
<string name="birthdayNotificationSingleUpcText">L\'anniversaire de %1$s arrive dans %2$d %3$s!</string>
2424
<string name="birthdayNotificationTitle">Anniversaires</string>
2525
<string name="birthdayNotificationTitleUpc">Anniversaires à venir</string>
2626
<string name="birthdayOldBornIn">âgé de ", né en "</string>
@@ -108,7 +108,7 @@
108108
<string name="settingsAppearanceResetHint">Cela ne supprimera aucune de vos données, comme vos notes, etc.</string>
109109
<string name="settingsAppearanceResetTitle">Réinitialiser tous les paramètres par défaut ?</string>
110110
<string name="settingsAppearanceResetToDefault">Réinitialiser tous les paramètres par défaut</string>
111-
<string name="settingsAppearanceSampleText">Exemple de texte</string>
111+
<string name="settingsAppearanceSampleText">Exemple</string>
112112
<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>
113113
<string name="settingsAppearanceShakeTask">Secouer le rappel de tâche dans le panneau d\'accueil</string>
114114
<string name="settingsAppearanceShapes">Formes</string>

0 commit comments

Comments
 (0)