T29270

diff --git a/source/workspace/EverFolder/gen/com/yuji/ef/R.java b/source/workspace/EverFolder/gen/com/yuji/ef/R.java
index 68cd5a8..f1ff24d 100644 (file)
--- a/source/workspace/EverFolder/gen/com/yuji/ef/R.java
+++ b/source/workspace/EverFolder/gen/com/yuji/ef/R.java
@@ -38,11 +38,12 @@ public final class R {
         public static final int mainMsgOkButton=0x7f070005;
         public static final int rightButton=0x7f07000b;
         public static final int scrollView=0x7f070007;
-        public static final int settingCloseButton=0x7f070010;
+        public static final int settingCloseButton=0x7f070011;
         public static final int settingConfirmMsg=0x7f07000d;
+        public static final int settingLoginButton=0x7f07000e;
         public static final int settingMsgLayout=0x7f07000c;
-        public static final int settingUpdateButton=0x7f07000e;
-        public static final int settingUpdateSpinner=0x7f07000f;
+        public static final int settingUpdateButton=0x7f07000f;
+        public static final int settingUpdateSpinner=0x7f070010;
     }
     public static final class layout {
         public static final int main=0x7f030000;
@@ -50,9 +51,24 @@ public final class R {
     }
     public static final class string {
         public static final int app_name=0x7f050000;
+        public static final int cancelButton=0x7f050003;
         public static final int closeButton=0x7f050004;
-        public static final int mainConfirmTitle=0x7f050001;
-        public static final int selectTitle=0x7f050002;
-        public static final int settingConfirmTitle=0x7f050003;
+        public static final int mainAddMsg=0x7f050008;
+        public static final int mainConfirmMsg=0x7f050006;
+        public static final int mainConfirmTitle=0x7f050005;
+        public static final int mainLeftButton=0x7f05000a;
+        public static final int mainRenameMsg=0x7f050009;
+        public static final int mainRightButton=0x7f05000b;
+        public static final int mainUpdateMsg=0x7f050007;
+        public static final int noButton=0x7f050002;
+        public static final int settingConfirmMsg=0x7f05000d;
+        public static final int settingConfirmTitle=0x7f05000c;
+        public static final int settingLoginButton=0x7f050010;
+        public static final int settingLoginTitle=0x7f05000f;
+        public static final int settingUpdateButton=0x7f050012;
+        public static final int settingUpdateMsg=0x7f05000e;
+        public static final int settingUpdateTimeTitle=0x7f050013;
+        public static final int settingUpdateTitle=0x7f050011;
+        public static final int yesButton=0x7f050001;
     }
 }

diff --git a/source/workspace/EverFolder/res/layout/main.xml b/source/workspace/EverFolder/res/layout/main.xml
index 9df65c3..c2093cd 100644 (file)
--- a/source/workspace/EverFolder/res/layout/main.xml
+++ b/source/workspace/EverFolder/res/layout/main.xml
@@ -10,10 +10,10 @@
         android:id="@+id/mainMsgLayout"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="3px"
-        android:background="#666666"
+        android:layout_margin="3dip"
+        android:background="#999999"
         android:orientation="vertical"
-        android:padding="6px" >
+        android:padding="6dip" >
 
         <TextView
             android:layout_width="fill_parent"
@@ -28,16 +28,17 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:background="#ffff66"
-            android:padding="10px"
-            android:text="@+string/selectTitle" >
+            android:padding="10dip"
+            android:text="@+string/mainConfirmMsg" >
         </TextView>
 
         <EditText
             android:id="@+id/mainMsgEditText"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:inputType="text"
-            android:ems="10" >
+            android:layout_marginTop="3dip"
+            android:ems="10"
+            android:inputType="text" >
 
             <requestFocus />
         </EditText>
@@ -52,14 +53,14 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="はい" />
+                android:text="@+string/yesButton" />
 
             <Button
                 android:id="@+id/mainMsgCancelButton"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="キャンセル" />
+                android:text="@+string/cancelButton" />
         </LinearLayout>
     </LinearLayout>
 
@@ -73,8 +74,7 @@
             android:id="@+id/frameLayout"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="10"
-            android:background="#666666" >
+            android:layout_weight="10" >
         </com.yuji.ef.IconFrameLayout>
     </com.yuji.ef.IconScrollView>
 
@@ -88,29 +88,14 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="←" />
+            android:text="@+string/mainLeftButton" />
 
         <Button
             android:id="@+id/rightButton"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="→" />
-        <!--
-        <Button
-            android:id="@+id/addButton"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="+" />
-
-        <Button
-            android:id="@+id/deleteButton"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="-" />
-        -->
+            android:text="@+string/mainRightButton" />
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file

diff --git a/source/workspace/EverFolder/res/layout/setting.xml b/source/workspace/EverFolder/res/layout/setting.xml
index 7c0ea56..4caf7ae 100644 (file)
--- a/source/workspace/EverFolder/res/layout/setting.xml
+++ b/source/workspace/EverFolder/res/layout/setting.xml
@@ -8,10 +8,10 @@
         android:id="@+id/settingMsgLayout"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="3px"
-        android:background="#666666"
+        android:layout_margin="3dip"
+        android:background="#999999"
         android:orientation="vertical"
-        android:padding="6px" >
+        android:padding="6dip" >
 
         <TextView
             android:layout_width="fill_parent"
@@ -26,8 +26,8 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:background="#ffff66"
-            android:padding="10px"
-            android:text="@+string/selectTitle" >
+            android:padding="10dip"
+            android:text="@+string/settingConfirmMsg" >
         </TextView>
     </LinearLayout>
 
@@ -42,12 +42,45 @@
             android:orientation="vertical"
             android:padding="0px" >
 
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="0px"
+                android:background="#99cccc"
+                android:text="@+string/settingLoginTitle"
+                android:textStyle="bold" />
+
+            <Button
+                android:id="@+id/settingLoginButton"
+                android:layout_marginTop="1dip"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@+string/settingLoginButton" />
+
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="0px"
+                android:background="#99cccc"
+                android:text="@+string/settingUpdateTitle"
+                android:textStyle="bold" />
+
             <Button
                 android:id="@+id/settingUpdateButton"
+                android:layout_marginTop="1dip"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@+string/closeButton" />
+                android:text="@+string/settingUpdateButton" />
+
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="0px"
+                android:background="#99cccc"
+                android:text="@+string/settingUpdateTimeTitle"
+                android:textStyle="bold" />
 
             <Spinner
                 android:id="@+id/settingUpdateSpinner"

diff --git a/source/workspace/EverFolder/res/values/strings.xml b/source/workspace/EverFolder/res/values/strings.xml
index 0408257..34ce92b 100644 (file)
--- a/source/workspace/EverFolder/res/values/strings.xml
+++ b/source/workspace/EverFolder/res/values/strings.xml
@@ -1,19 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string name="app_name">FolderEver</string>
 
-       <string-array name="note_update_time_array">
-           <item>自動更新しない</item>
-           <item>1時間</item>
-           <item>2時間</item>
-           <item>4時間</item>
-           <item>12時間</item>
-       </string-array>
-       <string-array name="note_update_time_array_value">
-           <item>0</item>
-           <item>1</item>
-           <item>2</item>
-           <item>4</item>
-           <item>12</item>
-       </string-array>
-</resources>
+    <string-array name="note_update_time_array">
+        <item>自動更新しない</item>
+        <item>1時間</item>
+        <item>2時間</item>
+        <item>4時間</item>
+        <item>12時間</item>
+    </string-array>
+    <string-array name="note_update_time_array_value">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>4</item>
+        <item>12</item>
+    </string-array>
+
+    <string name="yesButton">はい</string>
+    <string name="noButton">いいえ</string>
+    <string name="cancelButton">取消</string>
+    <string name="closeButton">閉じる</string>
+    <string name="mainConfirmTitle">メッセージ</string>
+    <string name="mainConfirmMsg">・・・</string>
+    <string name="mainUpdateMsg">データ更新中</string>
+    <string name="mainAddMsg">追加しますか？</string>
+    <string name="mainRenameMsg">リネームしますか？</string>
+    <string name="mainLeftButton">←</string>
+    <string name="mainRightButton">→</string>
+    <string name="settingConfirmTitle">メッセージ</string>
+    <string name="settingConfirmMsg">・・・</string>
+    <string name="settingUpdateMsg">データ更新中</string>
+    <string name="settingLoginTitle">ログイン</string>
+    <string name="settingLoginButton">ログインする</string>
+    <string name="settingUpdateTitle">更新</string>
+    <string name="settingUpdateButton">更新する</string>
+    <string name="settingUpdateTimeTitle">自動更新の間隔</string>
+
+</resources>
\ No newline at end of file

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java b/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
index 08f7a1d..e9be17d 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
@@ -781,7 +781,7 @@ public class EverFolderActivity extends BaseActivity {
 
                        if (!lock) {
                                msgLayout.setVisibility(View.VISIBLE);
-                               confirmMsg.setText("データ更新中"); // TODO
+                               confirmMsg.setText(getString(R.string.mainUpdateMsg));
                                msgEditText.setVisibility(View.GONE);
                                msgButtonLayout.setVisibility(View.GONE);
                                status = ScreenStatus.Normal;
@@ -829,6 +829,7 @@ public class EverFolderActivity extends BaseActivity {
                                msgLayout.setVisibility(View.VISIBLE);
                                msgEditText.setVisibility(View.VISIBLE);
                                msgButtonLayout.setVisibility(View.VISIBLE);
+                               confirmMsg.setText(getString(R.string.mainAddMsg));
                                msgEditText.setText("");
 
                                layout.setElabledTouchEvent(false);
@@ -840,6 +841,7 @@ public class EverFolderActivity extends BaseActivity {
                                msgLayout.setVisibility(View.VISIBLE);
                                msgEditText.setVisibility(View.VISIBLE);
                                msgButtonLayout.setVisibility(View.VISIBLE);
+                               confirmMsg.setText(getString(R.string.mainRenameMsg));
 
                                layout.setElabledTouchEvent(false);
 

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/SettingActivity.java b/source/workspace/EverFolder/src/com/yuji/ef/SettingActivity.java
index ae81616..8900568 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/SettingActivity.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/SettingActivity.java
@@ -16,6 +16,7 @@ import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.yuji.ef.common.Constant;
@@ -31,6 +32,8 @@ public class SettingActivity extends BaseActivity {
        private EditPrefUtil pref = new EditPrefUtil(this);
 
        private LinearLayout msgLayout;
+       private TextView confirmMsg;
+       private Button loginButton;
        private Button updateButton;
        private Spinner updateSpinner;
        private Button closeButton;
@@ -68,10 +71,18 @@ public class SettingActivity extends BaseActivity {
                setContentView(R.layout.setting);
 
                msgLayout = (LinearLayout) findViewById(R.id.settingMsgLayout);
+               confirmMsg = (TextView) findViewById(R.id.settingConfirmMsg);
+               loginButton = (Button) findViewById(R.id.settingLoginButton);
                updateButton = (Button) findViewById(R.id.settingUpdateButton);
                updateSpinner = (Spinner) findViewById(R.id.settingUpdateSpinner);
                closeButton = (Button) findViewById(R.id.settingCloseButton);
 
+               loginButton.setOnClickListener(new OnClickListener() {
+                       @Override
+                       public void onClick(View v) {
+                               loginButtonOnClick();
+                       }
+               });
                updateButton.setOnClickListener(new OnClickListener() {
                        @Override
                        public void onClick(View v) {
@@ -176,6 +187,10 @@ public class SettingActivity extends BaseActivity {
                }
        }
 
+       private void loginButtonOnClick(){
+               // TODO
+       }
+       
        private void updateButtonOnClick() {
                LockDao lockDao = (LockDao) LockDao.getInstance();
                boolean lock = lockDao.lock(this, Constant.LOCK_UPDATE_NOTE);
@@ -220,6 +235,7 @@ public class SettingActivity extends BaseActivity {
 
                if (lock) {
                        msgLayout.setVisibility(View.VISIBLE);
+                       confirmMsg.setText(getString(R.string.settingUpdateMsg));
                        return;
                }