Skip to content

Commit 69abcf9

Browse files
authored
Merge pull request #20 from GreatGarlic/master
Perfect Wave Background Demo
2 parents 5b807a5 + 17c2276 commit 69abcf9

File tree

3 files changed

+36
-3
lines changed

3 files changed

+36
-3
lines changed

library/src/main/java/me/itangqi/waveloadingview/WaveLoadingView.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,9 @@ private int measureHeight(int measureSpecHeight) {
481481

482482
public void setWaveBgColor(int color) {
483483
this.mWaveBgColor = color;
484+
mWaveBgPaint.setColor(this.mWaveBgColor);
485+
updateWaveShader();
486+
invalidate();
484487
}
485488

486489
public int getWaveBgColor() {

sample/src/main/java/me/itangqi/waveloadingview/MainActivity.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,18 @@ public void onColorChanged(@ColorInt int color) {
157157
public void onColorSelected(@ColorInt int color) {
158158
}
159159
});
160+
//Wave Background Color
161+
((LobsterShadeSlider) findViewById(R.id.shadeslider_wave_background_color)).addOnColorListener(new OnColorListener() {
162+
@Override
163+
public void onColorChanged(@ColorInt int color) {
164+
mWaveLoadingView.setWaveBgColor(color);
165+
}
166+
167+
@Override
168+
public void onColorSelected(@ColorInt int color) {
169+
}
170+
});
171+
160172

161173
// Border Color
162174
((LobsterShadeSlider) findViewById(R.id.shadeslider_border_color)).addOnColorListener(new OnColorListener() {

sample/src/main/res/layout/activity_main.xml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
app:wlv_borderWidth="3dp"
2222
app:wlv_progressValue="40"
2323
app:wlv_shapeType="circle"
24-
app:wlv_wave_background_Color="@android:color/holo_blue_light"
2524
app:wlv_round_rectangle="true"
2625
app:wlv_triangle_direction="north"
2726
app:wlv_titleCenter="Center Title"
@@ -197,11 +196,30 @@
197196
android:layout_toRightOf="@id/tv_wave_color"/>
198197

199198
<TextView
200-
android:id="@+id/tv_border_color"
199+
android:id="@+id/tv_wave_background_color"
201200
android:layout_width="wrap_content"
202201
android:layout_height="32dp"
203202
android:layout_below="@+id/tv_wave_color"
204203
android:gravity="center_vertical"
204+
android:text="Background Color:"
205+
android:textColor="@color/colorPrimaryText"/>
206+
207+
<com.larswerkman.lobsterpicker.sliders.LobsterShadeSlider
208+
android:id="@+id/shadeslider_wave_background_color"
209+
android:layout_width="match_parent"
210+
android:layout_height="wrap_content"
211+
android:layout_alignTop="@+id/tv_wave_background_color"
212+
android:layout_below="@+id/shadeslider_wave_color"
213+
android:layout_marginTop="5dp"
214+
android:layout_toRightOf="@id/tv_wave_background_color"/>
215+
216+
217+
<TextView
218+
android:id="@+id/tv_border_color"
219+
android:layout_width="wrap_content"
220+
android:layout_height="32dp"
221+
android:layout_below="@+id/tv_wave_background_color"
222+
android:gravity="center_vertical"
205223
android:text="Board Color:"
206224
android:textColor="@color/colorPrimaryText"/>
207225

@@ -210,7 +228,7 @@
210228
android:layout_width="match_parent"
211229
android:layout_height="wrap_content"
212230
android:layout_alignTop="@+id/tv_border_color"
213-
android:layout_below="@+id/shadeslider_wave_color"
231+
android:layout_below="@+id/shadeslider_wave_background_color"
214232
android:layout_marginTop="5dp"
215233
android:layout_toRightOf="@id/tv_border_color"/>
216234

0 commit comments

Comments
 (0)