mirror of https://github.com/iSoron/uhabits.git
sgallese
4 years ago
commit
b870dd85f4
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.2 KiB |
@ -0,0 +1,116 @@
|
|||||||
|
package org.isoron.uhabits.activities.common.dialogs
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import android.graphics.Typeface
|
||||||
|
import android.view.LayoutInflater
|
||||||
|
import android.view.View
|
||||||
|
import android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
|
||||||
|
import android.widget.Button
|
||||||
|
import androidx.appcompat.app.AlertDialog
|
||||||
|
import org.isoron.platform.gui.toInt
|
||||||
|
import org.isoron.uhabits.R
|
||||||
|
import org.isoron.uhabits.core.models.Entry.Companion.NO
|
||||||
|
import org.isoron.uhabits.core.models.Entry.Companion.SKIP
|
||||||
|
import org.isoron.uhabits.core.models.Entry.Companion.UNKNOWN
|
||||||
|
import org.isoron.uhabits.core.models.Entry.Companion.YES_AUTO
|
||||||
|
import org.isoron.uhabits.core.models.Entry.Companion.YES_MANUAL
|
||||||
|
import org.isoron.uhabits.core.models.PaletteColor
|
||||||
|
import org.isoron.uhabits.core.preferences.Preferences
|
||||||
|
import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior
|
||||||
|
import org.isoron.uhabits.core.ui.views.Theme
|
||||||
|
import org.isoron.uhabits.databinding.CheckmarkDialogBinding
|
||||||
|
import org.isoron.uhabits.inject.ActivityContext
|
||||||
|
import org.isoron.uhabits.utils.InterfaceUtils
|
||||||
|
import org.isoron.uhabits.utils.StyledResources
|
||||||
|
import javax.inject.Inject
|
||||||
|
|
||||||
|
class CheckmarkDialog
|
||||||
|
@Inject constructor(
|
||||||
|
@ActivityContext private val context: Context,
|
||||||
|
private val preferences: Preferences,
|
||||||
|
) : View.OnClickListener {
|
||||||
|
|
||||||
|
private lateinit var binding: CheckmarkDialogBinding
|
||||||
|
private lateinit var fontAwesome: Typeface
|
||||||
|
private val allButtons = mutableListOf<Button>()
|
||||||
|
private var selectedButton: Button? = null
|
||||||
|
|
||||||
|
fun create(
|
||||||
|
value: Int,
|
||||||
|
notes: String,
|
||||||
|
dateString: String,
|
||||||
|
paletteColor: PaletteColor,
|
||||||
|
callback: ListHabitsBehavior.CheckMarkDialogCallback,
|
||||||
|
theme: Theme,
|
||||||
|
): AlertDialog {
|
||||||
|
binding = CheckmarkDialogBinding.inflate(LayoutInflater.from(context))
|
||||||
|
fontAwesome = InterfaceUtils.getFontAwesome(context)!!
|
||||||
|
binding.etNotes.append(notes)
|
||||||
|
setUpButtons(value, theme.color(paletteColor).toInt())
|
||||||
|
|
||||||
|
val dialog = AlertDialog.Builder(context)
|
||||||
|
.setView(binding.root)
|
||||||
|
.setTitle(dateString)
|
||||||
|
.setPositiveButton(R.string.save) { _, _ ->
|
||||||
|
val newValue = when (selectedButton?.id) {
|
||||||
|
R.id.yesBtn -> YES_MANUAL
|
||||||
|
R.id.noBtn -> NO
|
||||||
|
R.id.skippedBtn -> SKIP
|
||||||
|
else -> UNKNOWN
|
||||||
|
}
|
||||||
|
callback.onNotesSaved(newValue, binding.etNotes.text.toString())
|
||||||
|
}
|
||||||
|
.setNegativeButton(android.R.string.cancel) { _, _ ->
|
||||||
|
callback.onNotesDismissed()
|
||||||
|
}
|
||||||
|
.setOnDismissListener {
|
||||||
|
callback.onNotesDismissed()
|
||||||
|
}
|
||||||
|
.create()
|
||||||
|
|
||||||
|
dialog.setOnShowListener {
|
||||||
|
binding.etNotes.requestFocus()
|
||||||
|
dialog.window?.setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_VISIBLE)
|
||||||
|
}
|
||||||
|
|
||||||
|
return dialog
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun setUpButtons(value: Int, color: Int) {
|
||||||
|
val sres = StyledResources(context)
|
||||||
|
val mediumContrastColor = sres.getColor(R.attr.contrast60)
|
||||||
|
setButtonAttrs(binding.yesBtn, color)
|
||||||
|
setButtonAttrs(binding.noBtn, mediumContrastColor)
|
||||||
|
setButtonAttrs(binding.skippedBtn, color, visible = preferences.isSkipEnabled)
|
||||||
|
setButtonAttrs(binding.questionBtn, mediumContrastColor, visible = preferences.areQuestionMarksEnabled)
|
||||||
|
when (value) {
|
||||||
|
UNKNOWN -> if (preferences.areQuestionMarksEnabled) {
|
||||||
|
binding.questionBtn.performClick()
|
||||||
|
} else {
|
||||||
|
binding.noBtn.performClick()
|
||||||
|
}
|
||||||
|
SKIP -> binding.skippedBtn.performClick()
|
||||||
|
YES_MANUAL -> binding.yesBtn.performClick()
|
||||||
|
YES_AUTO, NO -> binding.noBtn.performClick()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun setButtonAttrs(button: Button, color: Int, visible: Boolean = true) {
|
||||||
|
button.apply {
|
||||||
|
visibility = if (visible) View.VISIBLE else View.GONE
|
||||||
|
typeface = fontAwesome
|
||||||
|
setTextColor(color)
|
||||||
|
setOnClickListener(this@CheckmarkDialog)
|
||||||
|
}
|
||||||
|
allButtons.add(button)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onClick(v: View?) {
|
||||||
|
allButtons.forEach {
|
||||||
|
if (v?.id == it.id) {
|
||||||
|
it.isSelected = true
|
||||||
|
selectedButton = it
|
||||||
|
} else it.isSelected = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,14 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<item android:state_selected="true">
|
||||||
|
<shape>
|
||||||
|
<solid android:color="?attr/contrast40" />
|
||||||
|
<corners android:radius="4dp"/>
|
||||||
|
<padding
|
||||||
|
android:bottom="0dp"
|
||||||
|
android:left="8dp"
|
||||||
|
android:right="8dp"
|
||||||
|
android:top="0dp" />
|
||||||
|
</shape>
|
||||||
|
</item>
|
||||||
|
</selector>
|
||||||
@ -0,0 +1,29 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!--
|
||||||
|
~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
|
||||||
|
~
|
||||||
|
~ This file is part of Loop Habit Tracker.
|
||||||
|
~
|
||||||
|
~ Loop Habit Tracker is free software: you can redistribute it and/or modify
|
||||||
|
~ it under the terms of the GNU General Public License as published by the
|
||||||
|
~ Free Software Foundation, either version 3 of the License, or (at your
|
||||||
|
~ option) any later version.
|
||||||
|
~
|
||||||
|
~ Loop Habit Tracker is distributed in the hope that it will be useful, but
|
||||||
|
~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||||
|
~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||||
|
~ more details.
|
||||||
|
~
|
||||||
|
~ You should have received a copy of the GNU General Public License along
|
||||||
|
~ with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<stroke android:width="1dp" android:color="?attr/contrast40" />
|
||||||
|
<corners android:radius="4dp"/>
|
||||||
|
<padding
|
||||||
|
android:left="0dp"
|
||||||
|
android:top="8dp"
|
||||||
|
android:right="0dp"
|
||||||
|
android:bottom="0dp" />
|
||||||
|
</shape>
|
||||||
@ -0,0 +1,95 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:gravity="center"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:paddingTop="12dp"
|
||||||
|
android:paddingStart="10dp"
|
||||||
|
android:paddingEnd="10dp">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:padding="8dp"
|
||||||
|
android:baselineAligned="false">
|
||||||
|
|
||||||
|
<FrameLayout
|
||||||
|
style="@style/FormOuterBox"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_weight="1">
|
||||||
|
<LinearLayout style="@style/DialogFormInnerBox">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
style="@style/DialogFormLabel"
|
||||||
|
android:text="@string/value" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:gravity="center_horizontal"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_marginBottom="8dp">
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/yesBtn"
|
||||||
|
android:text="@string/fa_check"
|
||||||
|
style="@style/CheckmarkDialogBtn"/>
|
||||||
|
<Button
|
||||||
|
android:id="@+id/skippedBtn"
|
||||||
|
android:text="@string/fa_skipped"
|
||||||
|
android:visibility="gone"
|
||||||
|
style="@style/CheckmarkDialogBtn"/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/noBtn"
|
||||||
|
android:text="@string/fa_times"
|
||||||
|
style="@style/CheckmarkDialogBtn"/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/questionBtn"
|
||||||
|
android:text="@string/fa_question"
|
||||||
|
android:visibility="gone"
|
||||||
|
style="@style/CheckmarkDialogBtn"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
</FrameLayout>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:padding="5dp"
|
||||||
|
android:baselineAligned="false">
|
||||||
|
|
||||||
|
<FrameLayout
|
||||||
|
style="@style/FormOuterBox"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_weight="1">
|
||||||
|
|
||||||
|
<LinearLayout style="@style/DialogFormInnerBox">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
style="@style/DialogFormLabel"
|
||||||
|
android:text="@string/notes" />
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/etNotes"
|
||||||
|
android:inputType="textCapSentences|textMultiLine"
|
||||||
|
style="@style/FormInput"
|
||||||
|
android:scrollbars="vertical"
|
||||||
|
android:hint="@string/example_notes"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
|
|
|
|
|
|
@ -1,48 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
|
|
||||||
*
|
|
||||||
* This file is part of Loop Habit Tracker.
|
|
||||||
*
|
|
||||||
* Loop Habit Tracker is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by the
|
|
||||||
* Free Software Foundation, either version 3 of the License, or (at your
|
|
||||||
* option) any later version.
|
|
||||||
*
|
|
||||||
* Loop Habit Tracker is distributed in the hope that it will be useful, but
|
|
||||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
||||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
||||||
* more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along
|
|
||||||
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
package org.isoron.uhabits.core.models
|
|
||||||
|
|
||||||
class HabitMatcherBuilder {
|
|
||||||
private var archivedAllowed = false
|
|
||||||
private var reminderRequired = false
|
|
||||||
private var completedAllowed = true
|
|
||||||
|
|
||||||
fun build(): HabitMatcher {
|
|
||||||
return HabitMatcher(
|
|
||||||
isArchivedAllowed = archivedAllowed,
|
|
||||||
isReminderRequired = reminderRequired,
|
|
||||||
isCompletedAllowed = completedAllowed,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun setArchivedAllowed(archivedAllowed: Boolean): HabitMatcherBuilder {
|
|
||||||
this.archivedAllowed = archivedAllowed
|
|
||||||
return this
|
|
||||||
}
|
|
||||||
|
|
||||||
fun setCompletedAllowed(completedAllowed: Boolean): HabitMatcherBuilder {
|
|
||||||
this.completedAllowed = completedAllowed
|
|
||||||
return this
|
|
||||||
}
|
|
||||||
|
|
||||||
fun setReminderRequired(reminderRequired: Boolean): HabitMatcherBuilder {
|
|
||||||
this.reminderRequired = reminderRequired
|
|
||||||
return this
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -0,0 +1 @@
|
|||||||
|
alter table Repetitions add column notes text;
|
||||||
Binary file not shown.
Binary file not shown.
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in new issue