提交: dbce3d9c048cc67b7a266d159f97e19720ce0d46 - kigo (git)

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

Commit MetaInfo

• 修订版: dbce3d9c048cc67b7a266d159f97e19720ce0d46 (tree)
• 时间: 2012-09-09 21:24:11
• 作者: Kodakana <kodakana@linu...>
• Commiter: Kodakana

Log Message

メモリ不足のときの動作改善を目的とする変更。アイコン作成。その他整理。

更改概述

• modified: AndroidManifest.xml
• delete: REDME_EN => README_EN
• 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.class
• modified: bin/classes/org/pulpdust/kigo/R$string.class
• modified: bin/classes/org/pulpdust/kigo/R$style.class
• modified: bin/classes/org/pulpdust/kigo/R$xml.class
• modified: bin/res/drawable-hdpi/ic_launcher.png
• modified: bin/res/drawable-ldpi/ic_launcher.png
• modified: bin/res/drawable-mdpi/ic_launcher.png
• modified: bin/res/drawable-xhdpi/ic_launcher.png
• modified: bin/resources.ap_
• modified: gen/org/pulpdust/kigo/R.java
• modified: res/drawable-hdpi/ic_launcher.png
• modified: res/drawable-ldpi/ic_launcher.png
• modified: res/drawable-mdpi/ic_launcher.png
• modified: res/drawable-xhdpi/ic_launcher.png
• modified: res/values-ja/strings.xml
• modified: res/values/strings.xml
• modified: res/xml/prefs.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="1"
-    android:versionName="0.3"
+    android:versionName="0.4"
     android:installLocation="auto" >
 
     <uses-sdk

--- a/REDME_EN
+++ b/README_EN
@@ -29,7 +29,7 @@ You can change various settings from the Options menu to open the setting screen
   * Tap Behavour(Select from the "Open" "send" copy "," what happens when you tap an item)
   * Font Size(Select the size of a font in the list)
   * Haiku Host(Select the host that you want to use from h.hatena.ne.jp or h.hatena.com)
- * Send Template
+ * Mail Template
   * To:(During the "Send" operation, the address is automatically placed in the email To field)
   * CC:(Same as above)
   * BCC:(..)

--- 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="1"
-    android:versionName="0.3"
+    android:versionName="0.4"
     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.class and b/bin/classes/org/pulpdust/kigo/KigoActivity.class differ

Binary files a/bin/classes/org/pulpdust/kigo/R$string.class and b/bin/classes/org/pulpdust/kigo/R$string.class differ

Binary files a/bin/classes/org/pulpdust/kigo/R$style.class and b/bin/classes/org/pulpdust/kigo/R$style.class differ

Binary files a/bin/classes/org/pulpdust/kigo/R$xml.class and b/bin/classes/org/pulpdust/kigo/R$xml.class differ

Binary files a/bin/res/drawable-hdpi/ic_launcher.png and b/bin/res/drawable-hdpi/ic_launcher.png differ

Binary files a/bin/res/drawable-ldpi/ic_launcher.png and b/bin/res/drawable-ldpi/ic_launcher.png differ

Binary files a/bin/res/drawable-mdpi/ic_launcher.png and b/bin/res/drawable-mdpi/ic_launcher.png differ

Binary files a/bin/res/drawable-xhdpi/ic_launcher.png and b/bin/res/drawable-xhdpi/ic_launcher.png differ

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

--- a/gen/org/pulpdust/kigo/R.java
+++ b/gen/org/pulpdust/kigo/R.java
@@ -50,33 +50,42 @@ public final class R {
         public static final int main_context=0x7f090001;
     }
     public static final class string {
+        public static final int address=0x7f070003;
+        public static final int app_author=0x7f070004;
+        public static final int app_copy=0x7f070006;
+        public static final int app_lic=0x7f070002;
         public static final int app_name=0x7f070000;
-        public static final int bcc=0x7f070010;
-        public static final int button_find=0x7f070004;
-        public static final int cc=0x7f07000f;
-        public static final int err_fail_get=0x7f070007;
-        public static final int err_no_net=0x7f070006;
-        public static final int hello_world=0x7f070001;
-        public static final int hint_word=0x7f070005;
-        public static final int info_entries=0x7f070016;
-        public static final int info_follows=0x7f070017;
-        public static final int info_title=0x7f070018;
-        public static final int info_word=0x7f070019;
-        public static final int menu_copy=0x7f070011;
-        public static final int menu_info=0x7f070013;
-        public static final int menu_open=0x7f070012;
-        public static final int menu_relat=0x7f070014;
-        public static final int menu_send=0x7f070015;
-        public static final int menu_settings=0x7f070002;
-        public static final int on_load=0x7f070008;
-        public static final int pref_cat_app=0x7f070009;
-        public static final int pref_cat_templ=0x7f07000d;
-        public static final int pref_font=0x7f07000a;
-        public static final int pref_host=0x7f07000c;
-        public static final int pref_tap=0x7f07000b;
-        public static final int relateds=0x7f07001a;
-        public static final int title_activity_kigo=0x7f070003;
-        public static final int to=0x7f07000e;
+        public static final int app_ver=0x7f070001;
+        public static final int bcc=0x7f070018;
+        public static final int button_find=0x7f07000c;
+        public static final int cc=0x7f070017;
+        public static final int copy=0x7f070005;
+        public static final int err_fail_get=0x7f07000f;
+        public static final int err_no_net=0x7f07000e;
+        public static final int hello_world=0x7f070009;
+        public static final int hint_word=0x7f07000d;
+        public static final int info_entries=0x7f07001f;
+        public static final int info_follows=0x7f070020;
+        public static final int info_title=0x7f070021;
+        public static final int info_word=0x7f070022;
+        public static final int license=0x7f070008;
+        public static final int menu_copy=0x7f07001a;
+        public static final int menu_info=0x7f07001c;
+        public static final int menu_open=0x7f07001b;
+        public static final int menu_relat=0x7f07001d;
+        public static final int menu_send=0x7f07001e;
+        public static final int menu_settings=0x7f07000a;
+        public static final int on_load=0x7f070010;
+        public static final int pref_cat_about=0x7f070019;
+        public static final int pref_cat_app=0x7f070011;
+        public static final int pref_cat_templ=0x7f070015;
+        public static final int pref_font=0x7f070012;
+        public static final int pref_host=0x7f070014;
+        public static final int pref_tap=0x7f070013;
+        public static final int relateds=0x7f070023;
+        public static final int title_activity_kigo=0x7f07000b;
+        public static final int to=0x7f070016;
+        public static final int version=0x7f070007;
     }
     public static final class style {
         public static final int AppTheme=0x7f080000;

Binary files a/res/drawable-hdpi/ic_launcher.png and b/res/drawable-hdpi/ic_launcher.png differ

Binary files a/res/drawable-ldpi/ic_launcher.png and b/res/drawable-ldpi/ic_launcher.png differ

Binary files a/res/drawable-mdpi/ic_launcher.png and b/res/drawable-mdpi/ic_launcher.png differ

Binary files a/res/drawable-xhdpi/ic_launcher.png and b/res/drawable-xhdpi/ic_launcher.png differ

--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1,6 +1,14 @@
 <resources>
 
     <string name="app_name">Kigo</string>
+    <string name="app_ver">0.4</string>
+    <string name="app_lic">GNU GPL v3</string>
+    <string name="address">連絡先</string>
+    <string name="app_author">Kodakana&lt;[e-mail]&gt;</string>
+    <string name="copy">製作・著作</string>
+    <string name="app_copy">&#169; 2012 pulpdust.org/Kodakana</string>
+    <string name="version">Ver.</string>
+    <string name="license">許諾条件</string>
     <string name="hello_world">ほげえええぇぇぇぇぇ</string>
     <string name="menu_settings">設定</string>
     <string name="title_activity_kigo">Kigo</string>
@@ -17,6 +25,7 @@
     <string name="to">To:</string>
     <string name="cc">CC:</string>
     <string name="bcc">BCC:</string>
+    <string name="pref_cat_about">概要</string>
     <string name="menu_copy">コピー</string>
     <string name="menu_open">開く</string>
     <string name="menu_info">情報</string>

--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,14 @@
 <resources>
 
     <string name="app_name">Kigo</string>
+    <string name="app_ver">0.4</string>
+    <string name="app_lic">GNU GPL v3</string>
+    <string name="address">Address</string>
+    <string name="app_author">Kodakana&lt;[e-mail]&gt;</string>
+    <string name="copy">Copyright</string>
+    <string name="app_copy">&#169; 2012 pulpdust.org/Kodakana</string>
+    <string name="version">Ver.</string>
+    <string name="license">License</string>
     <string name="hello_world">Hello world!</string>
     <string name="menu_settings">Settings</string>
     <string name="title_activity_kigo">Kigo</string>
@@ -13,10 +21,11 @@
     <string name="pref_font">Font Size</string>
     <string name="pref_tap">Tap Behavior</string>
     <string name="pref_host">Haiku Host</string>
-    <string name="pref_cat_templ">Send To Template</string>
+    <string name="pref_cat_templ">Mail Template</string>
     <string name="to">To:</string>
     <string name="cc">CC:</string>
     <string name="bcc">BCC:</string>
+    <string name="pref_cat_about">About</string>
     <string name="menu_copy">Copy</string>
     <string name="menu_open">Open</string>
     <string name="menu_info">Info</string>

--- a/res/xml/prefs.xml
+++ b/res/xml/prefs.xml
@@ -32,5 +32,23 @@
         android:key="bcc"
         android:title="@string/bcc" />
     </PreferenceCategory>
-
+    <PreferenceCategory android:title="@string/pref_cat_about">
+        <Preference
+            android:selectable="false"
+            android:title="@string/app_name"
+            android:summary="@string/app_ver" />
+        <Preference
+            android:selectable="false"
+            android:title="@string/copy"
+            android:summary="@string/app_copy" />
+        <Preference
+            android:selectable="false"
+            android:title="@string/license"
+            android:summary="@string/app_lic" />
+        <Preference
+            android:selectable="false"
+            android:title="@string/address"
+            android:summary="@string/app_author" />
+    </PreferenceCategory>
+    
 </PreferenceScreen>
\ No newline at end of file

--- a/src/org/pulpdust/kigo/KigoActivity.java
+++ b/src/org/pulpdust/kigo/KigoActivity.java
@@ -80,6 +80,7 @@ public class KigoActivity extends Activity {
 	String[] send_to = new String[1];
 	String[] cc = new String[1];
 	String[] bcc = new String[1];
+	String svdt = "savedata";
 	int tpbhvr;
 	int fntsz = 12;
 	boolean prvd;
@@ -100,6 +101,7 @@ public class KigoActivity extends Activity {
         } else {
         	prvd = false;
         	rltd = false;
+        	loadSave();
         }
         readPrefs();
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
@@ -367,6 +369,12 @@ public class KigoActivity extends Activity {
     				setTitle(R.string.app_name);
     				reLoad(guri);
     				return true;
+    			} else if (!sbj.equals("")){
+    				edttxt.setText("");
+    				goFind();
+    				return true;
+    			} else {
+    				return super.dispatchKeyEvent(kev);
     			}
     		default:
     			return super.dispatchKeyEvent(kev);
@@ -495,7 +503,14 @@ public class KigoActivity extends Activity {
     	switch (requestCode){
     	case 2:
     		readPrefs();
-    		reLoad(guri);
+    		if (obj != null){
+        		arryadpt.clear();
+          		xmlBaker(obj);
+    		} else if (guri != null){
+        		reLoad(guri);
+    		} else {
+    			goFind();
+    		}
     		break;    	
     	}
     }
@@ -508,4 +523,33 @@ public class KigoActivity extends Activity {
     	cc[0] = sprefs.getString("cc", "");
     	bcc[0] = sprefs.getString("bcc", "");
     }
+    public void loadSave(){
+    	SharedPreferences spref = getSharedPreferences(svdt, 0);
+    	sbj = spref.getString("sbj", "");
+    	obj = spref.getString("obj", null);
+    	guri = spref.getString("guri", null);
+    }
+    
+    @Override
+    public void onStop(){
+    	super.onStop();
+		SharedPreferences spref = getSharedPreferences(svdt, 0);
+		SharedPreferences.Editor sedit = spref.edit();
+		if (obj != null){
+			sedit.putString("obj", obj);
+		} else {
+			sedit.putString("obj", null);
+		}
+    	if (!sbj.equals("")){
+    		sedit.putString("sbj", sbj);
+    	} else {
+    		sedit.putString("sbj", "");
+    	}
+    	if (guri != null){
+    		sedit.putString("guri", guri);
+    	} else {
+    		sedit.putString("guri", null);
+    	}
+		sedit.commit();
+    }
 }