diff --git a/app/build.gradle b/app/build.gradle index 51db5c2..59655b0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { applicationId "com.adlerosn.brasilfurfest" minSdkVersion 21 targetSdkVersion 30 - versionCode 64 - versionName "2021.5.22.0" + versionCode 65 + versionName "2021.9.6.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -29,26 +29,26 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - testImplementation 'junit:junit:4.13' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.0' - implementation 'org.jetbrains.kotlin:kotlin-reflect:1.5.0' + implementation fileTree(dir: '../libs', include: ['*.jar', '*.aar']) + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30' + implementation 'org.jetbrains.kotlin:kotlin-reflect:1.5.30' implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0' - implementation 'androidx.appcompat:appcompat:1.3.0' - implementation 'com.google.android.material:material:1.3.0' + implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'com.google.android.material:material:1.4.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.core:core-ktx:1.5.0' - implementation 'androidx.media:media:1.3.1' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation 'androidx.core:core-ktx:1.6.0' + implementation 'androidx.media:media:1.4.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.0' // implementation 'org.jetbrains.anko:anko-commons:0.10.5' implementation 'com.google.code.gson:gson:2.8.6' implementation 'com.brandongogetap:stickyheaders:0.6.2' implementation 'com.github.chuross:expandable-layout:1.0.5' // implementation 'com.github.shalskar:PeekAndPop:1.1.0' implementation 'com.github.vihtarb:tooltip:0.2.0' - implementation 'com.jsibbold:zoomage:1.3.1-SNAPSHOT' +// implementation 'com.jsibbold:zoomage:1.3.1' // implementation 'androidmads.library.qrgenearator:QRGenearator:1.0.4' implementation 'com.journeyapps:zxing-android-embedded:3.3.0' implementation 'com.google.zxing:core:3.3.0' diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c7e7889..ebb1d45 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -12,9 +12,9 @@ --> - #6746c3 - #311b92 - #000063 + #ff77a9 + #ec407a + #b4004e #718792 #455a64 @@ -40,7 +40,7 @@ #FAFAFA @color/material_io_primaryTextColor #fffde7 - @color/colorBase17c + @color/colorBase17b #f9a825 #7b1fa2 #29b6f6 diff --git a/build.gradle b/build.gradle index da372c1..acdec61 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,19 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.5.0' + ext.kotlin_version = '1.5.30' repositories { google() // jcenter() mavenCentral() maven { url 'https://jitpack.io' } - maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local' } +// maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local' } + flatDir { + dirs 'libs' + } } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0-beta02' + classpath 'com.android.tools.build:gradle:7.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong @@ -24,7 +27,10 @@ allprojects { // jcenter() mavenCentral() maven { url 'https://jitpack.io' } - maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local' } +// maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local' } + flatDir { + dirs 'libs' + } } } diff --git a/libs/zoomage-1.3.1-javadoc.jar b/libs/zoomage-1.3.1-javadoc.jar new file mode 100644 index 0000000..d0a6bfb Binary files /dev/null and b/libs/zoomage-1.3.1-javadoc.jar differ diff --git a/libs/zoomage-1.3.1-sources.jar b/libs/zoomage-1.3.1-sources.jar new file mode 100644 index 0000000..9dbba36 Binary files /dev/null and b/libs/zoomage-1.3.1-sources.jar differ diff --git a/libs/zoomage-1.3.1.aar b/libs/zoomage-1.3.1.aar new file mode 100644 index 0000000..55954f9 Binary files /dev/null and b/libs/zoomage-1.3.1.aar differ