Merge pull request #24 from Crazy-Marvin/development

Vacation Days v2.0
Crazy-Marvin · Mar 9, 2022 · 6d7ce7e · 6d7ce7e
2 parents 09c18cb + a2213a5
commit 6d7ce7e
Show file tree

Hide file tree

Showing 23 changed files with 72 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,37 @@
 .externalNativeBuild
 .cxx
 local.properties
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Log/OS Files
+*.log
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+output.json
+
+# IntelliJ
+*.iml
+.idea/
+misc.xml
+deploymentTargetDropDown.xml
+render.experimental.xml
+
+# Keystore files
+*.jks
+*.keystore
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Android Profiling
+*.hprof
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,14 +4,14 @@ plugins {
 
 android {
     compileSdkVersion 31
-    buildToolsVersion "29.0.3"
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "rocks.poopjournal.vacationdays"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "2.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -37,12 +37,12 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation 'com.squareup:android-times-square:1.6.5@aar'
-    implementation 'com.google.android.material:material:1.1.0'
+    implementation 'com.google.android.material:material:1.5.0'
     implementation 'com.github.sundeepk:compact-calendar-view:3.0.0'
     implementation 'de.hdodenhof:circleimageview:2.2.0'
     implementation 'com.ornach.nobobutton:nobobutton:1.6'
     implementation 'com.savvi.datepicker:rangepicker:1.3.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'com.wdullaer:materialdatetimepicker:3.5.1'
-    implementation 'com.opencsv:opencsv:4.6'
+    implementation 'com.opencsv:opencsv:5.6'
 }
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "rocks.poopjournal.vacationdays",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "1.0",
+      "outputFile": "app-release.apk"
+    }
+  ],
+  "elementType": "File"
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -18,7 +18,8 @@
         <activity android:name="rocks.poopjournal.vacationdays.SettingsActivity"></activity>
         <activity android:name="rocks.poopjournal.vacationdays.DatePicker" />
         <activity android:name="rocks.poopjournal.vacationdays.About" />
-        <activity android:name="rocks.poopjournal.vacationdays.MainActivity">
+        <activity android:name="rocks.poopjournal.vacationdays.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

diff --git a/app/src/main/res/drawable-v24/logo.png b/app/src/main/res/drawable-v24/logo.png
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.3"
+        classpath 'com.android.tools.build:gradle:7.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/fastlane/metadata/android/en-US/changelogs/3.txt b/fastlane/metadata/android/en-US/changelogs/3.txt
@@ -1,2 +1 @@
 Little improvements under the hood
-Fixed Fastlane setup
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1.jpeg b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1.jpeg
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2.jpeg b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2.jpeg
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/3.jpeg b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/3.jpeg
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/4.jpeg b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/4.jpeg
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/5.jpeg b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/5.jpeg
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/6.jpeg b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/6.jpeg
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/1.jpg b/fastlane/metadata/android/en-US/images/tenInchScreenshots/1.jpg
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/2.jpg b/fastlane/metadata/android/en-US/images/tenInchScreenshots/2.jpg
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/3.jpg b/fastlane/metadata/android/en-US/images/tenInchScreenshots/3.jpg
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/4.jpg b/fastlane/metadata/android/en-US/images/tenInchScreenshots/4.jpg
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/5.jpg b/fastlane/metadata/android/en-US/images/tenInchScreenshots/5.jpg
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/6.jpg b/fastlane/metadata/android/en-US/images/tenInchScreenshots/6.jpg
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jan 25 17:40:43 PKT 2022
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+#Wed Mar 02 21:53:46 CET 2022
+distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME