Skip to content

Commit

Permalink
removed library application manifest section and updated gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
Jacek Kwiecień committed Jan 9, 2017
1 parent 5a58fc0 commit 88328e5
Show file tree
Hide file tree
Showing 14 changed files with 42 additions and 33 deletions.
1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 15 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.2.3'
classpath 'com.github.dcendents:android-maven-plugin:1.2'
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
}
}

Expand All @@ -13,3 +13,16 @@ allprojects {
jcenter()
}
}

ext {
// SDK and Tools Versions
compileSdkVersion = 22
targetSdkVersion = 22
buildToolsVersion = "25.0.0"
minSdkVersion = 14
versionCode = 11
versionName = "1.1.0"

// App dependencies
supportLibraryVersion = '22.1.1'
}
Binary file added build/generated/mockable-android-22.jar
Binary file not shown.
Binary file added build/generated/mockable-android-25.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Apr 10 15:27:10 PDT 2013
#Mon Jan 09 11:52:36 CET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
16 changes: 8 additions & 8 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
apply plugin: 'com.android.library'
apply plugin: 'android-maven'
apply plugin: 'com.github.dcendents.android-maven'

android {
compileSdkVersion 22
buildToolsVersion "22.0.0"
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
minSdkVersion 14
targetSdkVersion 22
versionCode 9
versionName "1.0.9"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode rootProject.ext.versionCode
versionName rootProject.ext.versionName
}
buildTypes {
release {
Expand All @@ -21,5 +21,5 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:22.1.1'
compile "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
}
6 changes: 1 addition & 5 deletions library/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="pl.schibsted.roundoverlayprogress">
<manifest package="pl.schibsted.roundoverlayprogress">

<application android:allowBackup="true" android:label="@string/app_name">

</application>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ private void init(AttributeSet attrs) {
int src = attrs.getAttributeResourceValue("http://schemas.android.com/apk/res/android", "src", 0);
BitmapDrawable bitmapDrawable = (BitmapDrawable) getResources().getDrawable(src);

progressColor = a.getColor(R.styleable.RoundOverlayProgressView_progressColor, getResources().getColor(R.color.default_progress));
maxProgress = a.getInteger(R.styleable.RoundOverlayProgressView_maxProgress, 100);
animationDuration = a.getInteger(R.styleable.RoundOverlayProgressView_animationDuration, 300);
animate = a.getBoolean(R.styleable.RoundOverlayProgressView_animate, true);
progressColor = a.getColor(R.styleable.RoundOverlayProgressView_ropv_progressColor, getResources().getColor(R.color.default_progress));
maxProgress = a.getInteger(R.styleable.RoundOverlayProgressView_ropv_maxProgress, 100);
animationDuration = a.getInteger(R.styleable.RoundOverlayProgressView_ropv_animationDuration, 300);
animate = a.getBoolean(R.styleable.RoundOverlayProgressView_ropv_animate, true);

a.recycle();

Expand Down
8 changes: 4 additions & 4 deletions library/src/main/res/values/attrs.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="RoundOverlayProgressView">
<attr name="progressColor" format="color" />
<attr name="maxProgress" format="integer" />
<attr name="animationDuration" format="integer" />
<attr name="animate" format="boolean" />
<attr name="ropv_progressColor" format="color" />
<attr name="ropv_maxProgress" format="integer" />
<attr name="ropv_animationDuration" format="integer" />
<attr name="ropv_animate" format="boolean" />
</declare-styleable>

</resources>
4 changes: 2 additions & 2 deletions sample/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
android:layout_width="150dp"
android:layout_height="150dp"
android:src="@drawable/sample_image"
app:maxProgress="100"
app:progressColor="#80FFFFFF" />
app:ropv_maxProgress="100"
app:ropv_progressColor="#80FFFFFF" />

<Button
android:id="@+id/random_button"
Expand Down

0 comments on commit 88328e5

Please sign in to comment.