diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2ab898e..b3b637b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -35,11 +35,6 @@
-
-
-
-
-
@@ -52,6 +47,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/views/AddRequestActivity.java b/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java
index faf2d20..5be0e67 100644
--- a/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java
@@ -4,8 +4,11 @@
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.EditText;
+import android.widget.Spinner;
import android.widget.TextView;
import com.example.cosmosclient.R;
@@ -20,6 +23,7 @@
private EditText editTextProduct;
private Button addButon;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -27,6 +31,8 @@
editTextProduct = findViewById(R.id.editTextProduct);
+ Spinner category = findViewById(R.id.spinnerLocationCategory);
+
addButon = findViewById(R.id.buttonAdd);
addButon.setOnClickListener(new View.OnClickListener() {
@@ -40,6 +46,32 @@
}
});
+ // リスナーを登録
+ 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/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/layout/activity_add_request.xml b/app/src/main/res/layout/activity_add_request.xml
index 573877a..63ae23f 100644
--- a/app/src/main/res/layout/activity_add_request.xml
+++ b/app/src/main/res/layout/activity_add_request.xml
@@ -18,7 +18,6 @@
android:id="@+id/textProductName"
android:layout_width="wrap_content"
android:layout_height="50dp"
- android:layout_marginLeft="10dp"
android:layout_marginTop="70dp"
android:gravity="center|center_horizontal"
android:text=" 商品名 "
@@ -26,18 +25,23 @@
+ android:inputType="text"
+ android:paddingLeft="8dp"
+ android:paddingTop="8dp"
+ android:paddingRight="8dp"
+ android:paddingBottom="8dp" />
@@ -56,33 +60,36 @@
android:id="@id/textLocation"
android:layout_width="wrap_content"
android:layout_height="50dp"
- android:layout_marginLeft="20dp"
+ android:layout_marginLeft="10dp"
android:layout_marginTop="230dp"
android:gravity="center|center_horizontal"
android:text=" 場所 "
android:textSize="20sp" />
+ android:id="@+id/spinnerLocationCategory"
+ android:layout_width="300dp"
+ android:layout_height="50dp"
+ android:layout_marginLeft="100dp"
+ android:layout_marginTop="230dp"
+ android:entries="@array/location_category"
+ android:spinnerMode="dropdown" />
+ android:id="@+id/spinnerLocationSubCategory"
+ android:layout_width="300dp"
+ android:layout_height="50dp"
+ android:layout_marginLeft="100dp"
+ android:layout_marginTop="310dp" />
+ android:layout_marginTop="300dp"
+ android:text=" 追 加 "
+ android:textSize="36sp" />
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 69b2233..cf55c02 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,4 +3,5 @@
#008577
#00574B
#D81B60
+ #000
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9477e5e..7d0f4d7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -22,4 +22,11 @@
android.studio@android.com
Navigation header
Settings
+
+
+ - コンビニ・スーパー
+ - 家電・携帯電話
+ - 病院・診療所
+ - ペット・動物病院
+