From df795fd977b7184b87ec8a9d813ed06e14f9319d Mon Sep 17 00:00:00 2001
From: Jakub Kalinowski <kalj@netcompany.com>
Date: Wed, 9 Mar 2022 21:54:19 +0100
Subject: [PATCH] Showing skipped in habits view

---
 .../activities/common/dialogs/NumberPickerFactory.kt |  8 ++++++++
 .../activities/habits/list/views/NumberButtonView.kt | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt
index c1a01c24a..e72ddba0b 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt
@@ -21,14 +21,17 @@ package org.isoron.uhabits.activities.common.dialogs
 
 import android.content.Context
 import android.content.DialogInterface
+import android.content.DialogInterface.BUTTON_NEGATIVE
 import android.text.InputFilter
 import android.view.LayoutInflater
+import android.view.View
 import android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
 import android.view.inputmethod.EditorInfo
 import android.widget.EditText
 import android.widget.NumberPicker
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
+import org.isoron.uhabits.HabitsApplication
 import org.isoron.uhabits.R
 import org.isoron.uhabits.core.models.Entry
 import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior
@@ -88,6 +91,11 @@ class NumberPickerFactory
             .create()
 
         dialog.setOnShowListener {
+            val preferences = (context.applicationContext as HabitsApplication).component.preferences
+            if(!preferences.isSkipEnabled){
+                dialog.getButton(BUTTON_NEGATIVE).visibility = View.GONE
+            }
+
             picker.getChildAt(0)?.requestFocus()
             dialog.window?.setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_VISIBLE)
         }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt
index 3e48ed1a6..ecfac7b9a 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt
@@ -29,6 +29,7 @@ import android.view.View
 import android.view.View.OnClickListener
 import android.view.View.OnLongClickListener
 import org.isoron.uhabits.R
+import org.isoron.uhabits.core.models.Entry
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.inject.ActivityContext
 import org.isoron.uhabits.utils.InterfaceUtils.getDimension
@@ -132,6 +133,12 @@ class NumberButtonView(
         private val lowContrast: Int
         private val mediumContrast: Int
 
+        private val paint = TextPaint().apply {
+            typeface = getFontAwesome()
+            isAntiAlias = true
+            textAlign = Paint.Align.CENTER
+        }
+
         private val pUnit: TextPaint = TextPaint().apply {
             textSize = getDimension(context, R.dimen.smallerTextSize)
             typeface = NORMAL_TYPEFACE
@@ -169,6 +176,11 @@ class NumberButtonView(
                     typeface = BOLD_TYPEFACE
                     textSize = dim(R.dimen.smallTextSize)
                 }
+                value == Entry.SKIP.toDouble() / 1000 ->{
+                    label = resources.getString(R.string.fa_skipped)
+                    textSize = dim(R.dimen.smallTextSize)
+                    typeface = getFontAwesome()
+                }
                 preferences.areQuestionMarksEnabled -> {
                     label = resources.getString(R.string.fa_question)
                     typeface = getFontAwesome()