提交: 7e1c94641d80172a607f016ae490389e5fa2cabd - android_intent_lab (git)

Commit MetaInfo

• 修訂: 7e1c94641d80172a607f016ae490389e5fa2cabd (tree)
• 時間: 2012-10-22 00:53:25
• 作者: Masahiko, SAWAI <say@user...>
• Commiter: Masahiko, SAWAI

Log Message

IntentDetailActivity2 を ListView としてテスト実装

Change Summary

• add: .gitignore
• modified: intent-lab/AndroidManifest.xml
• add: intent-lab/res/layout/intent_detail_activity2.xml
• add: intent-lab/res/layout/intent_detail_item.xml
• modified: intent-lab/src/org/routine_work/intent_lab/intent/IntentDetailActivity.java
• add: intent-lab/src/org/routine_work/intent_lab/intent/IntentDetailActivity2.java
• modified: intent-lab/src/org/routine_work/intent_lab/intent/IntentListActivity.java
• modified: intent-lab/src/org/routine_work/intent_lab/intent/provider/IntentDBConstants.java
• modified: intent-lab/src/org/routine_work/intent_lab/intent/provider/IntentStore.java

差異

--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/intent-lab/target/
\ No newline at end of file

--- a/intent-lab/AndroidManifest.xml
+++ b/intent-lab/AndroidManifest.xml
@@ -29,8 +29,8 @@
 			</intent-filter>
 		</activity>
 
-		<!-- Intent Detail Viewer -->
-		<activity android:name=".intent.IntentDetailViewerActivity" >
+		<!-- Intent Detail -->
+		<activity android:name=".intent.IntentDetailActivity" >
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW" />
 				<category android:name="android.intent.category.DEFAULT" />
@@ -38,10 +38,10 @@
 			</intent-filter>
 		</activity>
 
-		<!-- Intent Editor -->
-		<activity android:name=".intent.IntentDetailEditorActivity" >
+		<!-- Intent Detail -->
+		<activity android:name=".intent.IntentDetailActivity2" >
 			<intent-filter>
-				<action android:name="android.intent.action.EDIT" />
+				<action android:name="android.intent.action.VIEW" />
 				<category android:name="android.intent.category.DEFAULT" />
 				<data android:mimeType="vnd.android.cursor.item/vnd.routine_work.intent" />
 			</intent-filter>

--- /dev/null
+++ b/intent-lab/res/layout/intent_detail_activity2.xml
@@ -0,0 +1,30 @@
+<?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"
+	>
+		<ImageButton
+			style="@style/actionbar_left_button" 
+			android:id="@+id/home_button"
+			android:src="?attr/ic_home"
+		/>
+		<TextView
+			style="@style/actionbar_title"
+			android:text="@string/edit_intent"
+		/>
+		<ImageButton
+			style="@style/actionbar_right_button" 
+			android:id="@+id/ok_button"
+			android:src="?attr/ic_ok"
+		/>
+	</LinearLayout>
+
+	<!-- list -->
+	<include layout="@layout/simple_list" />
+
+</LinearLayout>
\ No newline at end of file

--- /dev/null
+++ b/intent-lab/res/layout/intent_detail_item.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+>
+	<!-- Title -->
+	<LinearLayout 
+		android:id="@+id/intent_detail_item_name"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+	>
+		<TextView
+			style="@style/header"
+			android:text="@string/title"
+		/>
+		<TextView
+			android:id="@+id/name_textview"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="6dip"
+			android:textSize="20sp"
+			android:textColor="?android:textColorPrimary"
+		/>
+	</LinearLayout>
+
+	<!-- Action -->
+	<LinearLayout 
+		android:id="@+id/intent_detail_item_action"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+	>
+		<TextView
+			style="@style/header"
+			android:text="@string/action"
+		/>
+					
+		<TextView
+			style="@style/key"
+			android:text="@string/action_name"
+		/>
+		<TextView
+			style="@style/value"
+			android:id="@+id/action_textview"
+		/>
+	</LinearLayout>
+
+	<!-- Component -->
+	<LinearLayout 
+		android:id="@+id/intent_detail_item_component"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+	>
+		<TextView
+			style="@style/header"
+			android:text="@string/component"
+		/>
+		<TextView
+			style="@style/key"
+			android:text="@string/component_package"
+		/>
+		<TextView
+			style="@style/value"
+			android:id="@+id/component_package_textview"
+		/>
+		<TextView
+			style="@style/key"
+			android:text="@string/component_class"
+		/>
+		<TextView
+			style="@style/value"
+			android:id="@+id/component_class_textview"
+		/>
+	</LinearLayout>
+
+	<!-- Data URI-->
+	<LinearLayout 
+		android:id="@+id/intent_detail_item_data_uri"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+	>
+		<TextView
+			style="@style/header"
+			android:text="@string/data"
+		/>
+
+		<TextView
+			style="@style/key"
+			android:text="@string/data_uri"
+		/>
+		<TextView
+			style="@style/value"
+			android:id="@+id/data_uri_textview"
+		/>
+
+	</LinearLayout>
+
+	<!-- Data Type-->
+	<LinearLayout 
+		android:id="@+id/intent_detail_item_data_type"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+	>
+		<TextView
+			style="@style/key"
+			android:text="@string/data_type"
+		/>
+		<TextView
+			style="@style/value"
+			android:id="@+id/data_type_textview"
+		/>
+	</LinearLayout>
+
+</FrameLayout>
\ No newline at end of file

--- a/intent-lab/src/org/routine_work/intent_lab/intent/IntentDetailActivity.java
+++ b/intent-lab/src/org/routine_work/intent_lab/intent/IntentDetailActivity.java
@@ -229,7 +229,7 @@ public class IntentDetailActivity extends Activity
 				{
 					if (cursor.moveToFirst())
 					{
-						int titleColumnIndex = cursor.getColumnIndex(IntentStore.Intents.Columns.TITLE);
+						int titleColumnIndex = cursor.getColumnIndex(IntentStore.Intents.Columns.NAME);
 						title = cursor.getString(titleColumnIndex);
 					}
 				}

--- /dev/null
+++ b/intent-lab/src/org/routine_work/intent_lab/intent/IntentDetailActivity2.java
@@ -0,0 +1,332 @@
+package org.routine_work.intent_lab.intent;
+
+import android.app.Activity;
+import android.app.ListActivity;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageButton;
+import android.widget.TextView;
+import android.widget.Toast;
+import org.routine_work.intent_lab.R;
+import org.routine_work.intent_lab.intent.provider.IntentStore;
+import org.routine_work.utils.Log;
+
+public class IntentDetailActivity2 extends ListActivity
+	implements View.OnClickListener
+{
+
+	private static final String LOG_TAG = "intent-lab";
+	private static final int POSITION_NAME = 0;
+	private static final int POSITION_ACTION = 1;
+	private static final int POSITION_COMPONENT = 2;
+	private static final int POSITION_DATA_URI = 3;
+	private static final int POSITION_DATA_TYPE = 4;
+	// data
+	private Uri targetUri;
+	private String targetName;
+	private Intent targetIntent;
+	private IntentDetailListAdapter intentDetailListAdapter;
+
+	public void onClick(View view)
+	{
+		int id = view.getId();
+		switch (id)
+		{
+			case R.id.home_button:
+				finish();
+				break;
+		}
+	}
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState)
+	{
+		Log.v(LOG_TAG, "Hello");
+
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.intent_detail_activity2);
+
+		ImageButton homeButton = (ImageButton) findViewById(R.id.home_button);
+		homeButton.setOnClickListener(this);
+
+		// init 
+		targetUri = getIntent().getData();
+		if (targetUri != null)
+		{
+
+			ContentResolver cr = getContentResolver();
+			targetName = loadName(cr);
+			targetIntent = IntentStore.fetchIntent(cr, targetUri);
+		}
+
+		// init list adapter
+		if (targetIntent == null)
+		{
+			Toast.makeText(this, "No such intent exist.", Toast.LENGTH_SHORT).show();
+			finish();
+		}
+		else
+		{
+			intentDetailListAdapter = new IntentDetailListAdapter();
+			setListAdapter(intentDetailListAdapter);
+		}
+
+		Log.v(LOG_TAG, "Bye");
+	}
+
+	private String loadName(ContentResolver cr)
+	{
+		String title = null;
+
+		// load title
+		if (targetUri != null)
+		{
+			Cursor cursor = cr.query(targetUri, null, null, null, null);
+			if (cursor != null)
+			{
+				try
+				{
+					if (cursor.moveToFirst())
+					{
+						int titleColumnIndex = cursor.getColumnIndex(IntentStore.Intents.Columns.NAME);
+						title = cursor.getString(titleColumnIndex);
+					}
+				}
+				finally
+				{
+					cursor.close();
+				}
+			}
+		}
+
+		return title;
+	}
+
+	/*
+
+	 private void initializeCategories(Intent targetIntent)
+	 {
+	 Log.v(LOG_TAG, "Hello");
+
+	 Set<String> categories = targetIntent.getCategories();
+	 Log.d(LOG_TAG, "categories => " + categories);
+	 if (categories != null)
+	 {
+	 ViewGroup categoriesViewGroup = (ViewGroup) findViewById(R.id.categories_section);
+	 categoriesViewGroup.removeAllViews();
+
+	 LayoutInflater inflater = (LayoutInflater) getSystemService(LAYOUT_INFLATER_SERVICE);
+	 for (String category : categories)
+	 {
+	 View categoryItem = inflater.inflate(R.layout.category_list_item, categoriesViewGroup, true);
+	 TextView categoryTextView = (TextView) categoryItem.findViewById(R.id.category_textview);
+	 categoryTextView.setText(category);
+	 }
+	 }
+
+	 Log.v(LOG_TAG, "Bye");
+	 }
+
+	 private void initializeExtras(Intent targetIntent)
+	 {
+	 Log.v(LOG_TAG, "Hello");
+
+	 Bundle extras = targetIntent.getExtras();
+	 Log.d(LOG_TAG, "extras => " + extras);
+	 if (extras != null)
+	 {
+	 ViewGroup extrasViewGroup = (ViewGroup) findViewById(R.id.extras_section);
+	 extrasViewGroup.removeAllViews();
+
+	 LayoutInflater inflater = (LayoutInflater) getSystemService(LAYOUT_INFLATER_SERVICE);
+	 for (String key : extras.keySet())
+	 {
+	 Object value = extras.get(key);
+	 String type = value.getClass().getSimpleName();
+	 Log.d(LOG_TAG, "extra key => " + key);
+	 Log.d(LOG_TAG, "extra value => " + value);
+
+	 View extraItem = inflater.inflate(R.layout.extra_list_item, extrasViewGroup, true);
+	 TextView keyTextView = (TextView) extraItem.findViewById(R.id.extra_key_textview);
+	 TextView typeTextView = (TextView) extraItem.findViewById(R.id.extra_type_textview);
+	 TextView valueTextView = (TextView) extraItem.findViewById(R.id.extra_value_textview);
+
+	 keyTextView.setText(key);
+	 typeTextView.setText(type);
+	 valueTextView.setText(value.toString());
+	 }
+	 }
+	 Log.v(LOG_TAG, "Bye");
+	 }
+
+	 private void initializeFlags(Intent targetIntent)
+	 {
+	 Log.v(LOG_TAG, "Hello");
+
+	 int flags = targetIntent.getFlags();
+	 Log.d(LOG_TAG, "flags => " + flags);
+	 if (flags != 0)
+	 {
+	 ViewGroup flagsViewGroup = (ViewGroup) findViewById(R.id.flags_section);
+	 flagsViewGroup.removeAllViews();
+
+	 LayoutInflater inflater = (LayoutInflater) getSystemService(LAYOUT_INFLATER_SERVICE);
+	 for (int i = 0; i < IntentFlags.FLAG_VALUES.length; i++)
+	 {
+	 int flagValue = IntentFlags.FLAG_VALUES[i];
+	 String flagName = IntentFlags.FLAG_NAMES[i];
+	 if ((flags & flagValue) != 0)
+	 {
+	 Log.d(LOG_TAG, "flag name => " + flagName);
+	 View flagItem = inflater.inflate(R.layout.flag_list_item, flagsViewGroup, true);
+	 TextView flagNameTextView = (TextView) flagItem.findViewById(R.id.flag_name_textview);
+	 flagNameTextView.setText(flagName);
+	 }
+	 }
+	 }
+
+	 Log.v(LOG_TAG, "Bye");
+	 }
+	 */
+	class IntentDetailListAdapter extends BaseAdapter
+	{
+
+		private LayoutInflater inflater;
+
+		public IntentDetailListAdapter()
+		{
+			inflater = (LayoutInflater) getSystemService(Activity.LAYOUT_INFLATER_SERVICE);
+		}
+
+		public int getCount()
+		{
+			return 5;
+		}
+
+		public Object getItem(int position)
+		{
+			Object result = null;
+			switch (position)
+			{
+				case POSITION_NAME:
+					result = targetName;
+					break;
+				case POSITION_ACTION:
+					result = targetIntent.getAction();
+					break;
+				case POSITION_COMPONENT:
+					result = targetIntent.getComponent();
+					break;
+				case POSITION_DATA_URI:
+					result = targetIntent.getData();
+					break;
+				case POSITION_DATA_TYPE:
+					result = targetIntent.getType();
+					break;
+			}
+			return result;
+		}
+
+		public long getItemId(int position)
+		{
+			return position;
+		}
+
+		public View getView(int position, View convertView, ViewGroup parent)
+		{
+			View itemView;
+			Log.d(LOG_TAG, "Hello");
+
+			if (convertView == null)
+			{
+				itemView = inflater.inflate(R.layout.intent_detail_item, null);
+			}
+			else
+			{
+				itemView = convertView;
+			}
+			View nameView = itemView.findViewById(R.id.intent_detail_item_name);
+			View actionView = itemView.findViewById(R.id.intent_detail_item_action);
+			View componentView = itemView.findViewById(R.id.intent_detail_item_component);
+			View dataUriView = itemView.findViewById(R.id.intent_detail_item_data_uri);
+			View dataTypeView = itemView.findViewById(R.id.intent_detail_item_data_type);
+
+			nameView.setVisibility(View.GONE);
+			actionView.setVisibility(View.GONE);
+			componentView.setVisibility(View.GONE);
+			dataUriView.setVisibility(View.GONE);
+			dataTypeView.setVisibility(View.GONE);
+
+			Object item = getItem(position);
+			switch (position)
+			{
+				case POSITION_NAME:
+					String nameText = null;
+					if (item instanceof String)
+					{
+						nameText = (String) item;
+					}
+					TextView nameTextView = (TextView) nameView.findViewById(R.id.name_textview);
+					nameTextView.setText(nameText);
+					nameView.setVisibility(View.VISIBLE);
+					break;
+				case POSITION_ACTION:
+					String actionText = null;
+					if (item instanceof String)
+					{
+						actionText = (String) item;
+					}
+					TextView titleTextView = (TextView) actionView.findViewById(R.id.action_textview);
+					titleTextView.setText(actionText);
+					actionView.setVisibility(View.VISIBLE);
+					break;
+				case POSITION_COMPONENT:
+					String componentPackageText = null;
+					String componentClassText = null;
+					ComponentName componentName = (ComponentName) item;
+					if (componentName != null)
+					{
+						componentPackageText = componentName.getPackageName();
+						componentClassText = componentName.getClassName();
+					}
+					TextView componentPackageTextView = (TextView) componentView.findViewById(R.id.component_package_textview);
+					TextView componentClassTextView = (TextView) componentView.findViewById(R.id.component_class_textview);
+					componentPackageTextView.setText(componentPackageText);
+					componentClassTextView.setText(componentClassText);
+					componentView.setVisibility(View.VISIBLE);
+					break;
+				case POSITION_DATA_URI:
+					String dataUriText = null;
+					if (item instanceof Uri)
+					{
+						dataUriText = item.toString();
+					}
+					TextView dataUriTextView = (TextView) dataUriView.findViewById(R.id.data_uri_textview);
+					dataUriTextView.setText(dataUriText);
+					dataUriView.setVisibility(View.VISIBLE);
+					break;
+				case POSITION_DATA_TYPE:
+					String dataTypeText = null;
+					if (item instanceof String)
+					{
+						dataTypeText = (String) item;
+					}
+					TextView dataTypeTextView = (TextView) dataTypeView.findViewById(R.id.data_type_textview);
+					dataTypeTextView.setText(dataTypeText);
+					dataTypeView.setVisibility(View.VISIBLE);
+					break;
+			}
+
+			Log.d(LOG_TAG, "Bye");
+			return itemView;
+		}
+	}
+}

--- a/intent-lab/src/org/routine_work/intent_lab/intent/IntentListActivity.java
+++ b/intent-lab/src/org/routine_work/intent_lab/intent/IntentListActivity.java
@@ -33,7 +33,7 @@ public class IntentListActivity extends ListActivity
 	// init ListAdapter
 	private static final String[] MAPPING_FROM =
 	{
-		IntentStore.Intents.Columns.TITLE,
+		IntentStore.Intents.Columns.NAME,
 		IntentStore.Intents.Columns.ACTION,
 	};
 	private static final int[] MAPPING_TO =

--- a/intent-lab/src/org/routine_work/intent_lab/intent/provider/IntentDBConstants.java
+++ b/intent-lab/src/org/routine_work/intent_lab/intent/provider/IntentDBConstants.java
@@ -45,23 +45,23 @@ interface IntentDBConstants
 			String DATA = "_data";
 			String CREATED = "created";
 			String MODIFIED = "modified";
-			String TITLE = "title";
+			String NAME = "name";
 			String ACTION = "action"; // Intent.getAction()
 			String DATA_URI = "data_uri"; // Intent.getData()
 		}
 		// CREATE SQL
 		static final String CREATE_TABLE_SQL = "CREATE TABLE " + TABLE_NAME + "("
 			+ "  " + Columns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT"
+			+ ", " + Columns.NAME + " TEXT"
 			+ ", " + Columns.DATA + " TEXT"
-			+ ", " + Columns.TITLE + " TEXT"
-			+ ", " + Columns.CREATED + " INTEGER"
-			+ ", " + Columns.MODIFIED + " INTEGER"
+			+ ", " + Columns.CREATED + " INTEGER NOT NULL"
+			+ ", " + Columns.MODIFIED + " INTEGER NOT NULL"
 			+ ", " + Columns.ACTION + " TEXT"
 			+ ", " + Columns.DATA_URI + " TEXT"
 			+ ");";
 		String CREATE_TITLE_INDEX_SQL = "CREATE INDEX "
-			+ TABLE_NAME + "_" + Columns.TITLE + "_index "
-			+ "ON " + TABLE_NAME + "(" + Columns.TITLE + ");";
+			+ TABLE_NAME + "_" + Columns.NAME + "_index "
+			+ "ON " + TABLE_NAME + "(" + Columns.NAME + ");";
 		String CREATE_CREATED_INDEX_SQL = "CREATE INDEX "
 			+ TABLE_NAME + "_" + Columns.CREATED + "_index "
 			+ "ON " + TABLE_NAME + "(" + Columns.CREATED + ");";

--- a/intent-lab/src/org/routine_work/intent_lab/intent/provider/IntentStore.java
+++ b/intent-lab/src/org/routine_work/intent_lab/intent/provider/IntentStore.java
@@ -59,7 +59,7 @@ public class IntentStore
 			String DATA = IntentDBConstants.Intents.Columns.DATA;
 			String CREATED = IntentDBConstants.Intents.Columns.CREATED;
 			String MODIFIED = IntentDBConstants.Intents.Columns.MODIFIED;
-			String TITLE = IntentDBConstants.Intents.Columns.TITLE;
+			String NAME = IntentDBConstants.Intents.Columns.NAME;
 			String ACTION = IntentDBConstants.Intents.Columns.ACTION;
 			String DATA_URI = IntentDBConstants.Intents.Columns.DATA_URI;
 		}
@@ -111,7 +111,7 @@ public class IntentStore
 		String dataUri = intent.getDataString();
 		long now = new Date().getTime();
 		ContentValues initialValues = new ContentValues();
-		initialValues.put(Intents.Columns.TITLE, title);
+		initialValues.put(Intents.Columns.NAME, title);
 		initialValues.put(Intents.Columns.ACTION, action);
 		initialValues.put(Intents.Columns.DATA_URI, dataUri);
 		initialValues.put(Intents.Columns.CREATED, now);