コミット: bf1e92d00190bb51818f93cf9ec80873b1949417 - kigo (git)

はてなハイク・キーワードの検索と入力アプリ

コミットメタ情報

• リビジョン: bf1e92d00190bb51818f93cf9ec80873b1949417 (tree)
• 日時: 2012-10-29 20:33:25
• 作者: Kodakana <kodakana@linu...>
• コミッター: Kodakana

ログメッセージ

Dialog を DialogFragment に変更。起動時の接続確認を改善。

変更サマリ

• modified: AndroidManifest.xml
• modified: bin/AndroidManifest.xml
• modified: bin/Kigo.apk
• modified: bin/classes.dex
• modified: bin/classes/org/pulpdust/kigo/KigoActivity$1.class
• modified: bin/classes/org/pulpdust/kigo/KigoActivity$2.class
• modified: bin/classes/org/pulpdust/kigo/KigoActivity$3.class
• modified: bin/classes/org/pulpdust/kigo/KigoActivity$4.class
• modified: bin/classes/org/pulpdust/kigo/KigoActivity$5.class
• modified: bin/classes/org/pulpdust/kigo/KigoActivity$6.class
• modified: bin/classes/org/pulpdust/kigo/KigoActivity$7$1.class
• modified: bin/classes/org/pulpdust/kigo/KigoActivity$7.class
• delete: bin/classes/org/pulpdust/kigo/KigoActivity$8$1.class
• delete: bin/classes/org/pulpdust/kigo/KigoActivity$8.class
• add: bin/classes/org/pulpdust/kigo/KigoActivity$InfoDialog.class
• modified: bin/classes/org/pulpdust/kigo/KigoActivity.class
• modified: bin/resources.ap_
• modified: res/values-ja/strings.xml
• modified: res/values/strings.xml
• modified: src/org/pulpdust/kigo/KigoActivity.java

差分

--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.pulpdust.kigo"
-    android:versionCode="3"
-    android:versionName="0.51"
+    android:versionCode="4"
+    android:versionName="0.55"
     android:installLocation="auto" >
 
     <uses-sdk

--- a/bin/AndroidManifest.xml
+++ b/bin/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.pulpdust.kigo"
-    android:versionCode="3"
-    android:versionName="0.51"
+    android:versionCode="4"
+    android:versionName="0.55"
     android:installLocation="auto" >
 
     <uses-sdk

Binary files a/bin/Kigo.apk and b/bin/Kigo.apk differ

Binary files a/bin/classes.dex and b/bin/classes.dex differ

Binary files a/bin/classes/org/pulpdust/kigo/KigoActivity$1.class and b/bin/classes/org/pulpdust/kigo/KigoActivity$1.class differ

Binary files a/bin/classes/org/pulpdust/kigo/KigoActivity$2.class and b/bin/classes/org/pulpdust/kigo/KigoActivity$2.class differ

Binary files a/bin/classes/org/pulpdust/kigo/KigoActivity$3.class and b/bin/classes/org/pulpdust/kigo/KigoActivity$3.class differ

Binary files a/bin/classes/org/pulpdust/kigo/KigoActivity$4.class and b/bin/classes/org/pulpdust/kigo/KigoActivity$4.class differ

Binary files a/bin/classes/org/pulpdust/kigo/KigoActivity$5.class and b/bin/classes/org/pulpdust/kigo/KigoActivity$5.class differ

Binary files a/bin/classes/org/pulpdust/kigo/KigoActivity$6.class and b/bin/classes/org/pulpdust/kigo/KigoActivity$6.class differ

Binary files a/bin/classes/org/pulpdust/kigo/KigoActivity$7$1.class and b/bin/classes/org/pulpdust/kigo/KigoActivity$7$1.class differ

Binary files a/bin/classes/org/pulpdust/kigo/KigoActivity$7.class and b/bin/classes/org/pulpdust/kigo/KigoActivity$7.class differ

Binary files a/bin/classes/org/pulpdust/kigo/KigoActivity$8$1.class and /dev/null differ

Binary files a/bin/classes/org/pulpdust/kigo/KigoActivity$8.class and /dev/null differ

Binary files /dev/null and b/bin/classes/org/pulpdust/kigo/KigoActivity$InfoDialog.class differ

Binary files a/bin/classes/org/pulpdust/kigo/KigoActivity.class and b/bin/classes/org/pulpdust/kigo/KigoActivity.class differ

Binary files a/bin/resources.ap_ and b/bin/resources.ap_ differ

--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <string name="app_name">Kigo</string>
-    <string name="app_ver">0.51</string>
+    <string name="app_ver">0.55</string>
     <string name="app_lic">GNU GPL v3</string>
     <string name="address">連絡先</string>
     <string name="app_author">Kodakana&lt;[e-mail]&gt;</string>

--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <string name="app_name">Kigo</string>
-    <string name="app_ver">0.51</string>
+    <string name="app_ver">0.55</string>
     <string name="app_lic">GNU GPL v3</string>
     <string name="address">Address</string>
     <string name="app_author">Kodakana&lt;[e-mail]&gt;</string>

--- a/src/org/pulpdust/kigo/KigoActivity.java
+++ b/src/org/pulpdust/kigo/KigoActivity.java
@@ -25,10 +25,13 @@ import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.FragmentActivity;
 import android.text.ClipboardManager;
 import android.util.Log;
 import android.util.Xml;
@@ -56,23 +59,23 @@ import android.view.inputmethod.EditorInfo;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemLongClickListener;
 
-public class KigoActivity extends Activity {
+public class KigoActivity extends FragmentActivity {
 	static final String TAG = "KigoActivity";
 	static List<String> lst = new ArrayList<String>();
 	static ArrayAdapter<String> arryadpt;
 	EditText edttxt;
 	Button bttn;
 	ListView lstvw;
-	HttpResponse res = null;
+	static HttpResponse res = null;
 	CharSequence cptxt;
-	String host = "http://h.hatena.ne.jp/";
+	static String host = "http://h.hatena.ne.jp/";
 	String base = host + "keyword/";
 	String kpth = "keyword/";
 	String uri = host + 
 			"api/keywords/list.xml?without_related_keywords=true";
 	String lpth = "api/keywords/list.xml?without_related_keywords=true";
 	String iuri = host + "api/keywords/show.xml?word=";
-	String ipth = "api/keywords/show.xml?word=";
+	static String ipth = "api/keywords/show.xml?word=";
 	String guri;
 	String sbj = "";
 	String obj;
@@ -191,7 +194,8 @@ public class KigoActivity extends Activity {
         	}
         };
         lstvw.setAdapter(arryadpt);
-    	final String save[] = (String[]) getLastNonConfigurationInstance();
+//    	final String save[] = (String[]) getLastNonConfigurationInstance();
+    	final String save[] = (String[]) getLastCustomNonConfigurationInstance();
     	if (save != null){
     		if (save[0] != null){
     		obj = save[0];
@@ -200,7 +204,8 @@ public class KigoActivity extends Activity {
     		}
     		if (save[1] != null){ buri = save[1]; }
     		if (save[2] != null){ bwrd = save[2]; }
-      	} else {
+      	} else if (isConnect(this)){
+          	{
       		if (rltd == true){
       			guri = host + ipth + sbj;
           		reLoad(guri);
@@ -209,6 +214,10 @@ public class KigoActivity extends Activity {
       			goFind();
       		}
       	}
+      	} else {
+          	Toast.makeText(this, R.string.err_no_net, 
+        			Toast.LENGTH_SHORT).show();
+      	}
     }
     public void goFind(){
 		sbj = edttxt.getText().toString().trim();
@@ -275,7 +284,9 @@ public class KigoActivity extends Activity {
     		doOpen(cptxt);
     		return true;
     	case R.id.menu_info:
-    		echoInfo(cptxt.toString());
+    		DialogFragment id = InfoDialog.newInstance(this, cptxt.toString());
+    		id.show(getSupportFragmentManager(), "hoge");
+//    		echoInfo(cptxt.toString());
     		return true;
     	case R.id.menu_relat:
 //    		Intent intent = new Intent(gactn2);
@@ -312,18 +323,34 @@ public class KigoActivity extends Activity {
     		return false;
     	}
     }
-    public void echoInfo(final String word){
-    	final Handler handler = new Handler();
-		final Context context = this;
-    	new Thread(new Runnable(){
-    		@Override
-    		public void run(){
+    public static class InfoDialog extends DialogFragment{
+    	static Context cx;
+    	public static InfoDialog newInstance(Context c, String w){
+    		InfoDialog id = new InfoDialog();
+    		cx = c;
+    		Bundle args = new Bundle();
+    		args.putString("word", w);
+    		id.setArguments(args);
+    		return id;
+    	}
+    	@Override
+    	public Dialog onCreateDialog(Bundle savedInstanceState){
+    		return echoInfo(cx, getActivity(), getArguments().getString("word"));
+    	}
+    }
+    public static AlertDialog echoInfo(Context context, FragmentActivity av, String word){
+//    	final Handler handler = new Handler();
+    	AlertDialog ad = null;
+//		final Context context = this;
+//    	new Thread(new Runnable(){
+//    		@Override
+//    		public void run(){
 		    	try {
-		    		String turi = host + ipth + URLEncoder.encode(word.toString(), "UTF-8").replace("+", "%20");
-			    	final String xml = getHttp(turi);
-	    			handler.post(new Runnable(){
-	    				@Override
-	    				public void run(){
+		    		String turi = host + ipth + URLEncoder.encode(word, "UTF-8").replace("+", "%20");
+			    	final String xml = getHttp(context, turi);
+//	    			handler.post(new Runnable(){
+//	    				@Override
+//	    				public void run(){
 	    				    	if (xml != null){
 	    				    		String info[] = exInfo(xml);
 	    				    		if(info != null){
@@ -331,37 +358,56 @@ public class KigoActivity extends Activity {
 	    					    		LayoutInflater linflater = 
 	    					    				(LayoutInflater) context.getSystemService(LAYOUT_INFLATER_SERVICE);
 	    					    		View layout = linflater.inflate(R.layout.info,
-	    					    				(ViewGroup) findViewById(R.id.layout_root));
+	    					    				(ViewGroup) av.findViewById(R.id.layout_root));
 	    					    		TextView tv1 = (TextView) layout.findViewById(R.id.textView1);
 	    					    		TextView tv2 = (TextView) layout.findViewById(R.id.textView2);
 	    					    		TextView tv3 = (TextView) layout.findViewById(R.id.textView3);
 //	    					    		TextView tv4 = (TextView) layout.findViewById(R.id.textView4);
-	    					    		tv1.setText(getString(R.string.info_entries) + info[0]);
-	    					    		tv2.setText(getString(R.string.info_follows) + info[1]);
-	    					    		tv3.setText(getString(R.string.info_title) + info[2]);
+	    					    		tv1.setText(av.getString(R.string.info_entries) + info[0]);
+	    					    		tv2.setText(av.getString(R.string.info_follows) + info[1]);
+	    					    		tv3.setText(av.getString(R.string.info_title) + info[2]);
 //	    					    		tv4.setText(getString(R.string.info_word) + info[3]);
 	    				    			abuilder.setTitle(word);
 	    				    			abuilder.setCancelable(true);
 	    				    			abuilder.setView(layout);
-	    				    			abuilder.show();
+	    				    			ad = abuilder.create();
 	    				    		}
 	    				    	} else {
-	    				    		Toast.makeText(getApplicationContext(), R.string.err_fail_get, 
-	    			              			Toast.LENGTH_SHORT).show();
+	    				    		AlertDialog.Builder empty = new AlertDialog.Builder(context);
+    					    		LayoutInflater linflater = 
+    					    				(LayoutInflater) context.getSystemService(LAYOUT_INFLATER_SERVICE);
+    					    		View layout = linflater.inflate(R.layout.info,
+    					    				(ViewGroup) av.findViewById(R.id.layout_root));
+    					    		TextView tv1 = (TextView) layout.findViewById(R.id.textView1);
+    					    		tv1.setText(R.string.err_fail_get);
+    				    			empty.setTitle(word);
+    				    			empty.setCancelable(true);
+    				    			empty.setView(layout);
+	    				    		ad = empty.create();
+//	    				    		Toast.makeText(context, R.string.err_fail_get, 
+//	    			              			Toast.LENGTH_SHORT).show();
 	    				    	}
-	    				}
-	    			});
+//	    				}
+//	    			});
 
 				} catch (UnsupportedEncodingException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
-    		}
-    	}).start();
+    			return ad;
+//    		}
+//    	}).start();
     }
     
-    @Override
-    public Object onRetainNonConfigurationInstance(){
+//    @Override
+//    public Object onRetainNonConfigurationInstance(){
+//    	final String save[] = new String[3];
+//    	save[0] = obj;
+//    	save[1] = buri;
+//    	save[2] = bwrd;
+//    	return save;
+//    }
+    public Object onRetainCustomNonConfiguratonInstance(){
     	final String save[] = new String[3];
     	save[0] = obj;
     	save[1] = buri;
@@ -401,12 +447,13 @@ public class KigoActivity extends Activity {
     public void reLoad(final String uri){
 //    	final Getter getter = new Getter();
     	final Handler handler = new Handler();
+    	final Context c = getApplicationContext();
     	new Thread(new Runnable(){
     		@Override
     		public void run(){
 	        	  obj = null;
 //	        	  obj = getter.getHttp(uri);
-	        	  obj = getHttp(uri);
+	        	  obj = getHttp(c, uri);
     			handler.post(new Runnable(){
     				@Override
     				public void run(){
@@ -433,9 +480,9 @@ public class KigoActivity extends Activity {
     	}
     	return false;
     }
-    public String getHttp(final String uri){
-    	if (!isConnect(getApplicationContext())){
-          	Toast.makeText(getApplicationContext(), R.string.err_no_net, 
+    public static String getHttp(Context context, final String uri){
+    	if (!isConnect(context)){
+          	Toast.makeText(context, R.string.err_no_net, 
             			Toast.LENGTH_SHORT).show();
           	return null;
        } else {
@@ -485,7 +532,7 @@ public class KigoActivity extends Activity {
     		Log.e(TAG, e.getMessage());
     	}
     }
-    public String[] exInfo(String xml){
+    public static String[] exInfo(String xml){
     	try {
     		String ret[] = new String[4];
     		XmlPullParser xparser = Xml.newPullParser();