Commit: 789e2b0c9f5bc4877eb3640eda44103d8515985f - NaviVoiceChanger (git)

Navigation voice changer app for Android

Commit MetaInfo

• Revisão: 789e2b0c9f5bc4877eb3640eda44103d8515985f (tree)
• Hora: 2013-07-31 03:18:42
• Autor: HMML <hmml3939@gmai...>
• Commiter: HMML

Mensagem de Log

Add action menu.

Mudança Sumário

• modified: res/layout/activity_main_menu.xml
• modified: res/menu/download.xml
• modified: res/menu/install_list.xml
• modified: res/values/strings.xml
• modified: src/jp/nekoteki/android/navivoicechanger/Config.java
• modified: src/jp/nekoteki/android/navivoicechanger/DownloadActivity.java
• modified: src/jp/nekoteki/android/navivoicechanger/InstallListActivity.java

Diff

--- a/res/layout/activity_main_menu.xml
+++ b/res/layout/activity_main_menu.xml
@@ -14,18 +14,25 @@
         android:id="@+id/btn_menu_install"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:drawableLeft="@android:drawable/ic_menu_add"
+        android:paddingRight="32dp"
         android:text="@string/menu_install" />
 
     <Button
         android:id="@+id/btn_download"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:drawableLeft="@android:drawable/ic_menu_search"
+        android:gravity="center_vertical|center_horizontal"
+        android:paddingRight="32dp"
         android:text="@string/menu_download" />
 
     <Button
         android:id="@+id/btn_menu_maint"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:drawableLeft="@android:drawable/ic_menu_manage"
+        android:paddingRight="32dp"
         android:text="@string/menu_maint" />
 
 </LinearLayout>
\ No newline at end of file

--- a/res/menu/download.xml
+++ b/res/menu/download.xml
@@ -1,9 +1,4 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/text_download_guide"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
+    <item android:id="@+id/menu_go_install" android:showAsAction="always" android:icon="@android:drawable/ic_menu_add" android:onClick="goInstallListFromMenu" android:title="@string/title_activity_install_list"></item>
 
 </menu>

--- a/res/menu/install_list.xml
+++ b/res/menu/install_list.xml
@@ -1,3 +1,4 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:id="@+id/menu_go_download" android:showAsAction="always" android:icon="@android:drawable/ic_menu_search" android:title="@string/title_activity_download" android:onClick="goDownloadActivityFromMenu"></item>
 
 </menu>

--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -32,7 +32,7 @@
 
     <string name="msg_installed_removed">Installed data has been removed.</string>
     <string name="msg_downloaded_removed">Downloaded data has been removed.</string>
-    <string name="title_activity_download">DownloadActivity</string>
+    <string name="title_activity_download">Download Voice Data</string>
     <string name="guide_download">Tap to download. Then push back button to move to install view to install.</string>
     <string name="download_progress">Donwloading...</string>
     <string name="err_no_sd">No external storage is detected. You need to check your SD card or storage setting.</string>

--- a/src/jp/nekoteki/android/navivoicechanger/Config.java
+++ b/src/jp/nekoteki/android/navivoicechanger/Config.java
@@ -5,15 +5,32 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
 
 import android.content.Context;
+import android.util.Log;
 
 public class Config {
 	final static public String CONF_FILE = "config.ini";
 	
+	final static Map<String, String> DEFAULTS;
+	static {
+		Map<String, String> c = new HashMap<String, String>();
+		c.put("server_url_base", "http://nvc.nekoteki.jp");
+		DEFAULTS = Collections.unmodifiableMap(c);
+	}
+	
+	
 	public static String get(Context context, String name) {
-		return (String) getProp(context).get(name);
+		Log.d("Config", "Getting config key: "+name);
+		String v = (String) getProp(context).get(name);
+		if (v != null && !v.equals(""))
+			return v;
+		Log.d("Config", "Fallback to default for key: "+name);
+		return DEFAULTS.get(name);
 	}
 	
 	public static void set(Context context, String name, String value) {
@@ -32,6 +49,7 @@ public class Config {
 		Properties prop = new Properties();
 		File conf = getConfFile(context);
 		if (conf == null) return prop;
+		Log.d("Config", "Config prop file: "+conf.getAbsolutePath());
 		if (!conf.exists()) return prop;
 		try {
 			prop.load(new InputStreamReader(new FileInputStream(conf), "UTF-8"));

--- a/src/jp/nekoteki/android/navivoicechanger/DownloadActivity.java
+++ b/src/jp/nekoteki/android/navivoicechanger/DownloadActivity.java
@@ -31,14 +31,13 @@ import android.widget.TextView;
 import android.support.v4.app.NavUtils;
 import android.annotation.TargetApi;
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Color;
 import android.os.Build;
 
 public class DownloadActivity extends Activity {
 	
 	public class RemoteVoiceDataAdapter extends BaseAdapter {
-		final static String SERVER_BASE_URL = "http://tempest.private.nemui.org:3000";
-		
 		protected boolean eol = false;
 		protected Context context;
 		protected List<RemoteVoiceData> list;
@@ -78,8 +77,9 @@ public class DownloadActivity extends Activity {
 		
 		public void loadList(AbsListView view) {
 			if (this.loading || this.eol) return;
+			if (this.loading || this.eol) return;
 			this.loading = true;
-			String url = SERVER_BASE_URL+"/navi_voices.json?page="+Integer.toString(this.cur_page);
+			String url = Config.get(context, "server_url_base") +"/navi_voices.json?page="+Integer.toString(this.cur_page);
 				
 			new AsyncTask<Object, Void, RemoteVoiceData[]>() {
 				protected RemoteVoiceDataAdapter adapter;
@@ -295,4 +295,8 @@ public class DownloadActivity extends Activity {
 			view.setVisibility(View.GONE);
 		}
 	}
+	
+	public void goInstallListFromMenu(MenuItem item) {
+		startActivity(new Intent(DownloadActivity.this, InstallListActivity.class));
+	}
 }

--- a/src/jp/nekoteki/android/navivoicechanger/InstallListActivity.java
+++ b/src/jp/nekoteki/android/navivoicechanger/InstallListActivity.java
@@ -125,7 +125,6 @@ public class InstallListActivity extends Activity {
 			@Override
 			public void onClick(View arg0) {
 				startActivity(new Intent(InstallListActivity.this, DownloadActivity.class));
-				
 			}
 		});
 	}
@@ -233,4 +232,8 @@ public class InstallListActivity extends Activity {
 		}
 		dialog.show();
 	}
+	
+	public void goDownloadActivityFromMenu(MenuItem item) {
+		startActivity(new Intent(InstallListActivity.this, DownloadActivity.class));
+	}
 }