diff --git a/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java b/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java new file mode 100644 index 0000000..faf2d20 --- /dev/null +++ b/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java @@ -0,0 +1,46 @@ +package com.example.cosmosclient.views; + +import android.content.Intent; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; +import android.widget.TextView; + +import com.example.cosmosclient.R; + +import java.util.ArrayList; +import java.util.Date; + + +public class AddRequestActivity extends AppCompatActivity { + private RequestList requestList; + + private EditText editTextProduct; + + private Button addButon; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_add_request); + + editTextProduct = findViewById(R.id.editTextProduct); + + addButon = findViewById(R.id.buttonAdd); + + addButon.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + // エディットテキストのテキストを取得 + String inputProduct = editTextProduct.getText().toString(); + // 取得したテキストを TextView に張り付ける + RequestList requestlist = (new RequestList(inputProduct, new Date(2019, 6, 7), "スーパー", "a-hongo")); + startActivity(new Intent(AddRequestActivity.this, RequestListActivity.class)); + } + }); + + } + + +} diff --git a/app/src/main/java/com/example/cosmosclient/views/RequestList.java b/app/src/main/java/com/example/cosmosclient/views/RequestList.java index ac5903e..8cea439 100644 --- a/app/src/main/java/com/example/cosmosclient/views/RequestList.java +++ b/app/src/main/java/com/example/cosmosclient/views/RequestList.java @@ -6,11 +6,13 @@ private String product; private Date deadline; private String location; + private String name; - public RequestList(String product, Date deadline, String location) { + public RequestList(String product, Date deadline, String location, String name) { this.product = product; this.deadline = deadline; this.location = location; + this.name = name; } public String getProduct() { @@ -36,4 +38,12 @@ public void setLocation(String location) { this.location = location; } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } 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 d05028a..79a38eb 100644 --- a/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java @@ -37,7 +37,7 @@ Toast toast; //動作テスト用 //Request List - ArrayList requestlist = new ArrayList<>(); + public static ArrayList requestlist = new ArrayList<>(); //Color制御 boolean productColorFlag = true; //買うもの (true:白, false:黒) @@ -201,6 +201,8 @@ public void onClick(View view) { Snackbar.make(view, "Next Add Request Activity", Snackbar.LENGTH_LONG) .setAction("Action", null).show(); + startActivity(new Intent(RequestListActivity.this, AddRequestActivity.class)); + } }); @@ -215,9 +217,9 @@ navigationView.setNavigationItemSelectedListener(this); //Add Request - requestlist.add(new RequestList("わさび", new Date(2019, 6, 7), "スーパー")); - requestlist.add(new RequestList("ケーキ" , new Date(2019, 6, 6), "ダニエル")); - requestlist.add(new RequestList("からし", new Date(2018, 6, 4), "コンビニ")); + requestlist.add(new RequestList("わさび", new Date(2019, 6, 7), "スーパー", "a-hongo")); + requestlist.add(new RequestList("ケーキ" , new Date(2019, 6, 6), "ダニエル", "t-sugisawa")); + requestlist.add(new RequestList("からし", new Date(2018, 6, 4), "コンビニ", "n-kande")); //Add RequestList Table AddRequestListTable(requestlist); @@ -291,6 +293,7 @@ // textDeadline.setText("明日まで"); // } textDeadline.setText(ConvertMonth(i, requestList) + "/" + requestList.get(i).getDeadline().getDate()); +// textDeadline.setText(now.getMonth() + "/" + now.getDate()); textDeadline.setTextSize(20); textDeadline.setHeight(150); textDeadline.setGravity(Gravity.CENTER); @@ -303,6 +306,13 @@ textLocation.setGravity(Gravity.CENTER); tableRow.addView(textLocation); + TextView textName = new TextView(this); + textName.setText(requestList.get(i).getName()); + textName.setTextSize(20); + textName.setHeight(150); + textName.setGravity(Gravity.CENTER); + tableRow.addView(textName); + TableLayout requesttable = (TableLayout)findViewById(R.id.RequestList); requesttable.addView(tableRow); } diff --git a/app/src/main/res/drawable/ic_add_circle_black.xml b/app/src/main/res/drawable/ic_add_circle_black.xml new file mode 100644 index 0000000..db4e035 --- /dev/null +++ b/app/src/main/res/drawable/ic_add_circle_black.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_add_circle_black_24dp.xml b/app/src/main/res/drawable/ic_add_circle_black_24dp.xml deleted file mode 100644 index db4e035..0000000 --- a/app/src/main/res/drawable/ic_add_circle_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_settings_black.xml b/app/src/main/res/drawable/ic_settings_black.xml new file mode 100644 index 0000000..24a5623 --- /dev/null +++ b/app/src/main/res/drawable/ic_settings_black.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_settings_black_24dp.xml b/app/src/main/res/drawable/ic_settings_black_24dp.xml deleted file mode 100644 index 24a5623..0000000 --- a/app/src/main/res/drawable/ic_settings_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/activity_add_request.xml b/app/src/main/res/layout/activity_add_request.xml new file mode 100644 index 0000000..573877a --- /dev/null +++ b/app/src/main/res/layout/activity_add_request.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + +