Commit: ee006ec46b68c2bd855cbf03593450ffde6bf679 - android_intent_lab (git)

Commit MetaInfo

• Revision: ee006ec46b68c2bd855cbf03593450ffde6bf679 (tree)
• Zeit: 2013-01-30 17:56:31
• Autor: Masahiko, SAWAI <say@user...>
• Commiter: Masahiko, SAWAI

Log Message

Added intent name edit function

Ändern Zusammenfassung

• modified: intent-lab/AndroidManifest.xml
• modified: intent-lab/README.txt
• add: intent-lab/res/layout/edit_text_activity.xml
• modified: intent-lab/res/layout/simple_list.xml
• add: intent-lab/src/org/routine_work/intent_lab/common/EditTextActivity.java
• modified: intent-lab/src/org/routine_work/intent_lab/intent/IntentDetailActivity.java

Diff

--- a/intent-lab/AndroidManifest.xml
+++ b/intent-lab/AndroidManifest.xml
@@ -49,12 +49,14 @@
 		</activity>
 
 		<!-- Activity List Viewer -->
-		<activity android:name=".ResolveInfoListActivity"
-		/>
+		<activity android:name=".ResolveInfoListActivity" />
 		<!--
 			android:theme="@android:style/Theme.Dialog"
 		-->
 
+		<!-- Common Activity -->
+		<activity android:name=".common.EditTextActivity" />
+
 		<!-- content provider -->
 		<provider android:name=".intent.provider.IntentProvider"
 				  android:authorities="org.routine_work.intent_laboratory.intentsprovider"

--- a/intent-lab/README.txt
+++ b/intent-lab/README.txt
@@ -27,6 +27,7 @@ Intent の実験場ツールです． 以下のようなことができます。
 ** カテゴリ(リスト)
 ** エクストラ(マップ)
 
+
 ------------------------------------------------------------
 !! ビルドターゲット
 

--- /dev/null
+++ b/intent-lab/res/layout/edit_text_activity.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:orientation="vertical"
+>
+	<!-- action bar -->
+	<LinearLayout
+		style="@style/actionbar"
+		android:id="@+id/actionbar_container"
+	>
+		<ImageButton
+			style="@style/actionbar_left_button" 
+			android:id="@+id/cancel_button"
+			android:src="?attr/ic_clear"
+		/>
+		<TextView
+			style="@style/actionbar_title" 
+			android:id="@+id/title_textview"
+		/>
+		<ImageButton
+			style="@style/actionbar_right_button" 
+			android:id="@+id/ok_button"
+			android:src="?attr/ic_ok"
+		/>
+	</LinearLayout>
+
+
+	<!-- body -->
+	<FrameLayout
+		style="@style/body"
+	>
+		<EditText
+			android:id="@+id/singleLine_edittext"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="8dip"
+			android:inputType="text"
+			android:gravity="left"
+			android:visibility="visible"
+		/>
+		<EditText
+			android:id="@+id/multiLine_edittext"
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:inputType="textMultiLine"
+			android:gravity="left|top"
+			android:visibility="gone"
+		/>
+	</FrameLayout>
+
+</LinearLayout>
\ No newline at end of file

--- a/intent-lab/res/layout/simple_list.xml
+++ b/intent-lab/res/layout/simple_list.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/list_frame"
+<FrameLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
-	android:padding="2dip"
 >
 	<ListView
 		android:id="@android:id/list"
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
+		android:drawSelectorOnTop="false"
+		android:fastScrollEnabled="true"
 	/>
 	<TextView
 		android:id="@android:id/empty"

--- /dev/null
+++ b/intent-lab/src/org/routine_work/intent_lab/common/EditTextActivity.java
@@ -0,0 +1,132 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2012 Masahiko, SAWAI <[e-mail]>.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.routine_work.intent_lab.common;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.InputType;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.TextView;
+import org.routine_work.intent_lab.R;
+import org.routine_work.utils.Log;
+
+/**
+ *
+ * @author Masahiko, SAWAI <[e-mail]>
+ */
+public class EditTextActivity extends Activity
+	implements View.OnClickListener
+{
+
+	public static final String EXTRA_INPUT_TYPE = EditTextActivity.class.getPackage().getName() + ".INPUT_TYPE";
+	private static final String LOG_TAG = "simple-notepad";
+	private EditText mainEditText;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState)
+	{
+		Log.v(LOG_TAG, "Hello");
+//		setTheme(NotepadPreferenceUtils.getTheme(this));
+		super.onCreate(savedInstanceState);
+
+		getWindow().setSoftInputMode(
+			WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
+			| WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+		setContentView(R.layout.edit_text_activity);
+
+		EditText singleLineEditText = (EditText) findViewById(R.id.singleLine_edittext);
+		EditText multiLineEditText = (EditText) findViewById(R.id.multiLine_edittext);
+		ImageButton cancelImageButton = (ImageButton) findViewById(R.id.cancel_button);
+		ImageButton okImageButton = (ImageButton) findViewById(R.id.ok_button);
+
+		cancelImageButton.setOnClickListener(this);
+		okImageButton.setOnClickListener(this);
+
+		Intent intent = getIntent();
+
+		int defaultInputType = singleLineEditText.getInputType();
+		int inputType = intent.getIntExtra(EXTRA_INPUT_TYPE, defaultInputType);
+		Log.v(LOG_TAG, "EXTRA_INPUT_TYPE => " + inputType);
+		if (((inputType & InputType.TYPE_TEXT_FLAG_MULTI_LINE) != 0)
+			|| ((inputType & InputType.TYPE_TEXT_FLAG_IME_MULTI_LINE) != 0))
+		{
+			mainEditText = multiLineEditText;
+			singleLineEditText.setVisibility(View.GONE);
+			multiLineEditText.setVisibility(View.VISIBLE);
+		}
+		else
+		{
+			mainEditText = singleLineEditText;
+			singleLineEditText.setVisibility(View.VISIBLE);
+			multiLineEditText.setVisibility(View.GONE);
+		}
+
+		if (inputType != mainEditText.getInputType())
+		{
+			mainEditText.setInputType(inputType);
+		}
+
+		String title = intent.getStringExtra(Intent.EXTRA_TITLE);
+		Log.v(LOG_TAG, "EXTRA_TITLE => " + title);
+		if (!TextUtils.isEmpty(title))
+		{
+			TextView titleTextView = (TextView) findViewById(R.id.title_textview);
+			titleTextView.setText(title);
+			mainEditText.setHint(title);
+		}
+
+		String text = intent.getStringExtra(Intent.EXTRA_TEXT);
+		Log.v(LOG_TAG, "EXTRA_TEXT => " + text);
+		if (!TextUtils.isEmpty(text))
+		{
+			mainEditText.setText(text);
+		}
+
+		mainEditText.requestFocus();
+
+		Log.v(LOG_TAG, "Bye");
+	}
+
+	public void onClick(View v)
+	{
+		switch (v.getId())
+		{
+			case R.id.ok_button:
+				Intent okData = new Intent();
+				okData.putExtra(Intent.EXTRA_TEXT, mainEditText.getText().toString());
+				setResult(RESULT_OK, okData);
+				finish();
+				break;
+			case R.id.cancel_button:
+				setResult(RESULT_CANCELED);
+				finish();
+				break;
+		}
+	}
+}

--- a/intent-lab/src/org/routine_work/intent_lab/intent/IntentDetailActivity.java
+++ b/intent-lab/src/org/routine_work/intent_lab/intent/IntentDetailActivity.java
@@ -19,6 +19,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 import java.util.Set;
 import org.routine_work.intent_lab.R;
+import org.routine_work.intent_lab.common.EditTextActivity;
 import org.routine_work.intent_lab.intent.provider.IntentStore;
 import org.routine_work.utils.Log;
 
@@ -35,11 +36,20 @@ public class IntentDetailActivity extends ListActivity
 	private static final int POSITION_CATEGORIES = 5;
 	private static final int POSITION_FLAGS = 6;
 	private static final int POSITION_EXTRAS = 7;
+	private static final int REQUEST_CODE_EDIT_INTENT_NAME = 101;
+	private static final int REQUEST_CODE_EDIT_INTENT_ACTION = 102;
+	private static final int REQUEST_CODE_EDIT_INTENT_COMPONENT = 103;
+	private static final int REQUEST_CODE_EDIT_INTENT_DATA_URI = 104;
+	private static final int REQUEST_CODE_EDIT_INTENT_DATA_TYPE = 105;
+	private static final int REQUEST_CODE_EDIT_INTENT_CATEGORIES = 106;
+	private static final int REQUEST_CODE_EDIT_INTENT_FLAGS = 106;
+	private static final int REQUEST_CODE_EDIT_INTENT_EXTRAS = 108;
 	// data
 	private Uri targetUri;
 	private String targetName;
 	private Intent targetIntent;
 	private IntentDetailListAdapter intentDetailListAdapter;
+	private boolean modified;
 
 	public void onClick(View view)
 	{
@@ -52,6 +62,19 @@ public class IntentDetailActivity extends ListActivity
 		}
 	}
 
+	public void onItemClick(AdapterView<?> parent, View view, int position, long id)
+	{
+		Log.d(LOG_TAG, "onItemClick() : Hello");
+		Log.d(LOG_TAG, "position => " + position);
+		switch (position)
+		{
+			case POSITION_NAME:
+				startNameEditActivity();
+				break;
+		}
+		Log.d(LOG_TAG, "onItemClick() : Bye");
+	}
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState)
 	{
@@ -89,6 +112,23 @@ public class IntentDetailActivity extends ListActivity
 		Log.v(LOG_TAG, "Bye");
 	}
 
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data)
+	{
+		switch (requestCode)
+		{
+			case REQUEST_CODE_EDIT_INTENT_NAME:
+				if (resultCode == RESULT_OK)
+				{
+					targetName = data.getStringExtra(Intent.EXTRA_TEXT);
+					intentDetailListAdapter.notifyDataSetChanged();
+				}
+				break;
+			default:
+				super.onActivityResult(requestCode, resultCode, data);
+		}
+	}
+
 	private String loadName(ContentResolver cr)
 	{
 		String title = null;
@@ -117,9 +157,13 @@ public class IntentDetailActivity extends ListActivity
 		return title;
 	}
 
-	public void onItemClick(AdapterView<?> parent, View view, int position, long id)
+	private void startNameEditActivity()
 	{
-		Log.d(LOG_TAG, "position => " + position);
+		Intent intent = new Intent(this, EditTextActivity.class);
+		String title = getString(R.string.name);
+		intent.putExtra(Intent.EXTRA_TITLE, title);
+		intent.putExtra(Intent.EXTRA_TEXT, targetName);
+		startActivityForResult(intent, REQUEST_CODE_EDIT_INTENT_NAME);
 	}
 
 	class IntentDetailListAdapter extends BaseAdapter