Skip to content

Commit

Permalink
Merge pull request #112 from fractalwrench/master
Browse files Browse the repository at this point in the history
Library Updates
  • Loading branch information
jamie-beardedhen committed Oct 8, 2015
2 parents f31bb6a + e92c51d commit 332fec1
Show file tree
Hide file tree
Showing 181 changed files with 12,595 additions and 3,225 deletions.
49 changes: 1 addition & 48 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,62 +1,15 @@
# Copyright: Benjamin Weiss (keyboardsurfer) https://github.com/keyboardsurfer
# Under CC-BY-SA V3.0 (https://creativecommons.org/licenses/by-sa/3.0/legalcode)

# svn files
.svn

# built application files
*.apk
*.ap_
*.jar

# lint folder
lint

# files for the dex VM
*.dex

# Java class files
*.class

# generated files
bin/
gen/
classes/
gen-external-apklibs/

# maven output folder
target

# Local configuration file (sdk path, etc)
local.properties

# Eclipse project files
.classpath
.project
.metadata
.settings

# IntelliJ files
.idea
*.iml

# OSX files
.DS_Store

# Windows files
Thumbs.db

# vi swap files
*.swp

# backup files
*.bak

# gradle directory
.gradle
build/

#for oh-my-zsh jira plugin (https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins#jira)
.jira-url
atlassian-ide-plugin.xml

gradle/
30 changes: 30 additions & 0 deletions ADD_FONT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
Adding a Custom Font
=================

Android Bootstrap uses Typeface Icon Sets, which provide scalable graphics without the hassle of
adding different drawable sizes for various screen densities. It should be possible to define your
own icon sets by following the instructions below. Please send pull requests if you want an icon set
added to the library by default.

1.
Find the [reference sheet](https://fortawesome.github.io/Font-Awesome/cheatsheet/)
for the typeface, and use a script to parse it.
An example [parsing script](https://github.com/Bearded-Hen/AndroidBootstrapSample) is currently available
for the FontAwesome and Typicon typefaces. If possible, please also send a pull request for the script itself!

2.
Create a class which implements the IconSet interface. This describes the location of the typeface
in the assets directory, and the icon codes which map to unicode characters. See the default icon sets
for examples.

3.
Copy the typeface TTF file to the assets directory.

4.
Initialise the custom typeface by calling TypefaceProvider.registerCustomIconSet().

5.
Add icons to text using the BootstrapTextBuilder.

6.
Test out the new icon set, send a pull request, or raise an issue if something isn't working.
9 changes: 0 additions & 9 deletions AndroidBootstrap/.classpath

This file was deleted.

33 changes: 0 additions & 33 deletions AndroidBootstrap/.project

This file was deleted.

15 changes: 0 additions & 15 deletions AndroidBootstrap/AndroidManifest.xml

This file was deleted.

Binary file removed AndroidBootstrap/assets/fontawesome-webfont.ttf
Binary file not shown.
33 changes: 8 additions & 25 deletions AndroidBootstrap/build.gradle
Original file line number Diff line number Diff line change
@@ -1,35 +1,18 @@
apply plugin: 'com.android.library'

dependencies {

}
apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'

android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
compileSdkVersion 23
buildToolsVersion "23.0.1"

defaultConfig {
minSdkVersion 7
targetSdkVersion 22
minSdkVersion 11
targetSdkVersion 23
versionCode = Integer.parseInt(VERSION_CODE)
versionName = VERSION_NAME
}

sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
resources.srcDirs = ['src']
aidl.srcDirs = ['src']
renderscript.srcDirs = ['src']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
}

instrumentTest.setRoot('tests')
debug.setRoot('build-types/debug')
release.setRoot('build-types/release')
}
}

apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
dependencies {
compile 'com.android.support:support-annotations:23.0.1'
}
Binary file removed AndroidBootstrap/libs/android-support-v4.jar
Binary file not shown.
15 changes: 0 additions & 15 deletions AndroidBootstrap/project.properties

This file was deleted.

26 changes: 0 additions & 26 deletions AndroidBootstrap/res/drawable/bbuton_danger.xml

This file was deleted.

31 changes: 0 additions & 31 deletions AndroidBootstrap/res/drawable/bbuton_danger_rounded.xml

This file was deleted.

26 changes: 0 additions & 26 deletions AndroidBootstrap/res/drawable/bbuton_default.xml

This file was deleted.

29 changes: 0 additions & 29 deletions AndroidBootstrap/res/drawable/bbuton_default_rounded.xml

This file was deleted.

26 changes: 0 additions & 26 deletions AndroidBootstrap/res/drawable/bbuton_info.xml

This file was deleted.

29 changes: 0 additions & 29 deletions AndroidBootstrap/res/drawable/bbuton_info_rounded.xml

This file was deleted.

Loading

0 comments on commit 332fec1

Please sign in to comment.