diff --git a/.gitignore b/.gitignore index 39fb081..c0e8700 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,82 @@ +# Built application files +*.apk +*.ap_ +*.aab + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ +release/ + +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# IntelliJ *.iml -.gradle -/local.properties -/.idea/workspace.xml -/.idea/libraries -.DS_Store -/build -/captures +.idea/workspace.xml +.idea/tasks.xml +.idea/gradle.xml +.idea/assetWizardSettings.xml +.idea/dictionaries +.idea/libraries +# Android Studio 3 in .gitignore file. +.idea/caches +.idea/modules.xml +# Comment next line if keeping position of elements in Navigation Editor is relevant for you +.idea/navEditor.xml + +# Keystore files +# Uncomment the following lines if you do not want to check your keystore files in. +#*.jks +#*.keystore + +# External native build folder generated in Android Studio 2.2 and later .externalNativeBuild + +# Google Services (e.g. APIs or Firebase) +# google-services.json + +# Freeline +freeline.py +freeline/ +freeline_project_description.json + +# fastlane +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots +fastlane/test_output +fastlane/readme.md + +# Version control +vcs.xml + +# lint +lint/intermediates/ +lint/generated/ +lint/outputs/ +lint/tmp/ +# lint/reports/ \ No newline at end of file diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index f66db1a..0000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 0856b0d..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3963879..99202cc 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,11 +5,12 @@ diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 97ec4d7..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Pr0Ca1app/build.gradle b/Pr0Ca1app/build.gradle index f1bd2be..019cc19 100644 --- a/Pr0Ca1app/build.gradle +++ b/Pr0Ca1app/build.gradle @@ -7,7 +7,7 @@ android { minSdkVersion 19 targetSdkVersion 26 versionCode 1 - versionName "1.0" + versionName "1.0.2" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/Pr0Ca1app/src/main/res/ic_googleplay.png b/Pr0Ca1app/src/main/res/ic_googleplay.png new file mode 100644 index 0000000..7b0782e Binary files /dev/null and b/Pr0Ca1app/src/main/res/ic_googleplay.png differ diff --git a/Pr0Ca1app/src/main/res/mipmap-hdpi/ic_launcher.png b/Pr0Ca1app/src/main/res/mipmap-hdpi/ic_launcher.png index a2f5908..a88a3b4 100644 Binary files a/Pr0Ca1app/src/main/res/mipmap-hdpi/ic_launcher.png and b/Pr0Ca1app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/Pr0Ca1app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/Pr0Ca1app/src/main/res/mipmap-hdpi/ic_launcher_round.png index 1b52399..38658e6 100644 Binary files a/Pr0Ca1app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/Pr0Ca1app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/Pr0Ca1app/src/main/res/mipmap-mdpi/ic_launcher.png b/Pr0Ca1app/src/main/res/mipmap-mdpi/ic_launcher.png index ff10afd..452ee28 100644 Binary files a/Pr0Ca1app/src/main/res/mipmap-mdpi/ic_launcher.png and b/Pr0Ca1app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/Pr0Ca1app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/Pr0Ca1app/src/main/res/mipmap-mdpi/ic_launcher_round.png index 115a4c7..e9caaae 100644 Binary files a/Pr0Ca1app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/Pr0Ca1app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/Pr0Ca1app/src/main/res/mipmap-xhdpi/ic_launcher.png b/Pr0Ca1app/src/main/res/mipmap-xhdpi/ic_launcher.png index dcd3cd8..30e8776 100644 Binary files a/Pr0Ca1app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/Pr0Ca1app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/Pr0Ca1app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/Pr0Ca1app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 459ca60..746cde5 100644 Binary files a/Pr0Ca1app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/Pr0Ca1app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/Pr0Ca1app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Pr0Ca1app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 8ca12fe..b753b1a 100644 Binary files a/Pr0Ca1app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/Pr0Ca1app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/Pr0Ca1app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/Pr0Ca1app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index 8e19b41..4d9aed9 100644 Binary files a/Pr0Ca1app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/Pr0Ca1app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/Pr0Ca1app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Pr0Ca1app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index b824ebd..6c217ce 100644 Binary files a/Pr0Ca1app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/Pr0Ca1app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/Pr0Ca1app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/Pr0Ca1app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index 4c19a13..3108ebe 100644 Binary files a/Pr0Ca1app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/Pr0Ca1app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/build.gradle b/build.gradle index e6b32bc..077cb2f 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.4' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0b4b06c..1bac3fb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 25 03:49:45 CST 2017 +#Sun May 26 23:44:53 CDT 2019 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.4-all.zip