creator tools strings

app/src/main/java/com/kickstarter/libs/utils/StringUtils.java

@@ -4,6 +4,8 @@
 import android.support.annotation.Nullable;
 import android.util.Patterns;
 
+import java.util.Locale;
+
 public final class StringUtils {
   private StringUtils() {}
 
@@ -19,6 +21,15 @@ public static boolean isPresent(final @Nullable String str) {
     return !isEmpty(str);
   }
 
+  /**
+   * Returns a string with only the first character capitalized.
+   */
+  public static @NonNull String sentenceCase(final @NonNull String str) {
+    return str.length() <= 1
+      ? str.toUpperCase(Locale.getDefault())
+      : str.substring(0, 1).toUpperCase(Locale.getDefault()) + str.substring(1).toLowerCase(Locale.getDefault());
+  }
+
   /**
    * Returns a string wrapped in parentheses.
    */

app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerStatsViewHolder.java

@@ -18,6 +18,7 @@
 import java.util.List;
 
 import butterknife.Bind;
+import butterknife.BindString;
 import butterknife.ButterKnife;
 
 import static com.kickstarter.libs.rx.transformers.Transformers.observeForUI;
@@ -28,7 +29,10 @@ public class CreatorDashboardReferrerStatsViewHolder extends KSViewHolder {
 
   protected @Bind(R.id.dashboard_referrer_stats_empty_text_view) TextView emptyTextView;
   protected @Bind(R.id.dashboard_referrer_stats_recycler_view) RecyclerView referrerStatsRecyclerView;
-  protected @Bind(R.id.dashboard_referrer_stats_truncated_text_view) TextView truncatedTextView;
+  protected @Bind(R.id.dashboard_referrer_title) TextView referrerTitleTextView;
+
+  protected @BindString(R.string.Top_pledge_sources) String topPledgeSourcesString;
+  protected @BindString(R.string.Top_ten_pledge_sources) String topTenPledgeSourcesString;
 
   public CreatorDashboardReferrerStatsViewHolder(final @NonNull View view) {
     super(view);
@@ -50,10 +54,14 @@ public CreatorDashboardReferrerStatsViewHolder(final @NonNull View view) {
       .compose(observeForUI())
       .subscribe(this::toggleRecyclerViewAndEmptyStateVisibility);
 
-    this.viewModel.outputs.referrerStatsTruncatedTextIsGone()
+    this.viewModel.outputs.referrersTitleIsLimitedCopy()
       .compose(bindToLifecycle())
       .compose(observeForUI())
-      .subscribe(gone -> ViewUtils.setGone(this.truncatedTextView, gone));
+      .subscribe(this::setTitleCopy);
+  }
+
+  private void setTitleCopy(final boolean shouldShowLimitedCopy) {
+    this.referrerTitleTextView.setText(shouldShowLimitedCopy ? this.topTenPledgeSourcesString : this.topPledgeSourcesString);
   }
 
   private void toggleRecyclerViewAndEmptyStateVisibility(final @NonNull Boolean gone) {

app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardRewardStatsViewHolder.java

@@ -9,6 +9,7 @@
 import android.widget.TextView;
 
 import com.kickstarter.R;
+import com.kickstarter.libs.utils.StringUtils;
 import com.kickstarter.libs.utils.ViewUtils;
 import com.kickstarter.models.Project;
 import com.kickstarter.services.apiresponses.ProjectStatsEnvelope;
@@ -18,6 +19,7 @@
 import java.util.List;
 
 import butterknife.Bind;
+import butterknife.BindString;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -31,6 +33,10 @@ public final class CreatorDashboardRewardStatsViewHolder extends KSViewHolder {
   protected @Bind(R.id.dashboard_reward_stats_pledged_view) View pledgedColumnView;
   protected @Bind(R.id.dashboard_reward_stats_truncated_text_view) TextView truncatedTextView;
   protected @Bind(R.id.dashboard_reward_stats_recycler_view) RecyclerView rewardStatsRecyclerView;
+  protected @Bind(R.id.dashboard_reward_title) TextView rewardsTitleTextView;
+
+  protected @BindString(R.string.dashboard_graphs_rewards_top_rewards) String topRewardsString;
+  protected @BindString(R.string.Top_ten_rewards) String topTenRewardsString;
 
   public CreatorDashboardRewardStatsViewHolder(final @NonNull View view) {
     super(view);
@@ -56,6 +62,16 @@ public CreatorDashboardRewardStatsViewHolder(final @NonNull View view) {
       .compose(bindToLifecycle())
       .compose(observeForUI())
       .subscribe(gone -> ViewUtils.setGone(this.truncatedTextView, gone));
+
+    this.viewModel.outputs.rewardsTitleIsLimitedCopy()
+      .compose(bindToLifecycle())
+      .compose(observeForUI())
+      .subscribe(this::setTitleCopy);
+  }
+
+  private void setTitleCopy(final boolean shouldShowLimitedCopy) {
+    final String formattedTopRewards = StringUtils.sentenceCase(this.topRewardsString);
+    this.rewardsTitleTextView.setText(shouldShowLimitedCopy ? this.topTenRewardsString : formattedTopRewards);
   }
 
   private void toggleRecyclerViewAndEmptyStateVisibility(final @NonNull Boolean gone) {

app/src/main/java/com/kickstarter/viewmodels/CreatorDashboardReferrerBreakdownHolderViewModel.java

@@ -75,6 +75,9 @@ interface Outputs {
 
     /** Emits the current project and the amount pledged via internal referrers **/
     Observable<Pair<Project, Float>> projectAndInternalReferrerPledgedAmount();
+
+    /** Emits when there are more than 10 referrer stats and title copy should reflect limited list. */
+    Observable<Boolean> referrersTitleIsLimitedCopy();
   }
 
   final class ViewModel extends ActivityViewModel<CreatorDashboardReferrerBreakdownViewHolder> implements Inputs, Outputs {
@@ -194,6 +197,12 @@ public ViewModel(final @NonNull Environment environment) {
 
       this.pledgedViaInternalLayoutIsGone = this.internalReferrerPledgedAmount
         .map(amount -> amount <= 0f);
+
+      referrerStats
+        .map(rs -> rs.size() > 10)
+        .distinctUntilChanged()
+        .compose(bindToLifecycle())
+        .subscribe(this.referrersTitleIsLimitedCopy);
     }
 
     public final Inputs inputs = this;
@@ -220,6 +229,7 @@ public ViewModel(final @NonNull Environment environment) {
     private final Observable<Pair<Project, Float>> projectAndCustomReferrerPledgedAmount;
     private final Observable<Pair<Project, Float>> projectAndExternalReferrerPledgedAmount;
     private final Observable<Pair<Project, Float>> projectAndInternalReferrerPledgedAmount;
+    private final PublishSubject<Boolean> referrersTitleIsLimitedCopy = PublishSubject.create();
 
     @Override
     public void projectAndStatsInput(final @NonNull Pair<Project, ProjectStatsEnvelope> projectAndStats) {
@@ -291,6 +301,8 @@ public void projectAndStatsInput(final @NonNull Pair<Project, ProjectStatsEnvelo
     public @NonNull Observable<Pair<Project, Float>> projectAndInternalReferrerPledgedAmount() {
       return this.projectAndInternalReferrerPledgedAmount;
     }
-
+    @Override public @NonNull Observable<Boolean> referrersTitleIsLimitedCopy() {
+      return this.referrersTitleIsLimitedCopy;
+    }
   }
 }

app/src/main/java/com/kickstarter/viewmodels/CreatorDashboardReferrerStatsHolderViewModel.java

@@ -35,8 +35,8 @@ interface Outputs {
     /** Emits when there are no referrer stats. */
     Observable<Boolean> referrerStatsListIsGone();
 
-    /** Emits when there are more than 10 referrer stats. */
-    Observable<Boolean> referrerStatsTruncatedTextIsGone();
+    /** Emits when there are more than 10 referrer stats and title copy should reflect limited list. */
+    Observable<Boolean> referrersTitleIsLimitedCopy();
   }
 
   final class ViewModel extends ActivityViewModel<CreatorDashboardReferrerStatsViewHolder> implements Inputs, Outputs {
@@ -62,10 +62,10 @@ public ViewModel(final @NonNull Environment environment) {
         .subscribe(this.referrerStatsListIsGone);
 
       sortedReferrerStats
-        .map(pr -> pr.size() <= 10)
+        .map(rs -> rs.size() > 10)
         .distinctUntilChanged()
         .compose(bindToLifecycle())
-        .subscribe(this.referrerStatsTruncatedTextIsGone);
+        .subscribe(this.referrersTitleIsLimitedCopy);
     }
 
     final private class OrderByBackersReferrerStatsComparator implements Comparator<ProjectStatsEnvelope.ReferrerStats> {
@@ -89,7 +89,7 @@ public int compare(final @NonNull ProjectStatsEnvelope.ReferrerStats o1, final @
 
     private final Observable<Pair<Project, List<ProjectStatsEnvelope.ReferrerStats>>> projectAndReferrerStats;
     private final PublishSubject<Boolean> referrerStatsListIsGone = PublishSubject.create();
-    private final PublishSubject<Boolean> referrerStatsTruncatedTextIsGone = PublishSubject.create();
+    private final PublishSubject<Boolean> referrersTitleIsLimitedCopy = PublishSubject.create();
 
     @Override
     public void projectAndReferrerStatsInput(final @NonNull Pair<Project, List<ProjectStatsEnvelope.ReferrerStats>> projectAndReferrerStats) {
@@ -101,8 +101,8 @@ public void projectAndReferrerStatsInput(final @NonNull Pair<Project, List<Proje
     @Override public @NonNull Observable<Boolean> referrerStatsListIsGone() {
       return this.referrerStatsListIsGone;
     }
-    @Override public @NonNull Observable<Boolean> referrerStatsTruncatedTextIsGone() {
-      return this.referrerStatsTruncatedTextIsGone;
+    @Override public @NonNull Observable<Boolean> referrersTitleIsLimitedCopy() {
+      return this.referrersTitleIsLimitedCopy;
     }
   }
 }

app/src/main/java/com/kickstarter/viewmodels/CreatorDashboardRewardStatsHolderViewModel.java

@@ -40,6 +40,9 @@ interface Outputs {
 
     /** Emits when there are more than 10 reward stats. */
     Observable<Boolean> rewardsStatsTruncatedTextIsGone();
+
+    /** Emits when there are more than 10 reward stats and title copy should reflect limited list. */
+    Observable<Boolean> rewardsTitleIsLimitedCopy();
   }
 
   final class ViewModel extends ActivityViewModel<CreatorDashboardRewardStatsViewHolder> implements Inputs, Outputs {
@@ -65,10 +68,16 @@ public ViewModel(final @NonNull Environment environment) {
         .subscribe(this.rewardsStatsListIsGone);
 
       sortedRewardStats
-        .map(pr -> pr.size() <= 10)
+        .map(rs -> rs.size() <= 10)
         .distinctUntilChanged()
         .compose(bindToLifecycle())
         .subscribe(this.rewardsStatsTruncatedTextIsGone);
+
+      sortedRewardStats
+        .map(rs -> rs.size() > 10)
+        .distinctUntilChanged()
+        .compose(bindToLifecycle())
+        .subscribe(this.rewardsTitleIsLimitedCopy);
     }
 
     final private class OrderByPledgedRewardStatsComparator implements Comparator<ProjectStatsEnvelope.RewardStats> {
@@ -94,6 +103,7 @@ public int compare(final ProjectStatsEnvelope.RewardStats o1, final ProjectStats
     private final Observable<Pair<Project, List<ProjectStatsEnvelope.RewardStats>>> projectAndRewardStats;
     private final PublishSubject<Boolean> rewardsStatsListIsGone = PublishSubject.create();
     private final PublishSubject<Boolean> rewardsStatsTruncatedTextIsGone = PublishSubject.create();
+    private final PublishSubject<Boolean> rewardsTitleIsLimitedCopy = PublishSubject.create();
 
     @Override
     public void pledgedColumnTitleClicked() {
@@ -113,5 +123,9 @@ public void projectAndRewardStatsInput(final @NonNull Pair<Project, List<Project
     @Override public @NonNull Observable<Boolean> rewardsStatsTruncatedTextIsGone() {
       return this.rewardsStatsTruncatedTextIsGone;
     }
+    @Override
+    public Observable<Boolean> rewardsTitleIsLimitedCopy() {
+      return this.rewardsTitleIsLimitedCopy;
+    }
   }
 }

app/src/main/res/layout/dashboard_funding_view.xml

@@ -37,7 +37,7 @@
           android:layout_height="match_parent"
           android:layout_alignParentStart="true"
           android:gravity="center_vertical"
-          android:text="@string/dashboard_buttons_project"
+          android:text="@string/View_project"
           android:textColor="@color/ksr_soft_black"
           android:textSize="@dimen/callout" />
 

app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml

@@ -6,7 +6,8 @@
   android:layout_height="wrap_content"
   android:divider="@drawable/divider_dark_grey_500_horizontal"
   android:orientation="vertical"
-  android:showDividers="beginning">
+  android:showDividers="beginning"
+  android:visibility="gone">
 
   <TextView
     style="@style/Title2"
@@ -15,7 +16,8 @@
     android:layout_marginTop="@dimen/grid_7"
     android:paddingEnd="@dimen/grid_2"
     android:paddingStart="@dimen/grid_2"
-    android:text="@string/dashboard_graphs_referrers_title_referrers" />
+    android:text="@string/How_backers_found_your_project"
+    android:visibility="gone" />
 
   <LinearLayout
     android:id="@+id/referrer_breakdown_chart_layout"
@@ -74,7 +76,7 @@
           <TextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:text="@string/dashboard_graphs_referrers_pledged_via_kickstarter" />
+            android:text="@string/via_kickstarter" />
 
         </LinearLayout>
 
@@ -118,7 +120,7 @@
           <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/dashboard_graphs_referrers_pledged_via_external" />
+            android:text="@string/via_external" />
 
         </LinearLayout>
 
@@ -163,7 +165,7 @@
           <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/dashboard_graphs_referrers_pledged_via_custom" />
+            android:text="@string/via_custom" />
 
         </LinearLayout>
       </LinearLayout>

app/src/main/res/layout/dashboard_referrer_stats_view.xml

@@ -2,20 +2,32 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
-  android:paddingStart="@dimen/grid_2"
-  android:paddingEnd="@dimen/grid_2"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
   android:layout_marginBottom="@dimen/grid_5"
-  android:layout_marginTop="@dimen/grid_1"
+  android:divider="@drawable/divider_dark_grey_500_horizontal"
   android:orientation="vertical"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content">
+  android:showDividers="beginning">
+
+  <TextView
+    android:id="@+id/dashboard_referrer_title"
+    style="@style/Title2"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/grid_7"
+    android:paddingEnd="@dimen/grid_2"
+    android:paddingStart="@dimen/grid_2"
+    android:text="@string/Top_pledge_sources" />
 
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/grid_1"
     android:divider="@drawable/divider_dark_grey_500_horizontal"
-    android:showDividers="middle"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:paddingEnd="@dimen/grid_2"
+    android:paddingStart="@dimen/grid_2"
+    android:showDividers="middle">
 
     <LinearLayout
       style="@style/CreatorDashboardTableRowContainer">
@@ -48,9 +60,9 @@
         android:text="@string/dashboard_graphs_funding_backers" />
 
       <TextView
+        style="@style/CreatorDashboardTableRowText"
         android:layout_width="0dp"
         android:layout_weight="3"
-        style="@style/CreatorDashboardTableRowText"
         android:text="@string/dashboard_graphs_referrers_source" />
 
     </LinearLayout>
@@ -59,24 +71,17 @@
       android:id="@+id/dashboard_referrer_stats_recycler_view"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      tools:listitem="@layout/dashboard_referrer_stats_row_view"/>
+      tools:listitem="@layout/dashboard_referrer_stats_row_view" />
 
   </LinearLayout>
 
   <TextView
     android:id="@+id/dashboard_referrer_stats_empty_text_view"
-    android:paddingTop="@dimen/grid_10"
-    android:paddingBottom="@dimen/grid_10"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center"
-    tools:text="Sorry, no stats yet!\n
You don’t have any backings"/>
-
-  <TextView
-    style="@style/BodyPrimary"
-    android:id="@+id/dashboard_referrer_stats_truncated_text_view"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    tools:text="Limited to the top 10 rewards."/>
+    android:paddingBottom="@dimen/grid_10"
+    android:paddingTop="@dimen/grid_10"
+    android:text="@string/Data_will_appear_here_once" />
 
 </LinearLayout>