Merge pull request #12 from poin-settia/work

パッケージの変更
Nuu-mA · Oct 28, 2017 · 7c991c5 · 7c991c5
2 parents 652ae00 + cb5657a
commit 7c991c5
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 27 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.AppCompat.Light.NoActionBar">
-        <activity android:name=".MainActivity">
+        <activity android:name=".View.PersonActivity">
             <intent-filter
                 android:label="日記帳">
                 <action android:name="android.intent.action.MAIN" />

diff --git a/...ia/konkatsudiary/AbstractRealmHelper.java → ...katsudiary/Model/AbstractRealmHelper.java b/...ia/konkatsudiary/AbstractRealmHelper.java → ...katsudiary/Model/AbstractRealmHelper.java
@@ -1,4 +1,6 @@
-package com.pengin.poinsetia.konkatsudiary;
+package com.pengin.poinsetia.konkatsudiary.Model;
+
+import com.pengin.poinsetia.konkatsudiary.Model.Person;
 
 import io.realm.Realm;
 import io.realm.RealmObject;

diff --git a/...nsetia/konkatsudiary/ItemRealmHelper.java → .../konkatsudiary/Model/ItemRealmHelper.java b/...nsetia/konkatsudiary/ItemRealmHelper.java → .../konkatsudiary/Model/ItemRealmHelper.java
@@ -1,9 +1,12 @@
-package com.pengin.poinsetia.konkatsudiary;
+package com.pengin.poinsetia.konkatsudiary.Model;
+
+import com.pengin.poinsetia.konkatsudiary.Model.AbstractRealmHelper;
+import com.pengin.poinsetia.konkatsudiary.Model.Person;
 
 import io.realm.Realm;
 import io.realm.RealmResults;
 
-public class ItemRealmHelper extends AbstractRealmHelper<Person>{
+public class ItemRealmHelper extends AbstractRealmHelper<Person> {
 
     public static void insertOneShot(Person person) {
         executeTransactionOneShot(insertTransaction(person));

diff --git a/...engin/poinsetia/konkatsudiary/Person.java → ...poinsetia/konkatsudiary/Model/Person.java b/...engin/poinsetia/konkatsudiary/Person.java → ...poinsetia/konkatsudiary/Model/Person.java
@@ -1,4 +1,4 @@
-package com.pengin.poinsetia.konkatsudiary;
+package com.pengin.poinsetia.konkatsudiary.Model;
 
 
 import io.realm.RealmObject;

diff --git a/...ngin/poinsetia/konkatsudiary/RowData.java → ...oinsetia/konkatsudiary/Model/RowData.java b/...ngin/poinsetia/konkatsudiary/RowData.java → ...oinsetia/konkatsudiary/Model/RowData.java
@@ -1,4 +1,4 @@
-package com.pengin.poinsetia.konkatsudiary;
+package com.pengin.poinsetia.konkatsudiary.Model;
 
 public class RowData {
     private String mTitle;

diff --git a/...tia/konkatsudiary/OnRecyclerListener.java → ...onkatsudiary/View/OnRecyclerListener.java b/...tia/konkatsudiary/OnRecyclerListener.java → ...onkatsudiary/View/OnRecyclerListener.java
@@ -1,4 +1,4 @@
-package com.pengin.poinsetia.konkatsudiary;
+package com.pengin.poinsetia.konkatsudiary.View;
 
 import android.util.Log;
 import android.view.View;

diff --git a/...poinsetia/konkatsudiary/MainActivity.java → ...ia/konkatsudiary/View/PersonActivity.java b/...poinsetia/konkatsudiary/MainActivity.java → ...ia/konkatsudiary/View/PersonActivity.java
@@ -1,12 +1,14 @@
-package com.pengin.poinsetia.konkatsudiary;
+package com.pengin.poinsetia.konkatsudiary.View;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 
-public class MainActivity extends AppCompatActivity {
+import com.pengin.poinsetia.konkatsudiary.R;
+
+public class PersonActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

diff --git a/...oinsetia/konkatsudiary/PersonAdapter.java → ...tia/konkatsudiary/View/PersonAdapter.java b/...oinsetia/konkatsudiary/PersonAdapter.java → ...tia/konkatsudiary/View/PersonAdapter.java
@@ -1,4 +1,4 @@
-package com.pengin.poinsetia.konkatsudiary;
+package com.pengin.poinsetia.konkatsudiary.View;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -8,6 +8,10 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.pengin.poinsetia.konkatsudiary.Model.Person;
+import com.pengin.poinsetia.konkatsudiary.R;
+import com.pengin.poinsetia.konkatsudiary.Model.RowData;
+
 import io.realm.OrderedRealmCollection;
 
 public class PersonAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
@@ -39,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/...insetia/konkatsudiary/PersonFragment.java → ...ia/konkatsudiary/View/PersonFragment.java b/...insetia/konkatsudiary/PersonFragment.java → ...ia/konkatsudiary/View/PersonFragment.java
@@ -1,4 +1,4 @@
-package com.pengin.poinsetia.konkatsudiary;
+package com.pengin.poinsetia.konkatsudiary.View;
 
 
 import android.app.Activity;
@@ -25,6 +25,10 @@
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import com.pengin.poinsetia.konkatsudiary.Model.ItemRealmHelper;
+import com.pengin.poinsetia.konkatsudiary.Model.Person;
+import com.pengin.poinsetia.konkatsudiary.R;
+
 import java.util.ArrayList;
 
 import io.realm.Realm;

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -4,13 +4,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.pengin.poinsetia.konkatsudiary.MainActivity">
+    tools:context="com.pengin.poinsetia.konkatsudiary.View.PersonActivity">
 
 
 
     <fragment
         android:id="@+id/menuFragment"
-        android:name="com.pengin.poinsetia.konkatsudiary.PersonFragment"
+        android:name="com.pengin.poinsetia.konkatsudiary.View.PersonFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         />

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>