Skip to content

Commit

Permalink
Merge branch 'release/2.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
johnkil committed Dec 6, 2013
2 parents 12db21b + 18a32a6 commit 08cec47
Show file tree
Hide file tree
Showing 64 changed files with 499 additions and 43 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@ Change Log
==========


Version 2.0.0 *(2013-12-05)*
--------------------------

* Separated sample from library project.
* Pushed to Maven Central.


Version 1.5 *(2013-11-06)*
--------------------------

Expand Down
19 changes: 17 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ Sample layout with RobotoTextView:
<com.devspark.robototextview.widget.RobotoTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:typeface="roboto_thin"
android:textSize="22sp"
android:text="Roboto Thin"/>
android:text="Roboto Thin"
app:typeface="roboto_thin"/>
</FrameLayout>
```

Expand Down Expand Up @@ -87,6 +87,21 @@ Available values ​​for the `typeface` attribute:
* roboto_slab_bold


Gradle
------

Android-RobotoTextView library is now pushed to Maven Central as a AAR, so you just need to add the following dependency to your build.gradle.

``` xml
dependencies {
compile 'com.github.johnkil.android-robototextview:robototextview:2.0.0'
}
```

Example Gradle project using Android-RobotoTextView:

* [Android-RobotoTextView-Gradle-Sample](https://github.com/johnkil/Android-RobotoTextView-Gradle-Sample)


Developed By
------------
Expand Down
24 changes: 12 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@ buildscript {
repositories {
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:0.6.+'
}
}

apply plugin: 'android'
def isReleaseBuild() {
return version.contains("SNAPSHOT") == false
}

android {
compileSdkVersion 19
buildToolsVersion '19.0.0'
allprojects {
version = VERSION_NAME
group = GROUP

sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
}
repositories {
mavenCentral()
}
}
}

apply plugin: 'android-reporting'
14 changes: 14 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
VERSION_NAME=2.0.0-SNAPSHOT
VERSION_CODE=7
GROUP=com.github.johnkil.android-robototextview

POM_DESCRIPTION=Implementation of the fragment with the ability to display indeterminate progress indicator when you are waiting for the initial dataImplementation of a TextView and all its direct/indirect subclasses with native support for the Roboto fonts, includes the brand new Roboto Slab fonts.
POM_URL=https://github.com/johnkil/Android-RobotoTextView
POM_SCM_URL=https://github.com/johnkil/Android-RobotoTextView
POM_SCM_CONNECTION=scm:[email protected]:johnkil/Android-RobotoTextView.git
POM_SCM_DEV_CONNECTION=scm:[email protected]:johnkil/Android-RobotoTextView.git
POM_LICENCE_NAME=The Apache Software License, Version 2.0
POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=johnkil
POM_DEVELOPER_NAME=Evgeny Shishkin
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Sun Nov 03 13:28:14 MSK 2013
#Thu Dec 05 21:27:20 MSK 2013
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Expand Down
Empty file modified gradlew
100755 → 100644
Empty file.
82 changes: 82 additions & 0 deletions maven_push.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
apply plugin: 'maven'
apply plugin: 'signing'

def sonatypeRepositoryUrl
if (isReleaseBuild()) {
println 'RELEASE BUILD'
sonatypeRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
} else {
println 'DEBUG BUILD'
sonatypeRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
}

afterEvaluate { project ->
uploadArchives {
repositories {
mavenDeployer {
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }

pom.artifactId = POM_ARTIFACT_ID

repository(url: sonatypeRepositoryUrl) {
authentication(userName: nexusUsername, password: nexusPassword)
}

pom.project {
name POM_NAME
packaging POM_PACKAGING
description POM_DESCRIPTION
url POM_URL

scm {
url POM_SCM_URL
connection POM_SCM_CONNECTION
developerConnection POM_SCM_DEV_CONNECTION
}

licenses {
license {
name POM_LICENCE_NAME
url POM_LICENCE_URL
distribution POM_LICENCE_DIST
}
}

developers {
developer {
id POM_DEVELOPER_ID
name POM_DEVELOPER_NAME
}
}
}
}
}
}

signing {
required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
sign configurations.archives
}

task androidJavadocs(type: Javadoc) {
source = android.sourceSets.main.allJava
}

task androidJavadocsJar(type: Jar) {
classifier = 'javadoc'
//basename = artifact_id
from androidJavadocs.destinationDir
}

task androidSourcesJar(type: Jar) {
classifier = 'sources'
//basename = artifact_id
from android.sourceSets.main.allSource
}

artifacts {
//archives packageReleaseJar
archives androidSourcesJar
archives androidJavadocsJar
}
}
3 changes: 0 additions & 3 deletions project.properties

This file was deleted.

15 changes: 15 additions & 0 deletions robototextview-sample/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
apply plugin: 'android'

dependencies {
compile project(':robototextview')
}

android {
compileSdkVersion 19
buildToolsVersion "19.0.0"

defaultConfig {
minSdkVersion 3
targetSdkVersion 19
}
}
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.devspark.robototextview"
android:versionCode="6"
android:versionName="1.5">
package="com.devspark.robototextview.sample"
android:versionCode="7"
android:versionName="2.0.0">

<uses-sdk
android:minSdkVersion="3"
android:targetSdkVersion="17"/>
android:targetSdkVersion="19"/>

<application
android:label="@string/app_name"
android:icon="@drawable/ic_launcher"
android:theme="@style/AppTheme">
<activity
android:name="MainActivity"
android:label="@string/app_name">
android:name="MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
* limitations under the License.
*/

package com.devspark.robototextview;
package com.devspark.robototextview.sample;

import android.app.Activity;
import android.os.Bundle;

/**
* @author e.shishkin
* @author Evgeny Shishkin
*/
public class MainActivity extends Activity {
/**
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* Copyright 2013, Evgeny Shishkin
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
23 changes: 23 additions & 0 deletions robototextview/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
apply plugin: 'android-library'

android {
compileSdkVersion 19
buildToolsVersion "19.0.0"

defaultConfig {
minSdkVersion 3
targetSdkVersion 19
}

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

// Used to push in maven
apply from: '../maven_push.gradle'
3 changes: 3 additions & 0 deletions robototextview/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
POM_NAME=RobotoTextView Library
POM_ARTIFACT_ID=robototextview
POM_PACKAGING=aar
11 changes: 11 additions & 0 deletions robototextview/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.devspark.robototextview"
android:versionCode="7"
android:versionName="2.0.0">

<uses-sdk
android:minSdkVersion="3"
android:targetSdkVersion="19"/>
<application/>

</manifest>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright (C) 2013 Evgeny Shishkin
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.devspark.robototextview;

import android.content.Context;
Expand All @@ -7,7 +23,7 @@
/**
* The manager of roboto typefaces.
*
* @author e.shishkin
* @author Evgeny Shishkin
*/
public class RobotoTypefaceManager {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,34 @@
/*
* Copyright (C) 2013 Evgeny Shishkin
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.devspark.robototextview.widget;

import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Typeface;
import android.util.AttributeSet;
import android.widget.AutoCompleteTextView;

import com.devspark.robototextview.R;
import com.devspark.robototextview.RobotoTypefaceManager;

/**
* Implementation of a {@link AutoCompleteTextView} with native support for all the Roboto fonts.
*
* @author e.shishkin
* @author Evgeny Shishkin
*/
public class RobotoAutoCompleteTextView extends AutoCompleteTextView {

Expand Down
Loading

0 comments on commit 08cec47

Please sign in to comment.