From e4ad5e792cb4be776fc2872ef507249030da4928 Mon Sep 17 00:00:00 2001 From: clams2017 Date: Tue, 20 Feb 2018 13:38:49 +0900 Subject: [PATCH 01/14] =?UTF-8?q?=E6=9C=80=E4=BD=8E=E9=99=90=E3=81=AE?= =?UTF-8?q?=E5=85=A5=E5=8A=9B=E9=A0=85=E7=9B=AE=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slymapp/diverlog/view/LogAddFragment.java | 34 +++ app/src/main/res/drawable/underline.xml | 12 + app/src/main/res/layout/fragment_log_add.xml | 273 ++++++++++++++++-- app/src/main/res/values/dimens.xml | 4 + app/src/main/res/values/strings.xml | 37 ++- 5 files changed, 337 insertions(+), 23 deletions(-) create mode 100644 app/src/main/res/drawable/underline.xml diff --git a/app/src/main/java/com/slymapp/diverlog/view/LogAddFragment.java b/app/src/main/java/com/slymapp/diverlog/view/LogAddFragment.java index a9294ee..6567535 100644 --- a/app/src/main/java/com/slymapp/diverlog/view/LogAddFragment.java +++ b/app/src/main/java/com/slymapp/diverlog/view/LogAddFragment.java @@ -2,6 +2,7 @@ import android.annotation.TargetApi; import android.app.DatePickerDialog; +import android.app.TimePickerDialog; import android.content.Intent; import android.databinding.DataBindingUtil; import android.os.Build; @@ -11,6 +12,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.DatePicker; +import android.widget.TimePicker; import android.widget.Toast; import com.slymapp.diverlog.R; @@ -85,6 +87,38 @@ public void onDateSet(DatePicker datePicker, int i, int i1, int i2) { .show(); } }); + binding.inTimeValue.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Calendar cal = Calendar.getInstance(); + + new TimePickerDialog(getContext(), new TimePickerDialog.OnTimeSetListener() { + @Override + public void onTimeSet(TimePicker timePicker, int i, int i1) { + Date date = DateUtils.createFromTime(i, i1, 0); + diverLog.setStartTime(date); + binding.inTimeValue.setText(DateUtils.toTimeString(diverLog.getStartTime())); + } + }, cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), true) + .show(); + } + }); + binding.outTimeValue.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Calendar cal = Calendar.getInstance(); + + new TimePickerDialog(getContext(), new TimePickerDialog.OnTimeSetListener() { + @Override + public void onTimeSet(TimePicker timePicker, int i, int i1) { + Date date = DateUtils.createFromTime(i, i1, 0); + diverLog.setStartTime(date); + binding.outTimeValue.setText(DateUtils.toTimeString(diverLog.getStartTime())); + } + }, cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), true) + .show(); + } + }); binding.logAddAddBtn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { diff --git a/app/src/main/res/drawable/underline.xml b/app/src/main/res/drawable/underline.xml new file mode 100644 index 0000000..3253340 --- /dev/null +++ b/app/src/main/res/drawable/underline.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_log_add.xml b/app/src/main/res/layout/fragment_log_add.xml index 9bb9254..d2aee3a 100644 --- a/app/src/main/res/layout/fragment_log_add.xml +++ b/app/src/main/res/layout/fragment_log_add.xml @@ -5,9 +5,11 @@ + tools:text="500" /> + android:textSize="@dimen/text_size_default" + app:layout_constraintStart_toEndOf="@id/log_add_diving_number_value" + app:layout_constraintTop_toTopOf="parent" /> @@ -55,7 +61,7 @@ android:id="@+id/log_add_date_image_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="16dp" + android:layout_marginStart="@dimen/element_margin" android:contentDescription="@string/change_date" android:src="@android:drawable/ic_menu_my_calendar" app:layout_constraintBottom_toBottomOf="@id/log_add_date_value" @@ -69,30 +75,261 @@ android:layout_height="wrap_content" android:labelFor="@+id/log_add_place_value" android:text="@string/place" - android:textSize="30sp" + android:textSize="@dimen/text_size_default" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/log_add_date_label" tools:text="場所" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +