diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b3b637b..26cd441 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -35,6 +35,11 @@
+
+
+
+
+
@@ -56,14 +61,9 @@
android:name=".views.AddMemberActivity"
android:label="メンバー追加" />
-
-
-
-
-
diff --git a/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java b/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java
index bef866a..7abfe7c 100644
--- a/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java
@@ -1,5 +1,6 @@
package com.example.cosmosclient.views;
+import android.app.DatePickerDialog;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
@@ -7,7 +8,9 @@
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
+import android.widget.DatePicker;
import android.widget.EditText;
+import android.widget.ImageButton;
import android.widget.Spinner;
import android.widget.TextView;
@@ -15,14 +18,22 @@
import com.example.cosmosclient.entities.Request;
import java.sql.Date;
-import java.util.ArrayList;
+import java.util.Calendar;
public class AddRequestActivity extends AppCompatActivity {
private Request requestList;
+ private ImageButton calenderButton;
+
private EditText editTextProduct;
+ private int curYear;
+ private int curMonth;
+ private int curDayOfMonth;
+
+ private EditText editTextDeadline;
+
private Button addButon;
@Override
@@ -30,19 +41,54 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_add_request);
- editTextProduct = findViewById(R.id.editTextProduct);
+ calenderButton = findViewById(R.id.calenderButton);
- Spinner category = findViewById(R.id.spinnerLocationCategory);
+ editTextProduct = findViewById(R.id.editTextProduct);
- addButon = findViewById(R.id.buttonAdd);
+ editTextDeadline = findViewById(R.id.editTextDeadline);
+
+ Spinner category = findViewById(R.id.spinnerLocationCategory);
+
+ addButon = findViewById(R.id.buttonAdd);
+
+ calenderButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ //Calendarインスタンスを取得
+ final Calendar calender = Calendar.getInstance();
+
+ //DatePickerDialogインスタンスを取得
+ DatePickerDialog datePickerDialog = new DatePickerDialog(AddRequestActivity.this, new DatePickerDialog.OnDateSetListener() {
+
+ @Override
+ public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) {
+ curYear = year;
+ curMonth = month;
+ curDayOfMonth = dayOfMonth;
+
+ //setした日付を取得して表示
+ editTextDeadline.setText(String.format("%d / %02d / %02d", year, month+1, dayOfMonth));
+ }
+ },
+ calender.get(Calendar.YEAR),
+ calender.get(Calendar.MONTH),
+ calender.get(Calendar.DATE)
+ );
+
+ //dialogを表示
+ datePickerDialog.show();
+
+ }
+ });
addButon.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// エディットテキストのテキストを取得
String inputProduct = editTextProduct.getText().toString();
+
// 取得したテキストを TextView に張り付ける
- Request requestlist = (new Request(inputProduct, new Date(2019, 6, 7), "スーパー", "a-hongo"));
+ RequestListActivity.requestlist.add((new Request(inputProduct, new Date(curYear, curMonth, curDayOfMonth), "スーパー", "a-hongo")));
startActivity(new Intent(AddRequestActivity.this, RequestListActivity.class));
}
});
@@ -64,7 +110,6 @@
}
-
private void SearchSubCategory(String selectedCategory) {
}
diff --git a/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java b/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java
index 0f54465..10f9c11 100644
--- a/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java
@@ -236,6 +236,18 @@
}
+ @Override
+ protected void onStart() {
+ super.onStart();
+
+ }
+ @Override
+ protected void onPause(){
+ super.onPause();
+ ResetRequestListTable();
+ requestlist.clear();
+ }
+
@SuppressWarnings("StatementWithEmptyBody")
@Override
public boolean onNavigationItemSelected(MenuItem item) {
diff --git a/app/src/main/res/drawable/ic_date_range.xml b/app/src/main/res/drawable/ic_date_range.xml
new file mode 100644
index 0000000..cd7863e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_date_range.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/layout/activity_add_request.xml b/app/src/main/res/layout/activity_add_request.xml
index 63ae23f..42bd2ba 100644
--- a/app/src/main/res/layout/activity_add_request.xml
+++ b/app/src/main/res/layout/activity_add_request.xml
@@ -25,7 +25,7 @@
+
+
+
-
\ No newline at end of file
diff --git a/app/src/main/res/menu/group_list.xml b/app/src/main/res/menu/group_list.xml
index 492cda4..13486aa 100644
--- a/app/src/main/res/menu/group_list.xml
+++ b/app/src/main/res/menu/group_list.xml
@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto">