diff --git a/.gitignore b/.gitignore
index 5edb4ee..20fac51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,191 @@
-*.iml
-.gradle
-/local.properties
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-.DS_Store
/build
-/captures
-.externalNativeBuild
+### Java template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn. Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### Gradle template
+.gradle
+**/build/
+!src/**/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Avoid ignore Gradle wrappper properties
+!gradle-wrapper.properties
+
+# Cache of project
+.gradletasknamecache
+
+# Eclipse Gradle plugin generated files
+# Eclipse Core
+.project
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+### Android template
+# 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
+
+### Kotlin template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+
+
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
deleted file mode 100644
index e40c491..0000000
--- a/.idea/assetWizardSettings.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
deleted file mode 100644
index cdcede8..0000000
Binary files a/.idea/caches/build_file_checksums.ser and /dev/null differ
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
deleted file mode 100644
index ffc450d..0000000
Binary files a/.idea/caches/gradle_models.ser and /dev/null differ
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 7643783..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- xmlns:android
-
- ^$
-
-
-
-
-
-
-
-
- xmlns:.*
-
- ^$
-
-
- BY_NAME
-
-
-
-
-
-
- .*:id
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- .*:name
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- name
-
- ^$
-
-
-
-
-
-
-
-
- style
-
- ^$
-
-
-
-
-
-
-
-
- .*
-
- ^$
-
-
- BY_NAME
-
-
-
-
-
-
- .*
-
- http://schemas.android.com/apk/res/android
-
-
- ANDROID_ATTRIBUTE_ORDER
-
-
-
-
-
-
- .*
-
- .*
-
-
- BY_NAME
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 79ee123..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index fb7f4a8..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index e116abe..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 3cfa2c0..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index d830033..0000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
deleted file mode 100644
index 84609ef..0000000
--- a/.idea/kotlinc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 041240c..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,47 +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/app/.gitignore b/app/.gitignore
index 796b96d..f96ec13 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1 +1,190 @@
/build
+### Java template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn. Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### Gradle template
+.gradle
+**/build/
+!src/**/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Avoid ignore Gradle wrappper properties
+!gradle-wrapper.properties
+
+# Cache of project
+.gradletasknamecache
+
+# Eclipse Gradle plugin generated files
+# Eclipse Core
+.project
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+### Android template
+# 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
+
+### Kotlin template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+
diff --git a/app/.idea/caches/build_file_checksums.ser b/app/.idea/caches/build_file_checksums.ser
deleted file mode 100644
index ccaac80..0000000
Binary files a/app/.idea/caches/build_file_checksums.ser and /dev/null differ
diff --git a/app/.idea/codeStyles/Project.xml b/app/.idea/codeStyles/Project.xml
deleted file mode 100644
index 30aa626..0000000
--- a/app/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/gradle.xml b/app/.idea/gradle.xml
deleted file mode 100644
index d417c89..0000000
--- a/app/.idea/gradle.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__android_android_28.xml b/app/.idea/libraries/Gradle__android_android_28.xml
deleted file mode 100644
index 8fdf5a1..0000000
--- a/app/.idea/libraries/Gradle__android_android_28.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml b/app/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml
deleted file mode 100644
index bf16fff..0000000
--- a/app/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1.xml b/app/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1.xml
deleted file mode 100644
index 0d2f244..0000000
--- a/app/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml b/app/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml
deleted file mode 100644
index 27b1867..0000000
--- a/app/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1.xml b/app/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1.xml
deleted file mode 100644
index d9b46fa..0000000
--- a/app/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1.xml b/app/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1.xml
deleted file mode 100644
index fe1c3f3..0000000
--- a/app/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1.xml b/app/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1.xml
deleted file mode 100644
index 1a8b0d3..0000000
--- a/app/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1.xml b/app/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1.xml
deleted file mode 100644
index b6a4725..0000000
--- a/app/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0.xml
deleted file mode 100644
index 9b4aa14..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0.xml
deleted file mode 100644
index 7d90461..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0.xml
deleted file mode 100644
index 0904cde..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml b/app/.idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml
deleted file mode 100644
index 80e4d73..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3.xml b/app/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3.xml
deleted file mode 100644
index 105b126..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_3_jar.xml b/app/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_3_jar.xml
deleted file mode 100644
index c0adf88..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_3_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0.xml
deleted file mode 100644
index 0c39794..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0.xml
deleted file mode 100644
index de62ff1..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_customview_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_customview_28_0_0.xml
deleted file mode 100644
index d8f5911..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_customview_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0.xml
deleted file mode 100644
index 422e883..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0.xml
deleted file mode 100644
index adafbec..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0.xml
deleted file mode 100644
index 3c7c0f8..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_loader_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_loader_28_0_0.xml
deleted file mode 100644
index d15516b..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_loader_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0.xml
deleted file mode 100644
index abb32b5..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_print_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_print_28_0_0.xml
deleted file mode 100644
index 83ea00b..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_print_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0.xml
deleted file mode 100644
index eb56b40..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml b/app/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml
deleted file mode 100644
index 0fdecce..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0.xml
deleted file mode 100644
index 12c1bc8..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0.xml
deleted file mode 100644
index 0601ded..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0.xml
deleted file mode 100644
index 6a84b31..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0.xml
deleted file mode 100644
index 43f8a2c..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0.xml
deleted file mode 100644
index 4a21686..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0.xml
deleted file mode 100644
index baa31d9..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0.xml
deleted file mode 100644
index f1f1533..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0.xml
deleted file mode 100644
index 3153324..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2.xml b/app/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2.xml
deleted file mode 100644
index 3b001e0..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2.xml b/app/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2.xml
deleted file mode 100644
index 11ce3ac..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2.xml b/app/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2.xml
deleted file mode 100644
index bd7e88d..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2.xml b/app/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2.xml
deleted file mode 100644
index f389004..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0.xml
deleted file mode 100644
index 6a313b1..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0.xml b/app/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0.xml
deleted file mode 100644
index 5999d2f..0000000
--- a/app/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml b/app/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml
deleted file mode 100644
index 947e251..0000000
--- a/app/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_google_code_gson_gson_2_7_jar.xml b/app/.idea/libraries/Gradle__com_google_code_gson_gson_2_7_jar.xml
deleted file mode 100644
index 2f5eebc..0000000
--- a/app/.idea/libraries/Gradle__com_google_code_gson_gson_2_7_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml b/app/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
deleted file mode 100644
index 5c4dd4e..0000000
--- a/app/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_4_1_jar.xml b/app/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_4_1_jar.xml
deleted file mode 100644
index 18b4c5f..0000000
--- a/app/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_4_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__com_squareup_okio_okio_1_9_0_jar.xml b/app/.idea/libraries/Gradle__com_squareup_okio_okio_1_9_0_jar.xml
deleted file mode 100644
index d3e4934..0000000
--- a/app/.idea/libraries/Gradle__com_squareup_okio_okio_1_9_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml b/app/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
deleted file mode 100644
index f9c9a30..0000000
--- a/app/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__junit_junit_4_12_jar.xml b/app/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
deleted file mode 100644
index f4f25a8..0000000
--- a/app/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml b/app/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
deleted file mode 100644
index 5855a29..0000000
--- a/app/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml b/app/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
deleted file mode 100644
index 50cf2b9..0000000
--- a/app/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml b/app/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
deleted file mode 100644
index a5eaca5..0000000
--- a/app/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml b/app/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
deleted file mode 100644
index b4dabdc..0000000
--- a/app/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/misc.xml b/app/.idea/misc.xml
deleted file mode 100644
index 39c65f6..0000000
--- a/app/.idea/misc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/modules.xml b/app/.idea/modules.xml
deleted file mode 100644
index e653067..0000000
--- a/app/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/runConfigurations.xml b/app/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/app/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.idea/workspace.xml b/app/.idea/workspace.xml
deleted file mode 100644
index da7f2bb..0000000
--- a/app/.idea/workspace.xml
+++ /dev/null
@@ -1,2216 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- C:\Users\aa\AppData\Roaming\Subversion
-
-
-
-
- 1559804380428
-
-
- 1559804380428
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 1d3175a..c9e99ea 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,17 @@
plugins {
id 'com.android.application'
- id 'kotlin-android'
- id 'kotlin-kapt'
+ id 'com.android.legacy-kapt'
}
//apply plugin: 'com.tencent.tinker.patch'
android {
+ namespace 'com.dhl.wanandroid'
compileSdkVersion 31
+ buildFeatures {
+ buildConfig true
+ }
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ sourceCompatibility JavaVersion.VERSION_17
+ targetCompatibility JavaVersion.VERSION_17
}
defaultConfig {
@@ -24,13 +27,13 @@ android {
release {
minifyEnabled true
//signingConfig signingConfigs.release
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
debug {
//debuggable true
minifyEnabled false
// signingConfig signingConfigs.release
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
@@ -38,13 +41,9 @@ android {
// javaMaxHeapSize "4g"
// }
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
- kotlinOptions {
- jvmTarget = 1.8
+ sourceCompatibility JavaVersion.VERSION_17
+ targetCompatibility JavaVersion.VERSION_17
}
-
}
dependencies {
@@ -61,16 +60,15 @@ dependencies {
implementation 'androidx.navigation:navigation-fragment-ktx:2.2.2'
implementation 'androidx.navigation:navigation-ui-ktx:2.2.2'
annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
- implementation 'com.blankj:utilcode:1.25.8'
+ implementation 'com.blankj:utilcode:1.30.7'
implementation 'io.github.scwang90:refresh-layout-kernel:2.0.5' //核心必须依赖
implementation 'io.github.scwang90:refresh-header-classics:2.0.5'
implementation 'io.github.scwang90:refresh-header-material:2.0.5'
implementation 'com.zhy:base-rvadapter:3.0.3'
implementation 'com.youth.banner:banner:1.4.10'
- implementation 'com.just.agentweb:agentweb:4.0.3-beta'
+ implementation 'com.just.agentweb:agentweb:4.1.4'
implementation 'com.hyman:flowlayout-lib:1.1.2'
- implementation "androidx.core:core-ktx:1.6.0"
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+ implementation "androidx.core:core-ktx:1.7.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.3.0"
// 协程
@@ -90,12 +88,9 @@ dependencies {
implementation 'com.afollestad.material-dialogs:color:3.3.0'
implementation "androidx.paging:paging-runtime:3.0.1"
- def work_version = "2.6.0"
+ def work_version = "2.7.1"
// Kotlin + coroutines
implementation "androidx.work:work-runtime-ktx:$work_version"
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
}
-repositories {
- mavenCentral()
-}
diff --git a/app/gradle/wrapper/gradle-wrapper.jar b/app/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 7a3265e..0000000
Binary files a/app/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/app/gradlew b/app/gradlew
old mode 100644
new mode 100755
diff --git a/app/release/output.json b/app/release/output.json
deleted file mode 100644
index e895323..0000000
--- a/app/release/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1},"path":"app-release.apk","properties":{"packageId":"com.dhl.wanandroid","split":"","minSdkVersion":"19"}}]
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2e08170..e4ee29f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
+ xmlns:tools="http://schemas.android.com/tools">
@@ -16,6 +15,11 @@
android:networkSecurityConfig="@xml/network_security_config"
android:supportsRtl="true"
android:theme="@style/AppTheme">
+
+
-
\ No newline at end of file
+
diff --git a/app/src/main/java/com/dhl/wanandroid/activity/RegisterActivity.java b/app/src/main/java/com/dhl/wanandroid/activity/RegisterActivity.java
index 7847d75..49d3d4d 100644
--- a/app/src/main/java/com/dhl/wanandroid/activity/RegisterActivity.java
+++ b/app/src/main/java/com/dhl/wanandroid/activity/RegisterActivity.java
@@ -70,17 +70,13 @@ protected void onCreate(Bundle savedInstanceState) {
public void onClick(View view) {
- switch (view.getId()) {
- case R.id.bt_register:
+ if (view.getId() == R.id.bt_register) {
String userName = et_username.getText().toString();
String password = et_password.getText().toString();
String repeatPassword = et_repeatpassword.getText().toString();
register(userName, password, repeatPassword);
- break;
-
- case R.id.fab:
- animateRevealClose();
- break;
+ } else if (view.getId() == R.id.fab) {
+ animateRevealClose();
}
}
diff --git a/app/src/main/java/com/dhl/wanandroid/drawable/TextDrawable.kt b/app/src/main/java/com/dhl/wanandroid/drawable/TextDrawable.kt
index 622cd78..b91303f 100644
--- a/app/src/main/java/com/dhl/wanandroid/drawable/TextDrawable.kt
+++ b/app/src/main/java/com/dhl/wanandroid/drawable/TextDrawable.kt
@@ -252,7 +252,7 @@ class TextDrawable private constructor(builder: Builder) : ShapeDrawable(builder
radius = builder.radius
// text and color
- text = if (builder.toUpperCase) builder.text.toUpperCase() else builder.text
+ text = if (builder.toUpperCase) builder.text.uppercase() else builder.text
color = builder.color
// text paint settings
@@ -277,4 +277,4 @@ class TextDrawable private constructor(builder: Builder) : ShapeDrawable(builder
val paint = paint
paint.color = color
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/dhl/wanandroid/image/ImageWork.kt b/app/src/main/java/com/dhl/wanandroid/image/ImageWork.kt
index 724ec08..5cee63e 100644
--- a/app/src/main/java/com/dhl/wanandroid/image/ImageWork.kt
+++ b/app/src/main/java/com/dhl/wanandroid/image/ImageWork.kt
@@ -84,8 +84,10 @@ class ImageWork(val appContext: Context, workerParams: WorkerParameters):
imageInfoList.let {
val imageInfo = it?.get(0)
Log.d(TAG, "imageInfo = $imageInfo")
- val image = "http://s.cn.bing.net" + imageInfo?.url
- downLoadImage(image, imageInfo)
+ imageInfo?.let { splash ->
+ val image = "http://s.cn.bing.net" + splash.url
+ downLoadImage(image, splash)
+ }
}
}
diff --git a/app/src/main/java/com/dhl/wanandroid/service/SplashImageService.kt b/app/src/main/java/com/dhl/wanandroid/service/SplashImageService.kt
index 188e48d..2dae125 100644
--- a/app/src/main/java/com/dhl/wanandroid/service/SplashImageService.kt
+++ b/app/src/main/java/com/dhl/wanandroid/service/SplashImageService.kt
@@ -90,8 +90,10 @@ class SplashImageService : IntentService("SplashImageService") {
imageInfoList.let {
val imageInfo = it?.get(0)
Log.e(TAG, "imageInfo = $imageInfo")
- val image = "http://s.cn.bing.net" + imageInfo?.url
- handleActionFoo(image, imageInfo)
+ imageInfo?.let { splash ->
+ val image = "http://s.cn.bing.net" + splash.url
+ handleActionFoo(image, splash)
+ }
}
}
@@ -148,4 +150,4 @@ class SplashImageService : IntentService("SplashImageService") {
context.startService(intent)
}
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/dhl/wanandroid/vm/MainViewModel.kt b/app/src/main/java/com/dhl/wanandroid/vm/MainViewModel.kt
index 5aa628e..234a51f 100644
--- a/app/src/main/java/com/dhl/wanandroid/vm/MainViewModel.kt
+++ b/app/src/main/java/com/dhl/wanandroid/vm/MainViewModel.kt
@@ -88,10 +88,10 @@ class MainViewModel : BaseViewModel() {
}.flow.cachedIn(viewModelScope)
}
- fun getTopArticles(): LiveData> {
+ fun getTopArticles(): LiveData> {
viewModelScope.launch {
val topArticlesResponse = api.getTopArticle()
- if (topArticlesResponse?.isSuccessful) {
+ if (topArticlesResponse?.isSuccessful == true) {
val topArticles =
topArticlesResponse.body()?.data?.map { it.apply { isTop = true } }
?: emptyList()
diff --git a/build.gradle b/build.gradle
index 6caa688..49cae3a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,32 +1,9 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
- ext.kotlin_version = '1.6.0'
-
- repositories {
- maven{url 'http://maven.aliyun.com/nexus/content/groups/public/'}
- google()
- jcenter()
- mavenCentral()
- }
- dependencies {
- classpath "com.android.tools.build:gradle:4.1.1"
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- //classpath ('com.tencent.tinker:tinker-patch-gradle-plugin:1.9.1')
-
-
- // NOTE: Do not place your application dependencies here; they belong
- // in the individual module build.gradle files
- }
-}
-
-allprojects {
- repositories {
- google()
- jcenter()
- }
+plugins {
+ id 'com.android.application' version '9.2.0' apply false
+ id 'com.android.library' version '9.2.0' apply false
+ id 'com.android.legacy-kapt' version '9.2.0' apply false
}
-task clean(type: Delete) {
- delete rootProject.buildDir
+tasks.register('clean', Delete) {
+ delete rootProject.layout.buildDirectory
}
diff --git a/commom-lib/build.gradle b/commom-lib/build.gradle
index 030b5fc..ab129a1 100644
--- a/commom-lib/build.gradle
+++ b/commom-lib/build.gradle
@@ -1,11 +1,15 @@
plugins {
id 'com.android.library'
- id 'org.jetbrains.kotlin.android'
- id 'kotlin-kapt'
+ id 'com.android.legacy-kapt'
}
android {
+ namespace 'com.dhl.commonlibrary'
compileSdkVersion 31
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_17
+ targetCompatibility JavaVersion.VERSION_17
+ }
defaultConfig {
minSdkVersion 21
targetSdkVersion 31
@@ -41,8 +45,8 @@ dependencies {
api 'androidx.preference:preference-ktx:1.1.1'
api 'com.afollestad.material-dialogs:core:3.3.0'
api 'com.afollestad.material-dialogs:color:3.3.0'
- def work_version = "2.6.0"
+ def work_version = "2.7.1"
// Kotlin + coroutines
api "androidx.work:work-runtime-ktx:$work_version"
- api "androidx.core:core-ktx:1.6.0"
-}
\ No newline at end of file
+ api "androidx.core:core-ktx:1.7.0"
+}
diff --git a/commom-lib/src/main/AndroidManifest.xml b/commom-lib/src/main/AndroidManifest.xml
index 262a688..8072ee0 100644
--- a/commom-lib/src/main/AndroidManifest.xml
+++ b/commom-lib/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 7a3265e..0000000
Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8f000f4..090db89 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ 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
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/settings.gradle b/settings.gradle
index 486e97b..115db9e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,20 @@
+pluginManagement {
+ repositories {
+ google()
+ mavenCentral()
+ gradlePluginPortal()
+ }
+}
+
+dependencyResolutionManagement {
+ repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+ repositories {
+ google()
+ mavenCentral()
+ // Compatibility mirror for legacy dependencies that were only published to JCenter.
+ maven { url 'https://maven.aliyun.com/repository/public' }
+ }
+}
+
include ':app'
-include ':baselib'
-include ':libcommon'
-include ':lib_common'
include ':commom-lib'