Skip to content

Commit 0ff3a82

Browse files
jamie-beardedhenjamie-beardedhen
authored
Merge pull request #172 from fractalwrench/master
2.3.0 Release
2 parents 221ba81 + f82a67d commit 0ff3a82

File tree

8 files changed

+68
-41
lines changed

8 files changed

+68
-41
lines changed

‎AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/api/view/ProgressView.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.beardedhen.androidbootstrap.api.view;
22

3-
import android.support.annotation.IntRange;
4-
53
/**
64
* Views which implement this interface visually display ongoing progress to users
75
*/
@@ -57,7 +55,8 @@ public interface ProgressView {
5755

5856

5957
/**
60-
* Used for settings the maxprogress. Also check if Cumulative progress is smaller than the max before asigning, see {@link #checkCumulativeSmallerThanMax}.
58+
* Used for settings the maxprogress. Also check if Cumulative progress is smaller than the
59+
* max before asigning.
6160
* @param maxProgress the maxProgress value
6261
*/
6362
void setMaxProgress(int maxProgress);

‎AndroidBootstrap/src/main/java/com/beardedhen/androidbootstrap/font/MaterialIcons.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
* See the <a href="https://design.google.com/icons//">link</a> for icons
1111
* . <b>Please note that icon codes use underscores rather than hyphens in this
1212
* library.</b> All icons are prefixed with md_ EG: md_build.
13-
*
14-
* Most of this class is auto genarated by the project <a href="">here</a>.
1513
*/
1614
public class MaterialIcons implements IconSet {
1715

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
mavenCentral()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:2.1.0'
7+
classpath 'com.android.tools.build:gradle:2.1.2'
88
}
99
}
1010

‎gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
VERSION_NAME=2.2.0
2-
VERSION_CODE=220
1+
VERSION_NAME=2.3.0
2+
VERSION_CODE=230
33
GROUP=com.beardedhen
44

55
POM_DESCRIPTION=Bootstrap style widgets for Android, with Glyph Icons

‎sample/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ dependencies {
2929
compile project (':AndroidBootstrap') // replace with Maven dependency in your app
3030

3131
compile 'com.jakewharton:butterknife:7.0.1'
32-
compile 'com.android.support:appcompat-v7:23.3.0'
33-
compile 'com.android.support:support-annotations:23.3.0'
32+
compile 'com.android.support:appcompat-v7:23.4.0'
33+
compile 'com.android.support:support-annotations:23.4.0'
3434
}

‎sample/src/main/java/com/fractalwrench/androidbootstrap/sample/HomeActivity.java

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

33
import android.content.Intent;
4+
import android.net.Uri;
45
import android.os.Bundle;
56
import android.support.v7.app.AppCompatActivity;
67

7-
import com.beardedhen.androidbootstrap.BootstrapProgressBarGroup;
8-
98
import butterknife.ButterKnife;
109
import butterknife.OnClick;
1110

@@ -17,6 +16,12 @@ public class HomeActivity extends AppCompatActivity {
1716
ButterKnife.bind(this);
1817
}
1918

19+
@OnClick(R.id.github_btn) void onGithubClicked() {
20+
Intent intent = new Intent(Intent.ACTION_VIEW); startActivity(intent);
21+
intent.setData(Uri.parse("https://github.com/Bearded-Hen/Android-Bootstrap"));
22+
startActivity(intent);
23+
}
24+
2025
@OnClick(R.id.example_bootstrap_button) void onBootstrapButtonExampleClicked() {
2126
startActivity(new Intent(this, BootstrapButtonExample.class));
2227
}

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

Lines changed: 49 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,88 +2,108 @@
22

33
<ScrollView
44
xmlns:android="http://schemas.android.com/apk/res/android"
5+
xmlns:app="http://schemas.android.com/apk/res-auto"
56
android:layout_width="match_parent"
67
android:layout_height="match_parent"
78
>
89

910
<LinearLayout
1011
android:layout_width="match_parent"
1112
android:layout_height="wrap_content"
12-
android:padding="16dp"
1313
android:orientation="vertical"
14+
android:padding="16dp"
1415
>
1516

16-
<Button
17+
<com.beardedhen.androidbootstrap.BootstrapButton
18+
android:id="@+id/github_btn"
19+
style="@style/home_button"
20+
app:bootstrapBrand="danger"
21+
app:bootstrapSize="xl"
22+
app:bootstrapText="{fa-github} Fork me on Github {fa-heart}"
23+
app:showOutline="false"
24+
/>
25+
26+
<View
27+
android:layout_width="match_parent"
28+
android:layout_height="24dp"
29+
/>
30+
31+
<com.beardedhen.androidbootstrap.BootstrapButton
1732
android:id="@+id/example_bootstrap_button"
1833
style="@style/home_button"
1934
android:text="BootstrapButton"
2035
/>
2136

22-
<Button
37+
<com.beardedhen.androidbootstrap.BootstrapButton
2338
android:id="@+id/example_bootstrap_btn_group"
2439
style="@style/home_button"
2540
android:text="BootstrapButtonGroup"
2641
/>
2742

28-
<Button
43+
<com.beardedhen.androidbootstrap.BootstrapButton
2944
android:id="@+id/example_fontawesometext"
3045
style="@style/home_button"
3146
android:text="AwesomeTextView"
3247
/>
3348

34-
<Button
49+
<com.beardedhen.androidbootstrap.BootstrapButton
50+
android:id="@+id/example_bootstrap_label"
51+
style="@style/home_button"
52+
android:text="BootstrapLabel"
53+
/>
54+
55+
<com.beardedhen.androidbootstrap.BootstrapButton
3556
android:id="@+id/example_bootstrap_progress"
3657
style="@style/home_button"
3758
android:text="BootstrapProgressBar"
3859
/>
3960

40-
<Button
61+
<com.beardedhen.androidbootstrap.BootstrapButton
4162
android:id="@+id/example_bootstrap_progress_group"
4263
style="@style/home_button"
4364
android:text="BootstrapProgressBarGroup"
4465
/>
4566

46-
<Button
47-
android:id="@+id/example_bootstrap_label"
48-
style="@style/home_button"
49-
android:text="BootstrapLabel"
50-
/>
51-
52-
<Button
53-
android:id="@+id/example_bootstrap_edit_text"
54-
style="@style/home_button"
55-
android:text="BootstrapEditText"
56-
/>
57-
58-
<Button
67+
<com.beardedhen.androidbootstrap.BootstrapButton
5968
android:id="@+id/example_bootstrap_cricle_thumbnail"
6069
style="@style/home_button"
6170
android:text="BootstrapCircleThumbnail"
6271
/>
6372

64-
<Button
73+
<com.beardedhen.androidbootstrap.BootstrapButton
6574
android:id="@+id/example_bootstrap_thumbnail"
6675
style="@style/home_button"
6776
android:text="BootstrapThumbnail"
6877
/>
69-
<Button
78+
79+
<com.beardedhen.androidbootstrap.BootstrapButton
80+
android:id="@+id/example_bootstrap_edit_text"
81+
style="@style/home_button"
82+
android:text="BootstrapEditText"
83+
/>
84+
85+
<com.beardedhen.androidbootstrap.BootstrapButton
7086
android:id="@+id/example_bootstrap_well"
7187
style="@style/home_button"
72-
android:text="BootstrapWell"/>
73-
74-
<Button
88+
android:text="BootstrapWell"
89+
/>
90+
91+
<com.beardedhen.androidbootstrap.BootstrapButton
7592
android:id="@+id/example_bootstrap_dropdown"
7693
style="@style/home_button"
77-
android:text="BootstrapDropdown"/>
94+
android:text="BootstrapDropdown"
95+
/>
7896

79-
<Button
97+
<com.beardedhen.androidbootstrap.BootstrapButton
8098
android:id="@+id/example_bootstrap_alert"
8199
style="@style/home_button"
82-
android:text="BootstrapAlert"/>
100+
android:text="BootstrapAlert"
101+
/>
83102

84-
<Button
103+
<com.beardedhen.androidbootstrap.BootstrapButton
85104
android:id="@+id/example_bootstrap_badge"
86105
style="@style/home_button"
87-
android:text="BootstrapBadge"/>
106+
android:text="BootstrapBadge"
107+
/>
88108
</LinearLayout>
89109
</ScrollView>

‎sample/src/main/res/values/styles.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@
5858
<style name="home_button">
5959
<item name="android:layout_width">match_parent</item>
6060
<item name="android:layout_height">wrap_content</item>
61+
<item name="android:layout_margin">8dp</item>
62+
<item name="bootstrapBrand">primary</item>
63+
<item name="bootstrapSize">lg</item>
64+
<item name="showOutline">true</item>
65+
<item name="roundedCorners">true</item>
6166
</style>
6267

6368
</resources>

0 commit comments

Comments
 (0)