diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 88f3f83..4c3cd5d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,21 +10,17 @@ - + android:label="グループ作成"> diff --git a/app/src/main/java/com/example/cosmosclient/entities/CreateGroupResponse.java b/app/src/main/java/com/example/cosmosclient/entities/CreateGroupResponse.java new file mode 100644 index 0000000..2cf3fec --- /dev/null +++ b/app/src/main/java/com/example/cosmosclient/entities/CreateGroupResponse.java @@ -0,0 +1,11 @@ +package com.example.cosmosclient.entities; + +import java.util.ArrayList; + +public class CreateGroupResponse { + public String gId; + public String uri; + public String name; + public ArrayList members= new ArrayList<>(); + public ArrayList request = new ArrayList<>(); +} diff --git a/app/src/main/java/com/example/cosmosclient/entities/Request.java b/app/src/main/java/com/example/cosmosclient/entities/Request.java index 619f097..b4ccf6e 100644 --- a/app/src/main/java/com/example/cosmosclient/entities/Request.java +++ b/app/src/main/java/com/example/cosmosclient/entities/Request.java @@ -4,32 +4,18 @@ public class Request { - private String rId; - private String uri; - private Date date; - private String IssuerUid; private String product; private Date deadline; -// private String location; - private int location; - private String name; //消 - private boolean done = false; + private String location; + private String name; - public Request(String product, Date deadline, int location, String name) { + public Request(String product, Date deadline, String location, String name) { this.product = product; this.deadline = deadline; this.location = location; this.name = name; } - public String getrId() { - return rId; - } - - public void setrId(String rId) { - this.rId = rId; - } - public String getProduct() { return product; } @@ -46,11 +32,11 @@ this.deadline = deadline; } - public int getLocation() { + public String getLocation() { return location; } - public void setLocation(int location) { + public void setLocation(String location) { this.location = location; } diff --git a/app/src/main/java/com/example/cosmosclient/entities/SignupResponse.java b/app/src/main/java/com/example/cosmosclient/entities/SignupResponse.java index 712e2fd..ca8e0db 100644 --- a/app/src/main/java/com/example/cosmosclient/entities/SignupResponse.java +++ b/app/src/main/java/com/example/cosmosclient/entities/SignupResponse.java @@ -1,5 +1,7 @@ package com.example.cosmosclient.entities; +import java.util.ArrayList; + public class SignupResponse { public String uId; public String name; @@ -7,6 +9,7 @@ public String token; public String iconUri; public boolean login; + public ArrayList groups; } diff --git a/app/src/main/java/com/example/cosmosclient/entities/User.java b/app/src/main/java/com/example/cosmosclient/entities/User.java new file mode 100644 index 0000000..7d07fa4 --- /dev/null +++ b/app/src/main/java/com/example/cosmosclient/entities/User.java @@ -0,0 +1,118 @@ +package com.example.cosmosclient.entities; + +import java.util.HashSet; +import java.util.Set; + +public class User { + /** + * USER用のクラス + * + * @param uId string //LONGに変更 + * @param uri String + * @param name String + * @param iconUri String iconの保存先 + * @param login Boolean トークンが存在するか否か + * @param groups Set 所属するグループ + * @param tokens String userが持トークン一覧 + * + * TODO: Tokenのデータベース接続 + * TODO: tokenの持ち方要検討 + */ + + public String uId, uri, name, iconUri; + public boolean login = true; + public Set groups = new HashSet<>();//HashSetでいいのかな？ + //仕様ではStringを返すため + //public Set tokens = new HashSet<>(); + //public Set tokens = new HashSet<>(); + public String token; + private String dummyToken = "a9965652-c2ec-4a0d-a78a-b457e8b2deca"; + + public User() { + + } + public User(String name, String uId, String uri, String iconUri) { + setuId(uId); + setUri(uri); + setName(name); + setIconUri(iconUri); + setToken(this.dummyToken); + //addToken(this.dummyToken); + this.login = true; + } + + public String getuId() { + return uId; + } + + public void setuId(String uId) { + this.uId = uId; + } + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getIconUri() { + return iconUri; + } + + public void setIconUri(String iconUri) { + this.iconUri = iconUri; + } + + public boolean getLogin() { + return login; + } + + public void setLogin(boolean login) { + this.login = login; + } + + public void setToken(String token) { + this.token = token; + } + + public String getToken() { + return token; + } + + /* + * //仕様ではStringで返すため + * public Set getTokens(){ + * return tokens; + * } + * public void setTokens(Set tokens){ + * this.tokens=tokens; + * } + * public void addToken (String token){ + * tokens.add(token); + * } + */ + + public Set getGroups() { + return groups; + } + + public void setGroups(Set groups) { + this.groups = groups; + } + + public void addGroups(Group group){ + //テスト用 + //Group group = Groups.getInstance().getGroupByGid(gId); + groups.add(group); + } +} diff --git a/app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java b/app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java index a102c92..d364c4e 100644 --- a/app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java +++ b/app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java @@ -1,5 +1,6 @@ package com.example.cosmosclient.resources; +import com.example.cosmosclient.entities.CreateGroupResponse; import com.example.cosmosclient.entities.Group; import com.example.cosmosclient.entities.Request; @@ -16,7 +17,7 @@ public interface GroupsRest { @POST("groups") @FormUrlEncoded - Call createGroup(@Field("name") String name,@Field("uId") String uId,@Field("token") String token); + Call createGroup(@Field("name") String name, @Field("uId") String uId, @Field("token") String token); // @GET("/{gId}/requests") // Call> getRequestsListByGid(@Path("gid") String gid, @Query("token") String token); diff --git a/app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java b/app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java index 174c8e7..5ef1453 100644 --- a/app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java @@ -19,8 +19,8 @@ public class AddMemberActivity extends AppCompatActivity implements AdapterView.OnItemClickListener { private static final String[] scenes = { - "QRコードで招待", - "IDで招待", + "QRコードで追加", + "IDで追加", "LINEで招待" }; @@ -64,10 +64,11 @@ if(selectedText.contains("QR")==true){ intent = new Intent(this.getApplicationContext(), DisplayQRActivity.class); }else if(selectedText.contains("ID")==true){ - intent = new Intent(this.getApplicationContext(), DisplayGroupIDActivity.class); - }else if(selectedText.contains("LINE")==true){ + intent = new Intent(this.getApplicationContext(), DisplayQRActivity.class); + }else{ // intent = new Intent(this.getApplicationContext(), DisplayQRActivity.class); - intent = new Intent(Intent.ACTION_VIEW, Uri.parse("line://msg/text/?GroupID")); + Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse("line://msg/text/?GroupID")); + startActivity(i); } // Intent intent = new Intent(this.getApplicationContext(), DisplayQRActivity.class); 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 5987657..a9307f1 100644 --- a/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java @@ -114,47 +114,11 @@ addButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { -// //retrofitの処理 -// final Retrofit retrofit = new Retrofit.Builder() -// .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/cosmos/") -// .addConverterFactory(JacksonConverterFactory.create()) -// .build(); -// -// //interfaceから実装を取得 -// final GroupsRest requestsService = retrofit.create(GroupsRest.class); -// -// Call call = requestsService.getRequestsListByGid(); -// //サーバからのレスポンス -// call.enqueue(new Callback() { -// //成功時 -// @Override -// public void onResponse(Call call, Response response) { -// if (response.isSuccessful()) { -// Request result = response.body(); -// -// //app/Cosmosに情報保存 -// Cosmos app = (Cosmos) getApplication(); -// -// Toast.makeText(RequestListActivity.this, "RequestListに追加しました", Toast.LENGTH_SHORT).show(); -// } else { -// //onFailureでキャッチできないエラーの処理 -// Toast.makeText(RequestListActivity.this, "通信エラー", Toast.LENGTH_SHORT).show(); -// } -// } -// -// //失敗時 -// @Override -// public void onFailure(Call call, Throwable t) { -// //t.printStackTrace(); -// Toast.makeText(RequestListActivity.this, "RequestListの追加失敗しました", Toast.LENGTH_SHORT).show(); -// } -// }); - // エディットテキストのテキストを取得 String inputProduct = editTextProduct.getText().toString(); // 取得したテキストを TextView に張り付ける - RequestListActivity.requestlist.add(0, (new Request(inputProduct, new Date(curYear, curMonth, curDayOfMonth), Yolp.getInstance().getCodeBySubcategory(selectedSubCategory), "a-hongo"))); + RequestListActivity.requestlist.add(0, (new Request(inputProduct, new Date(curYear, curMonth, curDayOfMonth), selectedSubCategory, "a-hongo"))); finish(); } }); diff --git a/app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java b/app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java index 49e3d17..6aee5c9 100644 --- a/app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java @@ -1,5 +1,6 @@ package com.example.cosmosclient.views; +import android.content.Intent; import android.media.Image; import android.os.Handler; import android.support.v7.app.AppCompatActivity; @@ -14,6 +15,7 @@ import com.example.cosmosclient.R; import com.example.cosmosclient.app.Cosmos; +import com.example.cosmosclient.entities.CreateGroupResponse; import com.example.cosmosclient.entities.Group; import com.example.cosmosclient.resources.GroupsRest; @@ -45,8 +47,8 @@ Cosmos app = (Cosmos) getApplication(); uId = app.getuId(); ////サインアップでトークンが返ってきてないため一時コメントアウト - //token = app.getToken(); - token="abcdef"; + token = app.getToken(); + //token="abcdef"; //retrofitの処理 final Retrofit retrofit = new Retrofit.Builder() @@ -70,14 +72,16 @@ } }, 1000L); - Call createGroup = createGroupService.createGroup(groupNameText.getText().toString(), uId, token); + Call createGroup = createGroupService.createGroup(groupNameText.getText().toString(), uId, token); - createGroup.enqueue(new Callback() { + createGroup.enqueue(new Callback() { @Override - public void onResponse(Call call, Response response) { + public void onResponse(Call call, Response response) { if (response.isSuccessful()) { //成功時 - Group result = response.body(); + CreateGroupResponse result = response.body(); + Intent intent = new Intent(getApplication(), RequestListActivity.class); + // //確認用 // System.out.println(result.getgId()); @@ -85,6 +89,7 @@ // System.out.println(result.getRequests()); // System.out.println(result.getUri()); + startActivity(intent); Toast.makeText(CreateGroupActivity.this, "グループを作成しました", Toast.LENGTH_SHORT).show(); finish(); @@ -97,7 +102,7 @@ } @Override - public void onFailure(Call call, Throwable t) { + public void onFailure(Call call, Throwable t) { //失敗時 t.printStackTrace(); Toast.makeText(CreateGroupActivity.this, diff --git a/app/src/main/java/com/example/cosmosclient/views/DisplayGroupIDActivity.java b/app/src/main/java/com/example/cosmosclient/views/DisplayGroupIDActivity.java deleted file mode 100644 index f3b1841..0000000 --- a/app/src/main/java/com/example/cosmosclient/views/DisplayGroupIDActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.example.cosmosclient.views; - -import android.content.ClipData; -import android.content.ClipboardManager; -import android.content.Context; -import android.os.Build; -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; -import android.view.View; -import android.widget.Button; -import android.widget.EditText; -import android.widget.TextView; -import android.widget.Toast; - -import com.example.cosmosclient.R; -import com.example.cosmosclient.app.Cosmos; -import com.example.cosmosclient.entities.Group; - -public class DisplayGroupIDActivity extends AppCompatActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_display_group_id); - - EditText groupID = (EditText)findViewById(R.id.groupID); - // ボタンを設定 - Button copyButton = findViewById(R.id.copy_Button); - //読み取り専用にする設定 - groupID.setEnabled(false); -// //現在のグループ情報を格納しているものからgIdを取得 -// Cosmos app = (Cosmos) getApplication(); -// Group curentGroup = app.getCurentGroup(); -// //元となるgIdを取得完了 -// String gId = curentGroup.getgId(); - final String gId = "vrehngortis"; - groupID.setText(gId); - - copyButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - ClipboardManager clipboard - = (ClipboardManager) getSystemService( - Context.CLIPBOARD_SERVICE); - clipboard.setPrimaryClip(ClipData.newPlainText("", gId)); - } - }); - - } - -} 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 58421c5..de4d635 100644 --- a/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java @@ -1,8 +1,6 @@ package com.example.cosmosclient.views; -import android.annotation.TargetApi; import android.content.Intent; -import android.os.Build; import android.os.Bundle; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; @@ -15,7 +13,6 @@ import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.view.MenuItem; -import android.view.ViewGroup; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TableLayout; @@ -24,10 +21,7 @@ import android.widget.Toast; import com.example.cosmosclient.R; -import com.example.cosmosclient.app.Cosmos; import com.example.cosmosclient.entities.Request; -import com.example.cosmosclient.resources.GroupsRest; -import com.example.cosmosclient.yolp.Yolp; import java.text.Collator; import java.util.ArrayList; @@ -36,12 +30,6 @@ import java.util.Date; import java.util.Locale; -import retrofit2.Call; -import retrofit2.Callback; -import retrofit2.Response; -import retrofit2.Retrofit; -import retrofit2.converter.jackson.JacksonConverterFactory; - import static android.graphics.Color.BLACK; public class RequestListActivity extends AppCompatActivity @@ -61,11 +49,6 @@ //Rotation制御 boolean deadlineRotationFlag = false; //(true:回転, false:未回転) - LinearLayout productView; - LinearLayout deadlineView; - LinearLayout locationView; - LinearLayout nameView; - Collator collator = Collator.getInstance(Locale.JAPANESE); //productOnClick @@ -245,7 +228,7 @@ public Comparator locationSortComparator = new Comparator() { @Override public int compare(Request r1, Request r2) { - return Yolp.getInstance().getSubCategoryByCode(r1.getLocation()).getSubName().compareTo(Yolp.getInstance().getSubCategoryByCode(r2.getLocation()).getSubName()); + return r1.getLocation().compareTo(r2.getLocation()); } }; @@ -261,69 +244,6 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_request_list); - -// //retrofitの処理 -// final Retrofit retrofit = new Retrofit.Builder() -// .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/cosmos/") -// .addConverterFactory(JacksonConverterFactory.create()) -// .build(); -// -// //interfaceから実装を取得 -// final GroupsRest requestsService = retrofit.create(GroupsRest.class); -// -// //RequestList取得するための必要な情報 -// Cosmos app = (Cosmos) getApplication(); -// final String gid = app.getCurentGroup().getgId(); -// final String token = app.getToken(); -// -// final Call> requestsListByGidCall = requestsService.getRequestsListByGid(gid, token); -// -// //サーバからのレスポンス -// requestsListByGidCall.enqueue(new Callback() { -// //成功時 -// @Override -// public void onResponse(Call call, Response response) { -// if (response.isSuccessful()) { -// Request result = response.body(); -// -// Call requestsDetailByGidAndRidcall = requestsService.getRequestsDetailByGidAndRid(gid, token, result.getrId()); -// //サーバからのレスポンス -// requestsDetailByGidAndRidcall.enqueue(new Callback() { -// //成功時 -// @Override -// public void onResponse(Call call, Response response) { -// if (response.isSuccessful()) { -// Request result = response.body(); -// -// -// Toast.makeText(RequestListActivity.this, "RequestList詳細を取得しました", Toast.LENGTH_SHORT).show(); -// } else { -// //onFailureでキャッチできないエラーの処理 -// Toast.makeText(RequestListActivity.this, "通信エラー", Toast.LENGTH_SHORT).show(); -// } -// } -// //失敗時 -// @Override -// public void onFailure(Call call, Throwable t) { -// //t.printStackTrace(); -// Toast.makeText(RequestListActivity.this, "RequestList詳細の取得失敗しました", Toast.LENGTH_SHORT).show(); -// } -// }); -// Toast.makeText(RequestListActivity.this, "RequestListを取得しました", Toast.LENGTH_SHORT).show(); -// } else { -// //onFailureでキャッチできないエラーの処理 -// Toast.makeText(RequestListActivity.this, "通信エラー", Toast.LENGTH_SHORT).show(); -// } -// } -// -// //失敗時 -// @Override -// public void onFailure(Call call, Throwable t) { -// //t.printStackTrace(); -// Toast.makeText(RequestListActivity.this, "RequestListの取得失敗しました", Toast.LENGTH_SHORT).show(); -// } -// }); - Toolbar toolbar = (Toolbar) findViewById(R.id.requestlist_toolbar); setSupportActionBar(toolbar); @@ -341,9 +261,9 @@ requestlist.clear(); //Add Request - requestlist.add(new Request("わさび", new Date(2019, 6, 7), 205002, "a-hongo")); - requestlist.add(new Request("ケーキ" , new Date(2019, 6, 6), 205001, "t-sugisawa")); - requestlist.add(new Request("からし", new Date(2018, 6, 4), 205002, "n-kande")); + 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); @@ -358,16 +278,16 @@ NavigationView navigationView = (NavigationView) findViewById(R.id.request_list_nav_view); navigationView.setNavigationItemSelectedListener(this); - productView = (LinearLayout) findViewById(R.id.product); + LinearLayout productView = (LinearLayout) findViewById(R.id.product); productView.setOnClickListener(productOnClick); - deadlineView = (LinearLayout)findViewById(R.id.deadline); + LinearLayout deadlineView = (LinearLayout)findViewById(R.id.deadline); deadlineView.setOnClickListener(deadlineOnClick); - locationView = (LinearLayout)findViewById(R.id.location); + LinearLayout locationView = (LinearLayout)findViewById(R.id.location); locationView.setOnClickListener(locationOnClick); - nameView = (LinearLayout)findViewById(R.id.name); + LinearLayout nameView = (LinearLayout)findViewById(R.id.name); nameView.setOnClickListener(nameOnClick); } @@ -413,12 +333,8 @@ return requestList.get(i).getDeadline().getMonth() + 1; } - @TargetApi(Build.VERSION_CODES.O) private void AddRequestListTable(ArrayList requestList) { Date now = new Date(); - TableLayout requesttable = (TableLayout)findViewById(R.id.RequestList); - requesttable.setShrinkAllColumns(true); - for (int i = 0; i < requestList.size(); i++) { TableRow tableRow = new TableRow(this); @@ -427,7 +343,7 @@ textProduct.setTextSize(20); textProduct.setHeight(150); textProduct.setGravity(Gravity.CENTER); - tableRow.addView(textProduct, new TableRow.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT)); + tableRow.addView(textProduct); TextView textDeadline = new TextView(this); // if(now.after(requestList.get(i).getDeadline())) { @@ -444,22 +360,23 @@ textDeadline.setTextSize(20); textDeadline.setHeight(150); textDeadline.setGravity(Gravity.CENTER); - tableRow.addView(textDeadline, new TableRow.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT)); + tableRow.addView(textDeadline); TextView textLocation = new TextView(this); - textLocation.setText(Yolp.getInstance().getSubCategoryByCode(requestList.get(i).getLocation()).getSubName()); + textLocation.setText(requestList.get(i).getLocation()); textLocation.setTextSize(20); textLocation.setHeight(150); textLocation.setGravity(Gravity.CENTER); - tableRow.addView(textLocation, new TableRow.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT)); + 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, new TableRow.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT)); + tableRow.addView(textName); + TableLayout requesttable = (TableLayout)findViewById(R.id.RequestList); requesttable.addView(tableRow); } } diff --git a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java index da8b756..c2b9ae9 100644 --- a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java @@ -56,14 +56,14 @@ final EditText ConfirmPasswordText = findViewById(R.id.ConfirmPasswordText); iconChoice = findViewById(R.id.choiceImage); -// -// //入力欄監視 -// NameText.addTextChangedListener(new GenericTextWatcher(NameText)); -// PasswordText.addTextChangedListener(new GenericTextWatcher(PasswordText)); -// ConfirmPasswordText.addTextChangedListener(new GenericTextWatcher(ConfirmPasswordText)); -// -// //アカウント登録ボタン無効化 -// MakeAccountButton.setEnabled(false); + + //入力欄監視 + NameText.addTextChangedListener(new GenericTextWatcher(NameText)); + PasswordText.addTextChangedListener(new GenericTextWatcher(PasswordText)); + ConfirmPasswordText.addTextChangedListener(new GenericTextWatcher(ConfirmPasswordText)); + + //アカウント登録ボタン無効化 + MakeAccountButton.setEnabled(false); //Make Accountボタンの処理 MakeAccountButton.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/example/cosmosclient/yolp/Yolp.java b/app/src/main/java/com/example/cosmosclient/yolp/Yolp.java index 87e1a8a..1532db5 100644 --- a/app/src/main/java/com/example/cosmosclient/yolp/Yolp.java +++ b/app/src/main/java/com/example/cosmosclient/yolp/Yolp.java @@ -45,17 +45,6 @@ return codeToSubcategory; } - public int getCodeBySubcategory(String selectedSubCategory) { - int code = 0; - for(SubCategory subCategory : codeToSubcategory.values()) { - if(subCategory.getSubName().equals(selectedSubCategory)) { - code = subCategory.getCode(); - break; - } - } - return code; - } - public void setCodeToSubcategory(HashMap codeToSubcategory) { this.codeToSubcategory = codeToSubcategory; } diff --git a/app/src/main/res/layout/activity_add_member.xml b/app/src/main/res/layout/activity_add_member.xml index 242f8aa..7274a61 100644 --- a/app/src/main/res/layout/activity_add_member.xml +++ b/app/src/main/res/layout/activity_add_member.xml @@ -18,8 +18,8 @@ tools:layout_editor_absoluteX="0dp" /> - - - - - - -