Fork: 0
nitta-lab-2019 / CosmosClient
Browse code
Merge branches 'GroupListActivity' and 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosClient into GroupListActivity
AchieveRequests ...updateAreaInformation
commit 8f2a963624e77cbd4db28018bd84bce6e4c6c786
2 parents 530edc1 + af694df
t-sugisawa authored on 25 Jun 2019
Patch
Unified Split
Showing 4 changed files
View
13
■■■■■
 app/src/main/java/com/example/cosmosclient/app/Cosmos.java
package com.example.cosmosclient.app;
 
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<String> token;
private Group curGroup=null;
 
public Cosmos(){
this.token = new ArrayList<String>();
}
public List<String> getToken(){
return new ArrayList<String>(token);
}
 
//Group処理
public void setCurrentGroup(Group g){
curGroup = g;
}
public Group getCurentGroup(){
return curGroup;
}
 
 
}
View
92
■■■■■
 app/src/main/java/com/example/cosmosclient/entities/Group.java 0 → 100644
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<User> members;
*/
//private ArrayList<Request> requests;
private Set<Request> 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<Request> getRequests(){
return requests;
}
 
public void setRequests(Set<Request> requests){
this.requests = requests;
}
 
public void addRequests(Request request){
requests.add(request);
}
 
public ArrayList<Request> getRequestsList(){
ArrayList<Request> list = new ArrayList<Request>(getRequests());
return list;
}
 
/*メンバー*/
//public ArrayList<User> getMembersList(){
// return null;
//}
 
//public void addMemberByUid(String uId){
//
// members.add(user);
//}
 
//public DeleteResult deleteMember(String uid){
// members.remove(members.indexOf(uid));
// return null;
//}
 
/*リクエスト*/
 
}
View
2
■■■■■
 app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java
String inputProduct = editTextProduct.getText().toString();
 
// 取得したテキストを TextView に張り付ける
RequestListActivity.requestlist.add((new Request(inputProduct, new Date(curYear, curMonth, curDayOfMonth), "スーパー", "a-hongo")));
startActivity(new Intent(AddRequestActivity.this, RequestListActivity.class));
finish();
}
});
 
// リスナーを登録
View
66
■■■■■
 app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java
startActivity(new Intent(RequestListActivity.this, AddRequestActivity.class));
}
});
 
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(
this, requestlistDrawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
 
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"));
LinearLayout productView = (LinearLayout) findViewById(R.id.product);
productView.setOnClickListener(productOnClick);
 
LinearLayout deadlineView = (LinearLayout)findViewById(R.id.deadline);
deadlineView.setOnClickListener(deadlineOnClick);
 
LinearLayout locationView = (LinearLayout)findViewById(R.id.location);
locationView.setOnClickListener(locationOnClick);
 
}
 
@Override
protected void onRestart() {
super.onRestart();
 
ResetRequestListTable();
 
//Add RequestList Table
AddRequestListTable(requestlist);
 
LinearLayout productView = (LinearLayout) findViewById(R.id.product);
productView.setOnClickListener(productOnClick);
 
LinearLayout deadlineView = (LinearLayout)findViewById(R.id.deadline);
deadlineView.setOnClickListener(deadlineOnClick);
 
LinearLayout locationView = (LinearLayout)findViewById(R.id.location);
locationView.setOnClickListener(locationOnClick);
 
}
 
@Override
protected void onStart() {
super.onStart();
 
}
@Override
protected void onPause(){
super.onPause();
ResetRequestListTable();
requestlist.clear();
}
 
@SuppressWarnings("StatementWithEmptyBody")
@Override
}
 
private void AddRequestListTable(ArrayList<Request> 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);
textProduct.setText(requestList.get(i).getProduct());