added stub for spanish strings. closes hhroc#140 (includes app version)

thequbit · thequbit · commit f809f96fb9e1 · 2015-03-05T22:25:39.000-05:00
diff --git a/app/src/main/java/yellr/net/yellr_android/activities/HomeActivity.java b/app/src/main/java/yellr/net/yellr_android/activities/HomeActivity.java
@@ -248,9 +248,9 @@ public CharSequence getPageTitle(int position) {
             Locale l = Locale.getDefault();
             switch (position) {
                 case 0:
-                    return getString(R.string.title_fragment_assignments).toUpperCase(l);
+                    return getString(R.string.fragment_assignments_title).toUpperCase(l);
                 case 1:
-                    return getString(R.string.title_fragment_stories).toUpperCase(l);
+                    return getString(R.string.fragment_stories_title).toUpperCase(l);
             }
             return null;
         }
diff --git a/app/src/main/java/yellr/net/yellr_android/fragments/AssignmentsFragment.java b/app/src/main/java/yellr/net/yellr_android/fragments/AssignmentsFragment.java
@@ -191,10 +191,11 @@ public View getView(int position, View convertView, ViewGroup parent) {
             TextView textViewPostCount = (TextView) row.findViewById(R.id.frag_home_assignment_post_count);
 
             Typeface font = Typeface.createFromAsset(getActivity().getAssets(), "fontawesome-webfont.ttf");
+            textViewOrganization.setTypeface(font);
             textViewPostCount.setTypeface(font);
 
             textViewQuestionText.setText(this.assignments.get(position).question_text);
-            textViewOrganization.setText(getString(R.string.organization_label) + YellrUtils.ShortenString(this.assignments.get(position).organization));
+            textViewOrganization.setText(getString(R.string.fa_user) + "   " + YellrUtils.shortenString(this.assignments.get(position).organization));
             textViewPostCount.setText(getString(R.string.fa_comments) + " " + String.valueOf(this.assignments.get(position).post_count));
 
             return row;
diff --git a/app/src/main/java/yellr/net/yellr_android/fragments/PostFragment.java b/app/src/main/java/yellr/net/yellr_android/fragments/PostFragment.java
@@ -362,8 +362,8 @@ private void SubmitPostToYellr() {
 
         // reset display
         postText.setText("");
-        assignmentQuestion.setText(R.string.frag_post_assignment_title);
-        assignmentDescription.setText(R.string.frag_post_assignment_description);
+        assignmentQuestion.setText(getString(R.string.frag_post_assignment_title));
+        assignmentDescription.setText(getString(R.string.frag_post_assignment_description));
 
         // go back to home screen
         Intent homeIntent = new Intent(getActivity(), HomeActivity.class);
diff --git a/app/src/main/java/yellr/net/yellr_android/fragments/StoriesFragment.java b/app/src/main/java/yellr/net/yellr_android/fragments/StoriesFragment.java
@@ -194,10 +194,10 @@ public View getView(int position, View convertView, ViewGroup parent) {
             textViewPublishAuthor.setTypeface(font);
             textViewPublishDateTime.setTypeface(font);
 
-            textViewPublishAuthor.setText(getString(R.string.fa_user) + " " + stories.get(position).author_first_name + " " + stories.get(position).author_last_name);
+            textViewPublishAuthor.setText(getString(R.string.fa_user) + "   " + stories.get(position).author_first_name + " " + stories.get(position).author_last_name);
             textViewTitle.setText(this.stories.get(position).title);
 
-            Date pubDateStr = YellrUtils.PrettifyDateTime(this.stories.get(position).publish_datetime);
+            Date pubDateStr = YellrUtils.prettifyDateTime(this.stories.get(position).publish_datetime);
             String pubAgo = YellrUtils.calcTimeBetween(pubDateStr, new Date());
 
             textViewPublishDateTime.setText(getString(R.string.fa_pencil) + " " + pubAgo + " ago.");
diff --git a/app/src/main/java/yellr/net/yellr_android/fragments/ViewStoryFragment.java b/app/src/main/java/yellr/net/yellr_android/fragments/ViewStoryFragment.java
@@ -62,7 +62,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         String contentsRendered = intent.getStringExtra(ViewStoryFragment.ARG_STORY_CONTENTS_RENDERED);
 
         //TODO Use new datetime prettifier
-        Date pubDT = YellrUtils.PrettifyDateTime(publishedDateTime);
+        Date pubDT = YellrUtils.prettifyDateTime(publishedDateTime);
         String pubAgo = YellrUtils.calcTimeBetween(pubDT, new Date());
 
         Typeface font = Typeface.createFromAsset(getActivity().getAssets(), "fontawesome-webfont.ttf");
diff --git a/app/src/main/java/yellr/net/yellr_android/intent_services/assignments/AssignmentsIntentService.java b/app/src/main/java/yellr/net/yellr_android/intent_services/assignments/AssignmentsIntentService.java
@@ -50,14 +50,13 @@ protected void onHandleIntent(Intent intent) {
      */
     private void handleActionGetAssignments() {
 
-        String baseUrl = BuildConfig.BASE_URL + "/get_assignments.json";
 
-        String assignmentsJson = "[]";
 
         // get the location, but if the user has turned off location services,
         // it will come back null.  If it's null, we won't ping the server
         // and just return a blank json list
 
+        /*
         double latLng[] = YellrUtils.getLocation(getApplicationContext());
         if (latLng != null ) {
 
@@ -71,8 +70,13 @@ private void handleActionGetAssignments() {
                     + "&language_code=" + languageCode
                     + "&lat=" + lat
                     + "&lng=" + lng;
+        */
 
-            //Log.d("AssignmentsIntentService.UpdateData()","URL: " + url);
+        String assignmentsJson = "[]";
+
+        String baseUrl = BuildConfig.BASE_URL + "/get_assignments.json";
+        String url = YellrUtils.buildUrl(getApplicationContext(),baseUrl);
+        if (url != null) {
 
             //
             // TODO: need to check for exceptions better, this bombs out sometimes
diff --git a/app/src/main/java/yellr/net/yellr_android/intent_services/stories/StoriesIntentService.java b/app/src/main/java/yellr/net/yellr_android/intent_services/stories/StoriesIntentService.java
@@ -51,14 +51,15 @@ protected void onHandleIntent(Intent intent) {
      */
     private void handleActionGetStories() {
 
-        String baseUrl = BuildConfig.BASE_URL + "/get_stories.json";
+        //String baseUrl = BuildConfig.BASE_URL + "/get_stories.json";
 
-        String storiesJson = "[]";
+        //String storiesJson = "[]";
 
         // get the location, but if the user has turned off location services,
         // it will come back null.  If it's null, we won't ping the server
         // and just return a blank json list
 
+        /*
         double latLng[] = YellrUtils.getLocation(getApplicationContext());
         if (latLng != null ) {
 
@@ -72,7 +73,12 @@ private void handleActionGetStories() {
                     + "&language_code=" + languageCode
                     + "&lat=" + lat
                     + "&lng=" + lng;
+*/
+        String storiesJson = "[]";
 
+        String baseUrl = BuildConfig.BASE_URL + "/get_stories.json";
+        String url = YellrUtils.buildUrl(getApplicationContext(),baseUrl);
+        if (url != null) {
             try {
 
                 //
diff --git a/app/src/main/java/yellr/net/yellr_android/utils/YellrUtils.java b/app/src/main/java/yellr/net/yellr_android/utils/YellrUtils.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
 import android.location.Criteria;
 import android.location.Location;
 import android.location.LocationManager;
@@ -10,6 +11,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 import java.util.StringTokenizer;
 import java.util.UUID;
 
@@ -18,7 +20,7 @@
  */
 public class YellrUtils {
 
-    public static Date PrettifyDateTime(String rawDateTime) {
+    public static Date prettifyDateTime(String rawDateTime) {
 
         Date date = new Date();
         try {
@@ -45,44 +47,72 @@ public static String calcTimeBetween(Date start, Date end) {
         if (milliSeconds > DAY) {
             t = Math.round(milliSeconds / DAY);
             retString = String.format("%d day", t);
-            if( t > 1) {
+            if (t > 1) {
                 retString += "s";
             }
             //return retString;
-        }
-        else if (milliSeconds < DAY && milliSeconds > HOUR) {
+        } else if (milliSeconds < DAY && milliSeconds > HOUR) {
             t = Math.round(milliSeconds / HOUR);
             retString = String.format("%d hour", t);
-            if (t > 1 ) {
+            if (t > 1) {
                 retString += "s";
             }
             //return retString;
-        }
-        else if (milliSeconds < HOUR && milliSeconds > 15 * MINUTE) {
+        } else if (milliSeconds < HOUR && milliSeconds > 15 * MINUTE) {
             t = Math.round(milliSeconds / MINUTE);
             retString = String.format("%d minute", t);
-            if ( t > 1 ) {
+            if (t > 1) {
                 retString += "s";
             }
             //return retString;
-        }
-        else if (milliSeconds < 15 * MINUTE) {
+        } else if (milliSeconds < 15 * MINUTE) {
             retString = "Moments";
-        }
-        else {
+        } else {
             //Throw an exception instead?
         }
         return retString;
     }
 
-    public static String ShortenString(String str) {
+    public static String shortenString(String str) {
         String retString = str;
-        if ( str.length() > 20) {
-            retString = str.substring(0,20) + " ...";
+        if (str.length() > 20) {
+            retString = str.substring(0, 20) + " ...";
         }
         return retString;
     }
 
+    public static String getAppVersion(Context context) {
+        String version = "Unknown";
+        try {
+            PackageInfo pInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+            version = pInfo.versionName;
+        } catch (Exception ex) {
+            Log.d("YellrUtils.GetAppVersion()", "Error: " + ex.toString());
+        }
+        return version;
+    }
+
+    public static String buildUrl(Context context, String baseUrl ) {
+
+        String url = null;
+
+        double latLng[] = YellrUtils.getLocation(context);
+        if (latLng != null) {
+
+            String languageCode = Locale.getDefault().getLanguage();
+
+            url = baseUrl
+                + "?cuid=" + YellrUtils.getCUID(context)
+                + "&language_code=" + languageCode
+                + "&lat=" + latLng[0]
+                + "&lng=" + latLng[1]
+                + "&platform=" + "Android"
+                + "&app_version=" + YellrUtils.getAppVersion(context);
+        }
+
+        return url;
+    }
+
     public static double[] getLocation(Context context) {
 
         /*
diff --git a/app/src/main/res/layout/activity_post.xml b/app/src/main/res/layout/activity_post.xml
@@ -1,4 +1,8 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:id="@+id/container"
-    android:layout_width="match_parent" android:layout_height="match_parent"
-    tools:context="yellr.net.yellr_android.activities.PostActivity" tools:ignore="MergeRootFrame" />
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="yellr.net.yellr_android.activities.PostActivity"
+    tools:ignore="MergeRootFrame" />
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/splash_title"
-        android:text="@string/splash_title"
+        android:text="@string/activity_splash_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
@@ -22,7 +22,7 @@
 
     <TextView
         android:id="@+id/splash_tagline"
-        android:text="@string/splash_tagline"
+        android:text="@string/activity_splash_tag_line"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
diff --git a/app/src/main/res/layout/fragment_location.xml b/app/src/main/res/layout/fragment_location.xml
@@ -9,8 +9,8 @@
     tools:context="yellr.net.yellr_android.activities.LocationActivity$PlaceholderFragment">
 
     <TextView
-        android:id="@+id/frag_location_infotext"
-        android:text="@string/frag_location_infotext"
+        android:id="@+id/frag_location_info_text"
+        android:text="@string/frag_location_info_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingTop="20dp"
diff --git a/app/src/main/res/menu/menu_post.xml b/app/src/main/res/menu/menu_post.xml
@@ -4,7 +4,7 @@
     tools:context="yellr.net.yellr_android.activities.PostActivity">
 
     <item android:id="@+id/action_post_upload"
-        android:title="@string/action_post"
+        android:title=""
         android:orderInCategory="100"
         app:showAsAction="always" />
 </menu>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- App -->
+    <string name="app_name">Yellr</string>
+
+
+    <!-- Font Awesome Icons -->
+    <string name="fa_camera"></string>
+    <string name="fa_video_camera"></string>
+    <string name="fa_microphone"></string>
+    <string name="fa_upload"></string>
+    <string name="fa_comment"></string>
+    <string name="fa_comment_o"></string>
+    <string name="fa_comments"></string>
+    <string name="fa_comments_o"></string>
+    <string name="fa_question"></string>
+    <string name="fa_question_circle"></string>
+    <string name="fa_user"></string>
+    <string name="fa_pencil"></string>
+    <string name="fa_user_secret"></string>
+    <string name="fa_user_plus"></string>
+    <string name="fa_check_square"></string>
+    <string name="fa_times"></string>
+    <string name="fa_key"></string>
+    <string name="fa_random"></string>
+    <string name="fa_eye"></string>
+    <string name="fa_chevron_left_circle"></string>
+
+
+    <!-- Home Action Buttons -->
+    <string name="action_notification">Notifications</string>
+    <string name="action_messages">Messages</string>
+    <string name="action_profile">Profile</string>
+    <string name="action_new_post">New Post</string>
+
+    <!-- Splash -->
+    <string name="activity_splash_title">Yellr</string>
+    <string name="activity_splash_tag_line">Report for your community</string>
+
+
+    <!-- Assignments -->
+    <string name="fragment_assignments_title">Assignments</string>
+
+
+    <!-- Stories -->
+    <string name="fragment_stories_title">Stories</string>
+
+
+    <!-- View Story -->
+    <string name="title_activity_view_story">Yellr</string>
+
+
+    <!-- View Assignment -->
+    <string name="organization_label">Organization: </string>
+    <string name="title_activity_view_assignment">Assignment</string>
+    <string name="view_assignment_contribute">Contribute</string>
+
+
+    <!-- Notifications -->
+    <string name="title_activity_notifications">Notifications</string>
+
+
+    <!-- Post -->
+    <string name="activity_post_title">New Post</string>
+    <string name="frag_post_default_text">Tell us about your community</string>
+    <string name="frag_post_media_text">Add media:</string>
+    <string name="frag_post_submit_button">Submit</string>
+    <string name="frag_post_assignment_title">Free Post</string>
+    <string name="frag_post_assignment_description">You can tell us what you think on any topic!</string>
+    <string name="frag_post_toast_sending_post">Sending post ...</string>
+
+
+    <!-- Profile -->
+    <string name="activity_profile_title">ProfileActivity</string>
+    <string name="frag_profile_posts_description">Posts</string>
+    <string name="frag_profile_viewed_posts_description">Posts Viewed</string>
+    <string name="frag_profile_used_posts_description">Posts Used</string>
+    <string name="frag_profile_action_signup">SignUp</string>
+    <string name="frag_profile_action_new_uuid">New UUID</string>
+
+
+    <!-- location -->
+    <string name="activity_location_title">Set A Location</string>
+    <string name="frag_location_info_text">Yellr uses location to send you assignments and stories.  Enter the zipcode you would like to set as your home location.</string>
+
+
+    <!--<string name="action_settings">Settings</string>-->
+
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -248,9 +248,9 @@ public CharSequence getPageTitle(int position) {`
`248`	`248`	`Locale l = Locale.getDefault();`
`249`	`249`	`switch (position) {`
`250`	`250`	`case 0:`
`251`		`- return getString(R.string.title_fragment_assignments).toUpperCase(l);`
	`251`	`+ return getString(R.string.fragment_assignments_title).toUpperCase(l);`
`252`	`252`	`case 1:`
`253`		`- return getString(R.string.title_fragment_stories).toUpperCase(l);`
	`253`	`+ return getString(R.string.fragment_stories_title).toUpperCase(l);`
`254`	`254`	`}`
`255`	`255`	`return null;`
`256`	`256`	`}`