diff --git a/app/src/main/java/com/example/cosmosclient/app/Cosmos.java b/app/src/main/java/com/example/cosmosclient/app/Cosmos.java index 3065ed9..63fd1cc 100644 --- a/app/src/main/java/com/example/cosmosclient/app/Cosmos.java +++ b/app/src/main/java/com/example/cosmosclient/app/Cosmos.java @@ -2,11 +2,15 @@ import android.app.Application; +import com.example.cosmosclient.entities.Group; + import java.util.ArrayList; import java.util.List; public class Cosmos extends Application { + //token処理 private List token; + private Group curGroup=null; public Cosmos(){ this.token = new ArrayList(); @@ -20,4 +24,13 @@ return new ArrayList(token); } + //Group処理 + public void setCurrentGroup(Group g){ + curGroup = g; + } + public Group getCurentGroup(){ + return curGroup; + } + + } diff --git a/app/src/main/java/com/example/cosmosclient/entities/Group.java b/app/src/main/java/com/example/cosmosclient/entities/Group.java new file mode 100644 index 0000000..9e728a3 --- /dev/null +++ b/app/src/main/java/com/example/cosmosclient/entities/Group.java @@ -0,0 +1,91 @@ +package com.example.cosmosclient.entities; + +import java.util.ArrayList; +import java.util.Set; + +public class Group { + private String gId; + private String uri, name; + /* Userどうするか + private ArrayList members; + */ + //private ArrayList requests; + private Set requests; + + public Group(){ + + } + + public Group(String gId, String uri, String name, String uId){ + setgId(gId); + setUri(uri); + setName(name); + } + + public String getgId() { + return gId; + } + + private void setgId(String gId) { + this.gId = gId; + } + + public String getUri() { + return uri; + } + + private void setUri(String uri){ + this.uri = uri; + } + + public String getUriByGid(String gId){ + return uri; + } + + private void setName(String name){ + this.name = name; + } + + public String getName(){ + return name; + } + + public String getNameByGid(String gId){ + return name; + } + + public Set getRequests(){ + return requests; + } + + public void setRequests(Set requests){ + this.requests = requests; + } + + public void addRequests(Request request){ + requests.add(request); + } + + public ArrayList getRequestsList(){ + ArrayList list = new ArrayList(getRequests()); + return list; + } + + /*メンバー*/ + //public ArrayList getMembersList(){ + // return null; + //} + + //public void addMemberByUid(String uId){ + // + // members.add(user); + //} + + //public DeleteResult deleteMember(String uid){ + // members.remove(members.indexOf(uid)); + // return null; + //} + + /*リクエスト*/ + +} 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);