Merge pull request #133 from thequbit/master

fixed organization name being too long
hhroc · Feb 23, 2015 · 9b4a1d6 · 9b4a1d6
2 parents 418c495 + fa534da
commit 9b4a1d6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
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
@@ -194,7 +194,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
             textViewPostCount.setTypeface(font);
 
             textViewQuestionText.setText(this.assignments.get(position).question_text);
-            textViewOrganization.setText("Organization: " + this.assignments.get(position).organization);
+            textViewOrganization.setText("Organization: " + 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/utils/YellrUtils.java b/app/src/main/java/yellr/net/yellr_android/utils/YellrUtils.java
@@ -75,6 +75,14 @@ else if (milliSeconds < 15 * MINUTE) {
         return retString;
     }
 
+    public static String ShortenString(String str) {
+        String retString = str;
+        if ( str.length() > 20) {
+            retString = str.substring(0,20) + " ...";
+        }
+        return retString;
+    }
+
     public static double[] getLocation(Context context) {
 
         /*