From 5b657bc531330799982f17e1e7e31effc4aedff8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B8=A1=E8=BE=BA=20=E6=99=83=E7=94=9F?=
 <akio.watanabe@90201730n.intra.emercury.co.jp>
Date: Fri, 14 Jun 2013 17:16:43 +0900
Subject: [PATCH] =?UTF-8?q?Layout=E3=81=AE=E5=8B=89=E5=BC=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../1st/LayoutAssignment1/.classpath          |   5 +-
 .../.settings/org.eclipse.jdt.core.prefs      |   4 +
 .../1st/LayoutAssignment2/.classpath          |   5 +-
 .../.settings/org.eclipse.jdt.core.prefs      |   4 +
 .../res/layout/assignment_2_1.xml             |  13 +-
 .../res/layout/assignment_2_2.xml             |  38 ++++-
 .../1st/LayoutAssignment3/.classpath          |   5 +-
 .../.settings/org.eclipse.jdt.core.prefs      |   4 +
 .../LayoutAssignment3/res/drawable/back.xml   |   4 +
 .../res/layout/activity_main.xml              | 141 +++++++++++++++++-
 .../LayoutAssignment3/res/values/strings.xml  |   2 +-
 11 files changed, 211 insertions(+), 14 deletions(-)
 create mode 100644 assignments/fundamentals/1st/LayoutAssignment1/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 assignments/fundamentals/1st/LayoutAssignment2/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 assignments/fundamentals/1st/LayoutAssignment3/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 assignments/fundamentals/1st/LayoutAssignment3/res/drawable/back.xml

diff --git a/assignments/fundamentals/1st/LayoutAssignment1/.classpath b/assignments/fundamentals/1st/LayoutAssignment1/.classpath
index a4763d1e..0b084083 100644
--- a/assignments/fundamentals/1st/LayoutAssignment1/.classpath
+++ b/assignments/fundamentals/1st/LayoutAssignment1/.classpath
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/assignments/fundamentals/1st/LayoutAssignment1/.settings/org.eclipse.jdt.core.prefs b/assignments/fundamentals/1st/LayoutAssignment1/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..b080d2dd
--- /dev/null
+++ b/assignments/fundamentals/1st/LayoutAssignment1/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/assignments/fundamentals/1st/LayoutAssignment2/.classpath b/assignments/fundamentals/1st/LayoutAssignment2/.classpath
index a4763d1e..0b084083 100644
--- a/assignments/fundamentals/1st/LayoutAssignment2/.classpath
+++ b/assignments/fundamentals/1st/LayoutAssignment2/.classpath
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/assignments/fundamentals/1st/LayoutAssignment2/.settings/org.eclipse.jdt.core.prefs b/assignments/fundamentals/1st/LayoutAssignment2/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..b080d2dd
--- /dev/null
+++ b/assignments/fundamentals/1st/LayoutAssignment2/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/assignments/fundamentals/1st/LayoutAssignment2/res/layout/assignment_2_1.xml b/assignments/fundamentals/1st/LayoutAssignment2/res/layout/assignment_2_1.xml
index 71f2cea9..86a137b4 100644
--- a/assignments/fundamentals/1st/LayoutAssignment2/res/layout/assignment_2_1.xml
+++ b/assignments/fundamentals/1st/LayoutAssignment2/res/layout/assignment_2_1.xml
@@ -5,7 +5,7 @@
     tools:context=".MainActivity" >
 
     <!-- このLinearLayoutをRelativeLayoutに変更して同じレイアウトを実現してください -->
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="#ffc356"
@@ -13,6 +13,7 @@
         android:padding="4dp" >
 
         <ImageView
+            android:id="@+id/droid"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginRight="4dp"
@@ -20,9 +21,11 @@
             android:src="@drawable/ic_launcher" />
 
         <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@+id/droid"
+            android:layout_alignBottom="@+id/droid"
+            android:layout_toRightOf="@+id/droid"
             android:orientation="vertical" >
 
             <TextView
@@ -37,6 +40,6 @@
                 android:layout_weight="1"
                 android:background="#ffedc6" />
         </LinearLayout>
-    </LinearLayout>
+    </RelativeLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/assignments/fundamentals/1st/LayoutAssignment2/res/layout/assignment_2_2.xml b/assignments/fundamentals/1st/LayoutAssignment2/res/layout/assignment_2_2.xml
index 9efcc183..c5cf879c 100644
--- a/assignments/fundamentals/1st/LayoutAssignment2/res/layout/assignment_2_2.xml
+++ b/assignments/fundamentals/1st/LayoutAssignment2/res/layout/assignment_2_2.xml
@@ -3,7 +3,43 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".MainActivity" >
+    tools:context=".MainActivity" android:background="#bbbbbb">
 
 
+    <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="108dp" android:layout_gravity="left|center_vertical"
+            android:background="#e7e7e7" android:layout_margin="5dp">
+        <ImageView
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                android:id="@+id/imageView" android:layout_gravity="right|center_vertical"
+                android:src="@drawable/ic_launcher" android:cropToPadding="false" android:background="#ffffff"
+                android:layout_margin="5dp"/>
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:text="ドロイド君の画像ファイル"
+                android:id="@+id/textView" android:layout_gravity="left|top" android:layout_margin="10dp"/>
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="res/ic_launcher.png"
+                android:id="@+id/textView2" android:layout_gravity="center" android:textColor="#989898"/>
+    </FrameLayout>
+    <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="42dp" android:layout_gravity="center"
+            android:background="#e4e4e4" android:layout_marginLeft="5dp" android:layout_marginRight="5dp">
+        <TextView android:id="@+id/textView3" android:layout_width="wrap_content" android:layout_height="wrap_content"
+                  android:text="xhdpi" android:textSize="15dp" android:layout_alignBottom="@+id/imageView2"
+                  android:layout_alignLeft="@+id/profile" android:layout_gravity="left|center_vertical"
+                  android:textColor="#919191" android:layout_marginLeft="5dp"/>
+        <TextView android:id="@+id/textView4" android:layout_width="wrap_content" android:layout_height="wrap_content"
+                  android:text="12,516 bytes" android:textSize="15dp" android:layout_alignBottom="@+id/imageView2"
+                  android:layout_alignLeft="@+id/profile" android:layout_gravity="right|center_vertical"
+                  android:textColor="#919191" android:layout_marginRight="5dp"/>
+    </FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/assignments/fundamentals/1st/LayoutAssignment3/.classpath b/assignments/fundamentals/1st/LayoutAssignment3/.classpath
index a4763d1e..0b084083 100644
--- a/assignments/fundamentals/1st/LayoutAssignment3/.classpath
+++ b/assignments/fundamentals/1st/LayoutAssignment3/.classpath
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/assignments/fundamentals/1st/LayoutAssignment3/.settings/org.eclipse.jdt.core.prefs b/assignments/fundamentals/1st/LayoutAssignment3/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..b080d2dd
--- /dev/null
+++ b/assignments/fundamentals/1st/LayoutAssignment3/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/assignments/fundamentals/1st/LayoutAssignment3/res/drawable/back.xml b/assignments/fundamentals/1st/LayoutAssignment3/res/drawable/back.xml
new file mode 100644
index 00000000..c9bca95d
--- /dev/null
+++ b/assignments/fundamentals/1st/LayoutAssignment3/res/drawable/back.xml
@@ -0,0 +1,4 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+   <solid android:color="#ffffff" />
+   <stroke android:width="1dip" android:color="#000000"/>
+</shape>
\ No newline at end of file
diff --git a/assignments/fundamentals/1st/LayoutAssignment3/res/layout/activity_main.xml b/assignments/fundamentals/1st/LayoutAssignment3/res/layout/activity_main.xml
index c7c2725c..707444f7 100644
--- a/assignments/fundamentals/1st/LayoutAssignment3/res/layout/activity_main.xml
+++ b/assignments/fundamentals/1st/LayoutAssignment3/res/layout/activity_main.xml
@@ -2,9 +2,146 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    android:gravity="fill_vertical"
+    tools:context=".MainActivity" >
+
     <!-- TODO: 左側から順に、下記の View を配置していき、そのまとまりを画面上部に揃える -->
     <!-- 1. プロフィール画像(ic_launcher)と、それを囲う四角形の枠、その下に プロフィール と書かれた文字 -->
+
+    <ImageView
+        android:id="@+id/droid"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginTop="20dp"
+        android:background="@drawable/back"
+        android:src="@drawable/ic_launcher" />
+
+    <TextView
+        android:id="@+id/profile"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/droid"
+        android:layout_marginLeft="5dp"
+        android:text="プロフィール"
+        android:textSize="12dp" />
+
+    <TextView
+        android:id="@+id/nickname"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/droid"
+        android:layout_marginLeft="5dp"
+        android:layout_toRightOf="@+id/profile"
+        android:text="akio watanabe"
+        android:textSize="15dp"/>
+    
+    
+    <View android:id="@+id/Separator"
+        android:layout_width="match_parent"
+        android:layout_below="@+id/nickname"
+        android:layout_toRightOf="@+id/profile"
+        android:background="#000000"
+        android:layout_height="1dp"></View>
+        
+    
+    <LinearLayout 
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/nickname"
+        android:layout_toRightOf="@+id/profile"
+        android:layout_alignBottom="@+id/profile" android:id="@+id/linearLayout">
+                
+        <ImageButton
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.333"
+            android:src="@android:drawable/ic_menu_call"/>
+        
+        <ImageButton 
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.333"
+            android:src="@android:drawable/ic_menu_send"/>
+ 
+        <ImageButton 
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.333"
+            android:src="@android:drawable/ic_menu_share"/>
+    </LinearLayout>
+    <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/imageView"
+            android:src="@android:drawable/ic_menu_manage"
+            android:layout_above="@+id/Separator" android:layout_alignRight="@+id/nickname"
+            android:layout_marginRight="12dp"/>
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="70dp"
+            android:text="30件のお知らせがあります"
+            android:id="@+id/textView"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentEnd="true" android:background="#ffa073"
+            android:textColor="#fbffff" android:textSize="20dp"
+            android:paddingTop="20dp"
+            android:paddingLeft="10dp"
+            android:layout_above="@+id/imageView3" android:layout_alignLeft="@+id/textView4"/>
+    <ImageView
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:id="@+id/imageView2"
+            android:src="@drawable/ic_launcher"
+            android:layout_marginBottom="32dp"
+            android:layout_alignParentBottom="true" android:layout_toLeftOf="@+id/linearLayout"/>
+    <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/imageView3"
+               android:src="@drawable/ic_launcher"
+               android:layout_above="@+id/textView5" android:layout_alignRight="@+id/imageView"/>
+    <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/imageView4"
+               android:src="@drawable/ic_launcher"
+               android:layout_marginLeft="15dp"
+               android:layout_toRightOf="@+id/droid"
+               android:layout_below="@+id/textView3" android:layout_alignBottom="@+id/textView7"/>
+    <TextView
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:text="New Text"
+            android:id="@+id/textView2"
+            android:background="#000000" android:layout_below="@+id/profile" android:layout_alignParentLeft="true"/>
+    <TextView android:layout_width="match_parent" android:layout_height="1dp" android:text="New Text"
+              android:id="@+id/textView3" android:background="#000000"
+              android:layout_alignBottom="@+id/textView" android:layout_alignParentLeft="true"/>
+    <TextView android:id="@+id/textView4" android:layout_width="wrap_content" android:layout_height="wrap_content"
+              android:text="メニュー"
+              android:textSize="15dp" android:layout_alignBottom="@+id/imageView2"
+              android:layout_alignLeft="@+id/profile"/>
+    <TextView android:id="@+id/textView5" android:layout_width="wrap_content" android:layout_height="wrap_content"
+              android:text="つぶやきを投稿" android:textSize="15dp"
+              android:layout_alignTop="@+id/imageView2" android:layout_toLeftOf="@+id/textView8"
+              android:layout_marginRight="13dp"/>
+    <TextView android:id="@+id/textView6" android:layout_width="wrap_content" android:layout_height="wrap_content"
+              android:text="最近" android:textSize="15dp"
+              android:layout_above="@+id/textView4" android:layout_alignLeft="@+id/imageView"/>
+    <TextView android:layout_width="1dp" android:layout_height="50dp" android:text="New Text"
+              android:id="@+id/textView7" android:background="#000000"
+              android:layout_alignTop="@+id/textView3" android:layout_alignLeft="@+id/imageView4"
+              android:layout_alignParentBottom="true"/>
+    <TextView android:layout_width="1dp" android:layout_height="50dp" android:text="New Text"
+              android:id="@+id/textView8" android:background="#000000"
+              android:layout_alignTop="@+id/textView3"
+              android:layout_alignParentBottom="true" android:layout_toLeftOf="@+id/imageView3"/>
+    <ImageView
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:id="@+id/imageView5"
+            android:src="@drawable/badge"
+            android:layout_below="@+id/textView" android:layout_toLeftOf="@+id/textView7"/>
+    <TextView android:id="@+id/textView9" android:layout_width="wrap_content" android:layout_height="wrap_content"
+              android:text="30" android:textSize="15dp"
+              android:layout_below="@+id/textView3" android:layout_alignLeft="@+id/nickname"/>
+
     <!-- 2. 1. の右側の上半分に、ニックネームの表示と、そのさらに右端に設定アイコン -->
     <!-- 3. 1. の右側の下半分に、電話ボタン、メール送信ボタン、共有ボタンの 3 つを均等割付 -->
     <!-- 4. 2. と 3. の間に分割線 -->
@@ -28,6 +165,8 @@
     <!-- Hint: 3. バッチ用の背景は android:background="@drawable/badge" にします -->
     <!-- Hint: 4. TextView には、文字の隣に drawable を表示する属性があります -->
 
+
     <!-- TODO: 上記の View の上に、お知らせを表示する View を配置する -->
     <!-- Hint: 1. お知らせを表示する View の背景は android:background="@drawable/notify_button_state_list" にします -->
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/assignments/fundamentals/1st/LayoutAssignment3/res/values/strings.xml b/assignments/fundamentals/1st/LayoutAssignment3/res/values/strings.xml
index dd17177d..397ca4aa 100644
--- a/assignments/fundamentals/1st/LayoutAssignment3/res/values/strings.xml
+++ b/assignments/fundamentals/1st/LayoutAssignment3/res/values/strings.xml
@@ -4,5 +4,5 @@
     <string name="app_name">LayoutAssignment3</string>
     <string name="action_settings">Settings</string>
     <string name="hello_world">Hello world!</string>
-
+    
 </resources>
\ No newline at end of file