T28064

diff --git a/workspace/EverClip/gen/com/yuji/ec/R.java b/workspace/EverClip/gen/com/yuji/ec/R.java
index 2b75c3a..1b6a9e8 100644 (file)
--- a/workspace/EverClip/gen/com/yuji/ec/R.java
+++ b/workspace/EverClip/gen/com/yuji/ec/R.java
@@ -72,36 +72,36 @@ public final class R {
         public static final int cancelButton=0x7f050006;
         public static final int closeButton=0x7f050007;
         public static final int deleteButton=0x7f050005;
-        public static final int mainConfirmTitle=0x7f050013;
+        public static final int mainConfirmTitle=0x7f05001c;
         public static final int mainMenuSetting=0x7f050008;
-        public static final int mainTitle=0x7f050012;
+        public static final int mainTitle=0x7f05001b;
         public static final int noButton=0x7f050003;
-        public static final int noteTypeConfirmTitle=0x7f050016;
-        public static final int noteTypeTitle=0x7f050015;
-        public static final int selectTitle=0x7f050014;
+        public static final int noteTypeConfirmTitle=0x7f05001f;
+        public static final int noteTypeTitle=0x7f05001e;
+        public static final int selectTitle=0x7f05001d;
         public static final int sendButton=0x7f050001;
-        public static final int settingConfirmTitle=0x7f050017;
-        public static final int settingNoteButton=0x7f05001c;
-        public static final int settingNoteText=0x7f05001b;
-        public static final int settingNoteTitle=0x7f05001a;
-        public static final int settingSortTitle=0x7f05001d;
-        public static final int settingTimeButton=0x7f050022;
-        public static final int settingTimeText=0x7f050021;
-        public static final int settingTimeTitle=0x7f050020;
-        public static final int settingUpdateButton=0x7f05001f;
-        public static final int settingUpdateTitle=0x7f05001e;
-        public static final int settingUserButton=0x7f050019;
-        public static final int settingUserTitle=0x7f050018;
-        public static final int toastConnect=0x7f05000c;
-        public static final int toastEvernoteSystem=0x7f050010;
-        public static final int toastFailedToGetList=0x7f05000e;
-        public static final int toastFailedToWrite=0x7f05000b;
-        public static final int toastInvalidAuth=0x7f05000f;
-        public static final int toastNoteDoesNotExist=0x7f05000d;
-        public static final int toastSystem=0x7f050011;
+        public static final int settingConfirmTitle=0x7f050020;
+        public static final int settingNoteButton=0x7f05000c;
+        public static final int settingNoteText=0x7f050021;
+        public static final int settingNoteTitle=0x7f05000b;
+        public static final int settingSortTitle=0x7f05000d;
+        public static final int settingTimeButton=0x7f050011;
+        public static final int settingTimeText=0x7f050022;
+        public static final int settingTimeTitle=0x7f050010;
+        public static final int settingUpdateButton=0x7f05000f;
+        public static final int settingUpdateTitle=0x7f05000e;
+        public static final int settingUserButton=0x7f05000a;
+        public static final int settingUserTitle=0x7f050009;
+        public static final int toastConnect=0x7f050015;
+        public static final int toastEvernoteSystem=0x7f050019;
+        public static final int toastFailedToGetList=0x7f050017;
+        public static final int toastFailedToWrite=0x7f050014;
+        public static final int toastInvalidAuth=0x7f050018;
+        public static final int toastNoteDoesNotExist=0x7f050016;
+        public static final int toastSystem=0x7f05001a;
         public static final int updateButton=0x7f050004;
-        public static final int userPasswordTitle=0x7f05000a;
-        public static final int userUserTitle=0x7f050009;
+        public static final int userPasswordTitle=0x7f050013;
+        public static final int userUserTitle=0x7f050012;
         public static final int yesButton=0x7f050002;
     }
 }

diff --git a/workspace/EverClip/res/values/strings.xml b/workspace/EverClip/res/values/strings.xml
index fdf37d9..47de02a 100644 (file)
--- a/workspace/EverClip/res/values/strings.xml
+++ b/workspace/EverClip/res/values/strings.xml
@@ -12,6 +12,16 @@
 
     <string name="mainMenuSetting">設定</string>
     
+    <string name="settingUserTitle">ユーザ</string>
+    <string name="settingUserButton">ユーザ/パスワードを設定する</string>
+    <string name="settingNoteTitle">ノート一覧取得先</string>
+    <string name="settingNoteButton">更新</string>
+    <string name="settingSortTitle">ノートの並び順</string>
+    <string name="settingUpdateTitle">ノート一覧</string>
+    <string name="settingUpdateButton">ノート一覧を取得する</string>
+    <string name="settingTimeTitle">ノート一覧自動更新時間</string>
+    <string name="settingTimeButton">更新</string>
+
     <string name="userUserTitle">ユーザ</string>
     <string name="userPasswordTitle">パスワード</string>
 

diff --git a/workspace/EverClip/src/com/yuji/ec/UserPasswordActivity.java b/workspace/EverClip/src/com/yuji/ec/UserPasswordActivity.java
index f760221..4b251b8 100644 (file)
--- a/workspace/EverClip/src/com/yuji/ec/UserPasswordActivity.java
+++ b/workspace/EverClip/src/com/yuji/ec/UserPasswordActivity.java
@@ -1,11 +1,14 @@
 package com.yuji.ec;
 
 import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.EditText;
 
+import com.yuji.ec.common.CommonUtil;
 import com.yuji.ec.utility.BaseActivity;
 import com.yuji.ec.utility.EvernoteUtil;
 import com.yuji.ec.utility.PasswordUtil;
@@ -30,6 +33,34 @@ public class UserPasswordActivity extends BaseActivity {
                        public void onClick(View v) {
                                okButtonOnClick();
                        }});
+               userEditText.addTextChangedListener(new TextWatcher(){
+                       public void afterTextChanged(Editable s) {
+                               setStatus();
+                       }
+
+                       public void beforeTextChanged(CharSequence s, int start, int count,
+                                       int after) {
+                               
+                       }
+
+                       public void onTextChanged(CharSequence s, int start, int before,
+                                       int count) {
+                               
+                       }});
+               passwordEditText.addTextChangedListener(new TextWatcher(){
+                       public void afterTextChanged(Editable s) {
+                               setStatus();
+                       }
+
+                       public void beforeTextChanged(CharSequence s, int start, int count,
+                                       int after) {
+                               
+                       }
+
+                       public void onTextChanged(CharSequence s, int start, int before,
+                                       int count) {
+                               
+                       }});
                cancelButton.setOnClickListener(new OnClickListener(){
                        public void onClick(View v) {
                                cancelButtonOnClick();
@@ -40,6 +71,8 @@ public class UserPasswordActivity extends BaseActivity {
 
                userEditText.setText(username);
                passwordEditText.setText(password);
+               
+               setStatus();
        }
        
        private void okButtonOnClick(){
@@ -56,4 +89,12 @@ public class UserPasswordActivity extends BaseActivity {
        private void cancelButtonOnClick(){
                finish();               
        }
+       
+       private void setStatus(){
+               String username = userEditText.getText().toString();
+               String password = passwordEditText.getText().toString();
+
+               boolean enabled = !CommonUtil.isNull(username) && !CommonUtil.isNull(password);
+               okButton.setEnabled(enabled);
+       }
 }