Commit: 8e70b2c02c9746d05b8f3cf52a13a344752b5afc - NaviVoiceChanger (git)

Navigation voice changer app for Android

Commit MetaInfo

• Revision: 8e70b2c02c9746d05b8f3cf52a13a344752b5afc (tree)
• Time: 2013-08-05 21:13:33
• Author: HMML <hmml3939@gmai...>
• Commiter: HMML

Log Message

Show rating and download count on list.

Change Summary

• modified: res/values-ja/strings.xml
• modified: res/values/strings.xml
• modified: src/jp/nekoteki/android/navivoicechanger/DownloadActivity.java
• modified: src/jp/nekoteki/android/navivoicechanger/RemoteVoiceData.java

Incremental Difference

--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -53,4 +53,7 @@
     <string name="dlopt_order_dlcount">ダウンロード回数</string>
     <string name="apply">適用</string>
     <string name="dllist_opts_title">リストオプション</string>
+    <string name="author_">作者:</string>
+    <string name="downloads_">ダウンロード数:</string>
+    <string name="anonymous">(匿名)</string>
 </resources>
\ No newline at end of file

--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -55,5 +55,8 @@
     <string name="dlopt_order_dlcount">By download count</string>
     <string name="apply">Apply</string>
     <string name="dllist_opts_title">List options</string>
+    <string name="author_">Author:</string>
+    <string name="downloads_">Downloads:</string>
+    <string name="anonymous">(Anonymous)</string>
 
 </resources>

--- a/src/jp/nekoteki/android/navivoicechanger/DownloadActivity.java
+++ b/src/jp/nekoteki/android/navivoicechanger/DownloadActivity.java
@@ -34,6 +34,7 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.RadioButton;
+import android.widget.RatingBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -198,38 +199,56 @@ public class DownloadActivity extends Activity {
 			title.setTextSize(16);
 			textlayout.addView(title);
 
-			TextView description = new TextView(context);
-			description.setTextSize(12);
-			description.setText(rvd.getDescription());
-			textlayout.addView(description);
+			if (rvd.getAuthor() != null && !rvd.getAuthor().equals("")) {
+				TextView author = new TextView(context);
+				author.setTextSize(14);
+				author.setText(getResources().getString(R.string.author_)+" "+rvd.getAuthor());
+				textlayout.addView(author);
+			}
+			
+			LinearLayout infoline = new LinearLayout(context);
+			infoline.setOrientation(LinearLayout.HORIZONTAL);
+			if (rvd.getRating() > 0) {
+				RatingBar rating = new RatingBar(context, null, android.R.attr.ratingBarStyleSmall);
+				rating.setMax(5);
+				rating.setNumStars(5);
+				rating.setRating(rvd.getRating());
+				infoline.addView(rating);
+			}
+
+			if (rvd.getDlcount() > 0) {
+				TextView downloads = new TextView(context);
+				downloads.setTextSize(12);
+				downloads.setText(getResources().getString(R.string.downloads_) + " " + Integer.toString(rvd.getDlcount()));
+				downloads.setPadding(10, 0, 0, 0);
+				infoline.addView(downloads);
+			}
+			
+			textlayout.addView(infoline);
+			
+			if (rvd.getDescription() != null && !rvd.getDescription().equals("")) {
+				TextView description = new TextView(context);
+				description.setTextSize(12);
+				description.setText(rvd.getDescription());
+				textlayout.addView(description);
+			}
+			
 			container.addView(textlayout);
 
 			TextView downloaded = new TextView(context);
 			if (rvd.isDownloaded()) {
-				Drawable dmark = getResources().getDrawable(android.R.drawable.checkbox_on_background);
+				Drawable dmark = getResources().getDrawable(android.R.drawable.stat_sys_download_done);
 				dmark.setBounds(0, 0, 20, 20);
 				downloaded.setCompoundDrawables(dmark, null, null, null);
 				RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
 				lp.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
 				lp.addRule(RelativeLayout.ALIGN_PARENT_TOP);
 				downloaded.setLayoutParams(lp);
+				downloaded.setBackgroundColor(Color.GRAY);
+				downloaded.setTextSize(1);
 				container.addView(downloaded);
 			}
 
-			TextView author = new TextView(context);
-			if (rvd.getAuthor() != null && !rvd.getAuthor().equals("")) {
-				author.setTextSize(14);
-				author.setText("By "+rvd.getAuthor());
-				RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
-				lp.addRule(RelativeLayout.ALIGN_PARENT_TOP);
-				lp.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
-				if (rvd.isDownloaded()) {
-					lp.setMargins(0, 0, 22, 0);
-				}
-				author.setLayoutParams(lp);
-				container.addView(author);
-			}
-
 			container.setPadding(0, 5, 0, 5);
 			return container;
 		}

--- a/src/jp/nekoteki/android/navivoicechanger/RemoteVoiceData.java
+++ b/src/jp/nekoteki/android/navivoicechanger/RemoteVoiceData.java
@@ -31,6 +31,7 @@ public class RemoteVoiceData {
 	private String author;
 	private String description;
 	private VoiceData voice_data;
+	private int dlcount;
 	
 	public VoiceData getVoiceData() {
 		return voice_data;
@@ -179,4 +180,10 @@ public class RemoteVoiceData {
 				player.start();
 		}
 	}
+	public int getDlcount() {
+		return dlcount;
+	}
+	public void setDlcount(int dlcount) {
+		this.dlcount = dlcount;
+	}
 }