Skip to content

Commit

Permalink
Merge pull request #172 from fractalwrench/master
Browse files Browse the repository at this point in the history
2.3.0 Release
  • Loading branch information
jamie-beardedhen authored Jul 2, 2016
2 parents 221ba81 + f82a67d commit 0ff3a82
Show file tree
Hide file tree
Showing 8 changed files with 68 additions and 41 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.beardedhen.androidbootstrap.api.view;

import android.support.annotation.IntRange;

/**
* Views which implement this interface visually display ongoing progress to users
*/
Expand Down Expand Up @@ -57,7 +55,8 @@ public interface ProgressView {


/**
* Used for settings the maxprogress. Also check if Cumulative progress is smaller than the max before asigning, see {@link #checkCumulativeSmallerThanMax}.
* Used for settings the maxprogress. Also check if Cumulative progress is smaller than the
* max before asigning.
* @param maxProgress the maxProgress value
*/
void setMaxProgress(int maxProgress);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
* See the <a href="https://design.google.com/icons//">link</a> for icons
* . <b>Please note that icon codes use underscores rather than hyphens in this
* library.</b> All icons are prefixed with md_ EG: md_build.
*
* Most of this class is auto genarated by the project <a href="">here</a>.
*/
public class MaterialIcons implements IconSet {

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.0'
classpath 'com.android.tools.build:gradle:2.1.2'
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VERSION_NAME=2.2.0
VERSION_CODE=220
VERSION_NAME=2.3.0
VERSION_CODE=230
GROUP=com.beardedhen

POM_DESCRIPTION=Bootstrap style widgets for Android, with Glyph Icons
Expand Down
4 changes: 2 additions & 2 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ dependencies {
compile project (':AndroidBootstrap') // replace with Maven dependency in your app

compile 'com.jakewharton:butterknife:7.0.1'
compile 'com.android.support:appcompat-v7:23.3.0'
compile 'com.android.support:support-annotations:23.3.0'
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:support-annotations:23.4.0'
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package com.fractalwrench.androidbootstrap.sample;

import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;

import com.beardedhen.androidbootstrap.BootstrapProgressBarGroup;

import butterknife.ButterKnife;
import butterknife.OnClick;

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

@OnClick(R.id.github_btn) void onGithubClicked() {
Intent intent = new Intent(Intent.ACTION_VIEW); startActivity(intent);
intent.setData(Uri.parse("https://github.com/Bearded-Hen/Android-Bootstrap"));
startActivity(intent);
}

@OnClick(R.id.example_bootstrap_button) void onBootstrapButtonExampleClicked() {
startActivity(new Intent(this, BootstrapButtonExample.class));
}
Expand Down
78 changes: 49 additions & 29 deletions sample/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,88 +2,108 @@

<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"
>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:orientation="vertical"
android:padding="16dp"
>

<Button
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/github_btn"
style="@style/home_button"
app:bootstrapBrand="danger"
app:bootstrapSize="xl"
app:bootstrapText="{fa-github} Fork me on Github {fa-heart}"
app:showOutline="false"
/>

<View
android:layout_width="match_parent"
android:layout_height="24dp"
/>

<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/example_bootstrap_button"
style="@style/home_button"
android:text="BootstrapButton"
/>

<Button
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/example_bootstrap_btn_group"
style="@style/home_button"
android:text="BootstrapButtonGroup"
/>

<Button
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/example_fontawesometext"
style="@style/home_button"
android:text="AwesomeTextView"
/>

<Button
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/example_bootstrap_label"
style="@style/home_button"
android:text="BootstrapLabel"
/>

<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/example_bootstrap_progress"
style="@style/home_button"
android:text="BootstrapProgressBar"
/>

<Button
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/example_bootstrap_progress_group"
style="@style/home_button"
android:text="BootstrapProgressBarGroup"
/>

<Button
android:id="@+id/example_bootstrap_label"
style="@style/home_button"
android:text="BootstrapLabel"
/>

<Button
android:id="@+id/example_bootstrap_edit_text"
style="@style/home_button"
android:text="BootstrapEditText"
/>

<Button
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/example_bootstrap_cricle_thumbnail"
style="@style/home_button"
android:text="BootstrapCircleThumbnail"
/>

<Button
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/example_bootstrap_thumbnail"
style="@style/home_button"
android:text="BootstrapThumbnail"
/>
<Button

<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/example_bootstrap_edit_text"
style="@style/home_button"
android:text="BootstrapEditText"
/>

<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/example_bootstrap_well"
style="@style/home_button"
android:text="BootstrapWell"/>

<Button
android:text="BootstrapWell"
/>

<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/example_bootstrap_dropdown"
style="@style/home_button"
android:text="BootstrapDropdown"/>
android:text="BootstrapDropdown"
/>

<Button
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/example_bootstrap_alert"
style="@style/home_button"
android:text="BootstrapAlert"/>
android:text="BootstrapAlert"
/>

<Button
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/example_bootstrap_badge"
style="@style/home_button"
android:text="BootstrapBadge"/>
android:text="BootstrapBadge"
/>
</LinearLayout>
</ScrollView>
5 changes: 5 additions & 0 deletions sample/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@
<style name="home_button">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_margin">8dp</item>
<item name="bootstrapBrand">primary</item>
<item name="bootstrapSize">lg</item>
<item name="showOutline">true</item>
<item name="roundedCorners">true</item>
</style>

</resources>

0 comments on commit 0ff3a82

Please sign in to comment.