Skip to content

Commit ff75ece

Browse files
committed
fix #125 by updating sample code
1 parent 458255f commit ff75ece

3 files changed

Lines changed: 73 additions & 41 deletions

File tree

sample/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ android {
3131
}
3232

3333
dependencies {
34-
// compile project (':AndroidBootstrap') // replace with Maven dependency in your app
35-
compile 'com.github.fractalwrench:Android-Bootstrap:-SNAPSHOT'
34+
compile project (':AndroidBootstrap') // replace with Maven dependency in your app
35+
// compile 'com.github.fractalwrench:Android-Bootstrap:-SNAPSHOT'
3636

3737
compile 'com.jakewharton:butterknife:7.0.1'
3838
compile 'com.android.support:appcompat-v7:23.1.1'

sample/src/main/java/com/fractalwrench/androidbootstrap/sample/BootstrapButtonExample.java

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package com.fractalwrench.androidbootstrap.sample;
22

3-
import android.content.Context;
43
import android.os.Bundle;
54

65
import com.beardedhen.androidbootstrap.BootstrapButton;
7-
import com.beardedhen.androidbootstrap.api.attributes.BootstrapBrand;
86
import com.beardedhen.androidbootstrap.api.defaults.DefaultBootstrapBrand;
97
import com.beardedhen.androidbootstrap.api.defaults.DefaultBootstrapSize;
108

@@ -90,43 +88,7 @@ private void setupCustomStyle() {
9088
exampleCustomStyle.setBootstrapSize(3.0f);
9189

9290
// create a Bootstrap Theme with holo colors
93-
exampleCustomStyle.setBootstrapBrand(new BootstrapBrand() {
94-
@Override public int defaultFill(Context context) {
95-
return context.getResources().getColor(R.color.custom_default_fill);
96-
}
97-
98-
@Override public int defaultEdge(Context context) {
99-
return context.getResources().getColor(R.color.custom_default_edge);
100-
}
101-
102-
@Override public int defaultTextColor(Context context) {
103-
return context.getResources().getColor(android.R.color.white);
104-
}
105-
106-
@Override public int activeFill(Context context) {
107-
return context.getResources().getColor(R.color.custom_active_fill);
108-
}
109-
110-
@Override public int activeEdge(Context context) {
111-
return context.getResources().getColor(R.color.custom_active_edge);
112-
}
113-
114-
@Override public int activeTextColor(Context context) {
115-
return context.getResources().getColor(android.R.color.black);
116-
}
117-
118-
@Override public int disabledFill(Context context) {
119-
return context.getResources().getColor(R.color.custom_disabled_fill);
120-
}
121-
122-
@Override public int disabledEdge(Context context) {
123-
return context.getResources().getColor(R.color.custom_disabled_edge);
124-
}
125-
126-
@Override public int disabledTextColor(Context context) {
127-
return context.getResources().getColor(R.color.bootstrap_gray);
128-
}
129-
});
91+
exampleCustomStyle.setBootstrapBrand(new CustomBootstrapStyle(this));
13092
}
13193

13294
}
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
package com.fractalwrench.androidbootstrap.sample;
2+
3+
import android.content.Context;
4+
import android.support.annotation.ColorInt;
5+
6+
import com.beardedhen.androidbootstrap.api.attributes.BootstrapBrand;
7+
8+
/**
9+
* A custom Bootstrap Style. Implement {@see BootstrapBrand} in your own classes to define styles.
10+
*/
11+
public class CustomBootstrapStyle implements BootstrapBrand {
12+
13+
@ColorInt private final int defaultFill;
14+
@ColorInt private final int defaultEdge;
15+
@ColorInt private final int defaultTextColor;
16+
@ColorInt private final int activeFill;
17+
@ColorInt private final int activeEdge;
18+
@ColorInt private final int activeTextColor;
19+
@ColorInt private final int disabledFill;
20+
@ColorInt private final int disabledEdge;
21+
@ColorInt private final int disabledTextColor;
22+
23+
@SuppressWarnings("deprecation") public CustomBootstrapStyle(Context context) {
24+
defaultFill = context.getResources().getColor(R.color.custom_default_fill);
25+
defaultEdge = context.getResources().getColor(R.color.custom_default_edge);
26+
defaultTextColor = context.getResources().getColor(android.R.color.white);
27+
activeFill = context.getResources().getColor(R.color.custom_active_fill);
28+
activeEdge = context.getResources().getColor(R.color.custom_active_edge);
29+
activeTextColor = context.getResources().getColor(android.R.color.black);
30+
disabledFill = context.getResources().getColor(R.color.custom_disabled_fill);
31+
disabledEdge = context.getResources().getColor(R.color.custom_disabled_edge);
32+
disabledTextColor = context.getResources().getColor(R.color.bootstrap_gray);
33+
}
34+
35+
@Override public int defaultFill(Context context) {
36+
return defaultFill;
37+
}
38+
39+
@Override public int defaultEdge(Context context) {
40+
return defaultEdge;
41+
}
42+
43+
@Override public int defaultTextColor(Context context) {
44+
return defaultTextColor;
45+
}
46+
47+
@Override public int activeFill(Context context) {
48+
return activeFill;
49+
}
50+
51+
@Override public int activeEdge(Context context) {
52+
return activeEdge;
53+
}
54+
55+
@Override public int activeTextColor(Context context) {
56+
return activeTextColor;
57+
}
58+
59+
@Override public int disabledFill(Context context) {
60+
return disabledFill;
61+
}
62+
63+
@Override public int disabledEdge(Context context) {
64+
return disabledEdge;
65+
}
66+
67+
@Override public int disabledTextColor(Context context) {
68+
return disabledTextColor;
69+
}
70+
}

0 commit comments

Comments
 (0)