diff --git a/app/app.iml b/app/app.iml
index 7489e090..38290477 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -31,7 +31,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/debug" />
-          <option name="classpath" value="$MODULE_DIR$/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f32d60b81aeecdf3da9abe96d592507a/databinding-adapters-3.6.3-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/4d531d31d4c10bfb285e39b7f25438c3/databinding-runtime-3.6.3-api.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.databinding/databinding-common/3.6.3/555fa9bb14c6214e7ebbce7a0a2016d3c9a365f1/databinding-common-3.6.3.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/96015a6d72839a604724ad89694dc122/jetified-viewbinding-3.6.3-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/cd188d1126f5f2bed7a9a9adc8f750f8/navigation-ui-ktx-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/16bde5a268b31dee284da06156d7e8f1/navigation-ui-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/5789cb7cf3093379d5437a597e0e07f5/material-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/a154d268cc84e7f53f8debf8ce2ca06f/jetified-preference-ktx-1.1.1-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/b2352c283e32d4bbbb6cf34046325d27/preference-1.1.1-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/d8113fa49becebbb1ecc5f8807aa8334/appcompat-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/146c5a1a964c8d83c490a11a460cb4ee/navigation-fragment-ktx-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/43d7efdc16c5e46f1ead8d10b1c8daf6/jetified-fragment-ktx-1.2.4-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/272276ff8aa8e7e04a07c4b88f8c9278/navigation-runtime-ktx-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/db8c908aeb7f3b9a90bd9677474beb19/jetified-activity-ktx-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/a42d944f366cbc7cacbac9cd80622097/jetified-core-ktx-1.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/78bcd5b132c38bd8ffac1a14da5f3f1d/browser-1.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/768d4bbc3387b0280c4ff7d3b50467a4/lifecycle-extensions-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/fbc754069f19d249d4f917b2d14d3d77/legacy-support-v4-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/cb5e74637f3f97c7e6f191acb4518af0/navigation-fragment-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/78f4fede34ea2122a3fc58a18743e6a6/jetified-viewpager2-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/b26735bb6d57259fb859bde8bd7815b3/fragment-1.2.4-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/a9a09bc4780fc9a6870cc8cea0a41469/jetified-appcompat-resources-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/c47fd7d7dc02ea3dddd5829307ed47b4/legacy-support-core-ui-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f60d503848a7312f41ea0c690e81db3c/drawerlayout-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/6a014c1d44512b853b1698219329f7d3/navigation-runtime-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/9a4ba0d5b932e0a0696080e13d82c3d2/jetified-activity-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/611023dc8deabb10cf01784b0ce3c2b1/coordinatorlayout-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/acd17aa3febd2134521e12e179059987/recyclerview-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f4234cbe6ed77ba2a1483e5f4c50c33c/transition-1.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/e744c5901f92b0666b997a02e1d28444/vectordrawable-animated-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/27e73a641a26feb6756196f3406306a8/vectordrawable-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/0ad299a691af749d1bc74c1893243812/media-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/0597bc315b8daa2a39db6f912dd7fef9/legacy-support-core-utils-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/8261cc7dc801583621ae1686e77b20ba/viewpager-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/51995cd66ee66f63d9e1fa81d31aba40/loader-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/78dab6ef604983c68e9fa7da625a4c99/slidingpanelayout-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/df2f814cba6709de2245fe751785df12/customview-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/1894225b4728add4cfba2fa747a8e0fb/navigation-common-ktx-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/ca51898072c807d3dbc72aeebd79a9e4/navigation-common-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f6b087e5c3383f2243d985d144af9ece/swiperefreshlayout-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/ab18de97c4fa444df769be83004a8958/asynclayoutinflater-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/2053d5d8ce08f9621c7482d6dd5170dc/core-1.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/ac014d61322e1e528d7ce6d04bdedb28/jetified-lifecycle-runtime-ktx-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/59e8220cdf34f50df57c0337210c3819/jetified-lifecycle-process-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/746d4b93be16ffef6291f07b7ede794c/jetified-lifecycle-service-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/285999a7a12a158a95139a860fc16422/lifecycle-runtime-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/dd663f7056f5f52d05d169f62f187f9f/jetified-collection-ktx-1.1.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/d6cff49c67a55c9d846caac6db4f029c/versionedparcelable-1.1.0-api.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f380750b489f5a279ada37357a1586b3/cursoradapter-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/6acc4f28cd4ba5ae90580c5ac476db7a/cardview-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/cab6ee3d69ce5cce8eca8a6e7b6ad670/lifecycle-livedata-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/7a5172f1d39eeb86754423f81dc7d0e8/jetified-lifecycle-livedata-core-ktx-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/a568eea44a0a3df6c436037f1ee9006a/jetified-lifecycle-viewmodel-savedstate-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/911e6161aa5bf847a03136bb7401d5e5/lifecycle-livedata-core-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/5b8bd47d9c48717ee1e76d5cfaae05dc/core-runtime-2.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/53ad1c090e0e4ac03c45120888929877/jetified-savedstate-1.0.0-api.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.2.0/4ef09a745007778eef83b92f8f23987a8ea59496/lifecycle-common-2.2.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/261e9a74c7845ca029579ab94bb1efc7/jetified-lifecycle-viewmodel-ktx-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/d8e63f91f0dce5cc9e854c3743b1b453/lifecycle-viewmodel-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/02682a11fd5ebaa8e055575838fb83a1/documentfile-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/954ab66de19329692601713f1041e30a/localbroadcastmanager-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/62dbd37bbe25623b96220010fba40082/print-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/7a74caff008b00f69ea01931ee62716e/interpolator-1.0.0-api.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/2007790f728a1209fc7f4c998ef37192/jetified-kotlin-android-extensions-runtime-1.3.72.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/252e2a61fd070ba3f0443757e204c8b9/jetified-rxdownload4-1.0.9-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/04a3f47a61e66bdc148e7c91fa0eb96d/jetified-kotlin-stdlib-jdk7-1.3.72.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/af128bec281493d28e77d7acd3951223/jetified-converter-gson-2.6.1.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/ae29c4bd992ef6b798933c4866da6676/jetified-adapter-rxjava2-2.6.1.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/dc45a1f8246042c9b56a9cdb39289092/jetified-retrofit-2.6.2.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/36529dd66722df7ba976f1b15e22b5d9/jetified-okhttp-3.12.6.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/4b3b60a0a87cdc1bb9b88642240afa43/jetified-okio-jvm-2.3.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/081c2f986beda55569727e660dffc06e/jetified-kotlinx-coroutines-android-1.3.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/59de657b77e62115a66ce379115c343c/jetified-kotlinx-coroutines-core-1.3.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/88fdafa44c425dc99960dc38fd21e606/jetified-kotlin-stdlib-1.3.72.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/3fc56f9567b3362c5e198a251df74ff8/jetified-kotlin-stdlib-common-1.3.72.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/e6b13d476c07d97a8633c2e07ebe8ba6/jetified-annotations-13.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/a272c0ad4d8566b092489648ecceb025/constraintlayout-1.1.3-api.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.constraintlayout/constraintlayout-solver/1.1.3/54abe9ffb22cc9019b0b6fcc10f185cc4e67b34e/constraintlayout-solver-1.1.3.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/790d8a1c00f5fd4fd93d824f673d5157/jetified-listenablefuture-1.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/15c0731e39cb1a39fa0d4e4c5bd804b4/jetified-gson-2.8.5.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/d6b9ef3d3b503e285483facbbd76aa52/jetified-rxandroid-2.1.1-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/cd376cf77c119767e67660833f585cfd/jetified-rxkotlin-2.4.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f4481e12a0f9f1aebfbd1ea0f13c452b/jetified-rxjava-2.2.10.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/3d3d669577ba7cefe6419cad0ee96d20/jetified-reactive-streams-1.0.2.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/9620339831bbcec8d9cfe2795bbd776e/jetified-ClarityPotion-1.0.2-api.jar:/Users/Xinto/Library/Android/sdk/platforms/android-29/android.jar:/Users/Xinto/Library/Android/sdk/build-tools/29.0.3/core-lambda-stubs.jar" />
+          <option name="classpath" value="$MODULE_DIR$/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f32d60b81aeecdf3da9abe96d592507a/databinding-adapters-3.6.3-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/4d531d31d4c10bfb285e39b7f25438c3/databinding-runtime-3.6.3-api.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.databinding/databinding-common/3.6.3/555fa9bb14c6214e7ebbce7a0a2016d3c9a365f1/databinding-common-3.6.3.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/96015a6d72839a604724ad89694dc122/jetified-viewbinding-3.6.3-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/cd188d1126f5f2bed7a9a9adc8f750f8/navigation-ui-ktx-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/16bde5a268b31dee284da06156d7e8f1/navigation-ui-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/5789cb7cf3093379d5437a597e0e07f5/material-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/a6699c041cef944e735712c58bd6f044/jetified-GetJSON-1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/a154d268cc84e7f53f8debf8ce2ca06f/jetified-preference-ktx-1.1.1-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/b2352c283e32d4bbbb6cf34046325d27/preference-1.1.1-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/d8113fa49becebbb1ecc5f8807aa8334/appcompat-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/146c5a1a964c8d83c490a11a460cb4ee/navigation-fragment-ktx-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/43d7efdc16c5e46f1ead8d10b1c8daf6/jetified-fragment-ktx-1.2.4-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/272276ff8aa8e7e04a07c4b88f8c9278/navigation-runtime-ktx-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/db8c908aeb7f3b9a90bd9677474beb19/jetified-activity-ktx-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/a42d944f366cbc7cacbac9cd80622097/jetified-core-ktx-1.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/78bcd5b132c38bd8ffac1a14da5f3f1d/browser-1.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/768d4bbc3387b0280c4ff7d3b50467a4/lifecycle-extensions-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/fbc754069f19d249d4f917b2d14d3d77/legacy-support-v4-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/cb5e74637f3f97c7e6f191acb4518af0/navigation-fragment-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/78f4fede34ea2122a3fc58a18743e6a6/jetified-viewpager2-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/b26735bb6d57259fb859bde8bd7815b3/fragment-1.2.4-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/a9a09bc4780fc9a6870cc8cea0a41469/jetified-appcompat-resources-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/c47fd7d7dc02ea3dddd5829307ed47b4/legacy-support-core-ui-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f60d503848a7312f41ea0c690e81db3c/drawerlayout-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/6a014c1d44512b853b1698219329f7d3/navigation-runtime-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/9a4ba0d5b932e0a0696080e13d82c3d2/jetified-activity-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/611023dc8deabb10cf01784b0ce3c2b1/coordinatorlayout-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/acd17aa3febd2134521e12e179059987/recyclerview-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f4234cbe6ed77ba2a1483e5f4c50c33c/transition-1.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/e744c5901f92b0666b997a02e1d28444/vectordrawable-animated-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/27e73a641a26feb6756196f3406306a8/vectordrawable-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/0ad299a691af749d1bc74c1893243812/media-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/0597bc315b8daa2a39db6f912dd7fef9/legacy-support-core-utils-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/8261cc7dc801583621ae1686e77b20ba/viewpager-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/51995cd66ee66f63d9e1fa81d31aba40/loader-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/78dab6ef604983c68e9fa7da625a4c99/slidingpanelayout-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/df2f814cba6709de2245fe751785df12/customview-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/1894225b4728add4cfba2fa747a8e0fb/navigation-common-ktx-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/ca51898072c807d3dbc72aeebd79a9e4/navigation-common-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f6b087e5c3383f2243d985d144af9ece/swiperefreshlayout-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/ab18de97c4fa444df769be83004a8958/asynclayoutinflater-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/2053d5d8ce08f9621c7482d6dd5170dc/core-1.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/ac014d61322e1e528d7ce6d04bdedb28/jetified-lifecycle-runtime-ktx-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/59e8220cdf34f50df57c0337210c3819/jetified-lifecycle-process-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/746d4b93be16ffef6291f07b7ede794c/jetified-lifecycle-service-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/285999a7a12a158a95139a860fc16422/lifecycle-runtime-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/dd663f7056f5f52d05d169f62f187f9f/jetified-collection-ktx-1.1.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/d6cff49c67a55c9d846caac6db4f029c/versionedparcelable-1.1.0-api.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f380750b489f5a279ada37357a1586b3/cursoradapter-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/6acc4f28cd4ba5ae90580c5ac476db7a/cardview-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/cab6ee3d69ce5cce8eca8a6e7b6ad670/lifecycle-livedata-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/7a5172f1d39eeb86754423f81dc7d0e8/jetified-lifecycle-livedata-core-ktx-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/a568eea44a0a3df6c436037f1ee9006a/jetified-lifecycle-viewmodel-savedstate-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/911e6161aa5bf847a03136bb7401d5e5/lifecycle-livedata-core-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/5b8bd47d9c48717ee1e76d5cfaae05dc/core-runtime-2.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/53ad1c090e0e4ac03c45120888929877/jetified-savedstate-1.0.0-api.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.2.0/4ef09a745007778eef83b92f8f23987a8ea59496/lifecycle-common-2.2.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/261e9a74c7845ca029579ab94bb1efc7/jetified-lifecycle-viewmodel-ktx-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/d8e63f91f0dce5cc9e854c3743b1b453/lifecycle-viewmodel-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/02682a11fd5ebaa8e055575838fb83a1/documentfile-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/954ab66de19329692601713f1041e30a/localbroadcastmanager-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/62dbd37bbe25623b96220010fba40082/print-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/7a74caff008b00f69ea01931ee62716e/interpolator-1.0.0-api.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/2007790f728a1209fc7f4c998ef37192/jetified-kotlin-android-extensions-runtime-1.3.72.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/252e2a61fd070ba3f0443757e204c8b9/jetified-rxdownload4-1.0.9-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/04a3f47a61e66bdc148e7c91fa0eb96d/jetified-kotlin-stdlib-jdk7-1.3.72.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/af128bec281493d28e77d7acd3951223/jetified-converter-gson-2.6.1.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/ae29c4bd992ef6b798933c4866da6676/jetified-adapter-rxjava2-2.6.1.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/dc45a1f8246042c9b56a9cdb39289092/jetified-retrofit-2.6.2.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/36529dd66722df7ba976f1b15e22b5d9/jetified-okhttp-3.12.6.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/4b3b60a0a87cdc1bb9b88642240afa43/jetified-okio-jvm-2.3.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/081c2f986beda55569727e660dffc06e/jetified-kotlinx-coroutines-android-1.3.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/59de657b77e62115a66ce379115c343c/jetified-kotlinx-coroutines-core-1.3.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/88fdafa44c425dc99960dc38fd21e606/jetified-kotlin-stdlib-1.3.72.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/3fc56f9567b3362c5e198a251df74ff8/jetified-kotlin-stdlib-common-1.3.72.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/e6b13d476c07d97a8633c2e07ebe8ba6/jetified-annotations-13.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/a272c0ad4d8566b092489648ecceb025/constraintlayout-1.1.3-api.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.constraintlayout/constraintlayout-solver/1.1.3/54abe9ffb22cc9019b0b6fcc10f185cc4e67b34e/constraintlayout-solver-1.1.3.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/790d8a1c00f5fd4fd93d824f673d5157/jetified-listenablefuture-1.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/15c0731e39cb1a39fa0d4e4c5bd804b4/jetified-gson-2.8.5.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/d6b9ef3d3b503e285483facbbd76aa52/jetified-rxandroid-2.1.1-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/cd376cf77c119767e67660833f585cfd/jetified-rxkotlin-2.4.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f4481e12a0f9f1aebfbd1ea0f13c452b/jetified-rxjava-2.2.10.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/3d3d669577ba7cefe6419cad0ee96d20/jetified-reactive-streams-1.0.2.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/9620339831bbcec8d9cfe2795bbd776e/jetified-ClarityPotion-1.0.2-api.jar:/Users/Xinto/Library/Android/sdk/platforms/android-29/android.jar:/Users/Xinto/Library/Android/sdk/build-tools/29.0.3/core-lambda-stubs.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="app_debug" />
@@ -188,6 +188,7 @@
     <orderEntry type="library" name="Gradle: androidx.navigation:navigation-ui-ktx:2.2.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.navigation:navigation-ui:2.2.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.material:material:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.100rabhkr:GetJSON:1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.preference:preference-ktx:1.1.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.preference:preference:1.1.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.1.0@aar" level="project" />
diff --git a/app/build.gradle b/app/build.gradle
index 5fc598c8..71899fc5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -73,6 +73,7 @@ dependencies {
     implementation 'androidx.navigation:navigation-ui-ktx:2.2.2'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.github.ssseasonnn.RxDownload:rxdownload4:1.0.9'
+    implementation 'com.github.100rabhkr:GetJSON:1.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
diff --git a/app/src/main/java/com/vanced/manager/core/fragments/Home.kt b/app/src/main/java/com/vanced/manager/core/fragments/Home.kt
index 985a4330..1534e5e5 100644
--- a/app/src/main/java/com/vanced/manager/core/fragments/Home.kt
+++ b/app/src/main/java/com/vanced/manager/core/fragments/Home.kt
@@ -9,6 +9,8 @@ import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.navigation.findNavController
+import com.dezlum.codelabs.getjson.GetJson
+import com.google.gson.JsonObject
 import com.vanced.manager.R
 import com.vanced.manager.core.base.BaseFragment
 
@@ -38,6 +40,20 @@ open class Home : BaseFragment() {
         val microgStatus = pm?.let { isPackageInstalled("com.mgoogle.android.gms", it) }
         val vancedStatus = pm?.let { isPackageInstalled("com.vanced.android.youtube", it) }
 
+        val vancedLatestTxt = view.findViewById<TextView>(R.id.vanced_latest_version)
+        val microgLatestTxt = view.findViewById<TextView>(R.id.vanced_latest_version)
+
+        if (GetJson().isConnected(requireContext())) {
+            val vancedVer: JsonObject = GetJson().AsJSONObject("https://github.com/X1nto/VancedFiles/blob/master/vanced.json")
+            val microgVer: JsonObject = GetJson().AsJSONObject("https://github.com/X1nto/VancedFiles/blob/master/microg.json")
+            vancedLatestTxt.text = vancedVer.get("version").asString
+            microgLatestTxt.text = microgVer.get("version").asString
+
+        } else {
+            vancedLatestTxt.text = getString(R.string.unavailable)
+            microgLatestTxt.text = getString(R.string.unavailable)
+        }
+
         vancedinstallbtn.setOnClickListener {
             view.findNavController().navigate(R.id.toInstallThemeFragment)
         }
diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt
index 16761880..5e915a33 100644
--- a/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt
+++ b/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt
@@ -10,6 +10,7 @@ import android.os.Bundle
 import android.view.*
 import androidx.core.animation.addListener
 import androidx.viewpager2.widget.ViewPager2
+import com.dezlum.codelabs.getjson.GetJson
 import com.google.android.material.card.MaterialCardView
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
@@ -34,7 +35,8 @@ class HomeFragment : Home() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 
-        connectionStatus()
+        //connectionStatus()
+        checkNetwork()
 
         super.onViewCreated(view, savedInstanceState)
 
@@ -57,7 +59,48 @@ class HomeFragment : Home() {
         super .onCreateOptionsMenu(menu, inflater)
     }
 
-    private var networkCallback = object: ConnectivityManager.NetworkCallback() {
+    private fun checkNetwork() {
+        if (!GetJson().isConnected(requireContext())) {
+
+            activity?.runOnUiThread {
+
+                val networkErrorLayout = view?.findViewById<MaterialCardView>(R.id.home_network_wrapper)
+                val oa2 = ObjectAnimator.ofFloat(networkErrorLayout, "yFraction", -1f, 0.3f)
+                val oa3 = ObjectAnimator.ofFloat(networkErrorLayout, "yFraction", 0.3f, 0f)
+
+
+                oa2.apply {
+                    oa2.addListener(onStart = {
+                        networkErrorLayout?.visibility = View.VISIBLE
+                    })
+                    start()
+                }
+                oa3.start()
+
+            }
+
+        } else {
+
+            activity?.runOnUiThread {
+
+                val networkErrorLayout = view?.findViewById<MaterialCardView>(R.id.home_network_wrapper)
+                val oa2 = ObjectAnimator.ofFloat(networkErrorLayout, "yFraction", 0f, 0.3f)
+                val oa3 = ObjectAnimator.ofFloat(networkErrorLayout, "yFraction", 0.3f, -1f)
+
+                oa2.start()
+                oa3.apply {
+
+                    oa3.addListener(onEnd = {
+                        networkErrorLayout?.visibility = View.GONE
+                    })
+                    start()
+                }
+
+            }
+        }
+    }
+
+    /*private var networkCallback = object: ConnectivityManager.NetworkCallback() {
 
         override fun onLost(network: Network) {
             super.onLost(network)
@@ -114,7 +157,7 @@ class HomeFragment : Home() {
             connectivityManager.unregisterNetworkCallback(networkCallback)
         } catch (e: Exception) {}
         connectivityManager.registerNetworkCallback(networkRequest, networkCallback)
-    }
+    }*/
 
 }
 
diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt
index 3b262c1b..1d1ed24f 100644
--- a/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt
+++ b/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt
@@ -12,6 +12,8 @@ import android.widget.Button
 import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.fragment.app.DialogFragment
+import com.dezlum.codelabs.getjson.GetJson
+import com.vanced.manager.BuildConfig
 
 import com.vanced.manager.R
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -43,36 +45,45 @@ class UpdateCheckFragment : DialogFragment() {
 
         closebtn.setOnClickListener { dismiss() }
 
-        recheckbtn.visibility = View.GONE
-        checkingTxt.text = "Update Found!"
-        loadCircle.visibility = View.GONE
+        if (GetJson().isConnected(requireContext())) {
+            val checkUrl = GetJson().AsJSONObject("https://github.com/X1nto/VancedFiles/blob/master/manager.json")
+            val remoteVersion = checkUrl.get("versionCode").asInt
 
-        updatebtn.setOnClickListener {
-            val url =
-                "https://github.com/X1nto/VancedFiles/blob/master/release.apk"
-            url.download()
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribeBy(
-                    onNext = { progress ->
-                        loadBar.visibility = View.VISIBLE
-                        loadBar.progress =
-                            "${progress.downloadSizeStr()}/${progress.totalSizeStr()}".toInt()
-                    },
-                    onComplete = {
-                        val apk = url.file()
-                        val uri = Uri.fromFile(apk)
-                        val intent = Intent(Intent.ACTION_VIEW)
-                        intent.setDataAndType(uri, "application/vnd.android.package-archive")
-                        startActivity(intent)
-                    },
-                    onError = {
-                        checkingTxt.text = "Something went wrong"
-                    }
-                )
-        }
+            if (remoteVersion > BuildConfig.VERSION_CODE) {
 
+                recheckbtn.visibility = View.GONE
+                checkingTxt.text = "Update Found!"
+                loadCircle.visibility = View.GONE
 
+                updatebtn.setOnClickListener {
+                    val url =
+                        "https://github.com/X1nto/VancedFiles/blob/master/release.apk"
+                    url.download()
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribeBy(
+                            onNext = { progress ->
+                                loadBar.visibility = View.VISIBLE
+                                loadBar.progress =
+                                    "${progress.downloadSizeStr()}/${progress.totalSizeStr()}".toInt()
+                            },
+                            onComplete = {
+                                val apk = url.file()
+                                val uri = Uri.fromFile(apk)
+                                val intent = Intent(Intent.ACTION_VIEW)
+                                intent.setDataAndType(uri, "application/vnd.android.package-archive")
+                                startActivity(intent)
+                            },
+                            onError = {
+                                checkingTxt.text = "Something went wrong"
+                            }
+                        )
+                }
 
+            } else {
+                checkingTxt.text = "No updates found"
+            }
+
+        } else checkingTxt.text = "No connection"
 
     }