Skip to content

Commit

Permalink
Version 1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
marcoscgdev committed Dec 19, 2018
1 parent 0e9e0e5 commit 66a66a6
Show file tree
Hide file tree
Showing 11 changed files with 84 additions and 73 deletions.
29 changes: 29 additions & 0 deletions .idea/codeStyles/Project.xml

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

6 changes: 0 additions & 6 deletions .idea/compiler.xml

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/dictionaries/marco.xml

This file was deleted.

49 changes: 10 additions & 39 deletions .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/modules.xml

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

20 changes: 10 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 27
compileSdkVersion 28
defaultConfig {
applicationId "com.marcoscg.xmassnowsample"
minSdkVersion 14
targetSdkVersion 27
versionCode 100
versionName "1.0.0"
targetSdkVersion 28
versionCode 101
versionName "1.0.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand All @@ -19,10 +19,10 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:27+'
compile project(':library')
testCompile 'junit:junit:4.12'
androidTestCompile 'com.android.support.test:runner:1.0.1'
androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.1'
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation project(':library')
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
}
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.2.1'


// NOTE: Do not place your application dependencies here; they belong
Expand Down
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 Dec 27 13:27:28 CET 2017
#Wed Dec 19 22:40:14 CET 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
18 changes: 9 additions & 9 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 27
compileSdkVersion 28
defaultConfig {
minSdkVersion 14
targetSdkVersion 27
versionCode 100
versionName "1.0.0"
targetSdkVersion 28
versionCode 101
versionName "1.0.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand All @@ -19,9 +19,9 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:27+'
testCompile 'junit:junit:4.12'
androidTestCompile 'com.android.support.test:runner:1.0.1'
androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.1'
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:28.0.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
}
4 changes: 2 additions & 2 deletions library/src/main/java/com/marcoscg/xmassnow/SnowView.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ protected void onSizeChanged(int width, int height, int oldw, int oldh) {
animation.setInterpolator(interpolator);

coords[i] = new int[] { sRandomGen.nextInt(width - 30), -60 };
int size = 18 * height / 1000 + sRandomGen.nextInt(13);
Drawable snow_flake = mContext.getResources().getDrawable(R.drawable.snow);
int size = 10 * height / 1000 + sRandomGen.nextInt(13);
Drawable snow_flake = mContext.getResources().getDrawable(R.drawable.snow_flake);

snow_flake.setBounds(0, 0, size, size);
drawables.add(new AnimateDrawable(snow_flake, animation));
Expand Down
20 changes: 20 additions & 0 deletions library/src/main/res/drawable/snow_flake.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ XmasSnow - snow_flake.xml
~ Created by Marcos Calvo García on 19/12/18 22:40.
~ Copyright (c) 2018. All rights reserved.
~
~ Last modified 19/12/18 22:40.
-->

<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">

<solid
android:color="#ffffff"/>

<size
android:width="16dp"
android:height="16dp"/>
</shape>

0 comments on commit 66a66a6

Please sign in to comment.