Commit: b7a3f86ec13a6291a5ef408f6c5abcac4012e896 - snapping_camera (git)

Commit MetaInfo

• Révision: b7a3f86ec13a6291a5ef408f6c5abcac4012e896 (tree)
• l'heure: 2012-09-07 22:06:29
• Auteur: Kodakana <kodakana@user...>
• Commiter: Kodakana

Message de Log

撮らずに送信する場合の動作の改善。ファイルを開く場合に拡張子が大文字だと失敗する問題の修正。ファイルを開く場合にパスにマルチバイト文字が含まれていると正しく動作しない問題の改善。日本語リソースを追加。

Change Summary

• modified: AndroidManifest.xml
• modified: bin/AndroidManifest.xml
• modified: bin/Snapping Camera.apk
• modified: bin/classes.dex
• modified: bin/classes/org/pulpdust/snappingcamera/MainActivity$2.class
• modified: bin/classes/org/pulpdust/snappingcamera/MainActivity.class
• modified: bin/resources.ap_
• modified: res/layout/activity_main.xml
• add: res/values-ja/strings.xml
• modified: src/org/pulpdust/snappingcamera/MainActivity.java

Modification

--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,11 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.pulpdust.snappingcamera"
     android:versionCode="1"
-    android:versionName="0.3"
+    android:versionName="0.4"
     android:installLocation="auto" >
 
     <uses-sdk
-        android:minSdkVersion="8"
+        android:minSdkVersion="4"
         android:targetSdkVersion="8" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
@@ -14,7 +14,8 @@
         android:label="@string/app_name" >
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name" >
+            android:label="@string/app_name"
+            android:windowSoftInputMode="stateUnchanged|adjustResize" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

--- a/bin/AndroidManifest.xml
+++ b/bin/AndroidManifest.xml
@@ -1,11 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.pulpdust.snappingcamera"
     android:versionCode="1"
-    android:versionName="0.3"
+    android:versionName="0.4"
     android:installLocation="auto" >
 
     <uses-sdk
-        android:minSdkVersion="8"
+        android:minSdkVersion="4"
         android:targetSdkVersion="8" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
@@ -14,7 +14,8 @@
         android:label="@string/app_name" >
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name" >
+            android:label="@string/app_name"
+            android:windowSoftInputMode="stateUnchanged|adjustResize" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

Binary files a/bin/Snapping Camera.apk and b/bin/Snapping Camera.apk differ

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

Binary files a/bin/classes/org/pulpdust/snappingcamera/MainActivity$2.class and b/bin/classes/org/pulpdust/snappingcamera/MainActivity$2.class differ

Binary files a/bin/classes/org/pulpdust/snappingcamera/MainActivity.class and b/bin/classes/org/pulpdust/snappingcamera/MainActivity.class differ

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

--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -28,6 +28,7 @@
         android:id="@+id/button2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/editText1"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
         android:text="@string/kigo" />

--- /dev/null
+++ b/res/values-ja/strings.xml
@@ -0,0 +1,22 @@
+<resources>
+
+    <string name="app_name">Snapping Camera</string>
+    <string name="hello_world">またお会いしましたね。</string>
+    <string name="menu_notake">撮らない</string>
+    <string name="menu_open">ファイルから&#8230;</string>
+    <string name="menu_settings">設定&#8230;</string>
+    <string name="title_activity_main">MainActivity</string>
+    <string name="to">To:</string>
+    <string name="sub">Subject:</string>
+    <string name="cc">CC:</string>
+    <string name="bcc">BCC:</string>
+    <string name="shot">写真を撮る</string>
+    <string name="err_not_cam">カメラが見つかりません。</string>
+    <string name="err_not_mail">送信できません。</string>
+    <string name="err_not_sd">拡張記憶領域が見つかりません。</string>
+    <string name="err_den_sd">拡張記憶領域と連絡がとれません。</string>
+    <string name="err_not_act">アクティビティが見つかりません。</string>
+    <string name="err_not_file">ファイルを選択してください。</string>
+    <string name="kigo">Kigo</string>
+
+</resources>
\ No newline at end of file

--- a/src/org/pulpdust/snappingcamera/MainActivity.java
+++ b/src/org/pulpdust/snappingcamera/MainActivity.java
@@ -50,7 +50,7 @@ public class MainActivity extends Activity {
         setContentView(R.layout.activity_main);
 //        snpcmrvw = (SnappingCameraView) findViewById(R.id.surfaceView1);
         if (Intent.ACTION_SEND.equals(getIntent().getAction())){
-        	Intent throwint = buildSender();
+        	Intent throwint = buildSender(0);
         	String type = getIntent().getType();
         	throwint.setType(type);
         	Uri uri = getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
@@ -76,9 +76,9 @@ public class MainActivity extends Activity {
 					@Override
 					public void onClick(View v) {
 						Intent intent = new Intent("org.pulpdust.kigo.action.PICK_KEYWORD");
-						if (subject != null){
-							intent.putExtra("org.pulpdust.kigo.extra.WORD", subject);
-						}
+//						if (subject != null){
+//							intent.putExtra("org.pulpdust.kigo.extra.WORD", subject);
+//						}
 				        try {
 				            startActivityForResult(intent, 4);
 				        } catch (ActivityNotFoundException e){
@@ -128,9 +128,10 @@ public class MainActivity extends Activity {
     		Toast.makeText(this, R.string.err_not_sd, Toast.LENGTH_LONG).show();
     		return;
     	}
-        File path = 
-        		Environment.getExternalStoragePublicDirectory(
-        				Environment.DIRECTORY_PICTURES + "/snapping");
+//        File path = 
+//        		Environment.getExternalStoragePublicDirectory(
+//        				Environment.DIRECTORY_PICTURES + "/snapping");
+        File path = new File(Environment.getExternalStorageDirectory(), "/Pictures/snapping");
         if (!path.exists()){
         	path.mkdirs();
         }
@@ -148,6 +149,7 @@ public class MainActivity extends Activity {
         
         Intent intent = new Intent();
         intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
+//        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.putExtra(MediaStore.EXTRA_OUTPUT, imguri);
         try {
             startActivityForResult(intent, 1);        	
@@ -157,13 +159,25 @@ public class MainActivity extends Activity {
         }
     }
     
-    public Intent buildSender(){
-    	Intent intent = new Intent(Intent.ACTION_SEND);
+    public Intent buildSender(int mode){
+    	Intent intent = new Intent();
+    	if (mode == 1){
+    		intent.setAction(Intent.ACTION_SENDTO);
+    	} else if (mode == 0){
+    		intent.setAction(Intent.ACTION_SEND);
+    	} else {
+    		intent.setAction(Intent.ACTION_SEND);
+    	}
+    	intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
     	if (!subject.equalsIgnoreCase("")){
 	    intent.putExtra(Intent.EXTRA_SUBJECT, subject);
     	}
     	if (!send_to[0].equalsIgnoreCase("")){
-	    intent.putExtra(Intent.EXTRA_EMAIL, send_to);
+    		if (mode == 1){
+    			intent.setData(Uri.parse("mailto:" + send_to[0]));
+    		} else {
+    			intent.putExtra(Intent.EXTRA_EMAIL, send_to);
+    		}
     	}
     	if (!cc[0].equalsIgnoreCase("")){
 	    intent.putExtra(Intent.EXTRA_CC, cc);
@@ -178,7 +192,7 @@ public class MainActivity extends Activity {
     	switch (requestCode){
     	case 1:
     		if (resultCode == RESULT_OK){
-    			Intent mailint = buildSender();
+    			Intent mailint = buildSender(0);
     			mailint.setType("image/jpeg");
     			mailint.putExtra(Intent.EXTRA_STREAM, imguri);
     			try {
@@ -208,16 +222,18 @@ public class MainActivity extends Activity {
     			String suri = data.getDataString();
     			File file = new File(suri);
     			if (!file.isDirectory()){
-    				Intent mailint = buildSender();
+    				Intent mailint = buildSender(0);
     				String ext = MimeTypeMap.getFileExtensionFromUrl(suri);
     				String mime = null;
     				if (ext != null){
-    					mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext);
+    					mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext.toLowerCase());
     				} else {
-    					mime = "all/all";
+    					mime = "application/octet-stream";
     				}
     				if (mime != null){
     					mailint.setType(mime);
+    				} else {
+    					mailint.setType("application/octet-stream");
     				}
     				mailint.putExtra(Intent.EXTRA_STREAM, Uri.parse(suri));
         			try {
@@ -274,9 +290,7 @@ public class MainActivity extends Activity {
     		startActivityForResult(prefint, 2);
     		return true;
     	case R.id.menu_notake:
-    		Intent ntint = buildSender();
-    		ntint.setType("text/plain");
-    		ntint.putExtra(Intent.EXTRA_TEXT, "");
+    		Intent ntint = buildSender(1);
 			try {
 				startActivity(ntint);
 			} catch (ActivityNotFoundException e){