Commit: 1340326a2fb9177d5987738fcd2e987c6bd6f54d - NaviVoiceChanger (git)

Navigation voice changer app for Android

Commit MetaInfo

• Revision: 1340326a2fb9177d5987738fcd2e987c6bd6f54d (tree)
• Time: 2013-08-02 04:53:09
• Author: HMML <hmml3939@gmai...>
• Commiter: HMML

Log Message

Show alert screen on first startup.

Change Summary

• modified: res/layout/activity_download.xml
• modified: res/values-ja/strings.xml
• modified: res/values/strings.xml
• modified: src/jp/nekoteki/android/navivoicechanger/Config.java
• modified: src/jp/nekoteki/android/navivoicechanger/MainMenuActivity.java
• modified: src/jp/nekoteki/android/navivoicechanger/MaintActivity.java
• modified: src/jp/nekoteki/android/navivoicechanger/RemoteVoiceData.java
• add: src/jp/nekoteki/android/navivoicechanger/StaticUtils.java
• modified: src/jp/nekoteki/android/navivoicechanger/VoiceData.java

Incremental Difference

--- a/res/layout/activity_download.xml
+++ b/res/layout/activity_download.xml
@@ -37,22 +37,29 @@
         android:orientation="vertical"
         android:visibility="gone" >
 
-        <ProgressBar
-            android:id="@+id/progressBar"
-            style="?android:attr/progressBarStyle"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:padding="16dp" />
+            android:layout_centerInParent="true" >
+
+            <ProgressBar
+                android:id="@+id/progressBar"
+                style="?android:attr/progressBarStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:padding="16dp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/download_progress"
+                android:textColor="@android:color/white"
+                android:textSize="24sp" />
+
+        </LinearLayout>
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toRightOf="@id/progressBar"
-            android:text="@string/download_progress"
-            android:textColor="@android:color/white"
-            android:textSize="24sp" />
     </RelativeLayout>
 
 </RelativeLayout>
\ No newline at end of file

--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -4,8 +4,8 @@
     <string name="app_name">ナビボイスチェンジャー</string>
     <string name="action_settings">設定</string>
     <string name="hello_world">Hello world!</string>
-    <string name="menu_install">音声データのインストール</string>
-    <string name="menu_download">音声データのダウンロード</string>
+    <string name="menu_install">音声のインストール</string>
+    <string name="menu_download">音声のダウンロード</string>
     <string name="menu_maint">メンテナンス</string>
     <string name="title_activity_install_list">音声データのインストール</string>
     <string name="err_broken_archive">音声データが壊れています。ダウンロードしなおしてください。</string>
@@ -35,5 +35,10 @@
     <string name="err_no_sd">外部ストレージが見つかりません。SDカードをチェックするか、ストレージの設定を確認してください。</string>
     <string name="err_no_sd_title">メディアエラー</string>
     <string name="c_menu_download">ダウンロード</string>
+    <string name="accept">わかった</string>
+    <string name="decline">断る!</string>
+    <string name="tos_title">おことわり</string>
+    <string name="tos">ダウンロードありがとうございます。すみませんが使うにあたり、以下に注意してください。\n\nこのアプリはマップと Android OS の現状の挙動に固定的に依存しています。それらは非公開のものであるため、将来の変更時にこのアプリは動作しなくなります。その場合の対応は全く保証できません。</string>
+    
     
 </resources>
\ No newline at end of file

--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -37,5 +37,9 @@
     <string name="err_no_sd">No external storage is detected. You need to check your SD card or storage setting.</string>
     <string name="err_no_sd_title">Medium Error</string>
     <string name="c_menu_download">Download</string>
+    <string name="accept">Accept</string>
+    <string name="decline">Decline</string>
+    <string name="tos_title">Notice</string>
+    <string name="tos">Thank you for downloading! Please keep mind following terms;\n\nThis app is depends on CURRENT behavior of Maps and Android OS statically. These are closed and un-documented, then this app WILL STOP WORKING on future changes. In that case, I can NOT promise to contienu to support.</string>
 
 </resources>

--- a/src/jp/nekoteki/android/navivoicechanger/Config.java
+++ b/src/jp/nekoteki/android/navivoicechanger/Config.java
@@ -45,7 +45,7 @@ public class Config {
 		}
 	}
 	
-	public static Properties getProp(Context context) {
+	private static Properties getProp(Context context) {
 		Properties prop = new Properties();
 		File conf = getConfFile(context);
 		if (conf == null) return prop;
@@ -59,7 +59,7 @@ public class Config {
 		return prop;
 	}
 	
-	public static File getConfFile(Context context) {
+	private static File getConfFile(Context context) {
 		File dir = context.getExternalFilesDir(null);
 		if (dir == null) return null;
 		if (!dir.exists()) dir.mkdirs();

--- a/src/jp/nekoteki/android/navivoicechanger/MainMenuActivity.java
+++ b/src/jp/nekoteki/android/navivoicechanger/MainMenuActivity.java
@@ -1,8 +1,14 @@
 package jp.nekoteki.android.navivoicechanger;
 
+import java.io.IOException;
+import java.util.zip.ZipException;
+
 import android.os.Bundle;
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
+import android.util.Log;
 import android.view.Menu;
 import android.view.View;
 
@@ -35,6 +41,27 @@ public class MainMenuActivity extends Activity {
 
 			}
 		});
+		
+		String tos_agree = Config.get(getApplicationContext(), "tos_agree"); 
+		if (tos_agree == null || !tos_agree.equals("1")) {
+			AlertDialog.Builder dialog = new AlertDialog.Builder(this);
+			dialog.setNegativeButton(R.string.decline, new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					StaticUtils.terminateSelf(getApplicationContext());
+				}
+			});
+			dialog.setPositiveButton(R.string.accept,  new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface arg0, int arg1) {
+					Config.set(getApplicationContext(), "tos_agree", "1");
+				}
+			});
+			dialog.setCancelable(false);
+			dialog.setTitle(R.string.tos_title);
+			dialog.setMessage(R.string.tos);
+			dialog.show();
+		} 
 	}
 
 	@Override

--- a/src/jp/nekoteki/android/navivoicechanger/MaintActivity.java
+++ b/src/jp/nekoteki/android/navivoicechanger/MaintActivity.java
@@ -28,6 +28,7 @@ public class MaintActivity extends Activity {
 				progress.setMessage("Purging files...");
 				progress.show();
 				VoiceData.purgeVoiceDataFromNavi(v.getContext());
+				StaticUtils.killMapsProcess(v.getContext());
 				progress.dismiss();
 				Toast.makeText(v.getContext(), R.string.msg_installed_removed, Toast.LENGTH_SHORT).show();
 			}

--- a/src/jp/nekoteki/android/navivoicechanger/RemoteVoiceData.java
+++ b/src/jp/nekoteki/android/navivoicechanger/RemoteVoiceData.java
@@ -15,16 +15,16 @@ import android.net.http.AndroidHttpClient;
 import android.util.Log;
 
 public class RemoteVoiceData {
-	protected int id;
-	protected String ini_url;
-	protected String archive_url;
-	protected String preview_url;
-	protected float rating;
-	protected String title;
-	protected String unit;
-	protected String author;
-	protected String description;
-	protected VoiceData voice_data;
+	private int id;
+	private String ini_url;
+	private String archive_url;
+	private String preview_url;
+	private float rating;
+	private String title;
+	private String unit;
+	private String author;
+	private String description;
+	private VoiceData voice_data;
 	
 	public VoiceData getVoiceData() {
 		return voice_data;

--- /dev/null
+++ b/src/jp/nekoteki/android/navivoicechanger/StaticUtils.java
@@ -0,0 +1,26 @@
+package jp.nekoteki.android.navivoicechanger;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.ActivityManager.RunningAppProcessInfo;
+import android.content.Context;
+import android.os.Process;
+import android.util.Log;
+
+public class StaticUtils {
+	public static void killMapsProcess(Context context) {
+		Log.i("Utils", "Trying to kill Maps...");
+		ActivityManager am = ((ActivityManager) context.getSystemService(Activity.ACTIVITY_SERVICE));
+		am.killBackgroundProcesses("com.google.android.apps.maps");
+		for (RunningAppProcessInfo pi: am.getRunningAppProcesses()) {
+			if (pi.processName != "com.google.android.apps.maps")
+				continue;
+			Log.d("Utils", "Killing pid="+Integer.toString(pi.pid));
+			android.os.Process.killProcess(pi.pid);
+		}
+	}
+	
+	public static void terminateSelf(Context context) {
+		Process.killProcess(Process.myPid());
+	}
+}

--- a/src/jp/nekoteki/android/navivoicechanger/VoiceData.java
+++ b/src/jp/nekoteki/android/navivoicechanger/VoiceData.java
@@ -57,17 +57,17 @@ public class VoiceData {
 	public final static String ARCHIVE_FILENAME = "voice_instructions.zip";
 	public static final String PREVIEW_FILESNAME = "preview.ogg";
 
-	protected int id;
-	protected String title;
-	protected float rating;
-	protected String description;
-	protected String archive_md5;
-	protected String unit;
-	protected String lang;
-	protected String path;
-	protected int version;
-	protected String author;
-	protected Context context;
+	private int id;
+	private String title;
+	private float rating;
+	private String description;
+	private String archive_md5;
+	private String unit;
+	private String lang;
+	private String path;
+	private int version;
+	private String author;
+	private Context context;
 	
 	static List<VoiceData> scanVoiceData(Context context) {
 		Log.d(VoiceData.class.getClass().getName(), "Start voice data dir scan.");
@@ -445,15 +445,7 @@ public class VoiceData {
 			// ignore
 		}
 		
-		ActivityManager am = ((ActivityManager) this.getContext().getSystemService(Activity.ACTIVITY_SERVICE));
-		am.killBackgroundProcesses("com.google.android.apps.maps");
-		for (RunningAppProcessInfo pi: am.getRunningAppProcesses()) {
-			if (pi.processName != "com.google.android.apps.maps")
-				continue;
-			android.os.Process.killProcess(pi.pid);
-		}
-		
-
+		StaticUtils.killMapsProcess(this.getContext());
 		Log.i("VoiceData", "Install finished!");
 	}