Commit: 5c4042fbee0a20cc96c6914f49c2134a0f066102 - snapping_camera (git)

Commit MetaInfo

• Revisión: 5c4042fbee0a20cc96c6914f49c2134a0f066102 (tree)
• Tiempo: 2012-09-09 21:27:03
• Autor: Kodakana <kodakana@user...>
• Commiter: Kodakana

Log Message

アイコン作成。その他整理。

Cambiar Resumen

• 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/classes/org/pulpdust/snappingcamera/R$string.class
• modified: bin/classes/org/pulpdust/snappingcamera/R$style.class
• modified: bin/classes/org/pulpdust/snappingcamera/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/snappingcamera/R.java
• modified: ic_launcher-web.png
• 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

Diferencia incremental

--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.pulpdust.snappingcamera"
     android:versionCode="1"
-    android:versionName="0.45"
+    android:versionName="0.5"
     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.snappingcamera"
     android:versionCode="1"
-    android:versionName="0.45"
+    android:versionName="0.5"
     android:installLocation="auto" >
 
     <uses-sdk

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/classes/org/pulpdust/snappingcamera/R$string.class and b/bin/classes/org/pulpdust/snappingcamera/R$string.class differ

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

Binary files a/bin/classes/org/pulpdust/snappingcamera/R$xml.class and b/bin/classes/org/pulpdust/snappingcamera/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/snappingcamera/R.java
+++ b/gen/org/pulpdust/snappingcamera/R.java
@@ -34,24 +34,34 @@ public final class R {
         public static final int activity_main=0x7f080000;
     }
     public static final class string {
+        public static final int address=0x7f060003;
+        public static final int app_author=0x7f060004;
+        public static final int app_copy=0x7f060006;
+        public static final int app_lic=0x7f060002;
         public static final int app_name=0x7f060000;
-        public static final int bcc=0x7f060009;
-        public static final int cc=0x7f060008;
-        public static final int err_den_sd=0x7f06000e;
-        public static final int err_not_act=0x7f06000f;
-        public static final int err_not_cam=0x7f06000b;
-        public static final int err_not_file=0x7f060010;
-        public static final int err_not_mail=0x7f06000c;
-        public static final int err_not_sd=0x7f06000d;
-        public static final int hello_world=0x7f060001;
-        public static final int kigo=0x7f060011;
-        public static final int menu_notake=0x7f060002;
-        public static final int menu_open=0x7f060003;
-        public static final int menu_settings=0x7f060004;
-        public static final int shot=0x7f06000a;
-        public static final int sub=0x7f060007;
-        public static final int title_activity_main=0x7f060005;
-        public static final int to=0x7f060006;
+        public static final int app_ver=0x7f060001;
+        public static final int bcc=0x7f060011;
+        public static final int cc=0x7f060010;
+        public static final int copy=0x7f060005;
+        public static final int err_den_sd=0x7f060018;
+        public static final int err_not_act=0x7f060019;
+        public static final int err_not_cam=0x7f060015;
+        public static final int err_not_file=0x7f06001a;
+        public static final int err_not_mail=0x7f060016;
+        public static final int err_not_sd=0x7f060017;
+        public static final int hello_world=0x7f060009;
+        public static final int kigo=0x7f06001b;
+        public static final int license=0x7f060008;
+        public static final int menu_notake=0x7f06000a;
+        public static final int menu_open=0x7f06000b;
+        public static final int menu_settings=0x7f06000c;
+        public static final int pref_cat_about=0x7f060013;
+        public static final int pref_cat_templ=0x7f060012;
+        public static final int shot=0x7f060014;
+        public static final int sub=0x7f06000f;
+        public static final int title_activity_main=0x7f06000d;
+        public static final int to=0x7f06000e;
+        public static final int version=0x7f060007;
     }
     public static final class style {
         public static final int AppTheme=0x7f070000;

Binary files a/ic_launcher-web.png and b/ic_launcher-web.png differ

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">Snapping Camera</string>
+    <string name="app_ver">0.5</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_notake">撮らない</string>
     <string name="menu_open">ファイルから&#8230;</string>
@@ -10,6 +18,8 @@
     <string name="sub">Subject:</string>
     <string name="cc">CC:</string>
     <string name="bcc">BCC:</string>
+    <string name="pref_cat_templ">送信の雛形</string>
+    <string name="pref_cat_about">概要</string>
     <string name="shot">写真を撮る</string>
     <string name="err_not_cam">カメラが見つかりません。</string>
     <string name="err_not_mail">送信できません。</string>

--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,14 @@
 <resources>
 
     <string name="app_name">Snapping Camera</string>
+    <string name="app_ver">0.5</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_notake">Not Take</string>
     <string name="menu_open">From File&#8230;</string>
@@ -10,6 +18,8 @@
     <string name="sub">Subject:</string>
     <string name="cc">CC:</string>
     <string name="bcc">BCC:</string>
+    <string name="pref_cat_templ">Mail Template</string>
+    <string name="pref_cat_about">About</string>
     <string name="shot">Take A Picture</string>
     <string name="err_not_cam">Camera Not Found.</string>
     <string name="err_not_mail">Sender Not Found.</string>

--- a/res/xml/prefs.xml
+++ b/res/xml/prefs.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+    <PreferenceCategory android:title="@string/pref_cat_templ">
 <!--     <EditTextPreference -->
 <!--         android:key="subject" -->
 <!--         android:title="@string/sub" /> -->
@@ -12,6 +13,25 @@
     <EditTextPreference
         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