-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #333 from HoraApps/develop
new version 0.5.8
- Loading branch information
Showing
198 changed files
with
22,486 additions
and
12,869 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| /build | ||
| /src/main/gen/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,75 +1,85 @@ | ||
| buildscript { | ||
| repositories { | ||
| jcenter() | ||
| } | ||
| dependencies { | ||
| classpath 'com.android.tools.build:gradle:2.1.2' | ||
| } | ||
| } | ||
|
|
||
| apply plugin: 'com.android.application' | ||
| apply plugin: "com.gladed.androidgitversion" | ||
|
|
||
| repositories { | ||
| jcenter() | ||
| maven { url "http://repo1.maven.org/maven2" } | ||
| maven { url "http://dl.bintray.com/dasar/maven" } | ||
| maven { url "http://dl.bintray.com/dasar/maven" } | ||
| } | ||
|
|
||
| android { | ||
| compileSdkVersion 23 | ||
| buildToolsVersion "23.0.3" | ||
|
|
||
| compileSdkVersion 24 | ||
| buildToolsVersion '24' | ||
|
|
||
| defaultConfig { | ||
| applicationId "com.horaapps.leafpic" | ||
| applicationId "org.horaapps.leafpic" | ||
| minSdkVersion 19 | ||
| targetSdkVersion 23 | ||
| versionCode 7 | ||
| versionName "v0.4" | ||
| targetSdkVersion 24 | ||
| versionName androidGitVersion.name() | ||
| versionCode androidGitVersion.code() | ||
| } | ||
|
|
||
| lintOptions { | ||
| disable 'MissingTranslation' | ||
| disable 'ExtraTranslation' | ||
| abortOnError false | ||
| } | ||
| // This is handled for you by the 2.0+ Gradle Plugin | ||
| aaptOptions { | ||
| additionalParameters "--no-version-vectors" | ||
| } | ||
|
|
||
| compileOptions { | ||
| sourceCompatibility JavaVersion.VERSION_1_6 | ||
| targetCompatibility JavaVersion.VERSION_1_6 | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| minifyEnabled false | ||
| proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | ||
| resValue "string", "app_name", "LeafPic" | ||
| } | ||
|
|
||
| debug { | ||
| applicationIdSuffix ".debug" | ||
| resValue "string", "app_name", "LeafPic (debug)" | ||
| } | ||
| } | ||
|
|
||
| productFlavors { | ||
| noGPlay { | ||
| //versionNameSuffix '-fdroid' | ||
| } | ||
| withGPlay { | ||
| //signingConfig signingConfigs.GPlayConfig | ||
| } | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| compile fileTree(dir: 'libs', include: ['*.jar']) | ||
| compile 'com.android.support:appcompat-v7:23.4.0' | ||
| compile 'com.android.support:cardview-v7:23.4.0' | ||
| compile 'com.android.support:recyclerview-v7:23.4.0' | ||
| compile 'com.android.support:design:23.4.0' | ||
| compile 'com.android.support:palette-v7:23.4.0' | ||
| compile fileTree(include: ['*.jar'], dir: 'libs') | ||
| compile 'com.android.support:appcompat-v7:24.1.1' | ||
| compile 'com.android.support:cardview-v7:24.1.1' | ||
| compile 'com.android.support:recyclerview-v7:24.1.1' | ||
| compile 'com.android.support:design:24.1.1' | ||
| compile 'com.android.support:palette-v7:24.1.1' | ||
| compile 'com.android.support:customtabs:24.1.1' | ||
| compile 'com.android.support:support-v4:24.1.1' | ||
| compile 'com.github.bumptech.glide:glide:3.7.0' | ||
| compile 'com.android.support:support-v4:23.4.0' | ||
| compile 'com.koushikdutta.ion:ion:2.1.7' | ||
| compile 'com.mikepenz:iconics-core:2.5.5@aar' | ||
| compile 'com.mikepenz:google-material-typeface:2.2.0.1.original@aar' | ||
| compile 'com.mikepenz:community-material-typeface:1.5.54.1@aar' | ||
| compile 'com.mikepenz:iconics-core:2.8.1@aar' | ||
| compile 'com.mikepenz:google-material-typeface:2.2.0.3.original@aar' | ||
| compile 'com.mikepenz:community-material-typeface:1.5.54.2@aar' | ||
| compile 'com.mikepenz:fontawesome-typeface:4.6.0.1@aar' | ||
| compile 'com.github.paolorotolo:appintro:3.4.0' | ||
| compile 'com.yalantis:ucrop:1.5.0' | ||
| compile 'uz.shift:colorpicker:0.5@aar' | ||
| compile 'com.balysv:material-ripple:1.0.2' | ||
| compile 'com.commit451:PhotoView:1.2.5' | ||
| compile 'com.google.android.exoplayer:exoplayer:r1.5.7' | ||
| compile 'de.psdev.licensesdialog:licensesdialog:1.8.0' | ||
| compile 'com.android.support:customtabs:23.4.0' | ||
| compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.5.0' | ||
| compile 'de.hdodenhof:circleimageview:2.0.0' | ||
| compile 'com.drewnoakes:metadata-extractor:2.9.1' | ||
| compile 'org.jetbrains:annotations-java5:15.0' | ||
| compile 'com.turingtechnologies.materialscrollbar:lib:10.0.3' | ||
| compile project(':photoview') | ||
| } |
13 changes: 0 additions & 13 deletions
13
app/src/androidTest/java/com/horaapps/leafpic/ApplicationTest.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.