diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9655dc5..26cd441 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -52,6 +52,9 @@ android:label="@string/title_activity_request_list" android:theme="@style/AppTheme.NoActionBar" /> + + android:theme="@style/AppTheme.NoActionBar"> + \ No newline at end of file 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 1d426d1..b4ccf6e 100644 --- a/app/src/main/java/com/example/cosmosclient/entities/Request.java +++ b/app/src/main/java/com/example/cosmosclient/entities/Request.java @@ -1,4 +1,50 @@ package com.example.cosmosclient.entities; +import java.util.Date; + public class Request { + + private String product; + private Date deadline; + private String location; + private 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 getProduct() { + return product; + } + + public void setProduct(String product) { + this.product = product; + } + + public Date getDeadline() { + return deadline; + } + + public void setDeadline(Date deadline) { + this.deadline = deadline; + } + + public String getLocation() { + return location; + } + + 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/AddRequestActivity.java b/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java new file mode 100644 index 0000000..7abfe7c --- /dev/null +++ b/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java @@ -0,0 +1,124 @@ +package com.example.cosmosclient.views; + +import android.app.DatePickerDialog; +import android.content.Intent; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.view.View; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.Button; +import android.widget.DatePicker; +import android.widget.EditText; +import android.widget.ImageButton; +import android.widget.Spinner; +import android.widget.TextView; + +import com.example.cosmosclient.R; +import com.example.cosmosclient.entities.Request; + +import java.sql.Date; +import java.util.Calendar; + + +public class AddRequestActivity extends AppCompatActivity { + private Request requestList; + + private ImageButton calenderButton; + + private EditText editTextProduct; + + private int curYear; + private int curMonth; + private int curDayOfMonth; + + private EditText editTextDeadline; + + private Button addButon; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_add_request); + + calenderButton = findViewById(R.id.calenderButton); + + editTextProduct = findViewById(R.id.editTextProduct); + + editTextDeadline = findViewById(R.id.editTextDeadline); + + Spinner category = findViewById(R.id.spinnerLocationCategory); + + addButon = findViewById(R.id.buttonAdd); + + calenderButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + //Calendarインスタンスを取得 + final Calendar calender = Calendar.getInstance(); + + //DatePickerDialogインスタンスを取得 + DatePickerDialog datePickerDialog = new DatePickerDialog(AddRequestActivity.this, new DatePickerDialog.OnDateSetListener() { + + @Override + public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) { + curYear = year; + curMonth = month; + curDayOfMonth = dayOfMonth; + + //setした日付を取得して表示 + editTextDeadline.setText(String.format("%d / %02d / %02d", year, month+1, dayOfMonth)); + } + }, + calender.get(Calendar.YEAR), + calender.get(Calendar.MONTH), + calender.get(Calendar.DATE) + ); + + //dialogを表示 + datePickerDialog.show(); + + } + }); + + addButon.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + // エディットテキストのテキストを取得 + 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)); + } + }); + + // リスナーを登録 + category.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + //　アイテムが選択された時 + @Override + public void onItemSelected(AdapterView parent, View view, int position, long id) { + Spinner spinner = (Spinner)parent; + String selectedCategory = (String)spinner.getSelectedItem(); + SearchSubCategory(selectedCategory); + } + + //　アイテムが選択されなかった + public void onNothingSelected(AdapterView parent) { + } + }); + + } + + private void SearchSubCategory(String selectedCategory) { + + } + + private void setSpinner(Spinner spinner, String[] arr){ + ArrayAdapter adapter = new ArrayAdapter(this, android.R.layout.simple_spinner_item, arr); + adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + spinner.setAdapter(adapter); + } + + +} 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 f22ce59..10f9c11 100644 --- a/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java @@ -12,88 +12,240 @@ import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; -import android.view.Menu; import android.view.MenuItem; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.TableLayout; +import android.widget.TableRow; +import android.widget.TextView; import android.widget.Toast; -import com.example.cosmosclient.MainActivity; import com.example.cosmosclient.R; +import com.example.cosmosclient.entities.Request; + +import java.text.Collator; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.Locale; + +import static android.graphics.Color.BLACK; public class RequestListActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener { Toast toast; //動作テスト用 + //Request List + public static ArrayList requestlist = new ArrayList<>(); + + //Color制御 + boolean productColorFlag = true; //買うもの (true:白, false:黒) + boolean deadlineColorFlag = true; //購入期限 + boolean locationColorFlag = true; //場所 + + //Rotation制御 + boolean deadlineRotationFlag = false; //(true:回転, false:未回転) + + Collator collator = Collator.getInstance(Locale.JAPANESE); + + //productOnClick + public View.OnClickListener productOnClick = new View.OnClickListener() { + @Override + public void onClick(View view) { + Toast.makeText(RequestListActivity.this, "product sorted", Toast.LENGTH_SHORT).show(); + ImageView product = (ImageView) findViewById(R.id.image_product); + ImageView deadline = (ImageView) findViewById(R.id.image_deadline); + ImageView location = (ImageView) findViewById(R.id.image_location); + if (!productColorFlag) { + product.setColorFilter(null); + productColorFlag = true; + ResetRequestListTable(); + AddRequestListTable(requestlist); + } else { + if(deadlineRotationFlag) { + deadlineRotationFlag = false; + } else { + deadline.setRotation(0); + } + product.setColorFilter(BLACK); + productColorFlag = false; + deadline.setColorFilter(null); + deadlineColorFlag = true; + location.setColorFilter(null); + locationColorFlag = true; + ResetRequestListTable(); + AddRequestListTable(SortProduct()); + } + } + }; + + //deadlineOnClick + public View.OnClickListener deadlineOnClick = new View.OnClickListener() { + @Override + public void onClick(View view) { + Toast.makeText(RequestListActivity.this, "deadline sorted", Toast.LENGTH_SHORT).show(); + ImageView product = (ImageView) findViewById(R.id.image_product); + ImageView deadline = (ImageView) findViewById(R.id.image_deadline); + ImageView location = (ImageView) findViewById(R.id.image_location); + if (!deadlineColorFlag) { + deadline.setColorFilter(null); + deadlineColorFlag = true; + ResetRequestListTable(); + AddRequestListTable(requestlist); + if(!deadlineRotationFlag) { + deadline.setRotation(0); + } + } else { + product.setColorFilter(null); + productColorFlag = true; + location.setColorFilter(null); + locationColorFlag = true; + + if (!deadlineRotationFlag) { + deadline.setColorFilter(BLACK); + deadlineRotationFlag = true; + ResetRequestListTable(); + AddRequestListTable(SortDeadline()); + } else { + deadline.setRotation(180); + deadlineColorFlag = false; + deadlineRotationFlag = false; + ResetRequestListTable(); + AddRequestListTable(ReverseDeadline()); + } + + } + } + }; + + //locationOnClick + public View.OnClickListener locationOnClick = new View.OnClickListener() { + @Override + public void onClick(View view) { + Toast.makeText(RequestListActivity.this, "location sorted", Toast.LENGTH_SHORT).show(); + ImageView product = (ImageView) findViewById(R.id.image_product); + ImageView deadline = (ImageView) findViewById(R.id.image_deadline); + ImageView location = (ImageView) findViewById(R.id.image_location); + if (!locationColorFlag) { + location.setColorFilter(null); + locationColorFlag = true; + ResetRequestListTable(); + AddRequestListTable(requestlist); + } else { + if(deadlineRotationFlag) { + deadlineRotationFlag = false; + } else { + deadline.setRotation(0); + } + location.setColorFilter(BLACK); + locationColorFlag = false; + product.setColorFilter(null); + productColorFlag = true; + deadline.setColorFilter(null); + deadlineColorFlag = true; + ResetRequestListTable(); + AddRequestListTable(SortLocation()); + } + } + }; + + //productSortComparator + public Comparator productSortComparator = new Comparator() { + @Override + public int compare(Request r1, Request r2) { + return collator.compare(r1.getProduct().toString(), r2.getProduct().toString()); + } + }; + + //deadlineSortComparator + public Comparator deadlineSortComparator = new Comparator() { + @Override + public int compare(Request r1, Request r2) { + return r1.getDeadline().compareTo(r2.getDeadline()); + } + }; + + //deadlineReverseComparator + public Comparator deadlineReverseComparator = new Comparator() { + @Override + public int compare(Request r1, Request r2) { + if (r1.getDeadline() == null || r2.getDeadline() == null) + return 0; + if(r1.getDeadline().getDate() >= r2.getDeadline().getDate() || r1.getDeadline().getMonth() < r2.getDeadline().getMonth()) + return -1; + if(r1.getDeadline().getDate() <= r2.getDeadline().getDate() || r1.getDeadline().getMonth() < r2.getDeadline().getMonth()) + return 1; + return r1.getDeadline().compareTo(r2.getDeadline()); + } + }; + + //locationSortComparator + public Comparator locationSortComparator = new Comparator() { + @Override + public int compare(Request r1, Request r2) { + return r1.getLocation().compareTo(r2.getLocation()); + } + }; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_request_list); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + Toolbar toolbar = (Toolbar) findViewById(R.id.requestlist_toolbar); setSupportActionBar(toolbar); - FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); + FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.addrequest_button); fab.setOnClickListener(new View.OnClickListener() { @Override 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)); } }); - //LEFTMARK -// DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); -// ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( -// this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); -// drawer.addDrawerListener(toggle); -// -// toggle.syncState(); + //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); + requestlistDrawer.addDrawerListener(toggle); + toggle.syncState(); - NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view); + 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); + + LinearLayout deadlineView = (LinearLayout)findViewById(R.id.deadline); + deadlineView.setOnClickListener(deadlineOnClick); + + LinearLayout locationView = (LinearLayout)findViewById(R.id.location); + locationView.setOnClickListener(locationOnClick); + } @Override - public void onBackPressed() { - DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); - if (drawer.isDrawerOpen(GravityCompat.END)) { - drawer.closeDrawer(GravityCompat.END); - } else { - super.onBackPressed(); - } + protected void onStart() { + super.onStart(); + } - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.request_list, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - //noinspection SimplifiableIfStatement - if (id == R.id.nav_member_list) { - // Handle the camera action - toast = Toast.makeText(RequestListActivity.this, "Next Member List Activity", Toast.LENGTH_LONG); - toast.show(); - } else if (id == R.id.nav_add_member) { - startActivity(new Intent(RequestListActivity.this, AddMemberActivity.class)); - } else if (id == R.id.nav_notification) { - toast = Toast.makeText(RequestListActivity.this, "Next Notification Activity", Toast.LENGTH_LONG); - toast.show(); - } else if (id == R.id.nav_settings) { - toast = Toast.makeText(RequestListActivity.this, "Next Settings Activity", Toast.LENGTH_LONG); - toast.show(); - } else if (id == R.id.nav_close) { - - } - - return super.onOptionsItemSelected(item); + protected void onPause(){ + super.onPause(); + ResetRequestListTable(); + requestlist.clear(); } @SuppressWarnings("StatementWithEmptyBody") @@ -103,7 +255,7 @@ int id = item.getItemId(); if (id == R.id.nav_member_list) { - // Handle the camera action + // Handle the member list action toast = Toast.makeText(RequestListActivity.this, "Next Member List Activity", Toast.LENGTH_LONG); toast.show(); } else if (id == R.id.nav_add_member) { @@ -114,12 +266,110 @@ } else if (id == R.id.nav_settings) { toast = Toast.makeText(RequestListActivity.this, "Next Settings Activity", Toast.LENGTH_LONG); toast.show(); - } else if (id == R.id.nav_close) { + } else if (id == R.id.request_list_nav_close) { } - DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); - drawer.closeDrawer(GravityCompat.END); + DrawerLayout requestlistDrawer = (DrawerLayout) findViewById(R.id.request_list_drawer_layout); + requestlistDrawer.closeDrawer(GravityCompat.START); return true; } + + private int ConvertMonth(int i, ArrayList requestList) { + if(requestList.get(i).getDeadline().getMonth() == 0) { + return 12; + } else { + return requestList.get(i).getDeadline().getMonth(); + } + } + + private void AddRequestListTable(ArrayList requestList) { + Date now = new Date(); + for (int i = 0; i < requestList.size(); i++) { + TableRow tableRow = new TableRow(this); + + TextView textProduct = new TextView(this); + textProduct.setText(requestList.get(i).getProduct()); + textProduct.setTextSize(20); + textProduct.setHeight(150); + textProduct.setGravity(Gravity.CENTER); + tableRow.addView(textProduct); + + TextView textDeadline = new TextView(this); +// if(now.after(requestList.get(i).getDeadline())) { +// textDeadline.setText("期限切れ"); +// } +// if (requestList.get(i).getDeadline().getMonth() == now.getMonth()) { +// textDeadline.setText("今日まで"); +// } +// if (requestList.get(i).getDeadline().getMonth() == now.getMonth() && requestList.get(i).getDeadline().getDate() - now.getDate() == 1) { +// 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); + tableRow.addView(textDeadline); + + TextView textLocation = new TextView(this); + textLocation.setText(requestList.get(i).getLocation()); + textLocation.setTextSize(20); + textLocation.setHeight(150); + 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); + } + } + + private void ResetRequestListTable() { + TableLayout requesttable = (TableLayout)findViewById(R.id.RequestList); + int childCount = requesttable.getChildCount(); + + // Remove all rows except the first one + if (childCount > 1) { + requesttable.removeViews(1, childCount - 1); + } + } + + private ArrayList SortProduct() { + ArrayList productsortRequestlist = (ArrayList) requestlist.clone(); + + Collections.sort(productsortRequestlist, productSortComparator); + return productsortRequestlist; + } + + private ArrayList SortDeadline() { + ArrayList deadlinesortRequestlist = (ArrayList) requestlist.clone(); + + Collections.sort(deadlinesortRequestlist, deadlineSortComparator); + return deadlinesortRequestlist; + } + + private ArrayList ReverseDeadline() { + ArrayList deadlinesortRequestlist = (ArrayList) requestlist.clone(); + + Collections.sort(deadlinesortRequestlist, deadlineReverseComparator); + return deadlinesortRequestlist; + } + + private ArrayList SortLocation() { + ArrayList locationsortRequestlist = (ArrayList) requestlist.clone(); + + Collections.sort(locationsortRequestlist, locationSortComparator); + return locationsortRequestlist; + } } + + + + diff --git a/app/src/main/res/drawable/edit_text_frame.xml b/app/src/main/res/drawable/edit_text_frame.xml new file mode 100644 index 0000000..516cd41 --- /dev/null +++ b/app/src/main/res/drawable/edit_text_frame.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_add_alert.xml b/app/src/main/res/drawable/ic_add_alert.xml new file mode 100644 index 0000000..a3fa696 --- /dev/null +++ b/app/src/main/res/drawable/ic_add_alert.xml @@ -0,0 +1,5 @@ + + + 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_close.xml b/app/src/main/res/drawable/ic_close.xml new file mode 100644 index 0000000..ca48b78 --- /dev/null +++ b/app/src/main/res/drawable/ic_close.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_date_range.xml b/app/src/main/res/drawable/ic_date_range.xml new file mode 100644 index 0000000..cd7863e --- /dev/null +++ b/app/src/main/res/drawable/ic_date_range.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_person.xml b/app/src/main/res/drawable/ic_person.xml new file mode 100644 index 0000000..8dcc1ac --- /dev/null +++ b/app/src/main/res/drawable/ic_person.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_person_add.xml b/app/src/main/res/drawable/ic_person_add.xml new file mode 100644 index 0000000..ab2ae36 --- /dev/null +++ b/app/src/main/res/drawable/ic_person_add.xml @@ -0,0 +1,5 @@ + + + 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..42bd2ba --- /dev/null +++ b/app/src/main/res/layout/activity_add_request.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +