Add placeholder for BottomSheetNumeric

dev
Aurelien Hubert 7 years ago
parent fb04ab9ff6
commit 5f5477457f
  1. 14
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt
  2. 6
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt
  3. 13
      app/src/main/res/layout/bottom_sheet_sum.xml

@ -36,6 +36,7 @@ class BottomSheetNumericTextFragment : BottomSheetFragment() {
* Init data
*/
private fun initData() {
valueHasPlaceholder = true
}
/**
@ -61,13 +62,20 @@ class BottomSheetNumericTextFragment : BottomSheetFragment() {
}
data[0].defaultValue?.let {
if (it is Double || it is Long) {
val valueString = if (it is Double || it is Long) {
val formatter = NumberFormat.getNumberInstance()
formatter.maximumFractionDigits = 6
formatter.isGroupingUsed = false
editText1.setText(formatter.format(it))
formatter.format(it)
} else {
editText1.setText(it.toString())
it.toString()
}
if (valueHasPlaceholder) {
this.value = it.toString().toDoubleOrNull()
editText1.hint = valueString
} else {
editText1.setText(valueString)
}
}

@ -6,6 +6,7 @@ import android.view.LayoutInflater
import android.view.View
import android.view.inputmethod.EditorInfo
import androidx.core.widget.addTextChangedListener
import com.ibm.icu.text.NumberFormat
import kotlinx.android.synthetic.main.bottom_sheet_sum.*
import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.*
import net.pokeranalytics.android.R
@ -63,7 +64,10 @@ class BottomSheetSumFragment : BottomSheetFragment() {
0.0
}
currentValue.text = currentDefaultValue.toCurrency(currentCurrency)
val formatter = NumberFormat.getNumberInstance()
formatter.maximumFractionDigits = 6
formatter.isGroupingUsed = false
currentValue.text = formatter.format(currentDefaultValue)
// First value
val defaultValue1 = try {

@ -15,12 +15,12 @@
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:text="+ 1000 $"
app:layout_constraintEnd_toStartOf="@+id/button2"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:text="+ 1000 $" />
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/button2"
@ -30,11 +30,11 @@
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:text="+ 2000 $"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/button1"
app:layout_constraintTop_toTopOf="parent"
android:text="+ 2000 $" />
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/currentValue"
@ -44,6 +44,11 @@
android:layout_marginStart="8dp"
android:layout_marginBottom="8dp"
android:gravity="center"
android:lines="1"
app:autoSizeMaxTextSize="22sp"
app:autoSizeMinTextSize="12sp"
app:autoSizeStepGranularity="2sp"
app:autoSizeTextType="uniform"
app:layout_constraintBottom_toBottomOf="@+id/editText1"
app:layout_constraintEnd_toStartOf="@+id/more"
app:layout_constraintHorizontal_bias="0.5"

Loading…
Cancel
Save