Skip to content

Commit 76f3e58

Browse files
jamie-beardedhenjamie-beardedhen
committed
reformat/optimise code
1 parent dec1716 commit 76f3e58

File tree

63 files changed

+1479
-1226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1479
-1226
lines changed

‎AndroidBootstrap/AndroidManifest.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.beardedhen.androidbootstrap"
44
android:versionCode="1"
5-
android:versionName="1.0" >
5+
android:versionName="1.0"
6+
>
67

78
<uses-sdk
89
android:minSdkVersion="7"
9-
android:targetSdkVersion="21" />
10+
android:targetSdkVersion="21"
11+
/>
1012

11-
<application/>
13+
<application />
1214

1315
</manifest>

‎AndroidBootstrap/res/drawable/bbuton_danger.xml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
33

4-
<item android:state_pressed="true"><shape>
4+
<item android:state_pressed="true">
5+
<shape>
56
<solid android:color="@color/bbutton_danger_pressed" />
67
<stroke android:width="1dp" android:color="@color/bbutton_danger_edge" />
7-
</shape></item>
8-
9-
<item android:state_enabled="false"><shape>
10-
<solid android:color="@color/bbutton_danger_disabled" />
8+
</shape>
9+
</item>
10+
11+
<item android:state_enabled="false">
12+
<shape>
13+
<solid android:color="@color/bbutton_danger_disabled" />
1114
<stroke android:width="1dp" android:color="@color/bbutton_danger_disabled_edge" />
12-
</shape></item>
13-
14-
15-
<item><shape>
15+
</shape>
16+
</item>
17+
18+
19+
<item>
20+
<shape>
1621
<solid android:color="@color/bbutton_danger" />
1722
<stroke android:width="1dp" android:color="@color/bbutton_danger_edge" />
18-
</shape></item>
23+
</shape>
24+
</item>
1925

2026
</selector>

‎AndroidBootstrap/res/drawable/bbuton_danger_rounded.xml

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,31 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
33

4-
<item android:state_pressed="true"><shape>
4+
<item android:state_pressed="true">
5+
<shape>
56
<solid android:color="@color/bbutton_danger_pressed" />
67
<stroke android:width="1dp" android:color="@color/bbutton_danger_edge" />
7-
<corners android:radius="@dimen/bbuton_rounded_corner_radius"/>
8-
</shape></item>
9-
10-
11-
<item android:state_enabled="false"><shape>
12-
<solid android:color="@color/bbutton_danger_disabled" />
8+
<corners android:radius="@dimen/bbuton_rounded_corner_radius" />
9+
</shape>
10+
</item>
11+
12+
13+
<item android:state_enabled="false">
14+
<shape>
15+
<solid android:color="@color/bbutton_danger_disabled" />
1316
<stroke android:width="1dp" android:color="@color/bbutton_danger_disabled_edge" />
14-
<corners android:radius="@dimen/bbuton_rounded_corner_radius"/>
15-
</shape></item>
16-
17+
<corners android:radius="@dimen/bbuton_rounded_corner_radius" />
18+
</shape>
19+
</item>
20+
1721

18-
<item><shape>
22+
<item>
23+
<shape>
1924
<solid android:color="@color/bbutton_danger" />
2025
<stroke android:width="1dp" android:color="@color/bbutton_danger_edge" />
21-
<corners android:radius="@dimen/bbuton_rounded_corner_radius"/>
22-
</shape></item>
23-
24-
26+
<corners android:radius="@dimen/bbuton_rounded_corner_radius" />
27+
</shape>
28+
</item>
29+
30+
2531
</selector>

‎AndroidBootstrap/res/drawable/bbuton_default.xml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
33

4-
<item android:state_pressed="true"><shape>
4+
<item android:state_pressed="true">
5+
<shape>
56
<solid android:color="@color/bbutton_default_pressed" />
67
<stroke android:width="1dp" android:color="@color/bbutton_default_edge" />
7-
</shape></item>
8-
9-
<item android:state_enabled="false"><shape>
10-
<solid android:color="@color/bbutton_default_disabled" />
8+
</shape>
9+
</item>
10+
11+
<item android:state_enabled="false">
12+
<shape>
13+
<solid android:color="@color/bbutton_default_disabled" />
1114
<stroke android:width="1dp" android:color="@color/bbutton_default_disabled_edge" />
12-
</shape></item>
13-
14-
15-
<item><shape>
15+
</shape>
16+
</item>
17+
18+
19+
<item>
20+
<shape>
1621
<solid android:color="@color/bbutton_default" />
1722
<stroke android:width="1dp" android:color="@color/bbutton_default_edge" />
18-
</shape></item>
23+
</shape>
24+
</item>
1925

2026
</selector>

‎AndroidBootstrap/res/drawable/bbuton_default_rounded.xml

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,29 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
33

4-
<item android:state_pressed="true"><shape>
4+
<item android:state_pressed="true">
5+
<shape>
56
<solid android:color="@color/bbutton_default_pressed" />
67
<stroke android:width="1dp" android:color="@color/bbutton_default_edge" />
7-
<corners android:radius="@dimen/bbuton_rounded_corner_radius"/>
8-
</shape></item>
9-
10-
<item android:state_enabled="false"><shape>
11-
<solid android:color="@color/bbutton_default_disabled" />
8+
<corners android:radius="@dimen/bbuton_rounded_corner_radius" />
9+
</shape>
10+
</item>
11+
12+
<item android:state_enabled="false">
13+
<shape>
14+
<solid android:color="@color/bbutton_default_disabled" />
1215
<stroke android:width="1dp" android:color="@color/bbutton_default_disabled_edge" />
13-
<corners android:radius="@dimen/bbuton_rounded_corner_radius"/>
14-
</shape></item>
15-
16-
17-
<item><shape>
16+
<corners android:radius="@dimen/bbuton_rounded_corner_radius" />
17+
</shape>
18+
</item>
19+
20+
21+
<item>
22+
<shape>
1823
<solid android:color="@color/bbutton_default" />
1924
<stroke android:width="1dp" android:color="@color/bbutton_default_edge" />
20-
<corners android:radius="@dimen/bbuton_rounded_corner_radius"/>
21-
</shape></item>
25+
<corners android:radius="@dimen/bbuton_rounded_corner_radius" />
26+
</shape>
27+
</item>
2228

2329
</selector>

‎AndroidBootstrap/res/drawable/bbuton_info.xml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
33

4-
<item android:state_pressed="true"><shape>
4+
<item android:state_pressed="true">
5+
<shape>
56
<solid android:color="@color/bbutton_info_pressed" />
67
<stroke android:width="1dp" android:color="@color/bbutton_info_edge" />
7-
</shape></item>
8-
9-
<item android:state_enabled="false"><shape>
10-
<solid android:color="@color/bbutton_info_disabled" />
8+
</shape>
9+
</item>
10+
11+
<item android:state_enabled="false">
12+
<shape>
13+
<solid android:color="@color/bbutton_info_disabled" />
1114
<stroke android:width="1dp" android:color="@color/bbutton_info_disabled_edge" />
12-
</shape></item>
13-
14-
15-
<item><shape>
15+
</shape>
16+
</item>
17+
18+
19+
<item>
20+
<shape>
1621
<solid android:color="@color/bbutton_info" />
1722
<stroke android:width="1dp" android:color="@color/bbutton_info_edge" />
18-
</shape></item>
23+
</shape>
24+
</item>
1925

2026
</selector>

‎AndroidBootstrap/res/drawable/bbuton_info_rounded.xml

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,29 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
33

4-
<item android:state_pressed="true"><shape>
4+
<item android:state_pressed="true">
5+
<shape>
56
<solid android:color="@color/bbutton_info_pressed" />
67
<stroke android:width="1dp" android:color="@color/bbutton_info_edge" />
7-
<corners android:radius="@dimen/bbuton_rounded_corner_radius"/>
8-
</shape></item>
9-
10-
<item android:state_enabled="false"><shape>
11-
<solid android:color="@color/bbutton_info_disabled" />
8+
<corners android:radius="@dimen/bbuton_rounded_corner_radius" />
9+
</shape>
10+
</item>
11+
12+
<item android:state_enabled="false">
13+
<shape>
14+
<solid android:color="@color/bbutton_info_disabled" />
1215
<stroke android:width="1dp" android:color="@color/bbutton_info_disabled_edge" />
13-
<corners android:radius="@dimen/bbuton_rounded_corner_radius"/>
14-
</shape></item>
15-
16-
17-
<item><shape>
16+
<corners android:radius="@dimen/bbuton_rounded_corner_radius" />
17+
</shape>
18+
</item>
19+
20+
21+
<item>
22+
<shape>
1823
<solid android:color="@color/bbutton_info" />
1924
<stroke android:width="1dp" android:color="@color/bbutton_info_edge" />
20-
<corners android:radius="@dimen/bbuton_rounded_corner_radius"/>
21-
</shape></item>
25+
<corners android:radius="@dimen/bbuton_rounded_corner_radius" />
26+
</shape>
27+
</item>
2228

2329
</selector>

‎AndroidBootstrap/res/drawable/bbuton_inverse.xml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
33

4-
<item android:state_pressed="true"><shape>
4+
<item android:state_pressed="true">
5+
<shape>
56
<solid android:color="@color/bbutton_inverse_pressed" />
67
<stroke android:width="1dp" android:color="@color/bbutton_inverse_edge" />
7-
</shape></item>
8-
9-
<item android:state_enabled="false"><shape>
10-
<solid android:color="@color/bbutton_inverse_disabled" />
8+
</shape>
9+
</item>
10+
11+
<item android:state_enabled="false">
12+
<shape>
13+
<solid android:color="@color/bbutton_inverse_disabled" />
1114
<stroke android:width="1dp" android:color="@color/bbutton_inverse_disabled_edge" />
12-
</shape></item>
13-
14-
15-
<item><shape>
15+
</shape>
16+
</item>
17+
18+
19+
<item>
20+
<shape>
1621
<solid android:color="@color/bbutton_inverse" />
1722
<stroke android:width="1dp" android:color="@color/bbutton_inverse_edge" />
18-
</shape></item>
23+
</shape>
24+
</item>
1925

2026
</selector>

‎AndroidBootstrap/res/drawable/bbuton_inverse_rounded.xml

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,29 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
33

4-
<item android:state_pressed="true"><shape>
4+
<item android:state_pressed="true">
5+
<shape>
56
<solid android:color="@color/bbutton_inverse_pressed" />
67
<stroke android:width="1dp" android:color="@color/bbutton_inverse_edge" />
7-
<corners android:radius="@dimen/bbuton_rounded_corner_radius"/>
8-
</shape></item>
9-
10-
<item android:state_enabled="false"><shape>
11-
<solid android:color="@color/bbutton_inverse_disabled" />
8+
<corners android:radius="@dimen/bbuton_rounded_corner_radius" />
9+
</shape>
10+
</item>
11+
12+
<item android:state_enabled="false">
13+
<shape>
14+
<solid android:color="@color/bbutton_inverse_disabled" />
1215
<stroke android:width="1dp" android:color="@color/bbutton_inverse_disabled_edge" />
13-
<corners android:radius="@dimen/bbuton_rounded_corner_radius"/>
14-
</shape></item>
15-
16-
17-
<item><shape>
16+
<corners android:radius="@dimen/bbuton_rounded_corner_radius" />
17+
</shape>
18+
</item>
19+
20+
21+
<item>
22+
<shape>
1823
<solid android:color="@color/bbutton_inverse" />
1924
<stroke android:width="1dp" android:color="@color/bbutton_inverse_edge" />
20-
<corners android:radius="@dimen/bbuton_rounded_corner_radius"/>
21-
</shape></item>
25+
<corners android:radius="@dimen/bbuton_rounded_corner_radius" />
26+
</shape>
27+
</item>
2228

2329
</selector>

‎AndroidBootstrap/res/drawable/bbuton_primary.xml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
33

4-
<item android:state_pressed="true"><shape>
4+
<item android:state_pressed="true">
5+
<shape>
56
<solid android:color="@color/bbutton_primary_pressed" />
67
<stroke android:width="1dp" android:color="@color/bbutton_primary_edge" />
7-
</shape></item>
8-
9-
<item android:state_enabled="false"><shape>
10-
<solid android:color="@color/bbutton_primary_disabled" />
8+
</shape>
9+
</item>
10+
11+
<item android:state_enabled="false">
12+
<shape>
13+
<solid android:color="@color/bbutton_primary_disabled" />
1114
<stroke android:width="1dp" android:color="@color/bbutton_primary_disabled_edge" />
12-
</shape></item>
13-
14-
15-
<item><shape>
15+
</shape>
16+
</item>
17+
18+
19+
<item>
20+
<shape>
1621
<solid android:color="@color/bbutton_primary" />
1722
<stroke android:width="1dp" android:color="@color/bbutton_primary_edge" />
18-
</shape></item>
23+
</shape>
24+
</item>
1925

2026
</selector>

0 commit comments

Comments
 (0)