Skip to content
This repository has been archived by the owner on Mar 27, 2022. It is now read-only.

Commit

Permalink
quick fix for nullPointerException thrown by updatePadding
Browse files Browse the repository at this point in the history
  • Loading branch information
EGE committed Mar 25, 2017
1 parent 8417110 commit 84a734c
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 44 deletions.
3 changes: 3 additions & 0 deletions library/src/main/java/co/ceryle/radiorealbutton/library/RadioRealButton.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,9 @@ private void updatePaddings() {
}

private void updatePadding(View view, boolean hasOtherView) {
if (null == view)
return;

int[] paddings = {paddingLeft, paddingTop, paddingRight, paddingBottom};

if (hasOtherView) {
Expand Down
86 changes: 42 additions & 44 deletions sample/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/grey_200">
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/grey_200">

<LinearLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -55,7 +55,7 @@
app:rrb_textColor="@color/white"
app:rrb_textGravity="left"
app:rrb_textSize="12sp"
app:rrb_textTypefacePath="fonts/shaka_pow.ttf"/>
app:rrb_textTypefacePath="fonts/shaka_pow.ttf" />

<co.ceryle.radiorealbutton.library.RadioRealButton
android:layout_width="wrap_content"
Expand All @@ -67,11 +67,11 @@
app:rrb_drawableTint="@color/white"
app:rrb_drawableWidth="36dp"
app:rrb_rippleColor="@color/blue_500"
app:rrb_text="Clark is jealous of Batman"
app:rrb_text="Clark is super jealous of Batman"
app:rrb_textColor="@color/white"
app:rrb_textGravity="center"
app:rrb_textSize="12sp"
app:rrb_textTypefacePath="fonts/shaka_pow.ttf"/>
app:rrb_textTypefacePath="fonts/shaka_pow.ttf" />

<co.ceryle.radiorealbutton.library.RadioRealButton
android:id="@+id/rrb_3"
Expand All @@ -89,7 +89,7 @@
app:rrb_textFillSpace="true"
app:rrb_textGravity="right"
app:rrb_textSize="12sp"
app:rrb_textTypefacePath="fonts/shaka_pow.ttf"/>
app:rrb_textTypefacePath="fonts/shaka_pow.ttf" />
</co.ceryle.radiorealbutton.library.RadioRealButtonGroup>


Expand All @@ -105,7 +105,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_marginRight="4dp"
android:text="Position: 0"/>
android:text="Position: 0" />

<co.ceryle.radiorealbutton.library.RadioRealButtonGroup
android:id="@+id/radioRealButtonGroup_1"
Expand Down Expand Up @@ -137,7 +137,7 @@
app:rrb_drawableWidth="48dp"
app:rrb_text="Button 1"
app:rrb_textStyle="italic"
app:rrb_textTypeface="serif"/>
app:rrb_textTypeface="serif" />

<co.ceryle.radiorealbutton.library.RadioRealButton
android:layout_width="wrap_content"
Expand All @@ -146,7 +146,7 @@
app:rrb_drawableWidth="36dp"
app:rrb_text="Button 2"
app:rrb_textStyle="italic"
app:rrb_textTypeface="serif"/>
app:rrb_textTypeface="serif" />

<co.ceryle.radiorealbutton.library.RadioRealButton
android:layout_width="wrap_content"
Expand All @@ -155,7 +155,7 @@
app:rrb_drawableWidth="24dp"
app:rrb_text="Button 3"
app:rrb_textStyle="italic"
app:rrb_textTypeface="serif"/>
app:rrb_textTypeface="serif" />
</co.ceryle.radiorealbutton.library.RadioRealButtonGroup>
</LinearLayout>

Expand Down Expand Up @@ -199,7 +199,7 @@
app:rrb_rippleColor="@color/black"
app:rrb_text="Bruce"
app:rrb_textColor="@color/black"
app:rrb_textTypefacePath="fonts/shaka_pow.ttf"/>
app:rrb_textTypefacePath="fonts/shaka_pow.ttf" />

<co.ceryle.radiorealbutton.library.RadioRealButton
android:layout_width="wrap_content"
Expand All @@ -212,7 +212,7 @@
app:rrb_rippleColor="@color/blue_500"
app:rrb_text="Clark"
app:rrb_textColor="@color/black"
app:rrb_textTypefacePath="fonts/shaka_pow.ttf"/>
app:rrb_textTypefacePath="fonts/shaka_pow.ttf" />

<co.ceryle.radiorealbutton.library.RadioRealButton
android:layout_width="wrap_content"
Expand All @@ -224,7 +224,7 @@
app:rrb_rippleColor="@color/yellow_600"
app:rrb_text="Diana"
app:rrb_textColor="@color/black"
app:rrb_textTypefacePath="fonts/shaka_pow.ttf"/>
app:rrb_textTypefacePath="fonts/shaka_pow.ttf" />
</co.ceryle.radiorealbutton.library.RadioRealButtonGroup>


Expand All @@ -239,32 +239,30 @@
android:layout_margin="4dp"
android:layout_weight="1"
android:elevation="2dp"
app:rrbg_borderColor="@color/black"
app:rrbg_borderColor="@color/teal_300"
app:rrbg_borderSize="1dp"
app:rrbg_bottomLineSize="0dp"
app:rrbg_checkedPosition="0"
app:rrbg_dividerColor="@color/black"
app:rrbg_dividerPadding="0dp"
app:rrbg_dividerSize="1dp"
app:rrbg_radius="28dp"
app:rrbg_selectorColor="@color/yellow_600"
app:rrbg_selectorSize="6dp">
app:rrbg_backgroundColor="@android:color/transparent"
app:rrbg_selectorColor="@color/teal_300"
app:rrbg_selectorFullSize="true"
app:rrbg_selectorRadius="28dp">

<co.ceryle.radiorealbutton.library.RadioRealButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:rrb_drawable="@drawable/b1"
app:rrb_drawableHeight="36dp"
app:rrb_drawableWidth="36dp"
app:rrb_rippleColor="@color/DarkRed"/>
app:rrb_ripple="false" />

<co.ceryle.radiorealbutton.library.RadioRealButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:rrb_drawable="@drawable/b2"
app:rrb_drawableHeight="36dp"
app:rrb_drawableWidth="36dp"
app:rrb_rippleColor="@color/blue_300"/>
app:rrb_ripple="false" />
</co.ceryle.radiorealbutton.library.RadioRealButtonGroup>


Expand All @@ -291,15 +289,15 @@
app:rrb_drawable="@drawable/b17"
app:rrb_drawableHeight="36dp"
app:rrb_drawableWidth="36dp"
app:rrb_rippleColor="@color/black"/>
app:rrb_rippleColor="@color/black" />

<co.ceryle.radiorealbutton.library.RadioRealButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:rrb_drawable="@drawable/b6"
app:rrb_drawableHeight="36dp"
app:rrb_drawableWidth="36dp"
app:rrb_rippleColor="@color/DarkRed"/>
app:rrb_rippleColor="@color/DarkRed" />
</co.ceryle.radiorealbutton.library.RadioRealButtonGroup>
</LinearLayout>

Expand Down Expand Up @@ -335,35 +333,35 @@
android:layout_height="wrap_content"
app:rrb_drawable="@drawable/b9"
app:rrb_drawableHeight="36dp"
app:rrb_drawableWidth="36dp"/>
app:rrb_drawableWidth="36dp" />

<co.ceryle.radiorealbutton.library.RadioRealButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:rrb_drawable="@drawable/b8"
app:rrb_drawableHeight="36dp"
app:rrb_drawableWidth="36dp"/>
app:rrb_drawableWidth="36dp" />

<co.ceryle.radiorealbutton.library.RadioRealButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:rrb_drawable="@drawable/b11"
app:rrb_drawableHeight="36dp"
app:rrb_drawableWidth="36dp"/>
app:rrb_drawableWidth="36dp" />

<co.ceryle.radiorealbutton.library.RadioRealButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:rrb_drawable="@drawable/b13"
app:rrb_drawableHeight="36dp"
app:rrb_drawableWidth="36dp"/>
app:rrb_drawableWidth="36dp" />

<co.ceryle.radiorealbutton.library.RadioRealButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:rrb_drawable="@drawable/b12"
app:rrb_drawableHeight="36dp"
app:rrb_drawableWidth="36dp"/>
app:rrb_drawableWidth="36dp" />
</co.ceryle.radiorealbutton.library.RadioRealButtonGroup>


Expand Down Expand Up @@ -393,45 +391,45 @@
android:layout_height="wrap_content"
app:rrb_drawable="@drawable/b7"
app:rrb_drawableHeight="36dp"
app:rrb_rippleColor="@color/white"
app:rrb_drawableTint="@color/white"
app:rrb_drawableWidth="36dp"/>
app:rrb_drawableWidth="36dp"
app:rrb_rippleColor="@color/white" />

<co.ceryle.radiorealbutton.library.RadioRealButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:rrb_drawable="@drawable/b7"
app:rrb_drawableHeight="36dp"
app:rrb_rippleColor="@color/white"
app:rrb_drawableTint="@color/white"
app:rrb_drawableWidth="36dp"/>
app:rrb_drawableWidth="36dp"
app:rrb_rippleColor="@color/white" />

<co.ceryle.radiorealbutton.library.RadioRealButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:rrb_drawable="@drawable/b7"
app:rrb_drawableHeight="36dp"
app:rrb_rippleColor="@color/white"
app:rrb_drawableTint="@color/white"
app:rrb_drawableWidth="36dp"/>
app:rrb_drawableWidth="36dp"
app:rrb_rippleColor="@color/white" />

<co.ceryle.radiorealbutton.library.RadioRealButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:rrb_drawable="@drawable/b7"
app:rrb_drawableHeight="36dp"
app:rrb_rippleColor="@color/white"
app:rrb_drawableTint="@color/white"
app:rrb_drawableWidth="36dp"/>
app:rrb_drawableWidth="36dp"
app:rrb_rippleColor="@color/white" />

<co.ceryle.radiorealbutton.library.RadioRealButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:rrb_drawable="@drawable/b7"
app:rrb_drawableHeight="36dp"
app:rrb_rippleColor="@color/white"
app:rrb_drawableTint="@color/white"
app:rrb_drawableWidth="36dp"/>
app:rrb_drawableWidth="36dp"
app:rrb_rippleColor="@color/white" />
</co.ceryle.radiorealbutton.library.RadioRealButtonGroup>

<co.ceryle.radiorealbutton.library.RadioRealButtonGroup
Expand Down Expand Up @@ -475,7 +473,7 @@
app:rrb_text="Legolas"
app:rrb_textColor="@color/black"
app:rrb_textSize="12sp"
app:rrb_textTypefacePath="fonts/aniron.ttf"/>
app:rrb_textTypefacePath="fonts/aniron.ttf" />

<co.ceryle.radiorealbutton.library.RadioRealButton
android:layout_width="wrap_content"
Expand All @@ -488,7 +486,7 @@
app:rrb_text="Gimli"
app:rrb_textColor="@color/black"
app:rrb_textSize="12sp"
app:rrb_textTypefacePath="fonts/aniron.ttf"/>
app:rrb_textTypefacePath="fonts/aniron.ttf" />

<co.ceryle.radiorealbutton.library.RadioRealButton
android:layout_width="wrap_content"
Expand All @@ -501,7 +499,7 @@
app:rrb_text="Aragorn"
app:rrb_textColor="@color/black"
app:rrb_textSize="12sp"
app:rrb_textTypefacePath="fonts/aniron.ttf"/>
app:rrb_textTypefacePath="fonts/aniron.ttf" />
</co.ceryle.radiorealbutton.library.RadioRealButtonGroup>

</LinearLayout>
Expand Down

0 comments on commit 84a734c

Please sign in to comment.