Commit: de1c4b9ea2570db340bf6a59127889cc57947fab - NaviVoiceChanger (git)

Navigation voice changer app for Android

Commit MetaInfo

• Revision: de1c4b9ea2570db340bf6a59127889cc57947fab (tree)
• Time: 2013-07-30 06:09:47
• Author: HMML <hmml3939@gmai...>
• Commiter: HMML

Log Message

Implement download list.

Change Summary

• modified: .gitignore
• modified: .settings/org.eclipse.jdt.core.prefs
• modified: AndroidManifest.xml
• add: README
• add: libs/android-support-v4.jar
• add: libs/jsonic-1.3.0.jar
• add: res/drawable/shadow_down.xml
• add: res/layout/activity_download.xml
• modified: res/layout/activity_install_list.xml
• modified: res/layout/activity_maint.xml
• add: res/layout/list_progress_footer.xml
• add: res/menu/download.xml
• modified: res/menu/maint.xml
• modified: res/values/strings.xml
• add: src/jp/nekoteki/android/navivoicechanger/DownloadActivity.java
• modified: src/jp/nekoteki/android/navivoicechanger/MainMenuActivity.java
• add: src/jp/nekoteki/android/navivoicechanger/RemoteVoiceData.java
• modified: src/jp/nekoteki/android/navivoicechanger/VoiceData.java

Incremental Difference

--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
-/gen
-/bin
-/libs
+/gen/
+/bin/
+*~
+*.bak
+*.orig
+.*.sw[po]

--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,11 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.6

--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -43,6 +43,14 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="jp.nekoteki.android.navivoicechanger.MainMenuActivity" />
         </activity>
+        <activity
+            android:name="jp.nekoteki.android.navivoicechanger.DownloadActivity"
+            android:label="@string/title_activity_download"
+            android:parentActivityName="jp.nekoteki.android.navivoicechanger.MainMenuActivity" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="jp.nekoteki.android.navivoicechanger.MainMenuActivity" />
+        </activity>
     </application>
 
 </manifest>

--- /dev/null
+++ b/README
@@ -0,0 +1,14 @@
+= Android Navigation Voice Changer
+
+== See Also
+
+ * http://productforums.google.com/forum/#!msg/maps/PWmQggbTBFA/9uBHeKxb0egJ
+ * http://forum.xda-developers.com/showthread.php?t=1828069
+
+== Author
+
+@gull08 on twitter
+
+== License
+
+GPLv3 ( http://www.gnu.org/licenses/gpl-3.0.html )
\ No newline at end of file

Binary files /dev/null and b/libs/android-support-v4.jar differ

Binary files /dev/null and b/libs/jsonic-1.3.0.jar differ

--- /dev/null
+++ b/res/drawable/shadow_down.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:startColor="#0000"
+        android:endColor="#f000"
+        android:angle="270" />
+</shape>

--- /dev/null
+++ b/res/layout/activity_download.xml
@@ -0,0 +1,72 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+    <TextView
+        android:id="@+id/text_download_guide"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:background="#000"
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="8dp"
+        android:text="@string/guide_download"
+        android:textColor="#fff" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="20dp"
+        android:layout_above="@id/text_download_guide"
+        android:background="@drawable/shadow_down"
+        android:orientation="vertical" >
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/text_download_guide"
+        android:layout_alignParentTop="true"
+        android:orientation="vertical"
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin" >
+
+        <ListView
+            android:id="@+id/download_item_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
+        </ListView>
+    </LinearLayout>
+
+    <RelativeLayout
+        android:id="@+id/download_pregrees"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#8000"
+        android:clickable="true"
+        android:orientation="vertical"
+        android:visibility="gone" >
+
+        <ProgressBar
+            android:id="@+id/progressBar"
+            style="?android:attr/progressBarStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:padding="16dp" />
+
+        <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/layout/activity_install_list.xml
+++ b/res/layout/activity_install_list.xml
@@ -1,6 +1,6 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/RelativeLayout1"
+    android:id="@+id/download_pregrees"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"

--- a/res/layout/activity_maint.xml
+++ b/res/layout/activity_maint.xml
@@ -25,7 +25,7 @@
             android:text="@string/btn_purge_installed" />
 
         <TextView
-            android:id="@+id/textView1"
+            android:id="@+id/text_btm_guide"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/desc_purge_installed" />

--- /dev/null
+++ b/res/layout/list_progress_footer.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/LinearLayout1"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="vertical" >
+
+    <ProgressBar
+        android:id="@+id/progressBar1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center" />
+
+</LinearLayout>

--- /dev/null
+++ b/res/menu/download.xml
@@ -0,0 +1,9 @@
+<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"/>
+
+</menu>

--- a/res/menu/maint.xml
+++ b/res/menu/maint.xml
@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item
-        android:id="@+id/action_settings"
+        android:id="@+id/text_download_guide"
         android:orderInCategory="100"
         android:showAsAction="never"
         android:title="@string/action_settings"/>

--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -27,8 +27,13 @@
     <string name="btn_purge_downloaded">Delete all downloaded</string>
     <string name="desc_purge_installed">Voice setting on Navigation will be reset. This action removes installed voice data and all cache files from data directory of Maps.</string>
     <string name="desc_purge_downloaded">Delete all downloaded voice data from THIS APPLICATION (NOT Navigation).</string>
+
     <color name="maint_bg">#fff3f3f3</color>
+
     <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="guide_download">Tap to download. Then push back button to move to install view to install.</string>
+    <string name="download_progress">Donwloading...</string>
 
 </resources>

--- /dev/null
+++ b/src/jp/nekoteki/android/navivoicechanger/DownloadActivity.java
@@ -0,0 +1,245 @@
+package jp.nekoteki.android.navivoicechanger;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+import net.arnx.jsonic.JSON;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+
+import android.net.http.AndroidHttpClient;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.app.Activity;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
+import android.widget.AbsListView.OnScrollListener;
+import android.widget.AbsListView;
+import android.widget.BaseAdapter;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.support.v4.app.NavUtils;
+import android.annotation.TargetApi;
+import android.content.Context;
+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;
+		protected int cur_page = 1; 
+		protected boolean loading = false;
+
+		public RemoteVoiceDataAdapter(Context context) {
+			super();
+			this.context = context;
+			this.reset();
+ 		}
+		
+		@Override
+		public int getCount() {
+			return this.list.size();
+		}
+
+		@Override
+		public Object getItem(int position) {
+			return this.list.get(position);
+		}
+
+		@Override
+		public long getItemId(int position) {
+			return ((RemoteVoiceData) this.getItem(position)).getId();
+		}
+		
+		public void reset() {
+			this.cur_page = 1;
+			this.list = new ArrayList<RemoteVoiceData>();
+			this.notifyDataSetChanged();
+		}
+		
+		public void add(RemoteVoiceData vd) {
+			this.list.add(vd);
+		}
+		
+		public void loadList(AbsListView view) {
+			if (this.loading || this.eol) return;
+			this.loading = true;
+			String url = SERVER_BASE_URL+"/navi_voices.json?page="+Integer.toString(this.cur_page);
+				
+			new AsyncTask<Object, Void, RemoteVoiceData[]>() {
+				protected RemoteVoiceDataAdapter adapter;
+				protected ListView view;
+
+				@Override
+				protected RemoteVoiceData[] doInBackground(Object... params) {
+					try {
+						String url = (String) params[0];
+						this.view = (ListView) params[1];
+						this.adapter = (RemoteVoiceDataAdapter) params[2];
+						AndroidHttpClient client = AndroidHttpClient.newInstance("NaviVoiceChange");
+						Log.i(this.getClass().toString(), "Loading URL: "+url);
+						HttpResponse res;
+						res = client.execute(new HttpGet(url));
+						this.adapter.cur_page += 1;
+						InputStream json_stream = res.getEntity().getContent();
+						RemoteVoiceData[] vdlist = JSON.decode(json_stream, RemoteVoiceData[].class);
+						json_stream.close();
+						client.close();
+						return vdlist;
+					} catch (IOException e) {
+						Log.d(this.getClass().toString(), "Failed to load from server.");
+						e.printStackTrace();
+						return null;
+					} catch (Exception e) {
+						Log.e(this.getClass().toString(), "Unknwon Exception in AsyncTask!!");
+						e.printStackTrace();
+						return null;
+					}
+ 				}
+
+				protected void onPostExecute(RemoteVoiceData[] vdlist) {
+					if (vdlist == null || vdlist.length == 0) {
+						Log.i(this.getClass().toString(),"EOL detected.");
+						this.adapter.eol = true;
+						this.view.removeFooterView(((DownloadActivity) this.view.getContext()).list_footer_marker);
+						this.adapter.loading = false;
+						this.adapter.notifyDataSetChanged();
+						this.view.invalidateViews();
+						return;
+					}
+
+					Log.d(this.getClass().toString(), "Checking items...");
+					for (RemoteVoiceData rvd: vdlist) {
+						Log.d(this.getClass().toString(), "Item #" + Integer.toString(rvd.getId())+": "+rvd.getTitle());
+						this.adapter.list.add(rvd);
+					}
+					Log.d(this.getClass().toString(), "Item load done.");
+					this.adapter.notifyDataSetChanged();
+					this.view.invalidateViews();
+					this.adapter.loading = false;
+				}
+			}.execute(url, view, this);
+		}
+		
+		@Override
+		public View getView(int position, View convertView, ViewGroup parent) {
+			RemoteVoiceData rvd = (RemoteVoiceData) getItem(position);
+			
+			RelativeLayout container = new RelativeLayout(context);
+			
+			LinearLayout textlayout = new LinearLayout(context);
+			textlayout.setOrientation(LinearLayout.VERTICAL);
+			textlayout.setLayoutParams(new ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
+			textlayout.setFocusable(false);
+			textlayout.setFocusableInTouchMode(false);
+
+			TextView title = new TextView(context);
+			title.setText(rvd.getTitle());
+			title.setTextColor(Color.BLACK);
+			title.setTextSize(16);
+			textlayout.addView(title);
+
+			TextView description = new TextView(context);
+			description.setTextSize(13);
+			description.setText(rvd.getDescription());
+			textlayout.addView(description);
+			
+			container.addView(textlayout);
+			
+			convertView = container;
+			return convertView;
+		}
+		
+	}
+
+	public View list_footer_marker = null;
+	public RemoteVoiceDataAdapter vd_list_adapter;
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_download);
+		// Show the Up button in the action bar.
+		setupActionBar();
+		
+		this.vd_list_adapter = new RemoteVoiceDataAdapter(this); 
+		this.list_footer_marker = getLayoutInflater().inflate(R.layout.list_progress_footer, null); 
+
+		ListView lv = (ListView) findViewById(R.id.download_item_list);
+		lv.addFooterView(this.list_footer_marker);
+		lv.setAdapter(this.vd_list_adapter);
+		lv.setOnScrollListener(new OnScrollListener() {
+			@Override
+			public void onScrollStateChanged(AbsListView view, int scrollState) {
+				// nothing to do...
+			}
+			
+			@Override
+			public void onScroll(AbsListView view, int firstVisibleItem,
+					int visibleItemCount, int totalItemCount) {
+				if (totalItemCount == firstVisibleItem + visibleItemCount)
+					((DownloadActivity) view.getContext()).vd_list_adapter.loadList(view);
+			}
+		});
+	}
+
+	/**
+	 * Set up the {@link android.app.ActionBar}, if the API is available.
+	 */
+	@TargetApi(Build.VERSION_CODES.HONEYCOMB)
+	private void setupActionBar() {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+			getActionBar().setDisplayHomeAsUpEnabled(true);
+		}
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		// Inflate the menu; this adds items to the action bar if it is present.
+		getMenuInflater().inflate(R.menu.download, menu);
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+		case android.R.id.home:
+			// This ID represents the Home or Up button. In the case of this
+			// activity, the Up button is shown. Use NavUtils to allow users
+			// to navigate up one level in the application structure. For
+			// more details, see the Navigation pattern on Android Design:
+			//
+			// http://developer.android.com/design/patterns/navigation.html#up-vs-back
+			//
+			NavUtils.navigateUpFromSameTask(this);
+			return true;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+	
+	protected void setDownloadState(boolean flag) {
+		View view = findViewById(R.id.download_pregrees);
+		if (flag) {
+			view.setVisibility(View.VISIBLE);
+		} else {
+			view.setVisibility(View.GONE);
+		}
+	}
+	
+
+}

--- a/src/jp/nekoteki/android/navivoicechanger/MainMenuActivity.java
+++ b/src/jp/nekoteki/android/navivoicechanger/MainMenuActivity.java
@@ -28,7 +28,13 @@ public class MainMenuActivity extends Activity {
 			}
 		});
 		
-		findViewById(R.id.btn_download).setEnabled(false);
+		findViewById(R.id.btn_download).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				startActivity(new Intent(MainMenuActivity.this, DownloadActivity.class));
+
+			}
+		});
 	}
 
 	@Override

--- /dev/null
+++ b/src/jp/nekoteki/android/navivoicechanger/RemoteVoiceData.java
@@ -0,0 +1,69 @@
+package jp.nekoteki.android.navivoicechanger;
+
+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;
+	public int getId() {
+		return id;
+	}
+	public void setId(int id) {
+		this.id = id;
+	}
+	public String getIni_url() {
+		return ini_url;
+	}
+	public void setIni_url(String ini_url) {
+		this.ini_url = ini_url;
+	}
+	public String getArchive_url() {
+		return archive_url;
+	}
+	public void setArchive_url(String archive_url) {
+		this.archive_url = archive_url;
+	}
+	public String getPreview_url() {
+		return preview_url;
+	}
+	public void setPreview_url(String preview_url) {
+		this.preview_url = preview_url;
+	}
+	public float getRating() {
+		return rating;
+	}
+	public void setRating(float rating) {
+		this.rating = rating;
+	}
+	public String getTitle() {
+		return title;
+	}
+	public void setTitle(String title) {
+		this.title = title;
+	}
+	public String getUnit() {
+		return unit;
+	}
+	public void setUnit(String unit) {
+		this.unit = unit;
+	}
+	public String getAuthor() {
+		return author;
+	}
+	public void setAuthor(String author) {
+		this.author = author;
+	}
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	
+	
+}

--- a/src/jp/nekoteki/android/navivoicechanger/VoiceData.java
+++ b/src/jp/nekoteki/android/navivoicechanger/VoiceData.java
@@ -4,6 +4,7 @@ import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -210,6 +211,10 @@ public class VoiceData {
 			vd.delete();
 		}
 	}
+	
+	public VoiceData(Context context) {
+		/// nothing to do...
+	}
 
 	public VoiceData(File file, Context context) {
 		if (!file.exists() || !file.isDirectory())
@@ -218,19 +223,38 @@ public class VoiceData {
 		if (!ini.exists())
 			throw new 	IllegalArgumentException("Ini file not found");
 		
+		this.path        = file.getAbsolutePath();
+		try {
+			this.loadIniStream(new FileInputStream(ini), context);
+		} catch (IOException e) {
+			e.printStackTrace();
+			throw new 	IllegalArgumentException("Specified ini file not found: "+file.getAbsolutePath());
+		}
+	}
+	
+	public VoiceData(InputStream ini_stream, Context context) {
+		this.loadIniStream(ini_stream, context);
+	}
+
+	public void loadIniStream(InputStream ini_stream, Context context) {
 		Properties prop = new Properties();
 		try {
-			prop.load(new InputStreamReader(new FileInputStream(ini), "UTF-8"));
+			prop.load(new InputStreamReader(ini_stream, "UTF-8"));
 		} catch (IOException e) {
+			e.printStackTrace();
 			throw new 	IllegalArgumentException("Failed to load ini file");
 		}
+		try {
+			ini_stream.close();
+		} catch (IOException e) {
+			// ignore
+		}
 		
 		this.context     = context;
 		this.id          = Integer.parseInt(prop.getProperty("id"));
 		this.archive_md5 = prop.getProperty("archive_md5");
 		this.title       = prop.getProperty("title");
 		this.description = prop.getProperty("description");
-		this.path        = file.getAbsolutePath();
 		this.lang        = prop.getProperty("lang");
 		this.unit        = prop.getProperty("unit");
 		try {