From 0f7211c83c11e64c3115d0245959d9695cdf56d0 Mon Sep 17 00:00:00 2001
From: Federico Navarrete <darklord.navarrete@gmail.com>
Date: Fri, 31 Jul 2020 21:31:07 +0200
Subject: [PATCH] Upgraded

- Upgraded to AndroidX.
- Removed old libraries.
- Removed old Androids Support and Re-targetted to Android 10+.
- Merged with:

https://github.com/florent37/BubbleTab/pull/9

https://github.com/florent37/BubbleTab/pull/12
---
 .gitignore                                    |   2 +
 .idea/caches/build_file_checksums.ser         | Bin 0 -> 588 bytes
 .idea/codeStyles/Project.xml                  | 116 ++++++++++++++++
 .idea/compiler.xml                            |  22 ---
 .idea/copyright/profiles_settings.xml         |   3 -
 .idea/encodings.xml                           |   6 -
 .idea/gradle.xml                              |   3 +
 .idea/jarRepositories.xml                     |  30 +++++
 ...__androidx_activity_activity_1_0_0_aar.xml |  13 ++
 ...droidx_annotation_annotation_1_1_0_jar.xml |  13 ++
 ...androidx_appcompat_appcompat_1_1_0_aar.xml |  16 +++
 ...ppcompat_appcompat_resources_1_1_0_aar.xml |  13 ++
 ...droidx_arch_core_core_common_2_1_0_jar.xml |  11 ++
 ...roidx_arch_core_core_runtime_2_0_0_aar.xml |  13 ++
 ...__androidx_cardview_cardview_1_0_0_aar.xml |  13 ++
 ...droidx_collection_collection_1_1_0_jar.xml |  11 ++
 ...atorlayout_coordinatorlayout_1_1_0_aar.xml |  16 +++
 .../Gradle__androidx_core_core_1_1_0_aar.xml  |  16 +++
 ..._cursoradapter_cursoradapter_1_0_0_aar.xml |  13 ++
 ...droidx_customview_customview_1_0_0_aar.xml |  13 ++
 ...dx_drawerlayout_drawerlayout_1_0_0_aar.xml |  16 +++
 ...__androidx_fragment_fragment_1_1_0_aar.xml |  16 +++
 ...dx_interpolator_interpolator_1_0_0_aar.xml |  13 ++
 ...x_lifecycle_lifecycle_common_2_1_0_jar.xml |  11 ++
 ...lifecycle_lifecycle_livedata_2_0_0_aar.xml |  13 ++
 ...ycle_lifecycle_livedata_core_2_0_0_aar.xml |  13 ++
 ..._lifecycle_lifecycle_runtime_2_1_0_aar.xml |  13 ++
 ...ifecycle_lifecycle_viewmodel_2_1_0_aar.xml |  13 ++
 ...adle__androidx_loader_loader_1_0_0_aar.xml |  13 ++
 ...dx_recyclerview_recyclerview_1_1_0_aar.xml |  16 +++
 ...droidx_savedstate_savedstate_1_0_0_aar.xml |  13 ++
 ...droidx_transition_transition_1_2_0_aar.xml |  16 +++
 ...ectordrawable_vectordrawable_1_1_0_aar.xml |  13 ++
 ...able_vectordrawable_animated_1_1_0_aar.xml |  13 ++
 ...rcelable_versionedparcelable_1_1_0_aar.xml |  13 ++
 ...droidx_viewpager2_viewpager2_1_0_0_aar.xml |  16 +++
 ...androidx_viewpager_viewpager_1_0_0_aar.xml |  13 ++
 ...le_android_material_material_1_1_0_aar.xml |  16 +++
 ...r.xml => Gradle__junit_junit_4_12_jar.xml} |   6 +-
 .../Gradle__junit_junit_4_13_jar.xml          |  13 ++
 ...e__org_hamcrest_hamcrest_core_1_3_jar.xml} |   6 +-
 .../android_arch_core_common_1_0_0_jar.xml    |  11 --
 ...ndroid_arch_lifecycle_common_1_0_0_jar.xml |  11 --
 .../android_arch_lifecycle_runtime_1_0_0.xml  |  12 --
 ...upport_animated_vector_drawable_26_1_0.xml |  12 --
 ...om_android_support_appcompat_v7_26_1_0.xml |  12 --
 ...com_android_support_cardview_v7_26_1_0.xml |  12 --
 ...android_support_recyclerview_v7_26_1_0.xml |  12 --
 ...support_support_annotations_26_1_0_jar.xml |  11 --
 ..._android_support_support_compat_26_1_0.xml |  12 --
 ...android_support_support_core_ui_26_1_0.xml |  12 --
 ...roid_support_support_core_utils_26_1_0.xml |  12 --
 ...ndroid_support_support_fragment_26_1_0.xml |  12 --
 ...id_support_support_media_compat_26_1_0.xml |  12 --
 .../com_android_support_support_v4_26_1_0.xml |  12 --
 ...support_support_vector_drawable_26_1_0.xml |  12 --
 .../com_jakewharton_butterknife_7_0_1_jar.xml |  11 --
 .idea/markdown-navigator.xml                  |  72 ----------
 .../markdown-navigator/profiles_settings.xml  |   3 -
 .idea/misc.xml                                |  29 +---
 .idea/modules.xml                             |   6 +-
 .idea/vcs.xml                                 |   2 +-
 app/build.gradle                              |  29 ++--
 .../sample/BubbleTabMainActivity.java         |  17 +--
 .../bubbletab/sample/FakeAdapter.java         |  10 +-
 .../bubbletab/sample/FakeFragment.java        |  16 +--
 .../res/layout/bubbletab_activity_main.xml    |   2 +-
 app/src/main/res/layout/bubbletab_cell.xml    |   2 +-
 app/src/main/res/layout/bubbletab_page.xml    |   4 +-
 bubbletab/build.gradle                        |  17 ++-
 .../github/florent37/bubbletab/BubbleTab.java | 127 ++++++++++++------
 build.gradle                                  |  18 +--
 gradle.properties                             |   4 +-
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 74 files changed, 743 insertions(+), 425 deletions(-)
 create mode 100644 .idea/caches/build_file_checksums.ser
 create mode 100644 .idea/codeStyles/Project.xml
 delete mode 100644 .idea/compiler.xml
 delete mode 100644 .idea/copyright/profiles_settings.xml
 delete mode 100644 .idea/encodings.xml
 create mode 100644 .idea/jarRepositories.xml
 create mode 100644 .idea/libraries/Gradle__androidx_activity_activity_1_0_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_annotation_annotation_1_1_0_jar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_arch_core_core_common_2_1_0_jar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_collection_collection_1_1_0_jar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_1_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_core_core_1_1_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_1_0_jar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_1_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_transition_transition_1_2_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml
 create mode 100644 .idea/libraries/Gradle__com_google_android_material_material_1_1_0_aar.xml
 rename .idea/libraries/{junit_junit_4_12_jar.xml => Gradle__junit_junit_4_12_jar.xml} (64%)
 create mode 100644 .idea/libraries/Gradle__junit_junit_4_13_jar.xml
 rename .idea/libraries/{org_hamcrest_hamcrest_core_1_3_jar.xml => Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml} (63%)
 delete mode 100644 .idea/libraries/android_arch_core_common_1_0_0_jar.xml
 delete mode 100644 .idea/libraries/android_arch_lifecycle_common_1_0_0_jar.xml
 delete mode 100644 .idea/libraries/android_arch_lifecycle_runtime_1_0_0.xml
 delete mode 100644 .idea/libraries/com_android_support_animated_vector_drawable_26_1_0.xml
 delete mode 100644 .idea/libraries/com_android_support_appcompat_v7_26_1_0.xml
 delete mode 100644 .idea/libraries/com_android_support_cardview_v7_26_1_0.xml
 delete mode 100644 .idea/libraries/com_android_support_recyclerview_v7_26_1_0.xml
 delete mode 100644 .idea/libraries/com_android_support_support_annotations_26_1_0_jar.xml
 delete mode 100644 .idea/libraries/com_android_support_support_compat_26_1_0.xml
 delete mode 100644 .idea/libraries/com_android_support_support_core_ui_26_1_0.xml
 delete mode 100644 .idea/libraries/com_android_support_support_core_utils_26_1_0.xml
 delete mode 100644 .idea/libraries/com_android_support_support_fragment_26_1_0.xml
 delete mode 100644 .idea/libraries/com_android_support_support_media_compat_26_1_0.xml
 delete mode 100644 .idea/libraries/com_android_support_support_v4_26_1_0.xml
 delete mode 100644 .idea/libraries/com_android_support_support_vector_drawable_26_1_0.xml
 delete mode 100644 .idea/libraries/com_jakewharton_butterknife_7_0_1_jar.xml
 delete mode 100644 .idea/markdown-navigator.xml
 delete mode 100644 .idea/markdown-navigator/profiles_settings.xml

diff --git a/.gitignore b/.gitignore
index f6b286c..9c3fe67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,5 @@ captures/
 
 # Keystore files
 *.jks
+BubbleTab-sample.zip
+BubbleTab.zip
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
new file mode 100644
index 0000000000000000000000000000000000000000..50ba5c851236d765f91102b5cc9e44f2622706a3
GIT binary patch
literal 588
zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2
zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}<i#MFTj`TnT;dMa8(f)}9Fm!vT3nKt
zTj0aMpIeEdv4nx&Co8cmQNOe#Ge_SyvB0{bfPsOrcv<8sexSPqL2`N^IX#cW;tZfX
zEBmd3hs6>uGBYr_F>vMNC#JY1CYR(Fc`|U8WE7<qXXNLkR20}dFn|D0IR}sw0AltM
z27$zaf|w+b)1lrfEn;Abc3SgU{0AFH$O9$@29VVZ0&Sc4#k|(;f4E67Ot8;CMHuMB
z;?$Co%)Insn8reeItDh7+J+;|KHqILH#b^^oJl@DaZd>Y4~h+Ng>8Ym_9rjD|1h*m
zbav%D-BzG;a`KZCb3j2`kXlrdnOa;5SA1u?MJNZ$qU-zEwJaDouP-cN&~Ubj2`x@7
zDvn7@O-U_^fjT4x5kDA)T#@a$+0U?v<z)lsj5j}=>Pi^Il1h`3a#BkYlTd>JZf|u}
q(Bp)NWhZ94*GxB_w>iCpK@g7xjMA>NjucK~>ycWp?T)orMg;%|UCbW<

literal 0
HcmV?d00001

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..681f41a
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,116 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 96cc43e..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index f67d844..661678c 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="1.8 (2)" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..1593062
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://maven.google.com" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_aar.xml
new file mode 100644
index 0000000..50801a6
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.activity:activity:1.0.0@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/559a81a77b43bd0dfe0c076ffcddf76c/jetified-activity-1.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/559a81a77b43bd0dfe0c076ffcddf76c/jetified-activity-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/559a81a77b43bd0dfe0c076ffcddf76c/jetified-activity-1.0.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.activity/activity/1.0.0/28eb83e6a29ac3fbb87aa632cfa0e644a313f491/activity-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_annotation_annotation_1_1_0_jar.xml b/.idea/libraries/Gradle__androidx_annotation_annotation_1_1_0_jar.xml
new file mode 100644
index 0000000..5b17db6
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_annotation_annotation_1_1_0_jar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.annotation:annotation:1.1.0@jar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/408af38ec57369afe3fd6466e1c4bfdd5f15fc92/annotation-1.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/8b7bdc00eb4d998bfbc76767b098620990f2a805/annotation-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_aar.xml
new file mode 100644
index 0000000..b4d252f
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_aar.xml
@@ -0,0 +1,16 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.appcompat:appcompat:1.1.0@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/62c28c49af983be30a996f3422c32a7f/appcompat-1.1.0/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/62c28c49af983be30a996f3422c32a7f/appcompat-1.1.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/62c28c49af983be30a996f3422c32a7f/appcompat-1.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/62c28c49af983be30a996f3422c32a7f/appcompat-1.1.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.appcompat/appcompat/1.1.0/9865019bbd2d95e41dede3d8ebf964aa93f97766/appcompat-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_aar.xml
new file mode 100644
index 0000000..1033c62
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.appcompat:appcompat-resources:1.1.0@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/871d8b9665716137d5db865c89164fb0/jetified-appcompat-resources-1.1.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/871d8b9665716137d5db865c89164fb0/jetified-appcompat-resources-1.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/871d8b9665716137d5db865c89164fb0/jetified-appcompat-resources-1.1.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.appcompat/appcompat-resources/1.1.0/a7dcffd1afb81e3c892ad061b33da031c2d7289f/appcompat-resources-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_common_2_1_0_jar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_common_2_1_0_jar.xml
new file mode 100644
index 0000000..a7f501b
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_arch_core_core_common_2_1_0_jar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.arch.core:core-common:2.1.0@jar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/80ac2d7c8e6400ce2fbc663cd1a7e1cbef38c4b8/core-common-2.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml
new file mode 100644
index 0000000..53e12c3
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/96089ee5e139887d4a0c6fb25ac2aac8/core-runtime-2.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/96089ee5e139887d4a0c6fb25ac2aac8/core-runtime-2.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/96089ee5e139887d4a0c6fb25ac2aac8/core-runtime-2.0.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-runtime/2.0.0/bc41b287c95bc50a3cd27cb1b7cfb301805ba7f1/core-runtime-2.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml
new file mode 100644
index 0000000..53d1514
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.cardview:cardview:1.0.0@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5573a356ea537225afe8525465e84867/cardview-1.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5573a356ea537225afe8525465e84867/cardview-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5573a356ea537225afe8525465e84867/cardview-1.0.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.cardview/cardview/1.0.0/c9f3ce7ca74ad2c978230f4094ba6804c5166f9c/cardview-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_collection_collection_1_1_0_jar.xml b/.idea/libraries/Gradle__androidx_collection_collection_1_1_0_jar.xml
new file mode 100644
index 0000000..ecb16c3
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_collection_collection_1_1_0_jar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.collection:collection:1.1.0@jar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/bae67b0019fbb38498198fcc2d0282a340b71c5b/collection-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_1_0_aar.xml
new file mode 100644
index 0000000..3b37968
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_1_0_aar.xml
@@ -0,0 +1,16 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9699086ca5ab55ab057dff1ac9087dad/coordinatorlayout-1.1.0/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9699086ca5ab55ab057dff1ac9087dad/coordinatorlayout-1.1.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9699086ca5ab55ab057dff1ac9087dad/coordinatorlayout-1.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9699086ca5ab55ab057dff1ac9087dad/coordinatorlayout-1.1.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.coordinatorlayout/coordinatorlayout/1.1.0/a15529ac349d76a872ae5ef42b84c320c456cd7f/coordinatorlayout-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_core_core_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_core_core_1_1_0_aar.xml
new file mode 100644
index 0000000..f1162d3
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_core_core_1_1_0_aar.xml
@@ -0,0 +1,16 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.core:core:1.1.0@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/32293a2a2b3bcefd5e08b0a2edf8f45a/core-1.1.0/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/32293a2a2b3bcefd5e08b0a2edf8f45a/core-1.1.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/32293a2a2b3bcefd5e08b0a2edf8f45a/core-1.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/32293a2a2b3bcefd5e08b0a2edf8f45a/core-1.1.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.core/core/1.1.0/4ae37fad1fe95b42aa47a720908df37ba5d3c85e/core-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml
new file mode 100644
index 0000000..a28168e
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2cda398c4c3ce5a4068c8be87f27fd1a/cursoradapter-1.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2cda398c4c3ce5a4068c8be87f27fd1a/cursoradapter-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2cda398c4c3ce5a4068c8be87f27fd1a/cursoradapter-1.0.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.cursoradapter/cursoradapter/1.0.0/1e323083b41c31fd4d45510dfce50614963c3c6c/cursoradapter-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml
new file mode 100644
index 0000000..7460d2a
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.customview:customview:1.0.0@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ecab764c09fd4df9f9676ce1cbe90897/customview-1.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ecab764c09fd4df9f9676ce1cbe90897/customview-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ecab764c09fd4df9f9676ce1cbe90897/customview-1.0.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.customview/customview/1.0.0/61f6a717d144dff3a6bda413d9abeeb2bca71581/customview-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml
new file mode 100644
index 0000000..c5296d3
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml
@@ -0,0 +1,16 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ba2813509c4f98f24467406287532038/drawerlayout-1.0.0/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ba2813509c4f98f24467406287532038/drawerlayout-1.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ba2813509c4f98f24467406287532038/drawerlayout-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ba2813509c4f98f24467406287532038/drawerlayout-1.0.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.drawerlayout/drawerlayout/1.0.0/9ecd4ecb7da215ba4c5c3e00bf8d290dad6f2bc5/drawerlayout-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_aar.xml
new file mode 100644
index 0000000..85b43d1
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_aar.xml
@@ -0,0 +1,16 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.fragment:fragment:1.1.0@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/33411fa9e33990420f7a62a8b6c7f0bc/fragment-1.1.0/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/33411fa9e33990420f7a62a8b6c7f0bc/fragment-1.1.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/33411fa9e33990420f7a62a8b6c7f0bc/fragment-1.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/33411fa9e33990420f7a62a8b6c7f0bc/fragment-1.1.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.fragment/fragment/1.1.0/b9ebb04df2cb0cad4419af3c658690bc82aa5706/fragment-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml
new file mode 100644
index 0000000..90fd7e3
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.interpolator:interpolator:1.0.0@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/00a13828906047902cbbdb74965a1117/interpolator-1.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/00a13828906047902cbbdb74965a1117/interpolator-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/00a13828906047902cbbdb74965a1117/interpolator-1.0.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.interpolator/interpolator/1.0.0/fefd5e3cbc479b6b4a9532d05688a1e659e8d3d2/interpolator-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_1_0_jar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_1_0_jar.xml
new file mode 100644
index 0000000..8c4384c
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_1_0_jar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.lifecycle:lifecycle-common:2.1.0@jar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.1.0/c67e7807d9cd6c329b9d0218b2ec4e505dd340b7/lifecycle-common-2.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.1.0/ff1470ebad448355d3722c637c85d5174b584f38/lifecycle-common-2.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml
new file mode 100644
index 0000000..3e34c7b
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1bd9c3efb980ce624dea3252d4e087d5/lifecycle-livedata-2.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1bd9c3efb980ce624dea3252d4e087d5/lifecycle-livedata-2.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1bd9c3efb980ce624dea3252d4e087d5/lifecycle-livedata-2.0.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-livedata/2.0.0/740ce61935bd789380c01178bd8ce402402ebd2f/lifecycle-livedata-2.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml
new file mode 100644
index 0000000..02b0eb0
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1c58c582cb6da6443a5ee170812bbdda/lifecycle-livedata-core-2.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1c58c582cb6da6443a5ee170812bbdda/lifecycle-livedata-core-2.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1c58c582cb6da6443a5ee170812bbdda/lifecycle-livedata-core-2.0.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-livedata-core/2.0.0/c158207594782b42f3a2e08a5a029eb3319e4404/lifecycle-livedata-core-2.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_aar.xml
new file mode 100644
index 0000000..21bcb86
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.lifecycle:lifecycle-runtime:2.1.0@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ebc7a5e4f57559f31baf663663f480a6/lifecycle-runtime-2.1.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ebc7a5e4f57559f31baf663663f480a6/lifecycle-runtime-2.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ebc7a5e4f57559f31baf663663f480a6/lifecycle-runtime-2.1.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-runtime/2.1.0/533a0cd1a095abbdfd08a49c4d34bd0713977034/lifecycle-runtime-2.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_aar.xml
new file mode 100644
index 0000000..36a77f6
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.1.0@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4209693636dbe10c3ef6b65b75bed080/lifecycle-viewmodel-2.1.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4209693636dbe10c3ef6b65b75bed080/lifecycle-viewmodel-2.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4209693636dbe10c3ef6b65b75bed080/lifecycle-viewmodel-2.1.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-viewmodel/2.1.0/bfd86b9887c2343516f82bed91acbab34a45841d/lifecycle-viewmodel-2.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml
new file mode 100644
index 0000000..e7058b3
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.loader:loader:1.0.0@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/15eb681393b109739d4a97a10b771c8b/loader-1.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/15eb681393b109739d4a97a10b771c8b/loader-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/15eb681393b109739d4a97a10b771c8b/loader-1.0.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.loader/loader/1.0.0/b9ef587f3e46c7fe5b00264989764e43ff45cada/loader-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_1_0_aar.xml
new file mode 100644
index 0000000..af00b92
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_1_0_aar.xml
@@ -0,0 +1,16 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a29be069b946bc2c611c01e7e9862dfc/recyclerview-1.1.0/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a29be069b946bc2c611c01e7e9862dfc/recyclerview-1.1.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a29be069b946bc2c611c01e7e9862dfc/recyclerview-1.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a29be069b946bc2c611c01e7e9862dfc/recyclerview-1.1.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.1.0/f2bdf79e1977939817f54a9d3e2f6bc52b63bdd0/recyclerview-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml
new file mode 100644
index 0000000..7f5979c
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.savedstate:savedstate:1.0.0@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/917086d6be4a883781af541ee2a1ce7f/jetified-savedstate-1.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/917086d6be4a883781af541ee2a1ce7f/jetified-savedstate-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/917086d6be4a883781af541ee2a1ce7f/jetified-savedstate-1.0.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.savedstate/savedstate/1.0.0/e6daf87ed227a6f80bb8accb466755a5ee01a652/savedstate-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_transition_transition_1_2_0_aar.xml b/.idea/libraries/Gradle__androidx_transition_transition_1_2_0_aar.xml
new file mode 100644
index 0000000..4bb711f
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_transition_transition_1_2_0_aar.xml
@@ -0,0 +1,16 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.transition:transition:1.2.0@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/562870584525aab5b1a83dc96bc80437/transition-1.2.0/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/562870584525aab5b1a83dc96bc80437/transition-1.2.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/562870584525aab5b1a83dc96bc80437/transition-1.2.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/562870584525aab5b1a83dc96bc80437/transition-1.2.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.transition/transition/1.2.0/65d2a5dab39f120d3f584fdead252ce81ec7dbee/transition-1.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml
new file mode 100644
index 0000000..514f66c
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9cd9dccc1fcd1795f897d84232e75b8b/vectordrawable-1.1.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9cd9dccc1fcd1795f897d84232e75b8b/vectordrawable-1.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9cd9dccc1fcd1795f897d84232e75b8b/vectordrawable-1.1.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.vectordrawable/vectordrawable/1.1.0/1e0694477eed874c50c54b547cc3e5a62a57a62b/vectordrawable-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml
new file mode 100644
index 0000000..8b7b01b
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/771c0e8b329dbc7d2e9464db6b3dc0f3/vectordrawable-animated-1.1.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/771c0e8b329dbc7d2e9464db6b3dc0f3/vectordrawable-animated-1.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/771c0e8b329dbc7d2e9464db6b3dc0f3/vectordrawable-animated-1.1.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.vectordrawable/vectordrawable-animated/1.1.0/871a7705cd03bc246947638c712cdd11378233ff/vectordrawable-animated-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_aar.xml
new file mode 100644
index 0000000..7c8f598
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2227a3ddd3a4c022d7641d9ec62b1785/versionedparcelable-1.1.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2227a3ddd3a4c022d7641d9ec62b1785/versionedparcelable-1.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2227a3ddd3a4c022d7641d9ec62b1785/versionedparcelable-1.1.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.versionedparcelable/versionedparcelable/1.1.0/d9085927216387af679d18b6f472bc0fc5c7cc81/versionedparcelable-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_aar.xml
new file mode 100644
index 0000000..96503ca
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_aar.xml
@@ -0,0 +1,16 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/22f9accc40989476e5421878099602ea/jetified-viewpager2-1.0.0/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/22f9accc40989476e5421878099602ea/jetified-viewpager2-1.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/22f9accc40989476e5421878099602ea/jetified-viewpager2-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/22f9accc40989476e5421878099602ea/jetified-viewpager2-1.0.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.viewpager2/viewpager2/1.0.0/3c3569044e6969f1ee5c3aa03b08e6717a2d782f/viewpager2-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml
new file mode 100644
index 0000000..58feafe
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.viewpager:viewpager:1.0.0@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7fa4d05f6ead491e552348f0ef4bb115/viewpager-1.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7fa4d05f6ead491e552348f0ef4bb115/viewpager-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7fa4d05f6ead491e552348f0ef4bb115/viewpager-1.0.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.viewpager/viewpager/1.0.0/db045f92188b9d247d5f556866f8861ab68528f0/viewpager-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_google_android_material_material_1_1_0_aar.xml b/.idea/libraries/Gradle__com_google_android_material_material_1_1_0_aar.xml
new file mode 100644
index 0000000..28d7cd0
--- /dev/null
+++ b/.idea/libraries/Gradle__com_google_android_material_material_1_1_0_aar.xml
@@ -0,0 +1,16 @@
+<component name="libraryTable">
+  <library name="Gradle: com.google.android.material:material:1.1.0@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8bf3ce05a50c5fdfab8f2f158d67c9cf/material-1.1.0/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8bf3ce05a50c5fdfab8f2f158d67c9cf/material-1.1.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8bf3ce05a50c5fdfab8f2f158d67c9cf/material-1.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8bf3ce05a50c5fdfab8f2f158d67c9cf/material-1.1.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.material/material/1.1.0/7ba5bcd622e3d6d7ab6b9833717c4385e4ba0a51/material-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/junit_junit_4_12_jar.xml b/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
similarity index 64%
rename from .idea/libraries/junit_junit_4_12_jar.xml
rename to .idea/libraries/Gradle__junit_junit_4_12_jar.xml
index a026090..24e5b72 100644
--- a/.idea/libraries/junit_junit_4_12_jar.xml
+++ b/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
@@ -1,9 +1,11 @@
 <component name="libraryTable">
-  <library name="junit:junit:4.12@jar">
+  <library name="Gradle: junit:junit:4.12@jar">
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
     </CLASSES>
-    <JAVADOC />
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/941a8be4506c65f0a9001c08812fb7da1e505e21/junit-4.12-javadoc.jar!/" />
+    </JAVADOC>
     <SOURCES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/Gradle__junit_junit_4_13_jar.xml b/.idea/libraries/Gradle__junit_junit_4_13_jar.xml
new file mode 100644
index 0000000..bf50f62
--- /dev/null
+++ b/.idea/libraries/Gradle__junit_junit_4_13_jar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: junit:junit:4.13@jar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.13/e49ccba652b735c93bd6e6f59760d8254cf597dd/junit-4.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.13/17ed6c7dd587f52c9e7894964eff6a880f0658a/junit-4.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.13/d10a9c3acc6c07a5700e37697b5a6b4dcfb8abf9/junit-4.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/org_hamcrest_hamcrest_core_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
similarity index 63%
rename from .idea/libraries/org_hamcrest_hamcrest_core_1_3_jar.xml
rename to .idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
index 8bc8974..6b1e2e7 100644
--- a/.idea/libraries/org_hamcrest_hamcrest_core_1_3_jar.xml
+++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
@@ -1,9 +1,11 @@
 <component name="libraryTable">
-  <library name="org.hamcrest:hamcrest-core:1.3@jar">
+  <library name="Gradle: org.hamcrest:hamcrest-core:1.3@jar">
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar!/" />
     </CLASSES>
-    <JAVADOC />
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/ad09811315f1d4f5756986575b0ea16b99cd686f/hamcrest-core-1.3-javadoc.jar!/" />
+    </JAVADOC>
     <SOURCES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b/hamcrest-core-1.3-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/android_arch_core_common_1_0_0_jar.xml b/.idea/libraries/android_arch_core_common_1_0_0_jar.xml
deleted file mode 100644
index ee12c7f..0000000
--- a/.idea/libraries/android_arch_core_common_1_0_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="android.arch.core:common:1.0.0@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.0.0/a2d487452376193fc8c103dd2b9bd5f2b1b44563/common-1.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.0.0/a41fa3b9a66f3bdd41f98013a1688e969072aaf2/common-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/android_arch_lifecycle_common_1_0_0_jar.xml b/.idea/libraries/android_arch_lifecycle_common_1_0_0_jar.xml
deleted file mode 100644
index 66e22be..0000000
--- a/.idea/libraries/android_arch_lifecycle_common_1_0_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="android.arch.lifecycle:common:1.0.0@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.0.0/e414a4cb28434e25c4f6aa71426eb20cf4874ae9/common-1.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.0.0/39ce4055689b4b766478265a8c661f4165f26dc3/common-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/android_arch_lifecycle_runtime_1_0_0.xml b/.idea/libraries/android_arch_lifecycle_runtime_1_0_0.xml
deleted file mode 100644
index 3725db1..0000000
--- a/.idea/libraries/android_arch_lifecycle_runtime_1_0_0.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="android.arch.lifecycle:runtime-1.0.0">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/bubbletab/build/intermediates/exploded-aar/android.arch.lifecycle/runtime/1.0.0/jars/classes.jar!/" />
-      <root url="file://$PROJECT_DIR$/bubbletab/build/intermediates/exploded-aar/android.arch.lifecycle/runtime/1.0.0/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/runtime/1.0.0/1dd0298d8c45d8dfa4d038270247327f23df7a3a/runtime-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/com_android_support_animated_vector_drawable_26_1_0.xml b/.idea/libraries/com_android_support_animated_vector_drawable_26_1_0.xml
deleted file mode 100644
index e4966f2..0000000
--- a/.idea/libraries/com_android_support_animated_vector_drawable_26_1_0.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="com.android.support:animated-vector-drawable-26.1.0">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/bubbletab/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/26.1.0/jars/classes.jar!/" />
-      <root url="file://$PROJECT_DIR$/bubbletab/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/26.1.0/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/animated-vector-drawable/26.1.0/91743e9b07667784f471a3c4748e6883cd810084/animated-vector-drawable-26.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/com_android_support_appcompat_v7_26_1_0.xml b/.idea/libraries/com_android_support_appcompat_v7_26_1_0.xml
deleted file mode 100644
index 15c7ec4..0000000
--- a/.idea/libraries/com_android_support_appcompat_v7_26_1_0.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="com.android.support:appcompat-v7-26.1.0">
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/bubbletab/build/intermediates/exploded-aar/com.android.support/appcompat-v7/26.1.0/res" />
-      <root url="jar://$PROJECT_DIR$/bubbletab/build/intermediates/exploded-aar/com.android.support/appcompat-v7/26.1.0/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/appcompat-v7/26.1.0/2b34456c30d6b6e5db5fa3e8fa02f6cebd5531fd/appcompat-v7-26.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/com_android_support_cardview_v7_26_1_0.xml b/.idea/libraries/com_android_support_cardview_v7_26_1_0.xml
deleted file mode 100644
index 7e583c4..0000000
--- a/.idea/libraries/com_android_support_cardview_v7_26_1_0.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="com.android.support:cardview-v7-26.1.0">
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/cardview-v7/26.1.0/res" />
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/cardview-v7/26.1.0/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/cardview-v7/26.1.0/c77de78f36d149b36821993adbb3e11667dca382/cardview-v7-26.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/com_android_support_recyclerview_v7_26_1_0.xml b/.idea/libraries/com_android_support_recyclerview_v7_26_1_0.xml
deleted file mode 100644
index a4e8a98..0000000
--- a/.idea/libraries/com_android_support_recyclerview_v7_26_1_0.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="com.android.support:recyclerview-v7-26.1.0">
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/26.1.0/res" />
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/26.1.0/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/recyclerview-v7/26.1.0/63d6891b399433c913fe91ce95a8456de02d367f/recyclerview-v7-26.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/com_android_support_support_annotations_26_1_0_jar.xml b/.idea/libraries/com_android_support_support_annotations_26_1_0_jar.xml
deleted file mode 100644
index c6c1dfa..0000000
--- a/.idea/libraries/com_android_support_support_annotations_26_1_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="com.android.support:support-annotations:26.1.0@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/26.1.0/814258103cf26a15fcc26ecce35f5b7d24b73f8/support-annotations-26.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/26.1.0/29ca6aaf2d4976c13dd7c836e91bd2a61b697bf3/support-annotations-26.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/com_android_support_support_compat_26_1_0.xml b/.idea/libraries/com_android_support_support_compat_26_1_0.xml
deleted file mode 100644
index f43fc4a..0000000
--- a/.idea/libraries/com_android_support_support_compat_26_1_0.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="com.android.support:support-compat-26.1.0">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/bubbletab/build/intermediates/exploded-aar/com.android.support/support-compat/26.1.0/jars/classes.jar!/" />
-      <root url="file://$PROJECT_DIR$/bubbletab/build/intermediates/exploded-aar/com.android.support/support-compat/26.1.0/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-compat/26.1.0/73bfdb5cca1949a51219d3676700996990ea3b52/support-compat-26.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/com_android_support_support_core_ui_26_1_0.xml b/.idea/libraries/com_android_support_support_core_ui_26_1_0.xml
deleted file mode 100644
index 90ba627..0000000
--- a/.idea/libraries/com_android_support_support_core_ui_26_1_0.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="com.android.support:support-core-ui-26.1.0">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/bubbletab/build/intermediates/exploded-aar/com.android.support/support-core-ui/26.1.0/jars/classes.jar!/" />
-      <root url="file://$PROJECT_DIR$/bubbletab/build/intermediates/exploded-aar/com.android.support/support-core-ui/26.1.0/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-core-ui/26.1.0/4d52cef4a24bf9939de1d256ca9f0974c6e636a4/support-core-ui-26.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/com_android_support_support_core_utils_26_1_0.xml b/.idea/libraries/com_android_support_support_core_utils_26_1_0.xml
deleted file mode 100644
index d146c77..0000000
--- a/.idea/libraries/com_android_support_support_core_utils_26_1_0.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="com.android.support:support-core-utils-26.1.0">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/bubbletab/build/intermediates/exploded-aar/com.android.support/support-core-utils/26.1.0/jars/classes.jar!/" />
-      <root url="file://$PROJECT_DIR$/bubbletab/build/intermediates/exploded-aar/com.android.support/support-core-utils/26.1.0/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-core-utils/26.1.0/2b0c3da7f80880bbf365452b354490a77f085c96/support-core-utils-26.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/com_android_support_support_fragment_26_1_0.xml b/.idea/libraries/com_android_support_support_fragment_26_1_0.xml
deleted file mode 100644
index b579d31..0000000
--- a/.idea/libraries/com_android_support_support_fragment_26_1_0.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="com.android.support:support-fragment-26.1.0">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/bubbletab/build/intermediates/exploded-aar/com.android.support/support-fragment/26.1.0/jars/classes.jar!/" />
-      <root url="file://$PROJECT_DIR$/bubbletab/build/intermediates/exploded-aar/com.android.support/support-fragment/26.1.0/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-fragment/26.1.0/8279b00f5194701ff18363fa2958c5a26670b0ef/support-fragment-26.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/com_android_support_support_media_compat_26_1_0.xml b/.idea/libraries/com_android_support_support_media_compat_26_1_0.xml
deleted file mode 100644
index 2ff2a6f..0000000
--- a/.idea/libraries/com_android_support_support_media_compat_26_1_0.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="com.android.support:support-media-compat-26.1.0">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/bubbletab/build/intermediates/exploded-aar/com.android.support/support-media-compat/26.1.0/jars/classes.jar!/" />
-      <root url="file://$PROJECT_DIR$/bubbletab/build/intermediates/exploded-aar/com.android.support/support-media-compat/26.1.0/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-media-compat/26.1.0/774fd1164ec32514eec562953f723a1920a7fef7/support-media-compat-26.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/com_android_support_support_v4_26_1_0.xml b/.idea/libraries/com_android_support_support_v4_26_1_0.xml
deleted file mode 100644
index 7cb8231..0000000
--- a/.idea/libraries/com_android_support_support_v4_26_1_0.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="com.android.support:support-v4-26.1.0">
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/bubbletab/build/intermediates/exploded-aar/com.android.support/support-v4/26.1.0/res" />
-      <root url="jar://$PROJECT_DIR$/bubbletab/build/intermediates/exploded-aar/com.android.support/support-v4/26.1.0/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-v4/26.1.0/9c53eab3272b3b26583b17facac2e90d264b2788/support-v4-26.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/com_android_support_support_vector_drawable_26_1_0.xml b/.idea/libraries/com_android_support_support_vector_drawable_26_1_0.xml
deleted file mode 100644
index ec6e746..0000000
--- a/.idea/libraries/com_android_support_support_vector_drawable_26_1_0.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="com.android.support:support-vector-drawable-26.1.0">
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/bubbletab/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/26.1.0/res" />
-      <root url="jar://$PROJECT_DIR$/bubbletab/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/26.1.0/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-vector-drawable/26.1.0/7a59c417eb560e5ddc2de20792ad45b38e422a5b/support-vector-drawable-26.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/com_jakewharton_butterknife_7_0_1_jar.xml b/.idea/libraries/com_jakewharton_butterknife_7_0_1_jar.xml
deleted file mode 100644
index ce165f5..0000000
--- a/.idea/libraries/com_jakewharton_butterknife_7_0_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="com.jakewharton:butterknife:7.0.1@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife/7.0.1/d5d13ea991eab0252e3710e5df3d6a9d4b21d461/butterknife-7.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife/7.0.1/ad53343e57ae0969aaf451a19eef381abe2ad3a1/butterknife-7.0.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
deleted file mode 100644
index 7a87d8c..0000000
--- a/.idea/markdown-navigator.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MarkdownProjectSettings">
-    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="NONE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="true" showSelectionInPreview="true">
-      <PanelProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
-      </PanelProvider>
-    </PreviewSettings>
-    <ParserSettings gitHubSyntaxChange="false">
-      <PegdownExtensions>
-        <option name="ABBREVIATIONS" value="false" />
-        <option name="ANCHORLINKS" value="true" />
-        <option name="ASIDE" value="false" />
-        <option name="ATXHEADERSPACE" value="true" />
-        <option name="AUTOLINKS" value="true" />
-        <option name="DEFINITIONS" value="false" />
-        <option name="DEFINITION_BREAK_DOUBLE_BLANK_LINE" value="false" />
-        <option name="FENCED_CODE_BLOCKS" value="true" />
-        <option name="FOOTNOTES" value="false" />
-        <option name="HARDWRAPS" value="false" />
-        <option name="HTML_DEEP_PARSER" value="false" />
-        <option name="INSERTED" value="false" />
-        <option name="QUOTES" value="false" />
-        <option name="RELAXEDHRULES" value="true" />
-        <option name="SMARTS" value="false" />
-        <option name="STRIKETHROUGH" value="true" />
-        <option name="SUBSCRIPT" value="false" />
-        <option name="SUPERSCRIPT" value="false" />
-        <option name="SUPPRESS_HTML_BLOCKS" value="false" />
-        <option name="SUPPRESS_INLINE_HTML" value="false" />
-        <option name="TABLES" value="true" />
-        <option name="TASKLISTITEMS" value="true" />
-        <option name="TOC" value="false" />
-        <option name="WIKILINKS" value="true" />
-      </PegdownExtensions>
-      <ParserOptions>
-        <option name="COMMONMARK_LISTS" value="false" />
-        <option name="DUMMY" value="false" />
-        <option name="EMOJI_SHORTCUTS" value="true" />
-        <option name="FLEXMARK_FRONT_MATTER" value="false" />
-        <option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="false" />
-        <option name="GFM_TABLE_RENDERING" value="true" />
-        <option name="GITBOOK_URL_ENCODING" value="false" />
-        <option name="GITHUB_EMOJI_URL" value="false" />
-        <option name="GITHUB_LISTS" value="true" />
-        <option name="GITHUB_WIKI_LINKS" value="true" />
-        <option name="JEKYLL_FRONT_MATTER" value="false" />
-        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
-      </ParserOptions>
-    </ParserSettings>
-    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="true">
-      <GeneratorProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
-      </GeneratorProvider>
-      <headerTop />
-      <headerBottom />
-      <bodyTop />
-      <bodyBottom />
-    </HtmlSettings>
-    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssTextEnabled="false" isDynamicPageWidth="true">
-      <StylesheetProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
-      </StylesheetProvider>
-      <ScriptProviders />
-      <cssText />
-    </CssSettings>
-    <HtmlExportSettings updateOnSave="false" parentDir="$ProjectFileDir$" targetDir="$ProjectFileDir$" cssDir="" scriptDir="" plainHtml="false" imageDir="" copyLinkedImages="false" imageUniquifyType="0" targetExt="" useTargetExt="false" noCssNoScripts="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" />
-    <LinkMapSettings>
-      <textMaps />
-    </LinkMapSettings>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml
deleted file mode 100644
index 57927c5..0000000
--- a/.idea/markdown-navigator/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="MarkdownNavigator.ProfileManager">
-  <settings default="" pdf-export="" />
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index ba7052b..703e5d4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,30 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
+  <component name="CMakeSettings">
+    <configurations>
+      <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
+    </configurations>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 400f4c8..bd8ddf1 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,9 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/BubbleTab.iml" filepath="$PROJECT_DIR$/BubbleTab.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/bubbletab/bubbletab.iml" filepath="$PROJECT_DIR$/bubbletab/bubbletab.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/BubbleTab.iml" filepath="$PROJECT_DIR$/.idea/modules/BubbleTab.iml" group="BubbleTab" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/app.iml" group="BubbleTab/app" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/bubbletab/bubbletab.iml" filepath="$PROJECT_DIR$/.idea/modules/bubbletab/bubbletab.iml" group="BubbleTab/bubbletab" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 5b54afc..7336f78 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion project.sdk
-    buildToolsVersion project.buildTools
+    compileSdkVersion sdk
+    buildToolsVersion '29.0.2'
 
     defaultConfig {
         minSdkVersion project.minSdk
         targetSdkVersion project.sdk
         applicationId "com.github.florent37.topnav"
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "2.0"
     }
     buildTypes {
         release {
@@ -17,15 +17,20 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile project(":bubbletab")
-    //compile 'com.github.florent37:bubbletab:1.0.0'
-    compile 'com.android.support:appcompat-v7:'+project.supportVersion
-    compile 'com.android.support:cardview-v7:'+project.supportVersion
-    compile 'com.android.support:recyclerview-v7:'+project.supportVersion
-    compile 'com.jakewharton:butterknife:7.0.1'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.12'
+    implementation project(":bubbletab")
+
+    implementation 'com.github.florent37:bubbletab:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
 }
diff --git a/app/src/main/java/com/github/florent37/bubbletab/sample/BubbleTabMainActivity.java b/app/src/main/java/com/github/florent37/bubbletab/sample/BubbleTabMainActivity.java
index c16297b..7ccac7b 100644
--- a/app/src/main/java/com/github/florent37/bubbletab/sample/BubbleTabMainActivity.java
+++ b/app/src/main/java/com/github/florent37/bubbletab/sample/BubbleTabMainActivity.java
@@ -1,26 +1,23 @@
 package com.github.florent37.bubbletab.sample;
 
 import android.os.Bundle;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.github.florent37.bubbletab.BubbleTab;
 
-import butterknife.Bind;
-import butterknife.ButterKnife;
-
 public class BubbleTabMainActivity extends AppCompatActivity {
 
-    @Bind(R.id.bubbleTab) BubbleTab bubbleTab;
-    @Bind(R.id.viewPager) ViewPager viewPager;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.bubbletab_activity_main);
-        ButterKnife.bind(this);
 
-        viewPager.setAdapter(new FakeAdapter(getSupportFragmentManager()));
+        BubbleTab bubbleTab = findViewById(R.id.bubbleTab);
+        ViewPager viewPager = findViewById(R.id.viewPager);
+
+        viewPager.setAdapter(new FakeAdapter(getSupportFragmentManager(), 1));
         bubbleTab.setupWithViewPager(viewPager);
     }
 }
diff --git a/app/src/main/java/com/github/florent37/bubbletab/sample/FakeAdapter.java b/app/src/main/java/com/github/florent37/bubbletab/sample/FakeAdapter.java
index 2c5b3bc..a1a5e1b 100644
--- a/app/src/main/java/com/github/florent37/bubbletab/sample/FakeAdapter.java
+++ b/app/src/main/java/com/github/florent37/bubbletab/sample/FakeAdapter.java
@@ -1,13 +1,13 @@
 package com.github.florent37.bubbletab.sample;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
 
 public class FakeAdapter extends FragmentStatePagerAdapter {
 
-    public FakeAdapter(FragmentManager fm) {
-        super(fm);
+    public FakeAdapter(FragmentManager fm, int behavior) {
+        super(fm, behavior);
     }
 
     @Override
diff --git a/app/src/main/java/com/github/florent37/bubbletab/sample/FakeFragment.java b/app/src/main/java/com/github/florent37/bubbletab/sample/FakeFragment.java
index 0be3a07..a41b005 100644
--- a/app/src/main/java/com/github/florent37/bubbletab/sample/FakeFragment.java
+++ b/app/src/main/java/com/github/florent37/bubbletab/sample/FakeFragment.java
@@ -1,23 +1,21 @@
 package com.github.florent37.bubbletab.sample;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import butterknife.Bind;
-import butterknife.ButterKnife;
-
 /**
  * Created by florentchampigny on 13/07/2016.
  */
 public class FakeFragment extends Fragment {
 
-    @Bind(R.id.recyclerView) RecyclerView recyclerView;
+    RecyclerView recyclerView;
 
     @Nullable
     @Override
@@ -28,8 +26,8 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        ButterKnife.bind(this, view);
 
+        recyclerView = view.findViewById(R.id.recyclerView);
         recyclerView.setLayoutManager(new GridLayoutManager(getContext(), 2));
         recyclerView.setAdapter(new RecyclerView.Adapter() {
             @Override
diff --git a/app/src/main/res/layout/bubbletab_activity_main.xml b/app/src/main/res/layout/bubbletab_activity_main.xml
index 32780e7..fa77489 100644
--- a/app/src/main/res/layout/bubbletab_activity_main.xml
+++ b/app/src/main/res/layout/bubbletab_activity_main.xml
@@ -55,7 +55,7 @@
     </com.github.florent37.bubbletab.BubbleTab>
 
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/viewPager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
diff --git a/app/src/main/res/layout/bubbletab_cell.xml b/app/src/main/res/layout/bubbletab_cell.xml
index c16d324..a81b0c6 100644
--- a/app/src/main/res/layout/bubbletab_cell.xml
+++ b/app/src/main/res/layout/bubbletab_cell.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="250dp"
         android:layout_margin="5dp"
diff --git a/app/src/main/res/layout/bubbletab_page.xml b/app/src/main/res/layout/bubbletab_page.xml
index 148ead4..0851905 100644
--- a/app/src/main/res/layout/bubbletab_page.xml
+++ b/app/src/main/res/layout/bubbletab_page.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.RecyclerView
+<androidx.recyclerview.widget.RecyclerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/recyclerView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#e9eaed"
     android:orientation="vertical">
-</android.support.v7.widget.RecyclerView>
\ No newline at end of file
+</androidx.recyclerview.widget.RecyclerView>
\ No newline at end of file
diff --git a/bubbletab/build.gradle b/bubbletab/build.gradle
index c1c656e..6b52b48 100644
--- a/bubbletab/build.gradle
+++ b/bubbletab/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion project.sdk
-    buildToolsVersion project.buildTools
+    compileSdkVersion 29
+    buildToolsVersion '29.0.2'
 
     defaultConfig {
         minSdkVersion project.minSdk
@@ -16,12 +16,19 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:'+project.supportVersion
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.13'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'com.google.android.material:material:1.1.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
 }
 
 version = project.libraryVersion
diff --git a/bubbletab/src/main/java/com/github/florent37/bubbletab/BubbleTab.java b/bubbletab/src/main/java/com/github/florent37/bubbletab/BubbleTab.java
index 215c158..ae75565 100644
--- a/bubbletab/src/main/java/com/github/florent37/bubbletab/BubbleTab.java
+++ b/bubbletab/src/main/java/com/github/florent37/bubbletab/BubbleTab.java
@@ -5,15 +5,14 @@
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewPager;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.util.TypedValue;
 import android.view.View;
-import android.view.ViewTreeObserver;
 import android.widget.LinearLayout;
 
 import java.util.ArrayList;
@@ -24,22 +23,16 @@ public class BubbleTab extends LinearLayout {
     int numberOfIcons = 0;
     @Nullable
     ViewPager viewPager;
-    int tabWidth;
+
     private Circle circle = new Circle();
     private Setting setting;
     private List<View> icons;
-    private final ViewPager.OnPageChangeListener pageChangeListener = new ViewPager.OnPageChangeListener() {
-
-        float oldPositionOffset;
-        boolean toRight;
+    private final ChangeListener pageChangeListener = new ChangeListener();
+    private final class ChangeListener implements ViewPager.OnPageChangeListener {
+        int tabWidth;
 
         @Override
         public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-            //Log.d("percent", "" + positionOffset);
-
-            if (oldPositionOffset == 0) {
-                toRight = positionOffset > oldPositionOffset;
-            }
             if (tabWidth == 0 && numberOfIcons != 0) {
                 tabWidth = getWidth() / numberOfIcons;
 
@@ -56,34 +49,23 @@ public void onPageScrolled(int position, float positionOffset, int positionOffse
             circle.setScale(scale);
 
             if (positionOffset != 0) {
-                if (toRight) {
-                    if (positionOffset < 0.5f) {
-                        icons.get(position).setSelected(true);
-                        if (position + 1 < numberOfIcons) {
-                            icons.get(position + 1).setSelected(false);
-                        }
-                    } else {
-                        icons.get(position).setSelected(false);
-                        if (position + 1 < numberOfIcons) {
-                            icons.get(position + 1).setSelected(true);
-                        }
+                if (positionOffset < 0.5f) {
+                    icons.get(position).setSelected(true);
+                    if (position + 1 < numberOfIcons) {
+                        icons.get(position + 1).setSelected(false);
                     }
                 } else {
-                    if (positionOffset < 0.5f) {
-                        icons.get(position).setSelected(true);
-                        if (position - 1 > 0) {
-                            icons.get(position + 1).setSelected(false);
-                        }
-                    } else {
-                        icons.get(position).setSelected(false);
-                        if (position - 1 > 0) {
-                            icons.get(position + 1).setSelected(true);
-                        }
+                    icons.get(position).setSelected(false);
+                    if (position + 1 < numberOfIcons) {
+                        icons.get(position + 1).setSelected(true);
                     }
                 }
+            } else {
+                for(int i = 0; i < numberOfIcons; i++) {
+                    icons.get(i).setSelected(i == position);
+                }
             }
 
-            oldPositionOffset = positionOffset;
             postInvalidate();
         }
 
@@ -114,19 +96,31 @@ public BubbleTab(Context context, AttributeSet attrs, int defStyleAttr) {
     }
 
     public void setupWithViewPager(final ViewPager viewPager) {
-        this.viewPager = viewPager;
+        if(this.viewPager != null)
+            this.viewPager.removeOnPageChangeListener(pageChangeListener);
 
-        viewPager.addOnPageChangeListener(pageChangeListener);
+        this.viewPager = viewPager;
+        this.viewPager.addOnPageChangeListener(pageChangeListener);
 
         final int currentItem = viewPager.getCurrentItem();
         for (int i = 0; i < icons.size(); i++) {
             icons.get(i).setSelected(i == currentItem);
         }
-
-        circle.setTranslationX(tabWidth * currentItem);
+        //no need to update here since we override "onLayout(...)"
+        //  but still we want to support change of pager more then ones
+        circle.layout(this, this.viewPager);
         postInvalidate();
     }
 
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        if (viewPager != null) {
+            viewPager.addOnPageChangeListener(pageChangeListener);
+            postInvalidate();
+        }
+    }
+
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
@@ -157,7 +151,6 @@ public void onClick(View v) {
                 }
             });
         }
-
     }
 
     protected float dpToPx(int dp) {
@@ -169,6 +162,13 @@ private void init(Context context, AttributeSet attrs) {
         setting = new Setting(context, attrs);
     }
 
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        super.onLayout(changed, l, t, r, b);
+        //prepare shape even before any "onPageScrolled(...)" event
+        circle.layout(this, viewPager);
+    }
+
     @Override
     protected void onDraw(Canvas canvas) {
         circle.onDraw(canvas);
@@ -176,6 +176,7 @@ protected void onDraw(Canvas canvas) {
     }
 
     private static class Circle {
+        public float lastOffset = 0f; //current shape-offset in percentage (from 0f to 1f)
 
         private Paint paint = new Paint();
 
@@ -222,6 +223,46 @@ public void setRatio(float circleRatio) {
         public void setScale(float scale) {
             this.scale = scale;
         }
+
+
+        static int valueForFrame(int valueStart, int valueEnd, float frameStart, float frames, float currentFrame) {
+            return (int)( (valueEnd-valueStart)/frames * (currentFrame-frameStart) + valueStart );
+        }
+
+        public void layout(BubbleTab owner, int position, float positionOffset) {
+            int widthStart = 0; int widthEnd;
+            View c = owner.getChildAt(position);
+            if(c != null) {
+                widthStart = c.getWidth();
+                //animate to next tabs size and reverse
+                View next = owner.getChildAt(position+1);
+                if(next != null) {
+                    widthEnd = valueForFrame(widthStart, next.getWidth(), 0f, 1f, positionOffset);
+                } else {
+                    widthEnd = widthStart;
+                }
+                this.setWidth(widthEnd);
+            }
+
+            float x = c.getX() + widthStart * positionOffset;
+            this.setTranslationX(x);
+
+            float distanceFromMiddle = Math.abs(positionOffset - 0.5f);
+            float min = 0f;
+            float scale = min + (1 - min) * (distanceFromMiddle + 0.5f);
+
+            this.setScale(scale);
+            lastOffset = positionOffset;
+        }
+        //prepare shape based on "ViewPager" position
+        public void layout(BubbleTab owner, ViewPager viewPager) {
+            //get current Page-index
+            int position = viewPager != null ? viewPager.getCurrentItem() : 0;
+            //convert Page-index to position (position is always less than current Page-index)
+            if(position > 1)
+                position -= 1;
+            this.layout(owner, position, this.lastOffset);
+        }
     }
 
     static class Setting {
diff --git a/build.gradle b/build.gradle
index 2a4a0b0..5b101eb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,14 +4,15 @@ buildscript {
     repositories {
         jcenter()
         maven { url 'https://maven.google.com' }
+        google()
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.1'
+        classpath 'com.android.tools.build:gradle:4.0.1'
 
-        classpath "org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1"
+        classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.16.1"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
 
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -20,17 +21,18 @@ buildscript {
 }
 
 ext {
-    sdk = 26
-    buildTools = "26.0.2"
-    minSdk = 15
-    libraryVersion = "1.0.2"
-    supportVersion = "26.1.0"
+    sdk = 29
+    buildTools = "29.0.2"
+    minSdk = 21
+    libraryVersion = "2.0.0"
+    //supportVersion = "28.0.0"
 }
 
 allprojects {
     repositories {
         jcenter()
         maven { url 'https://maven.google.com' }
+        google()
 
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 1d3591c..915f0e6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,4 +15,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 79fcc3c..23285e3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 12 13:07:32 CEST 2016
+#Tue Jul 28 10:55:01 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip