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 7abfe7c..1abc948 100644 --- a/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java @@ -89,7 +89,7 @@ // 取得したテキストを TextView に張り付ける RequestListActivity.requestlist.add((new Request(inputProduct, new Date(curYear, curMonth, curDayOfMonth), "スーパー", "a-hongo"))); - startActivity(new Intent(AddRequestActivity.this, RequestListActivity.class)); + finish(); } }); 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 10f9c11..5cdef54 100644 --- a/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java @@ -207,6 +207,16 @@ } }); + requestlist.clear(); + + //Add Request + requestlist.add(new Request("わさび", new Date(2019, 6, 7), "スーパー", "a-hongo")); + requestlist.add(new Request("ケーキ" , new Date(2019, 6, 6), "ダニエル", "t-sugisawa")); + requestlist.add(new Request("からし", new Date(2018, 6, 4), "コンビニ", "n-kande")); + + //Add RequestList Table + AddRequestListTable(requestlist); + //LEFT hamburger button DrawerLayout requestlistDrawer = (DrawerLayout) findViewById(R.id.request_list_drawer_layout); ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( @@ -217,14 +227,6 @@ NavigationView navigationView = (NavigationView) findViewById(R.id.request_list_nav_view); navigationView.setNavigationItemSelectedListener(this); - //Add Request - requestlist.add(new Request("わさび", new Date(2019, 6, 7), "スーパー", "a-hongo")); - requestlist.add(new Request("ケーキ" , new Date(2019, 6, 6), "ダニエル", "t-sugisawa")); - requestlist.add(new Request("からし", new Date(2018, 6, 4), "コンビニ", "n-kande")); - - //Add RequestList Table - AddRequestListTable(requestlist); - LinearLayout productView = (LinearLayout) findViewById(R.id.product); productView.setOnClickListener(productOnClick); @@ -237,15 +239,13 @@ } @Override - protected void onStart() { - super.onStart(); + protected void onRestart() { + super.onRestart(); - } - @Override - protected void onPause(){ - super.onPause(); ResetRequestListTable(); - requestlist.clear(); + + //Add RequestList Table + AddRequestListTable(requestlist); } @SuppressWarnings("StatementWithEmptyBody") @@ -285,7 +285,7 @@ private void AddRequestListTable(ArrayList requestList) { Date now = new Date(); - for (int i = 0; i < requestList.size(); i++) { + for (int i = requestList.size()-1; i >= 0; i--) { TableRow tableRow = new TableRow(this); TextView textProduct = new TextView(this);