From df513f23990988e8b940ce549df253a0dc3f4930 Mon Sep 17 00:00:00 2001
From: Yuji Konishi <yuji.k64613@gmail.com>
Date: Thu, 19 Apr 2012 00:42:04 +0900
Subject: [PATCH] T28063

---
 workspace/EverClip/gen/com/yuji/ec/R.java          | 72 +++++++++++-----------
 workspace/EverClip/res/layout/main.xml             |  3 +
 workspace/EverClip/res/layout/note_type_list.xml   |  3 +
 .../EverClip/src/com/yuji/ec/EverClipActivity.java | 59 ++++++++++--------
 .../src/com/yuji/ec/NoteTypeListActivity.java      | 15 +++++
 5 files changed, 90 insertions(+), 62 deletions(-)

diff --git a/workspace/EverClip/gen/com/yuji/ec/R.java b/workspace/EverClip/gen/com/yuji/ec/R.java
index f767658..5f8a5e7 100644
--- a/workspace/EverClip/gen/com/yuji/ec/R.java
+++ b/workspace/EverClip/gen/com/yuji/ec/R.java
@@ -24,45 +24,47 @@ public final class R {
         public static final int icon=0x7f020000;
     }
     public static final class id {
+        public static final int mainCloseButton=0x7f070004;
         public static final int mainConfirmDeleteMsg=0x7f070002;
         public static final int mainLayout=0x7f070001;
         public static final int mainTitle=0x7f070000;
         public static final int mainView=0x7f070003;
-        public static final int noteTypeCancelButton=0x7f070008;
-        public static final int noteTypeConfirmDeleteMsg=0x7f070006;
-        public static final int noteTypeLayout=0x7f070005;
-        public static final int noteTypeTitle=0x7f070004;
-        public static final int noteTypeView=0x7f070007;
-        public static final int settingCloseButton=0x7f07001e;
-        public static final int settingLayout=0x7f070012;
-        public static final int settingMessage=0x7f070013;
-        public static final int settingNoteButton=0x7f070015;
-        public static final int settingSortRadio1=0x7f070018;
-        public static final int settingSortRadio2=0x7f070019;
-        public static final int settingSortRadioGroup=0x7f070017;
-        public static final int settingSortSpinner=0x7f070016;
-        public static final int settingTimeButton=0x7f07001d;
-        public static final int settingTimeCheckBox=0x7f07001a;
-        public static final int settingTimeLayout=0x7f07001b;
-        public static final int settingTimeText=0x7f07001c;
-        public static final int settingUserButton=0x7f070014;
-        public static final int text1=0x7f07001f;
-        public static final int text2=0x7f070020;
-        public static final int updatorCloseButton=0x7f070011;
-        public static final int updatorConfirmTitle=0x7f07000a;
-        public static final int updatorLayout=0x7f070009;
-        public static final int updatorMessage=0x7f07000b;
-        public static final int updatorNoteButton=0x7f07000f;
-        public static final int updatorNoteLayout=0x7f07000d;
-        public static final int updatorNoteSpinner=0x7f07000c;
-        public static final int updatorNoteText=0x7f07000e;
-        public static final int updatorUpdateButton=0x7f070010;
-        public static final int userCancelButton=0x7f070026;
-        public static final int userOkButton=0x7f070025;
-        public static final int userPasswordEditText=0x7f070024;
-        public static final int userPasswordTextView=0x7f070023;
-        public static final int userUserEditText=0x7f070022;
-        public static final int userUserTextView=0x7f070021;
+        public static final int noteTypeCancelButton=0x7f070009;
+        public static final int noteTypeCloseButton=0x7f07000a;
+        public static final int noteTypeConfirmDeleteMsg=0x7f070007;
+        public static final int noteTypeLayout=0x7f070006;
+        public static final int noteTypeTitle=0x7f070005;
+        public static final int noteTypeView=0x7f070008;
+        public static final int settingCloseButton=0x7f070020;
+        public static final int settingLayout=0x7f070014;
+        public static final int settingMessage=0x7f070015;
+        public static final int settingNoteButton=0x7f070017;
+        public static final int settingSortRadio1=0x7f07001a;
+        public static final int settingSortRadio2=0x7f07001b;
+        public static final int settingSortRadioGroup=0x7f070019;
+        public static final int settingSortSpinner=0x7f070018;
+        public static final int settingTimeButton=0x7f07001f;
+        public static final int settingTimeCheckBox=0x7f07001c;
+        public static final int settingTimeLayout=0x7f07001d;
+        public static final int settingTimeText=0x7f07001e;
+        public static final int settingUserButton=0x7f070016;
+        public static final int text1=0x7f070021;
+        public static final int text2=0x7f070022;
+        public static final int updatorCloseButton=0x7f070013;
+        public static final int updatorConfirmTitle=0x7f07000c;
+        public static final int updatorLayout=0x7f07000b;
+        public static final int updatorMessage=0x7f07000d;
+        public static final int updatorNoteButton=0x7f070011;
+        public static final int updatorNoteLayout=0x7f07000f;
+        public static final int updatorNoteSpinner=0x7f07000e;
+        public static final int updatorNoteText=0x7f070010;
+        public static final int updatorUpdateButton=0x7f070012;
+        public static final int userCancelButton=0x7f070028;
+        public static final int userOkButton=0x7f070027;
+        public static final int userPasswordEditText=0x7f070026;
+        public static final int userPasswordTextView=0x7f070025;
+        public static final int userUserEditText=0x7f070024;
+        public static final int userUserTextView=0x7f070023;
     }
     public static final class layout {
         public static final int main=0x7f030000;
diff --git a/workspace/EverClip/res/layout/main.xml b/workspace/EverClip/res/layout/main.xml
index c5356e4..1ce7edf 100644
--- a/workspace/EverClip/res/layout/main.xml
+++ b/workspace/EverClip/res/layout/main.xml
@@ -12,4 +12,7 @@
 		</LinearLayout>
 		<ListView android:id="@+id/mainView" android:layout_width="fill_parent" android:layout_height="fill_parent"></ListView>
 	</LinearLayout>
+	<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
+		<Button android:text="@+string/closeButton" android:layout_weight="1" android:id="@+id/mainCloseButton" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
+	</LinearLayout>    
 </LinearLayout>
diff --git a/workspace/EverClip/res/layout/note_type_list.xml b/workspace/EverClip/res/layout/note_type_list.xml
index e6f550e..27afa86 100644
--- a/workspace/EverClip/res/layout/note_type_list.xml
+++ b/workspace/EverClip/res/layout/note_type_list.xml
@@ -15,4 +15,7 @@
 			<Button android:id="@+id/noteTypeCancelButton" android:text="@+string/closeButton" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
 		</LinearLayout>  
 	</LinearLayout>
+	<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
+		<Button android:text="@+string/closeButton" android:layout_weight="1" android:id="@+id/noteTypeCloseButton" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
+	</LinearLayout>    
 </LinearLayout>
diff --git a/workspace/EverClip/src/com/yuji/ec/EverClipActivity.java b/workspace/EverClip/src/com/yuji/ec/EverClipActivity.java
index 71fd346..6e58d7c 100644
--- a/workspace/EverClip/src/com/yuji/ec/EverClipActivity.java
+++ b/workspace/EverClip/src/com/yuji/ec/EverClipActivity.java
@@ -7,12 +7,13 @@ import java.util.List;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.format.DateUtils;
-import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
+import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -36,6 +37,7 @@ public class EverClipActivity extends BaseActivity {
 	private LinearLayout layoutView = null;
 	private TextView messageText = null;
 	private ListView listView = null;
+	private Button closeButton = null;
 
 	private boolean isEmpty = true;
 	private static boolean isInit = true;
@@ -48,46 +50,41 @@ public class EverClipActivity extends BaseActivity {
 		layoutView = (LinearLayout) this.findViewById(R.id.mainLayout);
 		messageText = (TextView) this.findViewById(R.id.mainConfirmDeleteMsg);
 		listView = (ListView) this.findViewById(R.id.mainView);
-
+		closeButton = (Button) this.findViewById(R.id.mainCloseButton);
+		
 		listView.setOnItemClickListener(new OnItemClickListener() {
 			public void onItemClick(AdapterView<?> parent, View view,
 					int position, long id) {
 				listViewOnItemClickListener(parent, view, position, id);
 			}
 		});
-
-//		Intent it = getIntent();
-//		String action = it.getAction();
-//		if (action != null && ACTION_INTERCEPT.equals(action)) {
-//			String str = it.getStringExtra(REPLACE_KEY);
-//			if (CommonUtil.isNull(str)) {
-//				layoutView.setVisibility(View.GONE);
-//				str = null;
-//			} else {
-//				messageText.setText(str);
-//			}
-//			updateList(str);
-//		} else {
-//			updateList(null);
-//		}
+		closeButton.setOnClickListener(new OnClickListener(){
+			public void onClick(View v) {
+				closeButtonOnClick();
+		}});
+		
 		updateList();
+		
+		setStatus();
 	}
 
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 		updateList();
-		//settStatus();
+		
+		setStatus();
 	}
 
-	@Override
-	public boolean onKeyDown(int keyCode, KeyEvent event) {
-		if (keyCode != KeyEvent.KEYCODE_BACK) {
-			return super.onKeyDown(keyCode, event);
-		} else {
-			finish();
-			return false;
-		}
-	}	
+//	@Override
+//	public boolean onKeyDown(int keyCode, KeyEvent event) {
+//		if (keyCode != KeyEvent.KEYCODE_BACK) {
+//			return super.onKeyDown(keyCode, event);
+//		} else {
+//			finish();
+//			return false;
+//		}
+//	}	
+
 	@Override
 	protected void onStart() {
 		super.onStart();
@@ -145,6 +142,10 @@ public class EverClipActivity extends BaseActivity {
 		finish();
 	}
 
+	private void closeButtonOnClick(){
+		finish();
+	}
+	
 	private void updateList(){
 		Intent it = getIntent();
 		String action = it.getAction();
@@ -253,6 +254,10 @@ public class EverClipActivity extends BaseActivity {
 		Collections.sort(list, comp);
 	}
 	
+	private void setStatus(){
+		
+	}
+	
 	public static void init(boolean flag) {
 		isInit = flag;
 	}
diff --git a/workspace/EverClip/src/com/yuji/ec/NoteTypeListActivity.java b/workspace/EverClip/src/com/yuji/ec/NoteTypeListActivity.java
index 54d3d3e..2dcab49 100644
--- a/workspace/EverClip/src/com/yuji/ec/NoteTypeListActivity.java
+++ b/workspace/EverClip/src/com/yuji/ec/NoteTypeListActivity.java
@@ -6,8 +6,10 @@ import java.util.List;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
+import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -29,6 +31,7 @@ public class NoteTypeListActivity extends BaseActivity {
 	private LinearLayout layoutView = null;
 	private TextView messageText = null;
 	private ListView listView = null;
+	private Button closeButon = null;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -39,6 +42,7 @@ public class NoteTypeListActivity extends BaseActivity {
 		messageText = (TextView) this
 				.findViewById(R.id.noteTypeConfirmDeleteMsg);
 		listView = (ListView) this.findViewById(R.id.noteTypeView);
+		closeButon = (Button) this.findViewById(R.id.noteTypeCloseButton);
 
 		listView.setOnItemClickListener(new OnItemClickListener() {
 			public void onItemClick(AdapterView<?> parent, View view,
@@ -47,6 +51,12 @@ public class NoteTypeListActivity extends BaseActivity {
 			}
 		});
 
+		closeButon.setOnClickListener(new OnClickListener(){
+			public void onClick(View v) {
+				closeButonOnClick();
+			}});
+		closeButon.setEnabled(false);
+		
 		// updateList();
 		int noteItemType = pref.getInt(Constant.PREF_NOTE_ITEM_TYPE_TMP,
 				Constant.NOTE_ITEM_TYPE_ALL);
@@ -77,6 +87,10 @@ public class NoteTypeListActivity extends BaseActivity {
 		finish();
 	}
 
+	private void closeButonOnClick(){
+		finish();
+	}
+	
 	public void done(Error errorCode, List<INoteItem> nList) {
 		if (errorCode != null && !errorCode.equals(Error.NONE)) {
 			EvernoteUtil util = EvernoteUtil.getInstance();
@@ -99,6 +113,7 @@ public class NoteTypeListActivity extends BaseActivity {
 				R.layout.simple_list_item_1, itemList);
 		listView.setAdapter(adapter);
 
+		closeButon.setEnabled(true);
 		setStatus();
 	}
 
-- 
2.11.0