・Personリストアイテムの軽微な修正

Nuu-mA · Oct 28, 2017 · cb5657a · cb5657a
1 parent 82d71e5
commit cb5657a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 14 deletions.
diff --git a/app/src/main/java/com/pengin/poinsetia/konkatsudiary/View/PersonAdapter.java b/app/src/main/java/com/pengin/poinsetia/konkatsudiary/View/PersonAdapter.java
@@ -43,17 +43,17 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewT
         switch (viewType) {
             case VIEWTYPE_A:
                 return new viewHolderAlpha(mInflater
-                        .inflate(R.layout.list_item_a, viewGroup, false));
+                        .inflate(R.layout.list_item_person, viewGroup, false));
             case VIEWTYPE_B:
                 return new ViewHolderBeta(mInflater
                         .inflate(R.layout.list_item_b, viewGroup, false));
             default:
                 return new viewHolderAlpha(mInflater
-                        .inflate(R.layout.list_item_a, viewGroup, false));
+                        .inflate(R.layout.list_item_person, viewGroup, false));
         }
         */
         return new viewHolderAlpha(mInflater
-                .inflate(R.layout.list_item_a, viewGroup, false));
+                .inflate(R.layout.list_item_person, viewGroup, false));
     }
 
     @Override

diff --git a/app/src/main/res/layout/flower_dialog_layout.xml b/app/src/main/res/layout/flower_dialog_layout.xml
@@ -8,38 +8,38 @@
     android:orientation="vertical">
 
     <TextView
-        android:id="@+id/person_age_label"
+        android:id="@+id/person_name_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/person_label_age_text"
+        android:layout_marginTop="4dp"
+        android:text="@string/person_label_name_text"
         android:textColor="@color/text_primary"
         android:textSize="16sp" />
 
-    <Spinner
-        android:id="@+id/person_age_spinner"
+    <EditText
+        android:id="@+id/person_name_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
-        android:entries="@array/age_items"
+        android:inputType="text"
         android:textColor="@color/text_primary"
         android:textSize="16sp"
         tools:ignore="LabelFor" />
 
     <TextView
-        android:id="@+id/person_name_label"
+        android:id="@+id/person_age_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:text="@string/person_label_name_text"
+        android:text="@string/person_label_age_text"
         android:textColor="@color/text_primary"
         android:textSize="16sp" />
 
-    <EditText
-        android:id="@+id/person_name_text"
+    <Spinner
+        android:id="@+id/person_age_spinner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
-        android:inputType="text"
+        android:entries="@array/age_items"
         android:textColor="@color/text_primary"
         android:textSize="16sp"
         tools:ignore="LabelFor" />

diff --git a/app/src/main/res/layout/list_item_a.xml → app/src/main/res/layout/list_item_person.xml b/app/src/main/res/layout/list_item_a.xml → app/src/main/res/layout/list_item_person.xml
@@ -24,13 +24,28 @@
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
                 android:layout_weight="0.5"
+                android:textSize="20sp"
                 android:textColor="@color/text_primary"/>
             <TextView
                 android:id="@+id/person_age"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
                 android:layout_weight="0.5"
                 android:textColor="@color/text_secondary"/>
+            <TextView
+                android:id="@+id/person_job"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="0.5"
+                android:text="アプリエンジニア"
+                android:textColor="@color/text_secondary"/>
+            <TextView
+                android:id="@+id/person_income"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="0.5"
+                android:text="1,000万"
+                android:textColor="@color/text_secondary"/>
 
         </LinearLayout>