From 56487113f7812f49c55b56ace1ca5ed13852b0ec Mon Sep 17 00:00:00 2001 From: Izzy Oji Date: Wed, 14 Feb 2018 13:57:25 -0500 Subject: [PATCH 01/12] referrer chart wip --- ...boardReferrerBreakdownHolderViewModel.java | 2 +- .../main/res/drawable/indicator_vertical.xml | 7 + .../dashboard_referrer_breakdown_layout.xml | 159 +++++++++++++----- 3 files changed, 125 insertions(+), 43 deletions(-) create mode 100644 app/src/main/res/drawable/indicator_vertical.xml diff --git a/app/src/main/java/com/kickstarter/viewmodels/CreatorDashboardReferrerBreakdownHolderViewModel.java b/app/src/main/java/com/kickstarter/viewmodels/CreatorDashboardReferrerBreakdownHolderViewModel.java index 0d6fba0000..e506861658 100644 --- a/app/src/main/java/com/kickstarter/viewmodels/CreatorDashboardReferrerBreakdownHolderViewModel.java +++ b/app/src/main/java/com/kickstarter/viewmodels/CreatorDashboardReferrerBreakdownHolderViewModel.java @@ -124,7 +124,7 @@ public ViewModel(final @NonNull Environment environment) { ); this.customReferrerPercentText = this.customReferrerPercent - .map(percent -> NumberUtils.flooredPercentage(percent.floatValue() * 100f)); + .map(percent -> NumberUtils.flooredPercentage(percent * 100f)); this.customReferrerPledgedAmount = customReferrers .flatMap(rs -> diff --git a/app/src/main/res/drawable/indicator_vertical.xml b/app/src/main/res/drawable/indicator_vertical.xml new file mode 100644 index 0000000000..65ed9d0376 --- /dev/null +++ b/app/src/main/res/drawable/indicator_vertical.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml b/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml index 84df47507a..0d8b459172 100644 --- a/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml +++ b/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml @@ -1,6 +1,7 @@ + android:paddingEnd="@dimen/grid_2" + android:paddingStart="@dimen/grid_2" + android:baselineAligned="false"> - + - - - - - + android:orientation="vertical"> + android:orientation="horizontal"> + android:layout_height="wrap_content" + tools:text="75%" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -169,4 +238,10 @@ + From 24589759ea85646ceb4048f978dd8664702df4bf Mon Sep 17 00:00:00 2001 From: Izzy Oji Date: Thu, 15 Feb 2018 16:37:17 -0500 Subject: [PATCH 02/12] wip referrer chart --- ...rDashboardReferrerBreakdownViewHolder.java | 44 +-- .../dashboard_referrer_breakdown_layout.xml | 297 +++++++++--------- app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/dimens.xml | 2 + 4 files changed, 185 insertions(+), 159 deletions(-) diff --git a/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java b/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java index 036419389f..97dca26a72 100644 --- a/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java +++ b/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java @@ -2,9 +2,9 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.support.v4.graphics.drawable.DrawableCompat; import android.util.Pair; import android.view.View; +import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; @@ -37,9 +37,9 @@ public class CreatorDashboardReferrerBreakdownViewHolder extends KSViewHolder { protected @Bind(R.id.percent_via_external_circle_text_view) ImageView percentExternalCircleTextView; protected @Bind(R.id.percent_via_kickstarter_text_view) TextView percentInternalTextView; protected @Bind(R.id.percent_via_kickstarter_circle_text_view) ImageView percentInternalCircleTextView; - protected @Bind(R.id.pledged_via_custom_layout) LinearLayout pledgedViaCustomLayout; - protected @Bind(R.id.pledged_via_external_layout) LinearLayout pledgedViaExternalLayout; - protected @Bind(R.id.pledged_via_kickstarter_layout) LinearLayout pledgedViaInternalLayout; + protected @Bind(R.id.pledged_via_custom_layout) FrameLayout pledgedViaCustomLayout; + protected @Bind(R.id.pledged_via_external_layout) FrameLayout pledgedViaExternalLayout; + protected @Bind(R.id.pledged_via_kickstarter_layout) FrameLayout pledgedViaInternalLayout; protected @Bind(R.id.referrer_breakdown_chart_layout) LinearLayout referrerBreakdownLayout; protected @Bind(R.id.referrer_breakdown_view) ReferrerBreakdownView referrerBreakdownView; @@ -52,45 +52,45 @@ public CreatorDashboardReferrerBreakdownViewHolder(final @NonNull View view) { this.viewModel = new CreatorDashboardReferrerBreakdownHolderViewModel.ViewModel(environment()); - this.viewModel.outputs.customReferrerColor() - .compose(bindToLifecycle()) - .compose(observeForUI()) - .subscribe(color -> DrawableCompat.setTint(this.percentCustomCircleTextView.getDrawable(), color)); +// this.viewModel.outputs.customReferrerColor() +// .compose(bindToLifecycle()) +// .compose(observeForUI()) +// .subscribe(color -> DrawableCompat.setTint(this.percentCustomCircleTextView.getDrawable(), color)); this.viewModel.outputs.customReferrerPercent() .compose(bindToLifecycle()) .compose(observeForUI()) - .subscribe(percent -> this.referrerBreakdownView.setCustomAngleAndColor(percent * 360d)); + .subscribe(percent -> setReferrerWidth(percent, pledgedViaCustomLayout)); this.viewModel.outputs.customReferrerPercentText() .compose(bindToLifecycle()) .compose(observeForUI()) .subscribe(this.percentCustomTextView::setText); - this.viewModel.outputs.externalReferrerColor() - .compose(bindToLifecycle()) - .compose(observeForUI()) - .subscribe(color -> DrawableCompat.setTint(this.percentExternalCircleTextView.getDrawable(), color)); +// this.viewModel.outputs.externalReferrerColor() +// .compose(bindToLifecycle()) +// .compose(observeForUI()) +// .subscribe(color -> DrawableCompat.setTint(this.percentExternalCircleTextView.getDrawable(), color)); this.viewModel.outputs.externalReferrerPercent() .compose(bindToLifecycle()) .compose(observeForUI()) - .subscribe(percent -> this.referrerBreakdownView.setExternalAngleAndColor(percent * 360d)); + .subscribe(percent -> setReferrerWidth(percent, pledgedViaExternalLayout)); this.viewModel.outputs.externalReferrerPercentText() .compose(bindToLifecycle()) .compose(observeForUI()) .subscribe(this.percentExternalTextView::setText); - this.viewModel.outputs.internalReferrerColor() - .compose(bindToLifecycle()) - .compose(observeForUI()) - .subscribe(color -> DrawableCompat.setTint(this.percentInternalCircleTextView.getDrawable(), color)); +// this.viewModel.outputs.internalReferrerColor() +// .compose(bindToLifecycle()) +// .compose(observeForUI()) +// .subscribe(color -> DrawableCompat.setTint(this.percentInternalCircleTextView.getDrawable(), color)); this.viewModel.outputs.internalReferrerPercent() .compose(bindToLifecycle()) .compose(observeForUI()) - .subscribe(percent -> this.referrerBreakdownView.setInternalAngleAndColor(percent * 360d)); + .subscribe(percent -> setReferrerWidth(percent, pledgedViaInternalLayout)); this.viewModel.outputs.internalReferrerPercentText() .compose(bindToLifecycle()) @@ -128,6 +128,12 @@ public CreatorDashboardReferrerBreakdownViewHolder(final @NonNull View view) { .subscribe(pa -> this.setAmountPledgedTextViewText(pa, this.amountPledgedViaInternalTextView)); } + private static void setReferrerWidth(Float percent, FrameLayout frameLayout) { + LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) frameLayout.getLayoutParams(); + layoutParams.weight = percent; + frameLayout.setLayoutParams(layoutParams); + } + @Override public void bindData(final @Nullable Object data) throws Exception { final Pair projectAndStats = requireNonNull((Pair) data); diff --git a/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml b/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml index 0d8b459172..42fdf4c5aa 100644 --- a/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml +++ b/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml @@ -1,7 +1,6 @@ + android:paddingStart="@dimen/grid_2"> + + android:layout_marginStart="@dimen/grid_7_half" + android:layout_marginTop="@dimen/grid_17" + android:orientation="horizontal"> + + + android:layout_gravity="bottom" + android:layout_marginTop="@dimen/grid_6" + android:orientation="vertical"> + + + + + + + + + tools:text="$1,000" /> - + - - - - - - - - + android:background="@color/ksr_green_500" /> - + android:layout_marginEnd="@dimen/grid_7_half" + android:orientation="horizontal"> + + + + + + + + + + + + + + + + + + + + + @@ -124,124 +196,69 @@ + android:background="@color/ksr_highlighter_green" /> - - - + android:src="@drawable/indicator_vertical" + android:tint="@color/ksr_highlighter_green" /> - - - - - - - + android:layout_gravity="bottom" + android:orientation="vertical"> + android:layout_width="wrap_content" + android:layout_height="wrap_content"> - + + android:gravity="center" + tools:text="75%" /> - - - - - - - - - - - + tools:text="$22,000" /> - + - - + + + android:visibility="gone" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 1950d88626..9a0d4b9f8a 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -15,6 +15,7 @@ #395AEB #9B9E9E #656969 + #05F2BA #009E74 #037362 #034752 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index c61fd1de2c..70668703f7 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -17,12 +17,14 @@ 48dp 54dp 60dp + 64dp 63dp 72dp 78dp 84dp 90dp 96dp + 102dp 120dp 126dp 162dp From d6a1526e4fadbf64b686bd4e2b3bf53fdceb374b Mon Sep 17 00:00:00 2001 From: Izzy Oji Date: Thu, 15 Feb 2018 17:58:59 -0500 Subject: [PATCH 03/12] wip, fighting constraint layout --- app/build.gradle | 4 +++ ...rDashboardReferrerBreakdownViewHolder.java | 8 ++--- .../dashboard_referrer_breakdown_layout.xml | 33 +++++++++++++------ 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 95b5dccd9a..717292d368 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -128,6 +128,9 @@ android { repositories { jcenter() + maven { + url 'https://maven.google.com' + } } dependencies { @@ -170,6 +173,7 @@ dependencies { compile 'net.hockeyapp.android:HockeySDK:3.6.1' compile 'org.jsoup:jsoup:1.8.2' compile "com.mixpanel.android:mixpanel-android:4.6.4" + compile 'com.android.support.constraint:constraint-layout:1.0.2' // Testing testCompile 'junit:junit:4.12' diff --git a/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java b/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java index 97dca26a72..c3e4e75bb5 100644 --- a/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java +++ b/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java @@ -2,11 +2,11 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.support.constraint.ConstraintLayout; import android.util.Pair; import android.view.View; import android.widget.FrameLayout; import android.widget.ImageView; -import android.widget.LinearLayout; import android.widget.TextView; import com.kickstarter.R; @@ -40,7 +40,7 @@ public class CreatorDashboardReferrerBreakdownViewHolder extends KSViewHolder { protected @Bind(R.id.pledged_via_custom_layout) FrameLayout pledgedViaCustomLayout; protected @Bind(R.id.pledged_via_external_layout) FrameLayout pledgedViaExternalLayout; protected @Bind(R.id.pledged_via_kickstarter_layout) FrameLayout pledgedViaInternalLayout; - protected @Bind(R.id.referrer_breakdown_chart_layout) LinearLayout referrerBreakdownLayout; + protected @Bind(R.id.referrer_breakdown_chart_layout) ConstraintLayout referrerBreakdownLayout; protected @Bind(R.id.referrer_breakdown_view) ReferrerBreakdownView referrerBreakdownView; private KSCurrency ksCurrency; @@ -129,8 +129,8 @@ public CreatorDashboardReferrerBreakdownViewHolder(final @NonNull View view) { } private static void setReferrerWidth(Float percent, FrameLayout frameLayout) { - LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) frameLayout.getLayoutParams(); - layoutParams.weight = percent; + ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) frameLayout.getLayoutParams(); + layoutParams.horizontalWeight = percent; frameLayout.setLayoutParams(layoutParams); } diff --git a/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml b/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml index 42fdf4c5aa..99d1f9b10c 100644 --- a/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml +++ b/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml @@ -1,5 +1,6 @@ - - + android:paddingStart="@dimen/grid_2" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + tools:layout_constraintTop_creator="1" + android:layout_marginTop="54dp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:layout_editor_absoluteX="32dp"> + app:layout_constraintTop_toTopOf="@+id/pledged_via_kickstarter_layout" + app:layout_constraintEnd_toEndOf="@+id/pledged_via_kickstarter_layout" + app:layout_constraintEnd_toStartOf="@+id/pledged_via_custom_layout" + tools:layout_constraintTop_creator="1" + tools:layout_constraintRight_creator="1"> + tools:layout_constraintTop_creator="1" + android:layout_marginStart="236dp" + tools:layout_constraintLeft_creator="1" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@+id/pledged_via_external_layout"> - + Date: Fri, 16 Feb 2018 16:13:40 -0500 Subject: [PATCH 04/12] success constraint layout. --- .../dashboard_referrer_breakdown_layout.xml | 43 ++++++++----------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml b/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml index 99d1f9b10c..9bf9ff0452 100644 --- a/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml +++ b/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml @@ -1,7 +1,7 @@ - + android:layout_height="wrap_content" + android:paddingEnd="@dimen/grid_2" + android:paddingStart="@dimen/grid_2"> + app:layout_constraintEnd_toStartOf="@+id/pledged_via_external_layout"> + app:layout_constraintHorizontal_weight="1" + app:layout_constraintStart_toEndOf="@+id/pledged_via_kickstarter_layout" + app:layout_constraintEnd_toStartOf="@+id/pledged_via_custom_layout"> - - + app:layout_constraintTop_toTopOf="@+id/pledged_via_kickstarter_layout" + app:layout_constraintStart_toEndOf="@+id/pledged_via_external_layout" + app:layout_constraintHorizontal_weight="1"> Date: Wed, 21 Feb 2018 10:48:50 -0500 Subject: [PATCH 05/12] second pass of referrers chart w constraint layout --- .../dashboard_referrer_breakdown_layout.xml | 285 +++++++++--------- 1 file changed, 143 insertions(+), 142 deletions(-) diff --git a/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml b/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml index 9bf9ff0452..371890b743 100644 --- a/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml +++ b/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml @@ -25,202 +25,193 @@ android:paddingEnd="@dimen/grid_2" android:paddingStart="@dimen/grid_2"> - + app:layout_constraintTop_toTopOf="@+id/pledged_via_external_layout" /> - + - + android:background="@color/white" + android:contentDescription="@null" + android:padding="1dp" + android:src="@drawable/indicator_vertical" /> - + - - - - - - - - + android:orientation="horizontal"> + tools:text="75%" /> - + - + - + + + + - + app:layout_constraintTop_toBottomOf="parent" /> - + - + + + + + android:gravity="end" + android:layout_marginBottom="@dimen/grid_6" + android:orientation="vertical"> - - - - - - - - + android:layout_gravity="end" + android:orientation="horizontal"> - + + android:gravity="center" + tools:text="75%" /> - - - - - - + + + + + + + + + + + app:layout_constraintTop_toTopOf="@+id/pledged_via_kickstarter_layout" /> - - + - + + + + Date: Mon, 26 Feb 2018 14:51:12 -0500 Subject: [PATCH 06/12] add proper indicators --- ...rDashboardReferrerBreakdownViewHolder.java | 46 +++++++++++------ .../main/res/drawable/indicator_external.xml | 23 +++++++++ .../res/drawable/indicator_kickstarter.xml | 25 +++++++++ .../main/res/drawable/indicator_vertical.xml | 30 ++++++++--- .../dashboard_referrer_breakdown_layout.xml | 51 ++++++++----------- .../layout/dashboard_referrer_stats_view.xml | 4 +- 6 files changed, 126 insertions(+), 53 deletions(-) create mode 100644 app/src/main/res/drawable/indicator_external.xml create mode 100644 app/src/main/res/drawable/indicator_kickstarter.xml diff --git a/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java b/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java index c3e4e75bb5..2ddb167c12 100644 --- a/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java +++ b/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java @@ -3,9 +3,9 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.constraint.ConstraintLayout; +import android.support.v4.graphics.drawable.DrawableCompat; import android.util.Pair; import android.view.View; -import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; @@ -20,6 +20,7 @@ import java.math.RoundingMode; import butterknife.Bind; +import butterknife.BindDimen; import butterknife.ButterKnife; import static com.kickstarter.libs.rx.transformers.Transformers.observeForUI; @@ -37,12 +38,18 @@ public class CreatorDashboardReferrerBreakdownViewHolder extends KSViewHolder { protected @Bind(R.id.percent_via_external_circle_text_view) ImageView percentExternalCircleTextView; protected @Bind(R.id.percent_via_kickstarter_text_view) TextView percentInternalTextView; protected @Bind(R.id.percent_via_kickstarter_circle_text_view) ImageView percentInternalCircleTextView; - protected @Bind(R.id.pledged_via_custom_layout) FrameLayout pledgedViaCustomLayout; - protected @Bind(R.id.pledged_via_external_layout) FrameLayout pledgedViaExternalLayout; - protected @Bind(R.id.pledged_via_kickstarter_layout) FrameLayout pledgedViaInternalLayout; + protected @Bind(R.id.pledged_via_custom_indicator) View pledgedViaCustomIndicator; + protected @Bind(R.id.pledged_via_external_indicator) View pledgedViaExternalIndicator; + protected @Bind(R.id.pledged_via_kickstarter_indicator) View pledgedViaInternalIndicator; + protected @Bind(R.id.pledged_via_custom_layout) View pledgedViaCustomLayout; + protected @Bind(R.id.pledged_via_external_layout) View pledgedViaExternalLayout; + protected @Bind(R.id.pledged_via_kickstarter_layout) View pledgedViaInternalLayout; protected @Bind(R.id.referrer_breakdown_chart_layout) ConstraintLayout referrerBreakdownLayout; protected @Bind(R.id.referrer_breakdown_view) ReferrerBreakdownView referrerBreakdownView; + protected @BindDimen(R.dimen.grid_1_half) int grid1HalfPixels; + protected @BindDimen(R.dimen.grid_3) int grid3Pixels; + private KSCurrency ksCurrency; public CreatorDashboardReferrerBreakdownViewHolder(final @NonNull View view) { @@ -60,22 +67,22 @@ public CreatorDashboardReferrerBreakdownViewHolder(final @NonNull View view) { this.viewModel.outputs.customReferrerPercent() .compose(bindToLifecycle()) .compose(observeForUI()) - .subscribe(percent -> setReferrerWidth(percent, pledgedViaCustomLayout)); + .subscribe(percent -> setReferrerWidth(percent, this.pledgedViaCustomLayout, this.pledgedViaCustomIndicator)); this.viewModel.outputs.customReferrerPercentText() .compose(bindToLifecycle()) .compose(observeForUI()) .subscribe(this.percentCustomTextView::setText); -// this.viewModel.outputs.externalReferrerColor() -// .compose(bindToLifecycle()) -// .compose(observeForUI()) -// .subscribe(color -> DrawableCompat.setTint(this.percentExternalCircleTextView.getDrawable(), color)); + this.viewModel.outputs.externalReferrerColor() + .compose(bindToLifecycle()) + .compose(observeForUI()) + .subscribe(color -> DrawableCompat.setTint(this.percentExternalCircleTextView.getDrawable(), color)); this.viewModel.outputs.externalReferrerPercent() .compose(bindToLifecycle()) .compose(observeForUI()) - .subscribe(percent -> setReferrerWidth(percent, pledgedViaExternalLayout)); + .subscribe(percent -> setReferrerWidth(percent, this.pledgedViaExternalLayout, this.pledgedViaExternalIndicator)); this.viewModel.outputs.externalReferrerPercentText() .compose(bindToLifecycle()) @@ -90,7 +97,7 @@ public CreatorDashboardReferrerBreakdownViewHolder(final @NonNull View view) { this.viewModel.outputs.internalReferrerPercent() .compose(bindToLifecycle()) .compose(observeForUI()) - .subscribe(percent -> setReferrerWidth(percent, pledgedViaInternalLayout)); + .subscribe(percent -> setReferrerWidth(percent, this.pledgedViaInternalLayout, this.pledgedViaInternalIndicator)); this.viewModel.outputs.internalReferrerPercentText() .compose(bindToLifecycle()) @@ -128,10 +135,19 @@ public CreatorDashboardReferrerBreakdownViewHolder(final @NonNull View view) { .subscribe(pa -> this.setAmountPledgedTextViewText(pa, this.amountPledgedViaInternalTextView)); } - private static void setReferrerWidth(Float percent, FrameLayout frameLayout) { - ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) frameLayout.getLayoutParams(); - layoutParams.horizontalWeight = percent; - frameLayout.setLayoutParams(layoutParams); + private void setReferrerWidth(Float percent, View bar, View indicator) { + ConstraintLayout.LayoutParams barLayoutParams = (ConstraintLayout.LayoutParams) bar.getLayoutParams(); + barLayoutParams.horizontalWeight = percent; + bar.setLayoutParams(barLayoutParams); + + bar.post(() -> { + if (bar.getMeasuredWidth() < grid1HalfPixels) { + ConstraintLayout.LayoutParams indicatorLayoutParams = (ConstraintLayout.LayoutParams) bar.getLayoutParams(); + indicatorLayoutParams.setMarginEnd(0); + indicatorLayoutParams.setMarginStart(0); + indicator.setLayoutParams(barLayoutParams); + } + }); } @Override diff --git a/app/src/main/res/drawable/indicator_external.xml b/app/src/main/res/drawable/indicator_external.xml new file mode 100644 index 0000000000..5b9b41e16b --- /dev/null +++ b/app/src/main/res/drawable/indicator_external.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/indicator_kickstarter.xml b/app/src/main/res/drawable/indicator_kickstarter.xml new file mode 100644 index 0000000000..07b45b31f6 --- /dev/null +++ b/app/src/main/res/drawable/indicator_kickstarter.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/indicator_vertical.xml b/app/src/main/res/drawable/indicator_vertical.xml index 65ed9d0376..07b45b31f6 100644 --- a/app/src/main/res/drawable/indicator_vertical.xml +++ b/app/src/main/res/drawable/indicator_vertical.xml @@ -1,7 +1,25 @@ - - - - - \ No newline at end of file + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml b/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml index 8bc3aeeb1b..e931d1bd18 100644 --- a/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml +++ b/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml @@ -7,8 +7,7 @@ android:layout_height="wrap_content" android:divider="@drawable/divider_dark_grey_500_horizontal" android:orientation="vertical" - android:showDividers="beginning" - android:visibility="gone"> + android:showDividers="beginning"> + android:text="@string/How_backers_found_your_project" /> - + @@ -111,21 +110,21 @@ + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="@id/external_guideline"> + android:scaleX="-1" + android:src="@drawable/indicator_external" /> - + - - - - + diff --git a/app/src/main/res/layout/dashboard_referrer_stats_view.xml b/app/src/main/res/layout/dashboard_referrer_stats_view.xml index c3a79a7307..677fcb7eda 100644 --- a/app/src/main/res/layout/dashboard_referrer_stats_view.xml +++ b/app/src/main/res/layout/dashboard_referrer_stats_view.xml @@ -5,9 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/grid_5" - android:divider="@drawable/divider_dark_grey_500_horizontal" - android:orientation="vertical" - android:showDividers="beginning"> + android:orientation="vertical"> Date: Tue, 27 Feb 2018 16:31:58 -0500 Subject: [PATCH 07/12] at a good stopping point (without tests) --- ...rDashboardReferrerBreakdownViewHolder.java | 78 +++-- .../ui/views/ReferrerBreakdownView.java | 76 ----- .../res/drawable/creator_dashboard_circle.xml | 5 +- .../main/res/drawable/indicator_custom.xml | 19 ++ .../main/res/drawable/indicator_external.xml | 40 +-- .../res/drawable/indicator_kickstarter.xml | 42 +-- .../dashboard_referrer_breakdown_layout.xml | 321 +++++++++--------- 7 files changed, 263 insertions(+), 318 deletions(-) delete mode 100644 app/src/main/java/com/kickstarter/ui/views/ReferrerBreakdownView.java create mode 100644 app/src/main/res/drawable/indicator_custom.xml diff --git a/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java b/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java index 2ddb167c12..5343717be6 100644 --- a/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java +++ b/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java @@ -3,7 +3,6 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.constraint.ConstraintLayout; -import android.support.v4.graphics.drawable.DrawableCompat; import android.util.Pair; import android.view.View; import android.widget.ImageView; @@ -14,7 +13,6 @@ import com.kickstarter.libs.utils.ViewUtils; import com.kickstarter.models.Project; import com.kickstarter.services.apiresponses.ProjectStatsEnvelope; -import com.kickstarter.ui.views.ReferrerBreakdownView; import com.kickstarter.viewmodels.CreatorDashboardReferrerBreakdownHolderViewModel; import java.math.RoundingMode; @@ -38,16 +36,19 @@ public class CreatorDashboardReferrerBreakdownViewHolder extends KSViewHolder { protected @Bind(R.id.percent_via_external_circle_text_view) ImageView percentExternalCircleTextView; protected @Bind(R.id.percent_via_kickstarter_text_view) TextView percentInternalTextView; protected @Bind(R.id.percent_via_kickstarter_circle_text_view) ImageView percentInternalCircleTextView; + protected @Bind(R.id.pledged_via_custom) View pledgedViaCustomLayout; + protected @Bind(R.id.pledged_via_custom_bar) View pledgedViaCustomBar; protected @Bind(R.id.pledged_via_custom_indicator) View pledgedViaCustomIndicator; + protected @Bind(R.id.pledged_via_external) View pledgedViaExternalLayout; + protected @Bind(R.id.pledged_via_external_bar) View pledgedViaExternalBar; protected @Bind(R.id.pledged_via_external_indicator) View pledgedViaExternalIndicator; + protected @Bind(R.id.pledged_via_kickstarter_bar) View pledgedViaInternalBar; protected @Bind(R.id.pledged_via_kickstarter_indicator) View pledgedViaInternalIndicator; - protected @Bind(R.id.pledged_via_custom_layout) View pledgedViaCustomLayout; - protected @Bind(R.id.pledged_via_external_layout) View pledgedViaExternalLayout; - protected @Bind(R.id.pledged_via_kickstarter_layout) View pledgedViaInternalLayout; + protected @Bind(R.id.pledged_via_kickstarter) View pledgedViaInternalLayout; protected @Bind(R.id.referrer_breakdown_chart_layout) ConstraintLayout referrerBreakdownLayout; - protected @Bind(R.id.referrer_breakdown_view) ReferrerBreakdownView referrerBreakdownView; protected @BindDimen(R.dimen.grid_1_half) int grid1HalfPixels; + protected @BindDimen(R.dimen.grid_1) int grid1Pixels; protected @BindDimen(R.dimen.grid_3) int grid3Pixels; private KSCurrency ksCurrency; @@ -59,45 +60,35 @@ public CreatorDashboardReferrerBreakdownViewHolder(final @NonNull View view) { this.viewModel = new CreatorDashboardReferrerBreakdownHolderViewModel.ViewModel(environment()); -// this.viewModel.outputs.customReferrerColor() -// .compose(bindToLifecycle()) -// .compose(observeForUI()) -// .subscribe(color -> DrawableCompat.setTint(this.percentCustomCircleTextView.getDrawable(), color)); - this.viewModel.outputs.customReferrerPercent() .compose(bindToLifecycle()) .compose(observeForUI()) - .subscribe(percent -> setReferrerWidth(percent, this.pledgedViaCustomLayout, this.pledgedViaCustomIndicator)); + .subscribe(percent -> setReferrerWidth(percent, this.pledgedViaCustomBar, this.pledgedViaCustomIndicator)); this.viewModel.outputs.customReferrerPercentText() .compose(bindToLifecycle()) .compose(observeForUI()) .subscribe(this.percentCustomTextView::setText); - this.viewModel.outputs.externalReferrerColor() + this.viewModel.outputs.externalReferrerPercent() .compose(bindToLifecycle()) .compose(observeForUI()) - .subscribe(color -> DrawableCompat.setTint(this.percentExternalCircleTextView.getDrawable(), color)); + .subscribe(percent -> setReferrerWidth(percent, this.pledgedViaExternalBar, this.pledgedViaExternalIndicator)); this.viewModel.outputs.externalReferrerPercent() .compose(bindToLifecycle()) .compose(observeForUI()) - .subscribe(percent -> setReferrerWidth(percent, this.pledgedViaExternalLayout, this.pledgedViaExternalIndicator)); + .subscribe(__ -> flipIndicatorIfStatsOffScreen(this.pledgedViaExternalIndicator, this.pledgedViaExternalLayout)); this.viewModel.outputs.externalReferrerPercentText() .compose(bindToLifecycle()) .compose(observeForUI()) .subscribe(this.percentExternalTextView::setText); -// this.viewModel.outputs.internalReferrerColor() -// .compose(bindToLifecycle()) -// .compose(observeForUI()) -// .subscribe(color -> DrawableCompat.setTint(this.percentInternalCircleTextView.getDrawable(), color)); - this.viewModel.outputs.internalReferrerPercent() .compose(bindToLifecycle()) .compose(observeForUI()) - .subscribe(percent -> setReferrerWidth(percent, this.pledgedViaInternalLayout, this.pledgedViaInternalIndicator)); + .subscribe(percent -> setReferrerWidth(percent, this.pledgedViaInternalBar, this.pledgedViaInternalIndicator)); this.viewModel.outputs.internalReferrerPercentText() .compose(bindToLifecycle()) @@ -107,17 +98,17 @@ public CreatorDashboardReferrerBreakdownViewHolder(final @NonNull View view) { this.viewModel.outputs.pledgedViaCustomLayoutIsGone() .compose(bindToLifecycle()) .compose(observeForUI()) - .subscribe(ViewUtils.setGone(this.pledgedViaCustomLayout)); + .subscribe(gone -> this.hideReferrer(gone, this.pledgedViaCustomLayout, this.pledgedViaCustomBar, this.pledgedViaCustomIndicator)); this.viewModel.outputs.pledgedViaExternalLayoutIsGone() .compose(bindToLifecycle()) .compose(observeForUI()) - .subscribe(ViewUtils.setGone(this.pledgedViaExternalLayout)); + .subscribe(gone -> this.hideReferrer(gone, this.pledgedViaExternalLayout, this.pledgedViaExternalBar, this.pledgedViaExternalIndicator)); this.viewModel.outputs.pledgedViaInternalLayoutIsGone() .compose(bindToLifecycle()) .compose(observeForUI()) - .subscribe(ViewUtils.setGone(this.pledgedViaInternalLayout)); + .subscribe(gone -> this.hideReferrer(gone, this.pledgedViaInternalLayout, this.pledgedViaInternalBar, this.pledgedViaInternalIndicator)); this.viewModel.outputs.projectAndCustomReferrerPledgedAmount() .compose(bindToLifecycle()) @@ -140,16 +131,45 @@ private void setReferrerWidth(Float percent, View bar, View indicator) { barLayoutParams.horizontalWeight = percent; bar.setLayoutParams(barLayoutParams); + adjustIndicatorMarginForShortBar(bar, indicator); + } + + // i don't prefer to do this and am ~open~ to suggestions + private void adjustIndicatorMarginForShortBar(View bar, View indicator) { bar.post(() -> { - if (bar.getMeasuredWidth() < grid1HalfPixels) { - ConstraintLayout.LayoutParams indicatorLayoutParams = (ConstraintLayout.LayoutParams) bar.getLayoutParams(); - indicatorLayoutParams.setMarginEnd(0); - indicatorLayoutParams.setMarginStart(0); - indicator.setLayoutParams(barLayoutParams); + if (bar.getMeasuredWidth() < grid3Pixels) { + ConstraintLayout.LayoutParams indicatorLayoutParams = (ConstraintLayout.LayoutParams) indicator.getLayoutParams(); + indicatorLayoutParams.startToStart = bar.getId(); + indicatorLayoutParams.endToEnd = bar.getId(); + indicator.setLayoutParams(indicatorLayoutParams); } }); } + //same here + private void flipIndicatorIfStatsOffScreen(View indicator, View stats) { + stats.post(() -> { + if (stats.getLeft() < referrerBreakdownLayout.getLeft()) { + indicator.setScaleX(-1); + ConstraintLayout.LayoutParams indicatorLayoutParams = (ConstraintLayout.LayoutParams) indicator.getLayoutParams(); + indicatorLayoutParams.setMarginStart(grid3Pixels); + indicator.setLayoutParams(indicatorLayoutParams); + + ConstraintLayout.LayoutParams statsLayoutParams = (ConstraintLayout.LayoutParams) stats.getLayoutParams(); + statsLayoutParams.startToEnd = indicator.getId(); + statsLayoutParams.setMarginStart(grid1Pixels); + statsLayoutParams.endToStart = ConstraintLayout.LayoutParams.UNSET; + stats.setLayoutParams(statsLayoutParams); + } + }); + } + + private void hideReferrer(final boolean gone, final @NonNull View layout, final @NonNull View bar, final @NonNull View indicator) { + ViewUtils.setGone(layout, gone); + ViewUtils.setGone(bar, gone); + ViewUtils.setGone(indicator, gone); + } + @Override public void bindData(final @Nullable Object data) throws Exception { final Pair projectAndStats = requireNonNull((Pair) data); diff --git a/app/src/main/java/com/kickstarter/ui/views/ReferrerBreakdownView.java b/app/src/main/java/com/kickstarter/ui/views/ReferrerBreakdownView.java deleted file mode 100644 index ec66d7802b..0000000000 --- a/app/src/main/java/com/kickstarter/ui/views/ReferrerBreakdownView.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.kickstarter.ui.views; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.RectF; -import android.support.annotation.NonNull; -import android.util.AttributeSet; -import android.view.View; - -import com.kickstarter.libs.ReferrerColor; - -public final class ReferrerBreakdownView extends View { - - public Canvas canvas; - private Double customSweepAngle; - private Double externalSweepAngle; - private Double internalSweepAngle; - private RectF outerRectangle; - private RectF innerRectangle; - private Paint paint; - private static final int innerCircleOffset = 30; - - public ReferrerBreakdownView(final @NonNull Context context, final @NonNull AttributeSet attributeSet) { - super(context, attributeSet); - this.paint = new Paint(); - this.outerRectangle = new RectF(0, 0, 0, 0); - this.innerRectangle = new RectF(0, 0, 0, 0); - } - - public void setCustomAngleAndColor(final @NonNull Double sweepAngle) { - this.customSweepAngle = sweepAngle; - } - - public void setExternalAngleAndColor(final @NonNull Double sweepAngle) { - this.externalSweepAngle = sweepAngle; - } - - public void setInternalAngleAndColor(final @NonNull Double sweepAngle) { - this.internalSweepAngle = sweepAngle; - } - - @Override - protected void onDraw(final @NonNull Canvas canvas) { - super.onDraw(canvas); - this.canvas = canvas; - - this.paint.setAntiAlias(true); - this.paint.setStyle(Paint.Style.FILL); - - final float bottom = getHeight(); - final float left = getX(); - final float right = getWidth(); - final float top = getY(); - - this.outerRectangle.set(left, top, right, bottom); - this.innerRectangle.set(left + innerCircleOffset, top + innerCircleOffset, right - innerCircleOffset, bottom - innerCircleOffset); - - Float offset = 0f; - - this.paint.setColor(ReferrerColor.CUSTOM.getReferrerColor()); - this.canvas.drawArc(this.outerRectangle, offset, this.customSweepAngle.floatValue(), true, this.paint); - offset = offset + this.customSweepAngle.floatValue(); - - this.paint.setColor(ReferrerColor.EXTERNAL.getReferrerColor()); - this.canvas.drawArc(this.outerRectangle, offset, this.externalSweepAngle.floatValue(), true, this.paint); - offset = offset + this.externalSweepAngle.floatValue(); - - this.paint.setColor(ReferrerColor.INTERNAL.getReferrerColor()); - this.canvas.drawArc(this.outerRectangle, offset, this.internalSweepAngle.floatValue(), true, this.paint); - - this.paint.setColor(Color.WHITE); - this.canvas.drawArc(this.innerRectangle, 0, 360f, true, this.paint); - } -} diff --git a/app/src/main/res/drawable/creator_dashboard_circle.xml b/app/src/main/res/drawable/creator_dashboard_circle.xml index 76ab42e102..cb23dedc41 100644 --- a/app/src/main/res/drawable/creator_dashboard_circle.xml +++ b/app/src/main/res/drawable/creator_dashboard_circle.xml @@ -1,6 +1,9 @@ + + android:color="@android:color/white" /> diff --git a/app/src/main/res/drawable/indicator_custom.xml b/app/src/main/res/drawable/indicator_custom.xml new file mode 100644 index 0000000000..8009ddcbf2 --- /dev/null +++ b/app/src/main/res/drawable/indicator_custom.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/indicator_external.xml b/app/src/main/res/drawable/indicator_external.xml index 5b9b41e16b..d95e500568 100644 --- a/app/src/main/res/drawable/indicator_external.xml +++ b/app/src/main/res/drawable/indicator_external.xml @@ -1,23 +1,19 @@ - - - - - - - - - - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/indicator_kickstarter.xml b/app/src/main/res/drawable/indicator_kickstarter.xml index 07b45b31f6..922a16033a 100644 --- a/app/src/main/res/drawable/indicator_kickstarter.xml +++ b/app/src/main/res/drawable/indicator_kickstarter.xml @@ -1,25 +1,19 @@ - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml b/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml index e931d1bd18..fa0bab9ce5 100644 --- a/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml +++ b/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml @@ -14,6 +14,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/grid_7" + android:layout_marginBottom="@dimen/grid_6" android:paddingEnd="@dimen/grid_2" android:paddingStart="@dimen/grid_2" android:text="@string/How_backers_found_your_project" /> @@ -26,240 +27,228 @@ android:paddingStart="@dimen/grid_2"> + app:layout_constraintTop_toTopOf="@+id/pledged_via_external_bar" /> - + android:contentDescription="@null" + android:scaleX="-1" + android:scaleY="-1" + android:src="@drawable/indicator_kickstarter" + app:layout_constraintStart_toStartOf="@+id/pledged_via_kickstarter_bar" + app:layout_constraintTop_toTopOf="@+id/pledged_via_kickstarter_bar" /> - + - - - - - - - - + android:layout_marginBottom="@dimen/grid_1_half" + android:orientation="horizontal"> + android:layout_marginEnd="@dimen/grid_1_half" + tools:text="75%" /> - + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginEnd="1dp" + android:src="@drawable/creator_dashboard_circle" + android:tint="@color/ksr_green_800" + tools:ignore="ContentDescription" /> + + + + + - - - - + android:layout_marginBottom="@dimen/grid_6" + android:layout_marginEnd="@dimen/grid_1" + android:orientation="vertical" + app:layout_constraintBottom_toBottomOf="@+id/pledged_via_external_bar" + app:layout_constraintEnd_toStartOf="@+id/pledged_via_external_indicator" + app:layout_constraintTop_toTopOf="parent"> - - - - - - - - - - + android:layout_marginBottom="@dimen/grid_1_half" + android:orientation="horizontal"> + android:layout_marginEnd="@dimen/grid_1_half" + android:gravity="center" + tools:text="75%" /> + + + + + + + + + - + app:layout_constraintStart_toEndOf="@+id/pledged_via_external_bar" + app:layout_constraintTop_toTopOf="@+id/pledged_via_kickstarter_bar" /> + android:layout_marginEnd="@dimen/grid_1" + android:layout_marginTop="@dimen/grid_8" + android:gravity="end" + android:orientation="vertical" + app:layout_constraintEnd_toStartOf="@+id/pledged_via_custom_indicator" + app:layout_constraintTop_toTopOf="@+id/pledged_via_custom_bar"> - - - - - - - - - - + android:layout_marginBottom="@dimen/grid_1_half"> + + + android:gravity="center" + tools:text="75%" /> - + + + android:text="@string/via_custom" /> - - + + + From ed16cdd1e184742b476d46b94142de34465e6a7a Mon Sep 17 00:00:00 2001 From: Izzy Oji Date: Mon, 5 Mar 2018 16:44:40 -0500 Subject: [PATCH 08/12] uodating tests! --- ...rDashboardReferrerBreakdownViewHolder.java | 2 - ...boardReferrerBreakdownHolderViewModel.java | 28 ------- ...dReferrerBreakdownHolderViewModelTest.java | 73 ++++--------------- 3 files changed, 14 insertions(+), 89 deletions(-) diff --git a/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java b/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java index 5343717be6..59a55c75ff 100644 --- a/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java +++ b/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java @@ -134,7 +134,6 @@ private void setReferrerWidth(Float percent, View bar, View indicator) { adjustIndicatorMarginForShortBar(bar, indicator); } - // i don't prefer to do this and am ~open~ to suggestions private void adjustIndicatorMarginForShortBar(View bar, View indicator) { bar.post(() -> { if (bar.getMeasuredWidth() < grid3Pixels) { @@ -146,7 +145,6 @@ private void adjustIndicatorMarginForShortBar(View bar, View indicator) { }); } - //same here private void flipIndicatorIfStatsOffScreen(View indicator, View stats) { stats.post(() -> { if (stats.getLeft() < referrerBreakdownLayout.getLeft()) { diff --git a/app/src/main/java/com/kickstarter/viewmodels/CreatorDashboardReferrerBreakdownHolderViewModel.java b/app/src/main/java/com/kickstarter/viewmodels/CreatorDashboardReferrerBreakdownHolderViewModel.java index a7485e2116..0e27b2c9f6 100644 --- a/app/src/main/java/com/kickstarter/viewmodels/CreatorDashboardReferrerBreakdownHolderViewModel.java +++ b/app/src/main/java/com/kickstarter/viewmodels/CreatorDashboardReferrerBreakdownHolderViewModel.java @@ -28,27 +28,18 @@ interface Inputs { } interface Outputs { - /** Emits the color for the custom referrers on the pie chart **/ - Observable customReferrerColor(); - /** Emits the percentage of total pledges from a custom referrer **/ Observable customReferrerPercent(); /** Emits the text for the percentage of total pledges from a custom referrer **/ Observable customReferrerPercentText(); - /** Emits the color for the external referrers on the pie chart **/ - Observable externalReferrerColor(); - /** Emits the percentage of total pledges from a external referrer **/ Observable externalReferrerPercent(); /** Emits the text for the percentage of total pledges from an external referrer **/ Observable externalReferrerPercentText(); - /** Emits the color for the internal referrers on the pie chart **/ - Observable internalReferrerColor(); - /** Emits the percentage of total pledges from an internal referrer **/ Observable internalReferrerPercent(); @@ -75,9 +66,6 @@ interface Outputs { /** Emits the current project and the amount pledged via internal referrers **/ Observable> projectAndInternalReferrerPledgedAmount(); - - /** Emits when there are more than 10 referrer stats and title copy should reflect limited list. */ - Observable referrersTitleIsLimitedCopy(); } final class ViewModel extends ActivityViewModel implements Inputs, Outputs { @@ -236,11 +224,6 @@ public void projectAndStatsInput(final @NonNull Pair customReferrerColor() { - return this.customReferrerColor; - } @Override public @NonNull Observable customReferrerPercent() { return this.customReferrerPercent; @@ -250,10 +233,6 @@ public void projectAndStatsInput(final @NonNull Pair externalReferrerColor() { - return this.externalReferrerColor; - } - @Override public @NonNull Observable externalReferrerPercent() { return this.externalReferrerPercent; } @@ -262,10 +241,6 @@ public void projectAndStatsInput(final @NonNull Pair internalReferrerColor() { - return this.internalReferrerColor; - } - @Override public @NonNull Observable internalReferrerPercent() { return this.internalReferrerPercent; } @@ -301,8 +276,5 @@ public void projectAndStatsInput(final @NonNull Pair> projectAndInternalReferrerPledgedAmount() { return this.projectAndInternalReferrerPledgedAmount; } - @Override public @NonNull Observable referrersTitleIsLimitedCopy() { - return this.referrersTitleIsLimitedCopy; - } } } diff --git a/app/src/test/java/com/kickstarter/viewmodels/CreatorDashboardReferrerBreakdownHolderViewModelTest.java b/app/src/test/java/com/kickstarter/viewmodels/CreatorDashboardReferrerBreakdownHolderViewModelTest.java index 66c6b6b781..87ce838a4c 100644 --- a/app/src/test/java/com/kickstarter/viewmodels/CreatorDashboardReferrerBreakdownHolderViewModelTest.java +++ b/app/src/test/java/com/kickstarter/viewmodels/CreatorDashboardReferrerBreakdownHolderViewModelTest.java @@ -7,7 +7,6 @@ import com.kickstarter.factories.ProjectFactory; import com.kickstarter.factories.ProjectStatsEnvelopeFactory; import com.kickstarter.libs.Environment; -import com.kickstarter.libs.ReferrerColor; import com.kickstarter.libs.ReferrerType; import com.kickstarter.libs.utils.NumberUtils; import com.kickstarter.models.Project; @@ -16,6 +15,7 @@ import org.junit.Test; import java.util.Arrays; +import java.util.Collections; import java.util.List; import rx.observers.TestSubscriber; @@ -26,11 +26,8 @@ public class CreatorDashboardReferrerBreakdownHolderViewModelTest extends KSRobo private final TestSubscriber customReferrerPercent = new TestSubscriber<>(); private final TestSubscriber externalReferrerPercent = new TestSubscriber<>(); private final TestSubscriber internalReferrerPercent = new TestSubscriber<>(); - private final TestSubscriber customReferrerColor = new TestSubscriber<>(); private final TestSubscriber customReferrerPercentText = new TestSubscriber<>(); - private final TestSubscriber externalReferrerColor = new TestSubscriber<>(); private final TestSubscriber externalReferrerPercentText = new TestSubscriber<>(); - private final TestSubscriber internalReferrerColor = new TestSubscriber<>(); private final TestSubscriber internalReferrerPercentText = new TestSubscriber<>(); private final TestSubscriber pledgedViaCustomLayoutIsGone = new TestSubscriber<>(); private final TestSubscriber pledgedViaExternalLayoutIsGone = new TestSubscriber<>(); @@ -42,13 +39,10 @@ public class CreatorDashboardReferrerBreakdownHolderViewModelTest extends KSRobo protected void setUpEnvironment(final @NonNull Environment environment) { this.vm = new CreatorDashboardReferrerBreakdownHolderViewModel.ViewModel(environment); - this.vm.outputs.customReferrerColor().subscribe(this.customReferrerColor); this.vm.outputs.customReferrerPercent().subscribe(this.customReferrerPercent); this.vm.outputs.customReferrerPercentText().subscribe(this.customReferrerPercentText); - this.vm.outputs.externalReferrerColor().subscribe(this.externalReferrerColor); this.vm.outputs.externalReferrerPercent().subscribe(this.externalReferrerPercent); this.vm.outputs.externalReferrerPercentText().subscribe(this.externalReferrerPercentText); - this.vm.outputs.internalReferrerColor().subscribe(this.internalReferrerColor); this.vm.outputs.internalReferrerPercent().subscribe(this.internalReferrerPercent); this.vm.outputs.internalReferrerPercentText().subscribe(this.internalReferrerPercentText); this.vm.outputs.pledgedViaCustomLayoutIsGone().subscribe(this.pledgedViaCustomLayoutIsGone); @@ -60,16 +54,6 @@ protected void setUpEnvironment(final @NonNull Environment environment) { this.vm.outputs.projectAndInternalReferrerPledgedAmount().subscribe(this.projectAndInternalReferrerPledgedAmount); } - @Test - public void testCustomReferrerColor() { - final Project project = ProjectFactory.project(); - final ProjectStatsEnvelope statsEnvelope = ProjectStatsEnvelopeFactory.projectStatsEnvelope(); - - setUpEnvironment(environment()); - this.vm.inputs.projectAndStatsInput(Pair.create(project, statsEnvelope)); - this.customReferrerColor.assertValues(ReferrerColor.CUSTOM.getReferrerColor()); - } - @Test public void testCustomReferrerPercent() { final Project project = ProjectFactory.project(); @@ -77,8 +61,7 @@ public void testCustomReferrerPercent() { .percentageOfDollars(55f) .referrerType(ReferrerType.CUSTOM.getReferrerType()) .build(); - final List referrerList = Arrays.asList( - fiftyFivePercentCustomReferrer); + final List referrerList = Collections.singletonList(fiftyFivePercentCustomReferrer); final ProjectStatsEnvelope statsEnvelope = ProjectStatsEnvelopeFactory.projectStatsEnvelope().toBuilder().referralDistribution(referrerList).build(); setUpEnvironment(environment()); @@ -93,8 +76,7 @@ public void testCustomReferrerPercentText() { .percentageOfDollars(.55f) .referrerType(ReferrerType.CUSTOM.getReferrerType()) .build(); - final List referrerList = Arrays.asList( - fiftyFivePercentCustomReferrer); + final List referrerList = Collections.singletonList(fiftyFivePercentCustomReferrer); final ProjectStatsEnvelope statsEnvelope = ProjectStatsEnvelopeFactory.projectStatsEnvelope().toBuilder().referralDistribution(referrerList).build(); setUpEnvironment(environment()); @@ -102,16 +84,6 @@ public void testCustomReferrerPercentText() { this.customReferrerPercentText.assertValues("55%"); } - @Test - public void testExternalReferrerColor() { - final Project project = ProjectFactory.project(); - final ProjectStatsEnvelope statsEnvelope = ProjectStatsEnvelopeFactory.projectStatsEnvelope(); - - setUpEnvironment(environment()); - this.vm.inputs.projectAndStatsInput(Pair.create(project, statsEnvelope)); - this.externalReferrerColor.assertValues(ReferrerColor.EXTERNAL.getReferrerColor()); - } - @Test public void testExternalReferrerPercent() { final Project project = ProjectFactory.project(); @@ -119,8 +91,7 @@ public void testExternalReferrerPercent() { .percentageOfDollars(15f) .referrerType(ReferrerType.EXTERNAL.getReferrerType()) .build(); - final List referrerList = Arrays.asList( - fifteenPercentExternalReferrer); + final List referrerList = Collections.singletonList(fifteenPercentExternalReferrer); final ProjectStatsEnvelope statsEnvelope = ProjectStatsEnvelopeFactory.projectStatsEnvelope().toBuilder().referralDistribution(referrerList).build(); setUpEnvironment(environment()); @@ -135,8 +106,7 @@ public void testExternalReferrerPercentText() { .percentageOfDollars(15f) .referrerType(ReferrerType.EXTERNAL.getReferrerType()) .build(); - final List referrerList = Arrays.asList( - fifteenPercentExternalReferrer); + final List referrerList = Collections.singletonList(fifteenPercentExternalReferrer); final ProjectStatsEnvelope statsEnvelope = ProjectStatsEnvelopeFactory.projectStatsEnvelope().toBuilder().referralDistribution(referrerList).build(); setUpEnvironment(environment()); @@ -144,16 +114,6 @@ public void testExternalReferrerPercentText() { this.externalReferrerPercentText.assertValues(NumberUtils.flooredPercentage(15f * 100f)); } - @Test - public void testInternalReferrerColor() { - final Project project = ProjectFactory.project(); - final ProjectStatsEnvelope statsEnvelope = ProjectStatsEnvelopeFactory.projectStatsEnvelope(); - - setUpEnvironment(environment()); - this.vm.inputs.projectAndStatsInput(Pair.create(project, statsEnvelope)); - this.internalReferrerColor.assertValues(ReferrerColor.INTERNAL.getReferrerColor()); - } - @Test public void testInternalReferrerPercent() { final Project project = ProjectFactory.project(); @@ -161,8 +121,7 @@ public void testInternalReferrerPercent() { .percentageOfDollars(30f) .referrerType(ReferrerType.INTERNAL.getReferrerType()) .build(); - final List referrerList = Arrays.asList( - thirtyPercentInternalReferrer); + final List referrerList = Collections.singletonList(thirtyPercentInternalReferrer); final ProjectStatsEnvelope statsEnvelope = ProjectStatsEnvelopeFactory.projectStatsEnvelope().toBuilder().referralDistribution(referrerList).build(); setUpEnvironment(environment()); @@ -177,8 +136,7 @@ public void testInternalReferrerPercentText() { .percentageOfDollars(30f) .referrerType(ReferrerType.INTERNAL.getReferrerType()) .build(); - final List referrerList = Arrays.asList( - thirtyPercentInternalReferrer); + final List referrerList = Collections.singletonList(thirtyPercentInternalReferrer); final ProjectStatsEnvelope statsEnvelope = ProjectStatsEnvelopeFactory.projectStatsEnvelope().toBuilder().referralDistribution(referrerList).build(); setUpEnvironment(environment()); @@ -193,8 +151,7 @@ public void testPledgedViaCustomLayoutIsGone() { .pledged(0f) .referrerType(ReferrerType.CUSTOM.getReferrerType()) .build(); - final List referrerList = Arrays.asList( - zeroPledgedCustomReferrer); + final List referrerList = Collections.singletonList(zeroPledgedCustomReferrer); final ProjectStatsEnvelope statsEnvelope = ProjectStatsEnvelopeFactory.projectStatsEnvelope().toBuilder().referralDistribution(referrerList).build(); setUpEnvironment(environment()); @@ -209,8 +166,7 @@ public void testPledgedViaExternalLayoutIsGone() { .pledged(0f) .referrerType(ReferrerType.EXTERNAL.getReferrerType()) .build(); - final List referrerList = Arrays.asList( - zeroPledgedExternalReferrer); + final List referrerList = Collections.singletonList(zeroPledgedExternalReferrer); final ProjectStatsEnvelope statsEnvelope = ProjectStatsEnvelopeFactory.projectStatsEnvelope().toBuilder().referralDistribution(referrerList).build(); setUpEnvironment(environment()); @@ -225,8 +181,7 @@ public void testPledgedViaInternalLayoutIsGone() { .pledged(0f) .referrerType(ReferrerType.INTERNAL.getReferrerType()) .build(); - final List referrerList = Arrays.asList( - zeroPledgedInternalReferrer); + final List referrerList = Collections.singletonList(zeroPledgedInternalReferrer); final ProjectStatsEnvelope statsEnvelope = ProjectStatsEnvelopeFactory.projectStatsEnvelope().toBuilder().referralDistribution(referrerList).build(); setUpEnvironment(environment()); @@ -244,7 +199,7 @@ public void testProjectAndAveragePledge() { final ProjectStatsEnvelope statsEnvelope = ProjectStatsEnvelopeFactory.projectStatsEnvelope().toBuilder().cumulative(cumulativeStats).build(); setUpEnvironment(environment()); this.vm.inputs.projectAndStatsInput(Pair.create(project, statsEnvelope)); - this.projectAndAveragePledge.assertValues(Pair.create(project, 10)); + this.projectAndAveragePledge.assertValue(Pair.create(project, 10)); } @Test @@ -268,7 +223,7 @@ public void testProjectAndCustomReferrerPledgedAmount() { setUpEnvironment(environment()); this.vm.inputs.projectAndStatsInput(Pair.create(project, statsEnvelope)); - this.projectAndCustomReferrerPledgedAmount.assertValues(Pair.create(project, 3f)); + this.projectAndCustomReferrerPledgedAmount.assertValue(Pair.create(project, 3f)); } @Test @@ -292,7 +247,7 @@ public void testProjectAndExternalReferrerPledgedAmount() { setUpEnvironment(environment()); this.vm.inputs.projectAndStatsInput(Pair.create(project, statsEnvelope)); - this.projectAndExternalReferrerPledgedAmount.assertValues(Pair.create(project, 3f)); + this.projectAndExternalReferrerPledgedAmount.assertValue(Pair.create(project, 3f)); } @Test @@ -316,7 +271,7 @@ public void testProjectAndInternalReferrerPledgedAmount() { setUpEnvironment(environment()); this.vm.inputs.projectAndStatsInput(Pair.create(project, statsEnvelope)); - this.projectAndInternalReferrerPledgedAmount.assertValues(Pair.create(project, 2f)); + this.projectAndInternalReferrerPledgedAmount.assertValue(Pair.create(project, 2f)); } @Test From ff72bbe09d9ffe07bade1c405d8f96ba6596425b Mon Sep 17 00:00:00 2001 From: Izzy Oji Date: Tue, 6 Mar 2018 10:48:27 -0500 Subject: [PATCH 09/12] removing unused code --- ...torDashboardReferrerBreakdownViewHolder.java | 4 ---- ...shboardReferrerBreakdownHolderViewModel.java | 17 +---------------- .../dashboard_referrer_breakdown_layout.xml | 3 --- 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java b/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java index 59a55c75ff..f1ecfeb4e0 100644 --- a/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java +++ b/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java @@ -5,7 +5,6 @@ import android.support.constraint.ConstraintLayout; import android.util.Pair; import android.view.View; -import android.widget.ImageView; import android.widget.TextView; import com.kickstarter.R; @@ -30,12 +29,9 @@ public class CreatorDashboardReferrerBreakdownViewHolder extends KSViewHolder { protected @Bind(R.id.amount_pledged_via_kickstarter_text_view) TextView amountPledgedViaInternalTextView; protected @Bind(R.id.amount_pledged_via_external_text_view) TextView amountPledgedViaExternalTextView; protected @Bind(R.id.amount_pledged_via_custom_text_view) TextView amountPledgedViaCustomTextView; - protected @Bind(R.id.percent_via_custom_circle_text_view) ImageView percentCustomCircleTextView; protected @Bind(R.id.percent_via_custom_text_view) TextView percentCustomTextView; protected @Bind(R.id.percent_via_external_text_view) TextView percentExternalTextView; - protected @Bind(R.id.percent_via_external_circle_text_view) ImageView percentExternalCircleTextView; protected @Bind(R.id.percent_via_kickstarter_text_view) TextView percentInternalTextView; - protected @Bind(R.id.percent_via_kickstarter_circle_text_view) ImageView percentInternalCircleTextView; protected @Bind(R.id.pledged_via_custom) View pledgedViaCustomLayout; protected @Bind(R.id.pledged_via_custom_bar) View pledgedViaCustomBar; protected @Bind(R.id.pledged_via_custom_indicator) View pledgedViaCustomIndicator; diff --git a/app/src/main/java/com/kickstarter/viewmodels/CreatorDashboardReferrerBreakdownHolderViewModel.java b/app/src/main/java/com/kickstarter/viewmodels/CreatorDashboardReferrerBreakdownHolderViewModel.java index 0e27b2c9f6..15c6e40fc5 100644 --- a/app/src/main/java/com/kickstarter/viewmodels/CreatorDashboardReferrerBreakdownHolderViewModel.java +++ b/app/src/main/java/com/kickstarter/viewmodels/CreatorDashboardReferrerBreakdownHolderViewModel.java @@ -5,7 +5,6 @@ import com.kickstarter.libs.ActivityViewModel; import com.kickstarter.libs.Environment; -import com.kickstarter.libs.ReferrerColor; import com.kickstarter.libs.ReferrerType; import com.kickstarter.libs.utils.NumberUtils; import com.kickstarter.libs.utils.PairUtils; @@ -18,8 +17,6 @@ import rx.Observable; import rx.subjects.PublishSubject; -import static com.kickstarter.libs.rx.transformers.Transformers.takeWhen; - public interface CreatorDashboardReferrerBreakdownHolderViewModel { interface Inputs { @@ -105,9 +102,6 @@ public ViewModel(final @NonNull Environment environment) { this.projectAndAveragePledge = Observable.combineLatest(currentProject, averagePledge, Pair::create); - this.customReferrerColor = Observable.just(ReferrerColor.CUSTOM.getReferrerColor()) - .compose(takeWhen(customReferrers)); - this.customReferrerPercent = customReferrers .flatMap(rs -> Observable.from(rs) @@ -129,9 +123,6 @@ public ViewModel(final @NonNull Environment environment) { Pair::create ); - this.externalReferrerColor = Observable.just(ReferrerColor.EXTERNAL.getReferrerColor()) - .compose(takeWhen(externalReferrers)); - this.externalReferrerPercent = externalReferrers .flatMap(rs -> Observable.from(rs) @@ -153,9 +144,6 @@ public ViewModel(final @NonNull Environment environment) { Pair::create ); - this.internalReferrerColor = Observable.just(ReferrerColor.INTERNAL.getReferrerColor()) - .compose(takeWhen(internalReferrers)); - this.internalReferrerPercent = internalReferrers .flatMap(rs -> Observable.from(rs) @@ -163,7 +151,7 @@ public ViewModel(final @NonNull Environment environment) { ); this.internalReferrerPercentText = this.internalReferrerPercent - .map(percent -> NumberUtils.flooredPercentage(percent.floatValue() * 100f)); + .map(percent -> NumberUtils.flooredPercentage(percent * 100f)); this.internalReferrerPledgedAmount = internalReferrers .flatMap(rs -> @@ -198,15 +186,12 @@ public ViewModel(final @NonNull Environment environment) { private final PublishSubject> projectAndProjectStatsInput = PublishSubject.create(); - private final Observable customReferrerColor; private final Observable customReferrerPercent; private final Observable customReferrerPercentText; private final Observable customReferrerPledgedAmount; - private final Observable externalReferrerColor; private final Observable externalReferrerPercent; private final Observable externalReferrerPercentText; private final Observable externalReferrerPledgedAmount; - private final Observable internalReferrerColor; private final Observable internalReferrerPercent; private final Observable internalReferrerPercentText; private final Observable internalReferrerPledgedAmount; diff --git a/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml b/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml index fa0bab9ce5..ce2b7d5973 100644 --- a/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml +++ b/app/src/main/res/layout/dashboard_referrer_breakdown_layout.xml @@ -75,7 +75,6 @@ tools:text="75%" /> Date: Tue, 6 Mar 2018 10:54:48 -0500 Subject: [PATCH 10/12] checkstyles! --- ...rDashboardReferrerBreakdownViewHolder.java | 22 ++++++++-------- .../main/res/drawable/indicator_custom.xml | 2 +- .../main/res/drawable/indicator_external.xml | 2 +- .../main/res/drawable/indicator_vertical.xml | 25 ------------------- 4 files changed, 13 insertions(+), 38 deletions(-) delete mode 100644 app/src/main/res/drawable/indicator_vertical.xml diff --git a/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java b/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java index f1ecfeb4e0..2e65b7415e 100644 --- a/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java +++ b/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java @@ -122,18 +122,18 @@ public CreatorDashboardReferrerBreakdownViewHolder(final @NonNull View view) { .subscribe(pa -> this.setAmountPledgedTextViewText(pa, this.amountPledgedViaInternalTextView)); } - private void setReferrerWidth(Float percent, View bar, View indicator) { - ConstraintLayout.LayoutParams barLayoutParams = (ConstraintLayout.LayoutParams) bar.getLayoutParams(); + private void setReferrerWidth(final Float percent, final View bar, final View indicator) { + final ConstraintLayout.LayoutParams barLayoutParams = (ConstraintLayout.LayoutParams) bar.getLayoutParams(); barLayoutParams.horizontalWeight = percent; bar.setLayoutParams(barLayoutParams); adjustIndicatorMarginForShortBar(bar, indicator); } - private void adjustIndicatorMarginForShortBar(View bar, View indicator) { + private void adjustIndicatorMarginForShortBar(final View bar, final View indicator) { bar.post(() -> { - if (bar.getMeasuredWidth() < grid3Pixels) { - ConstraintLayout.LayoutParams indicatorLayoutParams = (ConstraintLayout.LayoutParams) indicator.getLayoutParams(); + if (bar.getMeasuredWidth() < this.grid3Pixels) { + final ConstraintLayout.LayoutParams indicatorLayoutParams = (ConstraintLayout.LayoutParams) indicator.getLayoutParams(); indicatorLayoutParams.startToStart = bar.getId(); indicatorLayoutParams.endToEnd = bar.getId(); indicator.setLayoutParams(indicatorLayoutParams); @@ -141,17 +141,17 @@ private void adjustIndicatorMarginForShortBar(View bar, View indicator) { }); } - private void flipIndicatorIfStatsOffScreen(View indicator, View stats) { + private void flipIndicatorIfStatsOffScreen(final View indicator, final View stats) { stats.post(() -> { - if (stats.getLeft() < referrerBreakdownLayout.getLeft()) { + if (stats.getLeft() < this.referrerBreakdownLayout.getLeft()) { indicator.setScaleX(-1); - ConstraintLayout.LayoutParams indicatorLayoutParams = (ConstraintLayout.LayoutParams) indicator.getLayoutParams(); - indicatorLayoutParams.setMarginStart(grid3Pixels); + final ConstraintLayout.LayoutParams indicatorLayoutParams = (ConstraintLayout.LayoutParams) indicator.getLayoutParams(); + indicatorLayoutParams.setMarginStart(this.grid3Pixels); indicator.setLayoutParams(indicatorLayoutParams); - ConstraintLayout.LayoutParams statsLayoutParams = (ConstraintLayout.LayoutParams) stats.getLayoutParams(); + final ConstraintLayout.LayoutParams statsLayoutParams = (ConstraintLayout.LayoutParams) stats.getLayoutParams(); statsLayoutParams.startToEnd = indicator.getId(); - statsLayoutParams.setMarginStart(grid1Pixels); + statsLayoutParams.setMarginStart(this.grid1Pixels); statsLayoutParams.endToStart = ConstraintLayout.LayoutParams.UNSET; stats.setLayoutParams(statsLayoutParams); } diff --git a/app/src/main/res/drawable/indicator_custom.xml b/app/src/main/res/drawable/indicator_custom.xml index 8009ddcbf2..dc7da66210 100644 --- a/app/src/main/res/drawable/indicator_custom.xml +++ b/app/src/main/res/drawable/indicator_custom.xml @@ -16,4 +16,4 @@ android:strokeColor="#05F2BA" android:strokeWidth="1" /> - \ No newline at end of file + diff --git a/app/src/main/res/drawable/indicator_external.xml b/app/src/main/res/drawable/indicator_external.xml index d95e500568..475a2a6f06 100644 --- a/app/src/main/res/drawable/indicator_external.xml +++ b/app/src/main/res/drawable/indicator_external.xml @@ -16,4 +16,4 @@ android:strokeColor="#009E74" android:strokeWidth="1" /> - \ No newline at end of file + diff --git a/app/src/main/res/drawable/indicator_vertical.xml b/app/src/main/res/drawable/indicator_vertical.xml deleted file mode 100644 index 07b45b31f6..0000000000 --- a/app/src/main/res/drawable/indicator_vertical.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file From aa031b463acdbbd007c9c9c66f331a98ac999fc1 Mon Sep 17 00:00:00 2001 From: Izzy Oji Date: Fri, 9 Mar 2018 10:32:57 -0500 Subject: [PATCH 11/12] renaming internal to kickstarter --- .../CreatorDashboardReferrerBreakdownViewHolder.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java b/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java index 2e65b7415e..aae99a98af 100644 --- a/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java +++ b/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java @@ -38,9 +38,9 @@ public class CreatorDashboardReferrerBreakdownViewHolder extends KSViewHolder { protected @Bind(R.id.pledged_via_external) View pledgedViaExternalLayout; protected @Bind(R.id.pledged_via_external_bar) View pledgedViaExternalBar; protected @Bind(R.id.pledged_via_external_indicator) View pledgedViaExternalIndicator; - protected @Bind(R.id.pledged_via_kickstarter_bar) View pledgedViaInternalBar; - protected @Bind(R.id.pledged_via_kickstarter_indicator) View pledgedViaInternalIndicator; - protected @Bind(R.id.pledged_via_kickstarter) View pledgedViaInternalLayout; + protected @Bind(R.id.pledged_via_kickstarter_bar) View pledgedViaKickstarterBar; + protected @Bind(R.id.pledged_via_kickstarter_indicator) View pledgedViaKickstarterIndicator; + protected @Bind(R.id.pledged_via_kickstarter) View pledgedViaKickstarterLayout; protected @Bind(R.id.referrer_breakdown_chart_layout) ConstraintLayout referrerBreakdownLayout; protected @BindDimen(R.dimen.grid_1_half) int grid1HalfPixels; @@ -84,7 +84,7 @@ public CreatorDashboardReferrerBreakdownViewHolder(final @NonNull View view) { this.viewModel.outputs.internalReferrerPercent() .compose(bindToLifecycle()) .compose(observeForUI()) - .subscribe(percent -> setReferrerWidth(percent, this.pledgedViaInternalBar, this.pledgedViaInternalIndicator)); + .subscribe(percent -> setReferrerWidth(percent, this.pledgedViaKickstarterBar, this.pledgedViaKickstarterIndicator)); this.viewModel.outputs.internalReferrerPercentText() .compose(bindToLifecycle()) @@ -104,7 +104,7 @@ public CreatorDashboardReferrerBreakdownViewHolder(final @NonNull View view) { this.viewModel.outputs.pledgedViaInternalLayoutIsGone() .compose(bindToLifecycle()) .compose(observeForUI()) - .subscribe(gone -> this.hideReferrer(gone, this.pledgedViaInternalLayout, this.pledgedViaInternalBar, this.pledgedViaInternalIndicator)); + .subscribe(gone -> this.hideReferrer(gone, this.pledgedViaKickstarterLayout, this.pledgedViaKickstarterBar, this.pledgedViaKickstarterIndicator)); this.viewModel.outputs.projectAndCustomReferrerPledgedAmount() .compose(bindToLifecycle()) From bb22317cbc62a840c6c21e35048620d39f6d102e Mon Sep 17 00:00:00 2001 From: Izzy Oji Date: Fri, 9 Mar 2018 10:33:30 -0500 Subject: [PATCH 12/12] removing unused dimens --- .../viewholders/CreatorDashboardReferrerBreakdownViewHolder.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java b/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java index aae99a98af..32d3e42140 100644 --- a/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java +++ b/app/src/main/java/com/kickstarter/ui/viewholders/CreatorDashboardReferrerBreakdownViewHolder.java @@ -43,7 +43,6 @@ public class CreatorDashboardReferrerBreakdownViewHolder extends KSViewHolder { protected @Bind(R.id.pledged_via_kickstarter) View pledgedViaKickstarterLayout; protected @Bind(R.id.referrer_breakdown_chart_layout) ConstraintLayout referrerBreakdownLayout; - protected @BindDimen(R.dimen.grid_1_half) int grid1HalfPixels; protected @BindDimen(R.dimen.grid_1) int grid1Pixels; protected @BindDimen(R.dimen.grid_3) int grid3Pixels;