Merge pull request tangqi92#20 from GreatGarlic/master

tangqi92 · web-flow · commit 69abcf9e5e2c · 2016-07-30T12:25:34.000+08:00
Perfect Wave Background Demo
diff --git a/library/src/main/java/me/itangqi/waveloadingview/WaveLoadingView.java b/library/src/main/java/me/itangqi/waveloadingview/WaveLoadingView.java
@@ -481,6 +481,9 @@ private int measureHeight(int measureSpecHeight) {
 
     public void setWaveBgColor(int color) {
         this.mWaveBgColor = color;
+        mWaveBgPaint.setColor(this.mWaveBgColor);
+        updateWaveShader();
+        invalidate();
     }
 
     public int getWaveBgColor() {
diff --git a/sample/src/main/java/me/itangqi/waveloadingview/MainActivity.java b/sample/src/main/java/me/itangqi/waveloadingview/MainActivity.java
@@ -157,6 +157,18 @@ public void onColorChanged(@ColorInt int color) {
             public void onColorSelected(@ColorInt int color) {
             }
         });
+        //Wave Background Color
+        ((LobsterShadeSlider) findViewById(R.id.shadeslider_wave_background_color)).addOnColorListener(new OnColorListener() {
+            @Override
+            public void onColorChanged(@ColorInt int color) {
+                mWaveLoadingView.setWaveBgColor(color);
+            }
+
+            @Override
+            public void onColorSelected(@ColorInt int color) {
+            }
+        });
+
 
         // Border Color
         ((LobsterShadeSlider) findViewById(R.id.shadeslider_border_color)).addOnColorListener(new OnColorListener() {
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
@@ -21,7 +21,6 @@
             app:wlv_borderWidth="3dp"
             app:wlv_progressValue="40"
             app:wlv_shapeType="circle"
-            app:wlv_wave_background_Color="@android:color/holo_blue_light"
             app:wlv_round_rectangle="true"
             app:wlv_triangle_direction="north"
             app:wlv_titleCenter="Center Title"
@@ -197,11 +196,30 @@
                     android:layout_toRightOf="@id/tv_wave_color"/>
 
                 <TextView
-                    android:id="@+id/tv_border_color"
+                    android:id="@+id/tv_wave_background_color"
                     android:layout_width="wrap_content"
                     android:layout_height="32dp"
                     android:layout_below="@+id/tv_wave_color"
                     android:gravity="center_vertical"
+                    android:text="Background Color:"
+                    android:textColor="@color/colorPrimaryText"/>
+
+                <com.larswerkman.lobsterpicker.sliders.LobsterShadeSlider
+                    android:id="@+id/shadeslider_wave_background_color"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_alignTop="@+id/tv_wave_background_color"
+                    android:layout_below="@+id/shadeslider_wave_color"
+                    android:layout_marginTop="5dp"
+                    android:layout_toRightOf="@id/tv_wave_background_color"/>
+
+
+                <TextView
+                    android:id="@+id/tv_border_color"
+                    android:layout_width="wrap_content"
+                    android:layout_height="32dp"
+                    android:layout_below="@+id/tv_wave_background_color"
+                    android:gravity="center_vertical"
                     android:text="Board Color:"
                     android:textColor="@color/colorPrimaryText"/>
 
@@ -210,7 +228,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_alignTop="@+id/tv_border_color"
-                    android:layout_below="@+id/shadeslider_wave_color"
+                    android:layout_below="@+id/shadeslider_wave_background_color"
                     android:layout_marginTop="5dp"
                     android:layout_toRightOf="@id/tv_border_color"/>
 

Original file line number	Diff line number	Diff line change
`@@ -481,6 +481,9 @@ private int measureHeight(int measureSpecHeight) {`
`481`	`481`
`482`	`482`	`public void setWaveBgColor(int color) {`
`483`	`483`	`this.mWaveBgColor = color;`
	`484`	`+ mWaveBgPaint.setColor(this.mWaveBgColor);`
	`485`	`+ updateWaveShader();`
	`486`	`+ invalidate();`
`484`	`487`	`}`
`485`	`488`
`486`	`489`	`public int getWaveBgColor() {`