Skip to content

Commit a2dfe52

Browse files
committed
MAX_YEAR 수정
1 parent ffcb0a4 commit a2dfe52

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

.idea/gradle.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/main/java/com/inventorybox/inventorybox/etc/DatePickerMonth.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,15 @@ import android.widget.Button
1313
import androidx.fragment.app.DialogFragment
1414
import com.inventorybox.inventorybox.R
1515
import com.super_rabbit.wheel_picker.WheelPicker
16+
import java.text.SimpleDateFormat
1617
import java.util.*
1718

1819
class DatePickerMonth() : DialogFragment(){
1920

20-
private val MAX_YEAR = 2020
21+
var currentTime = Calendar.getInstance().time
22+
var yearFormat: SimpleDateFormat = SimpleDateFormat("yyyy", Locale.getDefault())
23+
24+
private val MAX_YEAR = yearFormat.format(currentTime).toInt();
2125
private val MIN_YEAR = 2010
2226
lateinit var picker_month :WheelPicker
2327
lateinit var picker_year :WheelPicker

app/src/main/java/com/inventorybox/inventorybox/etc/DatePickerWeek.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,15 @@ import android.widget.Button
1313
import androidx.fragment.app.DialogFragment
1414
import com.inventorybox.inventorybox.R
1515
import com.super_rabbit.wheel_picker.WheelPicker
16+
import java.text.SimpleDateFormat
1617
import java.util.*
1718

1819
class DatePickerWeek() : DialogFragment(){
1920

20-
private val MAX_YEAR = 2020
21+
var currentTime = Calendar.getInstance().time
22+
var yearFormat: SimpleDateFormat = SimpleDateFormat("yyyy", Locale.getDefault())
23+
24+
private val MAX_YEAR = yearFormat.format(currentTime).toInt();
2125
private val MIN_YEAR = 2010
2226
private var listener : DatePickerDialog.OnDateSetListener? = null
2327

app/src/main/java/com/inventorybox/inventorybox/etc/RecordDatePicker.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import android.widget.Button
1313
import androidx.fragment.app.DialogFragment
1414
import com.inventorybox.inventorybox.R
1515
import com.super_rabbit.wheel_picker.WheelPicker
16+
import java.text.SimpleDateFormat
1617
import java.util.*
1718

1819
class RecordDatePicker() : DialogFragment(){
@@ -21,7 +22,10 @@ class RecordDatePicker() : DialogFragment(){
2122
val cal : Calendar = Calendar.getInstance()
2223
}
2324

24-
private val MAX_YEAR = 2020
25+
var currentTime = Calendar.getInstance().time
26+
var yearFormat: SimpleDateFormat = SimpleDateFormat("yyyy", Locale.getDefault())
27+
28+
private val MAX_YEAR = yearFormat.format(currentTime).toInt();
2529
private val MIN_YEAR = 2010
2630
private var listener : DatePickerDialog.OnDateSetListener? = null
2731

0 commit comments

Comments
 (0)