diff --git a/app/app.iml b/app/app.iml
index 8374fe1..918b135 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="$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f795978ba1ce216a62c8a586b1c37f0a/jetified-calligraphy-2.3.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/734dd5122cc1a66c82c80838fbcc7a79/appcompat-1.1.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/21d3215f74c65722087bc070f0b3d89c/recyclerview-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/c31ee2c68a8d819eb6680319864d78dd/cardview-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/d6e059f2a5743f9a56f6ccb31cc9ece9/core-ktx-1.3.0-rc01-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/471d601291d328516f45940fe90ef22a/legacy-support-core-ui-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/ab4ca67266e71d63b66203ffec6576e0/glide-4.10.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/745d17ab0b96d322c1427f4d40017703/fragment-1.1.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/d2a3a87bb54b8627eaae8d16fd71d8ce/appcompat-resources-1.1.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/36afce815b2fb9ec256f6e76ce9f2c3b/drawerlayout-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/8b62ef9728f2df6f87e716385b8352e2/legacy-support-core-utils-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/a03fa4d7222e281341a07e3ca98bc2bc/viewpager-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/9fa3cc5068508f97ef60330bde60401d/coordinatorlayout-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/fe92aa04bbaf8f649e1a5fbbebf641a0/slidingpanelayout-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/b2e4fa88d9cfcb22f1fed414d31e0b45/customview-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/3140911aee3a4100016637f8e6d9d415/swiperefreshlayout-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/287dc89f1fd65f8b4591374b26afebb5/asynclayoutinflater-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/93cbdad079eb6328d389753461b2482a/loader-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/f97117049135ac48309afb45eef3b26c/activity-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/44c88f024d6fb2c48635a4915e9edcf0/vectordrawable-animated-1.1.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/be8f5202d6f3d901a90eef1582fcbdd8/vectordrawable-1.1.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/2bd4dcac7bcdcd856c075a8acaaab73e/core-1.3.0-rc01-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/692789d1c34628f5332341ea834744ca/gifdecoder-4.10.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/a3a4d1d4b3157ca78e3812c08c00eb2d/cursoradapter-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/c3e53f261430124f943893ce9426b9b6/versionedparcelable-1.1.0-api.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/00f630531fa46e4bb85cc850e03c5ad9/interpolator-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/e73b80be766dc70275aafd4eafcf7ce8/lifecycle-runtime-2.1.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/429b3f1253ec26e545fa071969ae1df4/lifecycle-viewmodel-2.1.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/a83bfd77d3e78a909b957f8dbf733dce/documentfile-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/7d78f4f72c80e791d331d83cf3606d32/localbroadcastmanager-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/53237e46abcee7e34f55bc00482a4c56/print-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/31d7882a47cda5604f916b457758844a/savedstate-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/d6de557423144296983419dd5dfcf816/lifecycle-livedata-2.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/9d0376b00ec387ca3c3839080791bf18/lifecycle-livedata-core-2.0.0-api.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.1.0/c67e7807d9cd6c329b9d0218b2ec4e505dd340b7/lifecycle-common-2.1.0.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/0d1d202ee6dd959bcb380e203fc4e913/core-runtime-2.0.0-api.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/a0905a83d70bb629e8aa1be7300df54a/constraintlayout-1.1.3-api.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.constraintlayout/constraintlayout-solver/1.1.3/54abe9ffb22cc9019b0b6fcc10f185cc4e67b34e/constraintlayout-solver-1.1.3.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/2e344133aa129008d17d529472ff37af/jetified-FlycoTabLayout_Lib-2.1.2-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/fb7139d0724963ff9dc6d7d039b12115/jetified-SmartRefreshLayout-1.1.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/b2bfc12c3beaa54284d066c286ec3fa2/jetified-SmartRefreshHeader-1.1.0-api.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/disklrucache/4.10.0/64b5e97b9b10c47b62577d2b25f1e1fe9dcd1f56/disklrucache-4.10.0.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/annotations/4.10.0/bbe80fe87e3a3a08c995557f3b8e66f479bf9363/annotations-4.10.0.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/115c15651d1e49cf7ce35b72d85b8ed7/jetified-core-3.7.7-api.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.arialyy.aria/annotations/3.7.7/a1e7f33ceaa3774a28e1c84ab9de811dcc6562ed/annotations-3.7.7.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/9bdddfb1469d364da82079de2cdb9c85/publicComponent-3.7.7-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/86036a3cabb68b0d42df82c7eb32671b/httpComponent-3.7.7-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/a6124e86245f3d7b6de7aa8fb79ec132/okrx-1.0.2-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/458bbdcfe9005a516d20207202190f53/okserver-2.0.5-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/e7f1b647ea402d5a401a3a92bccb32d1/okgo-3.0.4-api.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-scalars/2.1.0/7c0d7c8f6e52115bb82fa018d81a8d0cae35dde5/converter-scalars-2.1.0.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.1.0/aa557d71ead91cbf26e0c316a0f593d168303309/converter-gson-2.1.0.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/adapter-rxjava/2.1.0/693eddc23e87ab13f9cf5001707ce8e7e1d1ff01/adapter-rxjava-2.1.0.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.1.0/2de7cd8b95b7021b1d597f049bcb422055119f2c/retrofit-2.1.0.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.8.1/4d060ca3190df0eda4dc13415532a12e15ca5f11/okhttp-3.8.1.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/1ab7ac28b4fa6273e5ceb7dda1e6b36f/rxandroid-1.2.1-api.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/io.reactivex/rxjava/1.3.0/af000bec2036a2a9d07197c4b03b8966bfc60b03/rxjava-1.3.0.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.alibaba/fastjson/1.2.21/4dc148b3edc0d58c1bdb9e4835c187c488986e05/fastjson-1.2.21.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/541787ceefb4b6d179235cc4efba7af8/jetified-utilcode-1.23.7-api.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.2/3edcfe49d2c6053a70a2a47e4e1c2f94998a49cf/gson-2.8.2.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/efea9d2b5f0cbc3465e577c4764ab60b/xxpermissions-6.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/5ca097a96c676443b5650bec145a2220/jpush-3.4.1-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/6c2e7ece6efb856a01280eadc401568d/jcore-2.2.4-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/8a6b905a5a869c988213b86506486a4d/jetified-bannerview-2.6.4-api.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.61/70dffc5f8ac5ea7c34f30deac5b9d8b1d48af066/kotlin-stdlib-jdk7-1.3.61.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.71/898273189ad22779da6bed88ded39b14cb5fd432/kotlin-stdlib-1.3.71.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.71/e71c3fef58e26affeb03d675e91fd8abdd44aa7b/kotlin-stdlib-common-1.3.71.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar;C:/Users/Administrator/AppData/Local/Android/Sdk/platforms/android-29/android.jar" />
+          <option name="classpath" value="$USER_HOME$/.gradle/caches/transforms-2/files-2.1/465fbe49fe34e11c525c39dbaf021812/jetified-calligraphy-2.3.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/734dd5122cc1a66c82c80838fbcc7a79/appcompat-1.1.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/c2787a5a24abae13c71e9a568e954dcb/recyclerview-1.1.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/c31ee2c68a8d819eb6680319864d78dd/cardview-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/5432887a4ced80349b970ea59a5f453c/core-ktx-1.4.0-alpha01-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/a3a4d1d4b3157ca78e3812c08c00eb2d/cursoradapter-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/ab4ca67266e71d63b66203ffec6576e0/glide-4.10.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/745d17ab0b96d322c1427f4d40017703/fragment-1.1.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/d2a3a87bb54b8627eaae8d16fd71d8ce/appcompat-resources-1.1.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/36afce815b2fb9ec256f6e76ce9f2c3b/drawerlayout-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/a03fa4d7222e281341a07e3ca98bc2bc/viewpager-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/b2e4fa88d9cfcb22f1fed414d31e0b45/customview-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/93cbdad079eb6328d389753461b2482a/loader-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/f97117049135ac48309afb45eef3b26c/activity-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/44c88f024d6fb2c48635a4915e9edcf0/vectordrawable-animated-1.1.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/be8f5202d6f3d901a90eef1582fcbdd8/vectordrawable-1.1.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/8a1c1ee65d79c86c184868991e25c3a3/core-1.4.0-alpha01-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/c3e53f261430124f943893ce9426b9b6/versionedparcelable-1.1.0-api.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/692789d1c34628f5332341ea834744ca/gifdecoder-4.10.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/429b3f1253ec26e545fa071969ae1df4/lifecycle-viewmodel-2.1.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/e73b80be766dc70275aafd4eafcf7ce8/lifecycle-runtime-2.1.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/00f630531fa46e4bb85cc850e03c5ad9/interpolator-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/31d7882a47cda5604f916b457758844a/savedstate-1.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/d6de557423144296983419dd5dfcf816/lifecycle-livedata-2.0.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/9d0376b00ec387ca3c3839080791bf18/lifecycle-livedata-core-2.0.0-api.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.1.0/c67e7807d9cd6c329b9d0218b2ec4e505dd340b7/lifecycle-common-2.1.0.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/0d1d202ee6dd959bcb380e203fc4e913/core-runtime-2.0.0-api.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.2.0-alpha01/cf0f760ea00702c040b3f8c9ccbe615ae26356dc/annotation-1.2.0-alpha01.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/a0905a83d70bb629e8aa1be7300df54a/constraintlayout-1.1.3-api.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.constraintlayout/constraintlayout-solver/1.1.3/54abe9ffb22cc9019b0b6fcc10f185cc4e67b34e/constraintlayout-solver-1.1.3.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/00b27fb18e3e5c817fa83b00f0fdb315/jetified-FlycoTabLayout_Lib-2.1.2-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/521f9d2aec25b8a9cd23388090bb9770/jetified-SmartRefreshLayout-1.1.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/8436f6218bae1e2e239c8e9ae617d58e/jetified-SmartRefreshHeader-1.1.0-api.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/disklrucache/4.10.0/64b5e97b9b10c47b62577d2b25f1e1fe9dcd1f56/disklrucache-4.10.0.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/annotations/4.10.0/bbe80fe87e3a3a08c995557f3b8e66f479bf9363/annotations-4.10.0.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/28738d98c6fbf08c27587fa39e747036/jetified-core-3.7.7-api.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.arialyy.aria/annotations/3.7.7/a1e7f33ceaa3774a28e1c84ab9de811dcc6562ed/annotations-3.7.7.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/9bdddfb1469d364da82079de2cdb9c85/publicComponent-3.7.7-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/86036a3cabb68b0d42df82c7eb32671b/httpComponent-3.7.7-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/a6124e86245f3d7b6de7aa8fb79ec132/okrx-1.0.2-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/458bbdcfe9005a516d20207202190f53/okserver-2.0.5-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/e7f1b647ea402d5a401a3a92bccb32d1/okgo-3.0.4-api.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-scalars/2.1.0/7c0d7c8f6e52115bb82fa018d81a8d0cae35dde5/converter-scalars-2.1.0.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.1.0/aa557d71ead91cbf26e0c316a0f593d168303309/converter-gson-2.1.0.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/adapter-rxjava/2.1.0/693eddc23e87ab13f9cf5001707ce8e7e1d1ff01/adapter-rxjava-2.1.0.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.1.0/2de7cd8b95b7021b1d597f049bcb422055119f2c/retrofit-2.1.0.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.8.1/4d060ca3190df0eda4dc13415532a12e15ca5f11/okhttp-3.8.1.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/1ab7ac28b4fa6273e5ceb7dda1e6b36f/rxandroid-1.2.1-api.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/io.reactivex/rxjava/1.3.0/af000bec2036a2a9d07197c4b03b8966bfc60b03/rxjava-1.3.0.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.alibaba/fastjson/1.2.21/4dc148b3edc0d58c1bdb9e4835c187c488986e05/fastjson-1.2.21.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/eb45a998b04abd73fca832e60861b419/jetified-utilcode-1.23.7-api.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.2/3edcfe49d2c6053a70a2a47e4e1c2f94998a49cf/gson-2.8.2.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/efea9d2b5f0cbc3465e577c4764ab60b/xxpermissions-6.0-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/5ca097a96c676443b5650bec145a2220/jpush-3.4.1-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/6c2e7ece6efb856a01280eadc401568d/jcore-2.2.4-api.jar;C:/Users/Administrator/.gradle/caches/transforms-2/files-2.1/b4da5a332e8e81cf2982b5aaaae23616/jetified-bannerview-2.6.4-api.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.61/70dffc5f8ac5ea7c34f30deac5b9d8b1d48af066/kotlin-stdlib-jdk7-1.3.61.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.71/898273189ad22779da6bed88ded39b14cb5fd432/kotlin-stdlib-1.3.71.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.71/e71c3fef58e26affeb03d675e91fd8abdd44aa7b/kotlin-stdlib-common-1.3.71.jar;C:/Users/Administrator/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar;C:/Users/Administrator/AppData/Local/Android/Sdk/platforms/android-29/android.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="app_debug" />
@@ -145,7 +145,7 @@
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.1.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.1.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.2.0-alpha01@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.github.bumptech.glide:disklrucache:4.10.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.github.bumptech.glide:annotations:4.10.0@jar" level="project" />
@@ -165,35 +165,26 @@
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: uk.co.chrisjenx:calligraphy:2.3.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.3.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.4.0-alpha01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.github.bumptech.glide:glide:4.10.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.activity:activity:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core:1.3.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:gifdecoder:4.10.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core:1.4.0-alpha01@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:gifdecoder:4.10.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
diff --git a/app/build.gradle b/app/build.gradle
index 56f2348..cb50eb4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,13 +12,13 @@ def releaseTime() {
 
 android {
     compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    buildToolsVersion "29.0.3"
     defaultConfig {
         applicationId "com.appstore.uiui"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 18
-        versionName "1.1.8"
+        versionCode 19
+        versionName "1.1.9"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         //极光
         ndk {
@@ -100,9 +100,9 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
 
     testImplementation 'junit:junit:4.12'
diff --git a/app/src/main/java/com/appstore/uiui/MyApplication.java b/app/src/main/java/com/appstore/uiui/MyApplication.java
index 0d786ec..80ae6be 100644
--- a/app/src/main/java/com/appstore/uiui/MyApplication.java
+++ b/app/src/main/java/com/appstore/uiui/MyApplication.java
@@ -36,7 +36,6 @@ import java.io.File;
 
 import cn.jpush.android.api.CustomMessage;
 import cn.jpush.android.api.JPushInterface;
-import uk.co.chrisjenx.calligraphy.CalligraphyConfig;
 
 /**
  * Created by asus on 2017/10/27.
@@ -59,7 +58,7 @@ public class MyApplication extends Application {
             @NonNull
             @Override
             public RefreshHeader createRefreshHeader(@NonNull Context context, @NonNull RefreshLayout layout) {
-                layout.setPrimaryColorsId(R.color.download, R.color.green);//全局设置主题颜色
+                layout.setPrimaryColorsId(R.color.download, R.color.red);//全局设置主题颜色
                 return new ClassicsHeader(context);//.setTimeFormat(new DynamicTimeFormat("更新于 %s"));//指定为经典Header，默认是 贝塞尔雷达Header
             }
         });
diff --git a/app/src/main/java/com/appstore/uiui/activity/DetailsActivity.java b/app/src/main/java/com/appstore/uiui/activity/DetailsActivity.java
index 91f6d4b..d541251 100644
--- a/app/src/main/java/com/appstore/uiui/activity/DetailsActivity.java
+++ b/app/src/main/java/com/appstore/uiui/activity/DetailsActivity.java
@@ -17,6 +17,7 @@ import com.appstore.uiui.R;
 import com.appstore.uiui.adapter.ImageAdapter;
 import com.appstore.uiui.base.BaseActivity;
 import com.appstore.uiui.bean.AppInfo;
+import com.appstore.uiui.bean.GlideCircleWithBorder;
 import com.appstore.uiui.helper.CustomSnapHelper;
 import com.appstore.uiui.utils.ApkUtils;
 import com.appstore.uiui.utils.ToastUtil;
@@ -80,12 +81,13 @@ public class DetailsActivity extends BaseActivity {
         tv_name.setText(appInfo.getApp_name());
         tv_company.setText(appInfo.getApp_developer());
         detali_tv_size.setText("大小\t" + "(" + appInfo.getApp_size() + "MB" + ")");
-        detail_tv_Developers.setText("供应商\t" + appInfo.getApp_developer());
+        detail_tv_Developers.setText("开发者\t" + appInfo.getApp_developer());
         tv_update_time.setText("时间\t" + appInfo.getCreatetime());
         tv_version.setText("版本\t" + appInfo.getApp_version_name());
         tv_content.setText(appInfo.getApp_desc());
         rating_bar.setRating((float) appInfo.getApp_score());
-        Glide.with(this).asBitmap().load(appInfo.getApp_img()).into(iv_icon);
+        Glide.with(this).asBitmap().load(appInfo.getApp_img())                    .transform(new GlideCircleWithBorder(this))
+                .into(iv_icon);
         List<String> list = new ArrayList<String>() {{
             this.add(appInfo.getApp_preview1());
             this.add(appInfo.getApp_preview2());
diff --git a/app/src/main/java/com/appstore/uiui/activity/MainActivity.java b/app/src/main/java/com/appstore/uiui/activity/MainActivity.java
index 99d943b..8c1360f 100644
--- a/app/src/main/java/com/appstore/uiui/activity/MainActivity.java
+++ b/app/src/main/java/com/appstore/uiui/activity/MainActivity.java
@@ -130,7 +130,7 @@ public class MainActivity extends BaseActivity {
 
     private void initTabLayout() {
         final List<Fragment> fragmentList = new ArrayList<>();
-        fragmentList.add(new FeaturedFragment());
+        fragmentList.add(new FeaturedFragment(this));
         fragmentList.add(new RankFragment());
         fragmentList.add(new KindFragment());
         fragmentList.add(new ManageFragment());
diff --git a/app/src/main/java/com/appstore/uiui/activity/SearcherActivity.java b/app/src/main/java/com/appstore/uiui/activity/SearcherActivity.java
index 6f60434..2a59c1d 100644
--- a/app/src/main/java/com/appstore/uiui/activity/SearcherActivity.java
+++ b/app/src/main/java/com/appstore/uiui/activity/SearcherActivity.java
@@ -1,8 +1,10 @@
 package com.appstore.uiui.activity;
 
+import android.graphics.Color;
 import android.os.Handler;
 import android.os.Message;
 import android.view.View;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.SearchView;
@@ -36,6 +38,10 @@ public class SearcherActivity extends BaseActivity {
     @Override
     protected void initView() {
         search = findViewById(R.id.search);
+//        int id = search.getContext().getResources().getIdentifier("android:id/search_src_text", null, null);
+        TextView textView = search.findViewById(androidx.appcompat.R.id.search_src_text);
+        textView.setTextColor(Color.WHITE);
+        textView.setHintTextColor(Color.WHITE);//提示字体颜色**
         recyclerView = findViewById(R.id.recyclerView);
     }
 
diff --git a/app/src/main/java/com/appstore/uiui/adapter/AppAdapter.java b/app/src/main/java/com/appstore/uiui/adapter/AppAdapter.java
index 73bbec1..318b120 100644
--- a/app/src/main/java/com/appstore/uiui/adapter/AppAdapter.java
+++ b/app/src/main/java/com/appstore/uiui/adapter/AppAdapter.java
@@ -2,6 +2,8 @@ package com.appstore.uiui.adapter;
 
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,6 +17,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.appstore.uiui.R;
 import com.appstore.uiui.activity.DetailsActivity;
 import com.appstore.uiui.bean.AppInfo;
+import com.appstore.uiui.bean.GlideCircleWithBorder;
 import com.appstore.uiui.listener.LogDownloadListener;
 import com.appstore.uiui.utils.ApkUtils;
 import com.appstore.uiui.utils.ToastUtil;
@@ -70,11 +73,22 @@ public class AppAdapter extends RecyclerView.Adapter<AppAdapter.Holder> {
             holder.refresh(downloadTask.progress);
         }
 
+
+
         if (!isNotLoadBitmap) {
-            Glide.with(mContext).asBitmap().load(appInfo.getApp_img()).placeholder(R.drawable.ic_place_holder).into(holder.ivIcon);
+            Glide.with(mContext)
+                    .asBitmap()
+                    .load(appInfo.getApp_img())
+                    .placeholder(R.drawable.ic_place_holder)
+                    .transform(new GlideCircleWithBorder(mContext))
+                    .into(holder.ivIcon);
         } else {
-            Glide.with(mContext).load(R.drawable.ic_place_holder).into(holder.ivIcon);
+            Glide.with(mContext)
+                    .load(R.drawable.ic_place_holder)
+                    .transform(new GlideCircleWithBorder(mContext))
+                    .into(holder.ivIcon);
         }
+
         holder.tvCompany.setText(appInfo.getApp_developer());
         if (isShowOrder) {
             holder.tvName.setText((position + 1) + "." + appInfo.getApp_name());
diff --git a/app/src/main/java/com/appstore/uiui/adapter/DownloadManagerAdapter.java b/app/src/main/java/com/appstore/uiui/adapter/DownloadManagerAdapter.java
index 691716e..76e42a4 100644
--- a/app/src/main/java/com/appstore/uiui/adapter/DownloadManagerAdapter.java
+++ b/app/src/main/java/com/appstore/uiui/adapter/DownloadManagerAdapter.java
@@ -16,6 +16,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.appstore.uiui.R;
 import com.appstore.uiui.bean.AppInfo;
+import com.appstore.uiui.bean.GlideCircleWithBorder;
 import com.appstore.uiui.listener.LogDownloadListener;
 import com.appstore.uiui.view.NumberProgressBar;
 import com.bumptech.glide.Glide;
@@ -125,7 +126,11 @@ public class DownloadManagerAdapter extends RecyclerView.Adapter<DownloadManager
             Progress progress = task.progress;
             AppInfo apk = (AppInfo) progress.extra1;
             if (apk != null) {
-                Glide.with(mContext).load(apk.getApp_img()).error(R.mipmap.ic_launcher).into(icon);
+                Glide.with(mContext)
+                        .load(apk.getApp_img())
+                        .error(R.mipmap.ic_launcher)
+                        .transform(new GlideCircleWithBorder(mContext))
+                        .into(icon);
                 name.setText(apk.getApp_name());
             } else {
                 name.setText(progress.fileName);
diff --git a/app/src/main/java/com/appstore/uiui/adapter/KindAdapter.java b/app/src/main/java/com/appstore/uiui/adapter/KindAdapter.java
index dd64129..b31ade6 100644
--- a/app/src/main/java/com/appstore/uiui/adapter/KindAdapter.java
+++ b/app/src/main/java/com/appstore/uiui/adapter/KindAdapter.java
@@ -13,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.appstore.uiui.R;
 import com.appstore.uiui.activity.KindDetailActivity;
+import com.appstore.uiui.bean.GlideCircleWithBorder;
 import com.appstore.uiui.bean.Kind;
 import com.bumptech.glide.Glide;
 
@@ -41,7 +42,9 @@ public class KindAdapter extends RecyclerView.Adapter<KindAdapter.KindViewHolder
     public void onBindViewHolder(KindViewHolder holder, int position) {
         final Kind kind = mKindList.get(position);
         holder.tvName.setText(kind.getName());
-        Glide.with(mContext).load(kind.getIcon()).into(holder.ivIcon);
+        Glide.with(mContext).load(kind.getIcon())
+//                .transform(new GlideCircleWithBorder(mContext))
+                .into(holder.ivIcon);
         holder.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/main/java/com/appstore/uiui/adapter/LocalAppAdapter.java b/app/src/main/java/com/appstore/uiui/adapter/LocalAppAdapter.java
index fc8eece..5dd3034 100644
--- a/app/src/main/java/com/appstore/uiui/adapter/LocalAppAdapter.java
+++ b/app/src/main/java/com/appstore/uiui/adapter/LocalAppAdapter.java
@@ -3,6 +3,8 @@ package com.appstore.uiui.adapter;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.text.format.Formatter;
 import android.view.LayoutInflater;
@@ -17,8 +19,11 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.appstore.uiui.R;
 import com.appstore.uiui.bean.AppInfo;
+import com.appstore.uiui.bean.GlideCircleWithBorder;
 import com.appstore.uiui.bean.LocalApp;
 import com.appstore.uiui.utils.ApkUtils;
+import com.appstore.uiui.utils.Utils;
+import com.bumptech.glide.Glide;
 
 import java.util.List;
 
@@ -49,8 +54,11 @@ public class LocalAppAdapter extends RecyclerView.Adapter<LocalAppAdapter.LocalA
     @Override
     public void onBindViewHolder(LocalAppViewHolder holder, int position) {
         final LocalApp localApp = localAppList.get(position);
-
-        holder.ivIcon.setImageDrawable(localApp.getIcon());
+        Bitmap bitmap = Utils.getRoundedBitmap(Utils.DrawableToBitmap(localApp.getIcon()), context);
+        Glide.with(context).load(bitmap)
+                .transform(new GlideCircleWithBorder(context))
+                .into(holder.ivIcon);
+        holder.ivIcon.setImageDrawable(new BitmapDrawable(context.getResources(), bitmap));
         holder.tvCompany.setText(localApp.getCompany());
         holder.tvName.setText(localApp.getAppName());
         holder.tvVersion.setText(localApp.getVersion());
diff --git a/app/src/main/java/com/appstore/uiui/adapter/ShowImageAdapter.java b/app/src/main/java/com/appstore/uiui/adapter/ShowImageAdapter.java
index 84a4e9a..1a13fd0 100644
--- a/app/src/main/java/com/appstore/uiui/adapter/ShowImageAdapter.java
+++ b/app/src/main/java/com/appstore/uiui/adapter/ShowImageAdapter.java
@@ -9,6 +9,7 @@ import android.widget.ImageView;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.appstore.uiui.R;
+import com.appstore.uiui.bean.GlideCircleWithBorder;
 import com.bumptech.glide.Glide;
 
 import java.util.List;
@@ -36,7 +37,12 @@ public class ShowImageAdapter extends RecyclerView.Adapter<ShowImageAdapter.Imag
     @Override
     public void onBindViewHolder(ImageViewHolder holder, int position) {
         String src = mSrcList.get(position);
-        Glide.with(mContext).asBitmap().load(src).placeholder(R.drawable.ic_place_holder).into(holder.imageView);
+        Glide.with(mContext)
+                .asBitmap()
+                .load(src)
+                .placeholder(R.drawable.ic_place_holder)
+                .transform(new GlideCircleWithBorder(mContext))
+                .into(holder.imageView);
     }
 
     @Override
diff --git a/app/src/main/java/com/appstore/uiui/adapter/UpdateAppAdapter.java b/app/src/main/java/com/appstore/uiui/adapter/UpdateAppAdapter.java
index 8dece68..54f377c 100644
--- a/app/src/main/java/com/appstore/uiui/adapter/UpdateAppAdapter.java
+++ b/app/src/main/java/com/appstore/uiui/adapter/UpdateAppAdapter.java
@@ -8,7 +8,6 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.cardview.widget.CardView;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.appstore.uiui.R;
@@ -59,7 +58,7 @@ public class UpdateAppAdapter extends RecyclerView.Adapter<UpdateAppAdapter.Upda
         holder.tvName.setText(appInfo.getAppName());
         holder.tvVersion.setText(appInfo.getVersionName() + "->" + appInfo.getNewVersionName());
         holder.btnDownLoad.setText("更新");
-        holder.btnDownLoad.setTextColor(context.getColor(R.color.green));
+        holder.btnDownLoad.setTextColor(context.getColor(R.color.red));
         holder.btnDownLoad.setBackground(context.getDrawable(R.drawable.btn_style_none));
         holder.btnDownLoad.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/app/src/main/java/com/appstore/uiui/bean/GlideCircleWithBorder.java b/app/src/main/java/com/appstore/uiui/bean/GlideCircleWithBorder.java
new file mode 100644
index 0000000..db44f7c
--- /dev/null
+++ b/app/src/main/java/com/appstore/uiui/bean/GlideCircleWithBorder.java
@@ -0,0 +1,112 @@
+package com.appstore.uiui.bean;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.RectF;
+
+import com.appstore.uiui.R;
+import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
+import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
+
+import java.security.MessageDigest;
+
+/**
+ * 加载圆形头像带白色边框
+ */
+public class GlideCircleWithBorder extends BitmapTransformation {
+    private Paint mBorderPaint;
+    private float mBorderWidth;
+    private Context mContext;
+
+    public GlideCircleWithBorder(Context context) {
+        this.mContext = context;
+    }
+
+//    public GlideCircleWithBorder(Context context, int borderWidth, int borderColor) {
+//        this.mContext = context;
+//        mBorderWidth = Resources.getSystem().getDisplayMetrics().density * borderWidth;
+//        mBorderPaint = new Paint();
+//        mBorderPaint.setDither(true);
+//        mBorderPaint.setAntiAlias(true);
+//        mBorderPaint.setColor(borderColor);
+//        mBorderPaint.setStyle(Paint.Style.STROKE);
+//        mBorderPaint.setStrokeWidth(mBorderWidth);
+//    }
+
+    protected Bitmap transform(BitmapPool pool, Bitmap toTransform, int outWidth, int outHeight) {
+        return circleCrop(pool, toTransform);
+    }
+
+    private Bitmap circleCrop(BitmapPool pool, Bitmap source) {
+        if (source == null) {
+            return null;
+        }
+//        int size = (int) (Math.min(source.getWidth(), source.getHeight()) - (mBorderWidth / 2));
+//        int x = (source.getWidth() - size) / 2;
+//        int y = (source.getHeight() - size) / 2;
+//        Bitmap squared = Bitmap.createBitmap(source, x, y, size, size);
+//        Bitmap result = pool.get(size, size, Bitmap.Config.ARGB_8888);
+//        if (result == null) {
+//            result = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+//        }
+        //创建画笔 画布 手动描绘边框
+//        Canvas canvas = new Canvas(result);
+//        Paint paint = new Paint();
+//        paint.setShader(new BitmapShader(squared, BitmapShader.TileMode.CLAMP, BitmapShader.TileMode.CLAMP));
+//        paint.setAntiAlias(true);
+//        float r = size / 2f;
+//        canvas.drawCircle(r, r, r, paint);
+//        if (mBorderPaint != null) {
+//            float borderRadius = r - mBorderWidth / 2;
+//            canvas.drawCircle(r, r, borderRadius, mBorderPaint);
+//        }
+//        Bitmap bgBitmap = Bitmap.createBitmap(mBitmap.getWidth(), mBitmap.getHeight(), Bitmap.Config.ARGB_8888);
+
+        Bitmap mask = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.mask);
+        //获取背景
+        int width = mask.getWidth();
+        int height = mask.getHeight();
+        Bitmap result = pool.get(width, height, Bitmap.Config.ARGB_8888);
+        if (result == null) {
+            result = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        }
+
+        Bitmap bitmapScale = Bitmap.createScaledBitmap(source, width, height, true);
+        Canvas canvas = new Canvas();
+        Paint paint = new Paint();
+        canvas.setBitmap(result);
+        canvas.drawBitmap(mask, 0, 0, paint);
+        canvas.drawBitmap(bitmapScale, 0, 0, paint);
+        Bitmap result2 = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+
+        Canvas canvas2 = new Canvas();
+        Paint paint2 = new Paint();
+        canvas2.setBitmap(result2);
+        canvas2.drawBitmap(mask, 0, 0, paint2);
+        paint2.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
+        canvas2.drawBitmap(result, 0, 0, paint2);
+
+        Bitmap bitmapshadow =BitmapFactory.decodeResource(mContext.getResources(), R.drawable.mask_shadow);
+        Bitmap bitmap=Bitmap.createScaledBitmap(bitmapshadow,width+2,height+2,true);
+        Canvas canvas3=new Canvas();
+        Paint paint3=new Paint();
+        canvas3.setBitmap(bitmap);
+        canvas3.drawBitmap(bitmapshadow,0,0,paint3);
+        canvas3.drawBitmap(result2,1,1,paint3);
+
+        return bitmap;
+    }
+
+    @Override
+    public void updateDiskCacheKey(MessageDigest messageDigest) {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/appstore/uiui/fragment/FeaturedFragment.java b/app/src/main/java/com/appstore/uiui/fragment/FeaturedFragment.java
index a63c276..1ee6752 100644
--- a/app/src/main/java/com/appstore/uiui/fragment/FeaturedFragment.java
+++ b/app/src/main/java/com/appstore/uiui/fragment/FeaturedFragment.java
@@ -53,6 +53,12 @@ public class FeaturedFragment extends LazyLoadFragment implements RefreshManager
     private boolean isNotLoadBitmap;
 
     private installReceiver myReceiver;
+    private Context mContext;
+
+    public FeaturedFragment(Context context) {
+        this.mContext = context;
+    }
+
 
     @Override
     public int getLayoutId() {
@@ -83,7 +89,7 @@ public class FeaturedFragment extends LazyLoadFragment implements RefreshManager
             filter.addAction("com.appstore.uiui.PACKAGE_REPLACED");
             filter.addAction("com.appstore.uiui.PACKAGE_REMOVED");
             filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
-            getActivity().getApplication().registerReceiver(myReceiver, filter);
+            mContext.registerReceiver(myReceiver, filter);
         }
     }
 
@@ -108,7 +114,7 @@ public class FeaturedFragment extends LazyLoadFragment implements RefreshManager
                         return new BannerViewHolder();
                     }
                 })
-                .setIndicatorColor(getResources().getColor(R.color.colorAccent), getResources().getColor(R.color.colorAccent))
+                .setIndicatorColor(getResources().getColor(R.color.white), getResources().getColor(R.color.colorAccent))
                 .setOnPageClickListener(new BannerViewPager.OnPageClickListener() {
                     @Override
                     public void onPageClick(int position) {
@@ -180,7 +186,7 @@ public class FeaturedFragment extends LazyLoadFragment implements RefreshManager
                                     return new BannerViewHolder();
                                 }
                             })
-                            .setIndicatorColor(getResources().getColor(R.color.colorAccent), getResources().getColor(R.color.colorAccent))
+                            .setIndicatorColor(getResources().getColor(R.color.white), getResources().getColor(R.color.colorAccent))
                             .setOnPageClickListener(new BannerViewPager.OnPageClickListener() {
                                 @Override
                                 public void onPageClick(int position) {
diff --git a/app/src/main/java/com/appstore/uiui/fragment/KindFragment.java b/app/src/main/java/com/appstore/uiui/fragment/KindFragment.java
index 371522f..6626f5d 100644
--- a/app/src/main/java/com/appstore/uiui/fragment/KindFragment.java
+++ b/app/src/main/java/com/appstore/uiui/fragment/KindFragment.java
@@ -14,7 +14,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.appstore.uiui.R;
 import com.appstore.uiui.adapter.KindAdapter;
 import com.appstore.uiui.base.BaseFragment;
-import com.appstore.uiui.base.RefreshManager;
 import com.appstore.uiui.bean.Kind;
 
 import java.util.ArrayList;
@@ -44,17 +43,17 @@ public class KindFragment extends BaseFragment {
 
     private void initView() {
         kindList = new ArrayList<>();
-        kindList.add(new Kind("语文", 1, R.drawable.icon_language));
-        kindList.add(new Kind("数学", 2, R.drawable.icon_math));
-        kindList.add(new Kind("英语", 3, R.drawable.icon_english));
-        kindList.add(new Kind("物理", 4, R.drawable.icon_physics));
-        kindList.add(new Kind("化学", 5, R.drawable.icon_chemistry));
-        kindList.add(new Kind("生物", 6, R.drawable.icon_biology));
-        kindList.add(new Kind("政治", 7, R.drawable.icon_politics));
-        kindList.add(new Kind("历史", 8, R.drawable.icon_history));
-        kindList.add(new Kind("地理", 9, R.drawable.icon_geography));
+        kindList.add(new Kind("语文", 1, R.drawable.icon_language1));
+        kindList.add(new Kind("数学", 2, R.drawable.icon_math1));
+        kindList.add(new Kind("英语", 3, R.drawable.icon_english1));
+        kindList.add(new Kind("物理", 4, R.drawable.icon_physics1));
+        kindList.add(new Kind("化学", 5, R.drawable.icon_chemistry1));
+        kindList.add(new Kind("生物", 6, R.drawable.icon_biology1));
+        kindList.add(new Kind("政治", 7, R.drawable.icon_politics1));
+        kindList.add(new Kind("历史", 8, R.drawable.icon_history1));
+        kindList.add(new Kind("地理", 9, R.drawable.icon_geography1));
 
-        kindList.add(new Kind("娱乐", 0, R.drawable.icon_game));
+        kindList.add(new Kind("娱乐", 0, R.drawable.icon_game1));
 
         adapter = new KindAdapter(kindList, getContext());
         mRvKind.setAdapter(adapter);
diff --git a/app/src/main/java/com/appstore/uiui/utils/Utils.java b/app/src/main/java/com/appstore/uiui/utils/Utils.java
index e88f999..4b22813 100644
--- a/app/src/main/java/com/appstore/uiui/utils/Utils.java
+++ b/app/src/main/java/com/appstore/uiui/utils/Utils.java
@@ -12,6 +12,14 @@ import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.PixelFormat;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.drawable.Drawable;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Build;
@@ -24,6 +32,8 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.Toast;
 
+import com.appstore.uiui.R;
+
 import java.io.FileReader;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
@@ -704,4 +714,72 @@ public class Utils {
 
     }
 
+    public static Bitmap getRoundedBitmap(Bitmap mBitmap, Context context) {
+        Bitmap bgBitmap = Bitmap.createBitmap(mBitmap.getWidth(), mBitmap.getHeight(), Bitmap.Config.ARGB_8888);
+
+        Bitmap mask = BitmapFactory.decodeResource(context.getResources(), R.drawable.mask);
+        int width = mask.getWidth();
+        int height = mask.getHeight();
+        Bitmap bitmapScale = Bitmap.createScaledBitmap(mBitmap, width, height, true);
+
+//        Palette p = Palette.from(mBitmap).generate();
+//        Palette.Swatch vibrant = p.getVibrantSwatch();//有活力的
+//        int color = vibrant.getRgb(); //样本中的像素数量
+
+        Bitmap result = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas();
+        Paint paint = new Paint();
+
+        canvas.setBitmap(result);
+//        canvas.drawColor(color);
+        canvas.drawBitmap(mask, 0, 0, paint);
+//        paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
+        canvas.drawBitmap(bitmapScale, 0, 0, paint);
+//        return result;
+
+        Bitmap result2 = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas2 = new Canvas();
+        Paint paint2 = new Paint();
+        canvas2.setBitmap(result2);
+        canvas2.drawBitmap(mask, 0, 0, paint2);
+        paint2.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
+        canvas2.drawBitmap(result, 0, 0, paint2);
+        return result2;
+
+
+//        Canvas mCanvas = new Canvas();
+//        mCanvas.setBitmap(bgBitmap);
+//        Paint mPaint = new Paint();
+//        RectF mRectM = new RectF(scaleM, scaleM, mBitmap.getWidth() - scaleM, mBitmap.getHeight() - scaleM); //设置剪裁圆角的区域
+//        Rect mRect = new Rect(0, 0, mBitmap.getWidth(), mBitmap.getHeight());
+//        RectF mRectF = mRectM;
+//
+//        float roundPx = 15;    //圆角半径
+//        mPaint.setAntiAlias(true);
+//        //Log.d("wy"+TAG,"mBitmap.getWidth()="+mBitmap.getWidth()+", mBitmap.getHeight()="+mBitmap.getHeight());
+//        mCanvas.drawRoundRect(mRectF, roundPx, roundPx, mPaint);
+//        mPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
+//        mCanvas.drawBitmap(mBitmap, mRect, mRect, mPaint);
+//        return bgBitmap;
+    }
+    public static Bitmap DrawableToBitmap(Drawable drawable) {
+
+        // 获取 drawable 长宽
+        int width = drawable.getIntrinsicWidth();
+        int heigh = drawable.getIntrinsicHeight();
+
+        drawable.setBounds(0, 0, width, heigh);
+
+        // 获取drawable的颜色格式
+        Bitmap.Config config = drawable.getOpacity() != PixelFormat.OPAQUE ? Bitmap.Config.ARGB_8888
+                : Bitmap.Config.RGB_565;
+        // 创建bitmap
+        Bitmap bitmap = Bitmap.createBitmap(width, heigh, config);
+        // 创建bitmap画布
+        Canvas canvas = new Canvas(bitmap);
+        // 将drawable 内容画到画布中
+        drawable.draw(canvas);
+        return bitmap;
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/abs__ic_menu_moreoverflow_normal_holo_light.png b/app/src/main/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
similarity index 100%
rename from app/src/main/res/drawable/abs__ic_menu_moreoverflow_normal_holo_light.png
rename to app/src/main/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
diff --git a/app/src/main/res/drawable/appstore_logo.png b/app/src/main/res/drawable-xhdpi/appstore_logo.png
similarity index 100%
rename from app/src/main/res/drawable/appstore_logo.png
rename to app/src/main/res/drawable-xhdpi/appstore_logo.png
diff --git a/app/src/main/res/drawable/bt_delete.png b/app/src/main/res/drawable-xhdpi/bt_delete.png
similarity index 100%
rename from app/src/main/res/drawable/bt_delete.png
rename to app/src/main/res/drawable-xhdpi/bt_delete.png
diff --git a/app/src/main/res/drawable/bt_return.png b/app/src/main/res/drawable-xhdpi/bt_return.png
similarity index 100%
rename from app/src/main/res/drawable/bt_return.png
rename to app/src/main/res/drawable-xhdpi/bt_return.png
diff --git a/app/src/main/res/drawable/favorite_bg.png b/app/src/main/res/drawable-xhdpi/favorite_bg.png
similarity index 100%
rename from app/src/main/res/drawable/favorite_bg.png
rename to app/src/main/res/drawable-xhdpi/favorite_bg.png
diff --git a/app/src/main/res/drawable/favorite_btn_normal.png b/app/src/main/res/drawable-xhdpi/favorite_btn_normal.png
similarity index 100%
rename from app/src/main/res/drawable/favorite_btn_normal.png
rename to app/src/main/res/drawable-xhdpi/favorite_btn_normal.png
diff --git a/app/src/main/res/drawable/favorite_btn_pressed.png b/app/src/main/res/drawable-xhdpi/favorite_btn_pressed.png
similarity index 100%
rename from app/src/main/res/drawable/favorite_btn_pressed.png
rename to app/src/main/res/drawable-xhdpi/favorite_btn_pressed.png
diff --git a/app/src/main/res/drawable/ic_action_bar.png b/app/src/main/res/drawable-xhdpi/ic_action_bar.png
similarity index 100%
rename from app/src/main/res/drawable/ic_action_bar.png
rename to app/src/main/res/drawable-xhdpi/ic_action_bar.png
diff --git a/app/src/main/res/drawable/ic_app.png b/app/src/main/res/drawable-xhdpi/ic_app.png
similarity index 100%
rename from app/src/main/res/drawable/ic_app.png
rename to app/src/main/res/drawable-xhdpi/ic_app.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_back.png b/app/src/main/res/drawable-xhdpi/ic_back.png
new file mode 100644
index 0000000..dbafbd0
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_back.png differ
diff --git a/app/src/main/res/drawable/ic_kind_detail.png b/app/src/main/res/drawable-xhdpi/ic_kind_detail.png
similarity index 100%
rename from app/src/main/res/drawable/ic_kind_detail.png
rename to app/src/main/res/drawable-xhdpi/ic_kind_detail.png
diff --git a/app/src/main/res/drawable/ic_logo.png b/app/src/main/res/drawable-xhdpi/ic_logo.png
similarity index 100%
rename from app/src/main/res/drawable/ic_logo.png
rename to app/src/main/res/drawable-xhdpi/ic_logo.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_search.png b/app/src/main/res/drawable-xhdpi/ic_menu_search.png
new file mode 100644
index 0000000..fcd26fb
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_menu_search.png differ
diff --git a/app/src/main/res/drawable/ic_menu_share_normal.png b/app/src/main/res/drawable-xhdpi/ic_menu_share_normal.png
similarity index 100%
rename from app/src/main/res/drawable/ic_menu_share_normal.png
rename to app/src/main/res/drawable-xhdpi/ic_menu_share_normal.png
diff --git a/app/src/main/res/drawable/ic_menu_share_pressed.png b/app/src/main/res/drawable-xhdpi/ic_menu_share_pressed.png
similarity index 100%
rename from app/src/main/res/drawable/ic_menu_share_pressed.png
rename to app/src/main/res/drawable-xhdpi/ic_menu_share_pressed.png
diff --git a/app/src/main/res/drawable/ic_overflow.png b/app/src/main/res/drawable-xhdpi/ic_overflow.png
similarity index 100%
rename from app/src/main/res/drawable/ic_overflow.png
rename to app/src/main/res/drawable-xhdpi/ic_overflow.png
diff --git a/app/src/main/res/drawable/ic_overflow1.png b/app/src/main/res/drawable-xhdpi/ic_overflow1.png
similarity index 100%
rename from app/src/main/res/drawable/ic_overflow1.png
rename to app/src/main/res/drawable-xhdpi/ic_overflow1.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_place_holder.png b/app/src/main/res/drawable-xhdpi/ic_place_holder.png
new file mode 100644
index 0000000..b264a49
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_place_holder.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_biology1.png b/app/src/main/res/drawable-xhdpi/icon_biology1.png
new file mode 100644
index 0000000..638075c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_biology1.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_chemistry1.png b/app/src/main/res/drawable-xhdpi/icon_chemistry1.png
new file mode 100644
index 0000000..b3c594f
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_chemistry1.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_download_task.png b/app/src/main/res/drawable-xhdpi/icon_download_task.png
new file mode 100644
index 0000000..9c23e46
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_download_task.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_english1.png b/app/src/main/res/drawable-xhdpi/icon_english1.png
new file mode 100644
index 0000000..366e13d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_english1.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_game1.png b/app/src/main/res/drawable-xhdpi/icon_game1.png
new file mode 100644
index 0000000..98600a6
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_game1.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_geography1.png b/app/src/main/res/drawable-xhdpi/icon_geography1.png
new file mode 100644
index 0000000..700c06d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_geography1.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_history1.png b/app/src/main/res/drawable-xhdpi/icon_history1.png
new file mode 100644
index 0000000..76418a7
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_history1.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_language1.png b/app/src/main/res/drawable-xhdpi/icon_language1.png
new file mode 100644
index 0000000..7993b28
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_language1.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_math1.png b/app/src/main/res/drawable-xhdpi/icon_math1.png
new file mode 100644
index 0000000..c60b614
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_math1.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_my_task.png b/app/src/main/res/drawable-xhdpi/icon_my_task.png
new file mode 100644
index 0000000..d231593
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_my_task.png differ
diff --git a/app/src/main/res/drawable/icon_nodata.png b/app/src/main/res/drawable-xhdpi/icon_nodata.png
similarity index 100%
rename from app/src/main/res/drawable/icon_nodata.png
rename to app/src/main/res/drawable-xhdpi/icon_nodata.png
diff --git a/app/src/main/res/drawable/icon_notask.png b/app/src/main/res/drawable-xhdpi/icon_notask.png
similarity index 100%
rename from app/src/main/res/drawable/icon_notask.png
rename to app/src/main/res/drawable-xhdpi/icon_notask.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_physics1.png b/app/src/main/res/drawable-xhdpi/icon_physics1.png
new file mode 100644
index 0000000..19eb1c7
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_physics1.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_politics1.png b/app/src/main/res/drawable-xhdpi/icon_politics1.png
new file mode 100644
index 0000000..a840144
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_politics1.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_search.png b/app/src/main/res/drawable-xhdpi/icon_search.png
new file mode 100644
index 0000000..17d8d98
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_search.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_update_task.png b/app/src/main/res/drawable-xhdpi/icon_update_task.png
new file mode 100644
index 0000000..ad005f8
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_update_task.png differ
diff --git a/app/src/main/res/drawable-xhdpi/mask.png b/app/src/main/res/drawable-xhdpi/mask.png
new file mode 100644
index 0000000..a108ec9
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/mask.png differ
diff --git a/app/src/main/res/drawable-xhdpi/mask_shadow.png b/app/src/main/res/drawable-xhdpi/mask_shadow.png
new file mode 100644
index 0000000..e0f512a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/mask_shadow.png differ
diff --git a/app/src/main/res/drawable/search_bottom.png b/app/src/main/res/drawable-xhdpi/search_bottom.png
similarity index 100%
rename from app/src/main/res/drawable/search_bottom.png
rename to app/src/main/res/drawable-xhdpi/search_bottom.png
diff --git a/app/src/main/res/drawable/background_title.xml b/app/src/main/res/drawable/background_title.xml
new file mode 100644
index 0000000..6167e65
--- /dev/null
+++ b/app/src/main/res/drawable/background_title.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <!--
+    android:startColor="#aa000000"  渐变起始色值
+    android:centerColor=""      渐变中间色值
+    android:endColor="#ffffffff"    渐变结束颜色
+    android:angle="45"      渐变的方向 默认为0 从做向右 ，90时从下向上 必须为45的整数倍
+    android:type="radial"       渐变类型 有三种 线性linear 放射渐变radial 扫描线性渐变sweep
+    android:centerX="0.5"       渐变中心相对X坐标只有渐变类型为放射渐变时有效
+    android:centerY="0.5"       渐变中心相对Y坐标只有渐变类型为放射渐变时有效
+    android:gradientRadius="100"    渐变半径 非线性放射有效
+     -->
+    <gradient
+        android:startColor="#dd5035"
+        android:endColor="#c12b6a"
+        android:angle="90"
+        />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_style_delete.xml b/app/src/main/res/drawable/btn_style_delete.xml
index 597712d..9e8eee5 100644
--- a/app/src/main/res/drawable/btn_style_delete.xml
+++ b/app/src/main/res/drawable/btn_style_delete.xml
@@ -1,36 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- 连框颜色值 -->
+
+    <!--边-->
     <item>
-        <shape>
-            <solid android:color="#f9493c" />
-            <corners android:radius="@dimen/dp_25" />
-
-        </shape>
-    </item>
-    <!-- 主体背景颜色值 -->
-    <item
-        android:bottom="1dp"
-        android:left="1dp"
-        android:right="1dp"
-        android:top="1dp">
-        <shape>
-<!--            <gradient-->
-<!--                android:angle="90"-->
-<!--                android:centerColor="#FFFFFF"-->
-<!--                android:centerX="0.5"-->
-<!--                android:centerY="0.5"-->
-<!--                android:endColor="#FFFFFF"-->
-<!--                android:startColor="#FFFFFF"-->
-<!--                android:type="linear" />-->
-
+        <shape android:shape="rectangle">
             <padding
-                android:bottom="2dp"
-                android:left="2dp"
-                android:right="2dp"
-                android:top="2dp" />
-            <!-- 应该是圆角 -->
-            <corners android:radius="@dimen/dp_25" />
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#00CCCCCC" />
+
+            <corners android:radius="25dp" />
         </shape>
     </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#10CCCCCC" />
+
+            <corners android:radius="225dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#20CCCCCC" />
+
+            <corners android:radius="25dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#30CCCCCC" />
+
+            <corners android:radius="25dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#50CCCCCC" />
+            <corners android:radius="25dp" />
+        </shape>
+    </item>
+
+    <!--中心背景 -->
+    <item>
+        <shape
+            android:shape="rectangle"
+            android:useLevel="false">
+            <!--实心 -->
+            <solid android:color="@color/red" />
+            <corners android:radius="25dp" />
+            <size android:width="32dp"
+                android:height="32dp"/>
+
+        </shape>
+    </item>
+
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_style_none.xml b/app/src/main/res/drawable/btn_style_none.xml
index ea4399f..ac143e5 100644
--- a/app/src/main/res/drawable/btn_style_none.xml
+++ b/app/src/main/res/drawable/btn_style_none.xml
@@ -1,36 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- 连框颜色值 -->
+
+    <!--边-->
     <item>
-        <shape>
-            <solid android:color="@color/download" />
-            <corners android:radius="@dimen/dp_25" />
-
-        </shape>
-    </item>
-    <!-- 主体背景颜色值 -->
-    <item
-        android:bottom="1dp"
-        android:left="1dp"
-        android:right="1dp"
-        android:top="1dp">
-        <shape>
-<!--            <gradient-->
-<!--                android:angle="90"-->
-<!--                android:centerColor="#FFFFFF"-->
-<!--                android:centerX="0.5"-->
-<!--                android:centerY="0.5"-->
-<!--                android:endColor="#FFFFFF"-->
-<!--                android:startColor="#FFFFFF"-->
-<!--                android:type="linear" />-->
-
+        <shape android:shape="rectangle">
             <padding
-                android:bottom="2dp"
-                android:left="2dp"
-                android:right="2dp"
-                android:top="2dp" />
-            <!-- 应该是圆角 -->
-            <corners android:radius="@dimen/dp_25" />
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#00CCCCCC" />
+
+            <corners android:radius="25dp" />
         </shape>
     </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#10CCCCCC" />
+
+            <corners android:radius="225dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#20CCCCCC" />
+
+            <corners android:radius="25dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#30CCCCCC" />
+
+            <corners android:radius="25dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#50CCCCCC" />
+            <corners android:radius="25dp" />
+        </shape>
+    </item>
+
+    <!--中心背景 -->
+    <item>
+        <shape
+            android:shape="rectangle"
+            android:useLevel="false">
+            <!--实心 -->
+            <solid android:color="@color/white" />
+            <corners android:radius="25dp" />
+            <size android:width="32dp"
+                android:height="32dp"/>
+
+        </shape>
+    </item>
+
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_style_open.xml b/app/src/main/res/drawable/btn_style_open.xml
index 82dfadb..9e8eee5 100644
--- a/app/src/main/res/drawable/btn_style_open.xml
+++ b/app/src/main/res/drawable/btn_style_open.xml
@@ -1,36 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- 连框颜色值 -->
+
+    <!--边-->
     <item>
-        <shape>
-            <solid android:color="@color/green" />
-            <corners android:radius="@dimen/dp_25" />
-
-        </shape>
-    </item>
-    <!-- 主体背景颜色值 -->
-    <item
-        android:bottom="1dp"
-        android:left="1dp"
-        android:right="1dp"
-        android:top="1dp">
-        <shape>
-<!--            <gradient-->
-<!--                android:angle="90"-->
-<!--                android:centerColor="#FFFFFF"-->
-<!--                android:centerX="0.5"-->
-<!--                android:centerY="0.5"-->
-<!--                android:endColor="#FFFFFF"-->
-<!--                android:startColor="#FFFFFF"-->
-<!--                android:type="linear" />-->
-
+        <shape android:shape="rectangle">
             <padding
-                android:bottom="2dp"
-                android:left="2dp"
-                android:right="2dp"
-                android:top="2dp" />
-            <!-- 应该是圆角 -->
-            <corners android:radius="@dimen/dp_25" />
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#00CCCCCC" />
+
+            <corners android:radius="25dp" />
         </shape>
     </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#10CCCCCC" />
+
+            <corners android:radius="225dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#20CCCCCC" />
+
+            <corners android:radius="25dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#30CCCCCC" />
+
+            <corners android:radius="25dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#50CCCCCC" />
+            <corners android:radius="25dp" />
+        </shape>
+    </item>
+
+    <!--中心背景 -->
+    <item>
+        <shape
+            android:shape="rectangle"
+            android:useLevel="false">
+            <!--实心 -->
+            <solid android:color="@color/red" />
+            <corners android:radius="25dp" />
+            <size android:width="32dp"
+                android:height="32dp"/>
+
+        </shape>
+    </item>
+
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_style_shadow.xml b/app/src/main/res/drawable/btn_style_shadow.xml
new file mode 100644
index 0000000..3354d68
--- /dev/null
+++ b/app/src/main/res/drawable/btn_style_shadow.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 连框颜色值 -->
+    <item>
+        <shape>
+            <solid android:color="@color/download" />
+            <corners android:radius="@dimen/dp_25" />
+
+        </shape>
+    </item>
+    <!-- 主体背景颜色值 -->
+    <item
+        android:bottom="1dp"
+        android:left="1dp"
+        android:right="1dp"
+        android:top="1dp">
+        <shape>
+            <!--            <gradient-->
+            <!--                android:angle="90"-->
+            <!--                android:centerColor="#FFFFFF"-->
+            <!--                android:centerX="0.5"-->
+            <!--                android:centerY="0.5"-->
+            <!--                android:endColor="#FFFFFF"-->
+            <!--                android:startColor="#FFFFFF"-->
+            <!--                android:type="linear" />-->
+
+            <padding
+                android:bottom="2dp"
+                android:left="2dp"
+                android:right="2dp"
+                android:top="2dp" />
+            <!-- 应该是圆角 -->
+            <corners android:radius="@dimen/dp_25" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_back.png b/app/src/main/res/drawable/ic_back.png
deleted file mode 100644
index fee4e16..0000000
Binary files a/app/src/main/res/drawable/ic_back.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_menu_search.png b/app/src/main/res/drawable/ic_menu_search.png
deleted file mode 100644
index 5d7196b..0000000
Binary files a/app/src/main/res/drawable/ic_menu_search.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_place_holder.png b/app/src/main/res/drawable/ic_place_holder.png
deleted file mode 100644
index 7f15d89..0000000
Binary files a/app/src/main/res/drawable/ic_place_holder.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_biology.png b/app/src/main/res/drawable/icon_biology.png
deleted file mode 100644
index 3391e3a..0000000
Binary files a/app/src/main/res/drawable/icon_biology.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_chemistry.png b/app/src/main/res/drawable/icon_chemistry.png
deleted file mode 100644
index 1b67635..0000000
Binary files a/app/src/main/res/drawable/icon_chemistry.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_download_task.png b/app/src/main/res/drawable/icon_download_task.png
deleted file mode 100644
index c8232ac..0000000
Binary files a/app/src/main/res/drawable/icon_download_task.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_english.png b/app/src/main/res/drawable/icon_english.png
deleted file mode 100644
index 6f5ddc1..0000000
Binary files a/app/src/main/res/drawable/icon_english.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_game.png b/app/src/main/res/drawable/icon_game.png
deleted file mode 100644
index 72394c9..0000000
Binary files a/app/src/main/res/drawable/icon_game.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_geography.png b/app/src/main/res/drawable/icon_geography.png
deleted file mode 100644
index b50d18c..0000000
Binary files a/app/src/main/res/drawable/icon_geography.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_history.png b/app/src/main/res/drawable/icon_history.png
deleted file mode 100644
index 99c7b5a..0000000
Binary files a/app/src/main/res/drawable/icon_history.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_language.png b/app/src/main/res/drawable/icon_language.png
deleted file mode 100644
index b48fa58..0000000
Binary files a/app/src/main/res/drawable/icon_language.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_math.png b/app/src/main/res/drawable/icon_math.png
deleted file mode 100644
index 61ec0f8..0000000
Binary files a/app/src/main/res/drawable/icon_math.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_my_task.png b/app/src/main/res/drawable/icon_my_task.png
deleted file mode 100644
index ee6e419..0000000
Binary files a/app/src/main/res/drawable/icon_my_task.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_physics.png b/app/src/main/res/drawable/icon_physics.png
deleted file mode 100644
index fc622ae..0000000
Binary files a/app/src/main/res/drawable/icon_physics.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_politics.png b/app/src/main/res/drawable/icon_politics.png
deleted file mode 100644
index 3bff914..0000000
Binary files a/app/src/main/res/drawable/icon_politics.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_serach.png b/app/src/main/res/drawable/icon_serach.png
deleted file mode 100644
index 1790b7b..0000000
Binary files a/app/src/main/res/drawable/icon_serach.png and /dev/null differ
diff --git a/app/src/main/res/drawable/icon_update_task.png b/app/src/main/res/drawable/icon_update_task.png
deleted file mode 100644
index 14f3e4b..0000000
Binary files a/app/src/main/res/drawable/icon_update_task.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ll_customer_selected.xml b/app/src/main/res/drawable/ll_customer_selected.xml
index feb4636..d2ce7b6 100644
--- a/app/src/main/res/drawable/ll_customer_selected.xml
+++ b/app/src/main/res/drawable/ll_customer_selected.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <solid android:color="@color/green" />
+    <solid android:color="@color/gray" />
 
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shap_search_left.xml b/app/src/main/res/drawable/shap_search_left.xml
index 16c9202..dbd3ef9 100644
--- a/app/src/main/res/drawable/shap_search_left.xml
+++ b/app/src/main/res/drawable/shap_search_left.xml
@@ -4,6 +4,9 @@
     <solid android:color="@color/backgroundcolor" />
     <!-- 圆角的幅度 -->
     <corners
-        android:bottomLeftRadius="@dimen/dp_25"
-        android:topLeftRadius="@dimen/dp_25" />
+        android:bottomLeftRadius="@dimen/dp_20"
+        android:topLeftRadius="@dimen/dp_20" />
+    <size
+        android:width="@dimen/dp_20"
+        android:height="@dimen/dp_40" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shap_search_right.xml b/app/src/main/res/drawable/shap_search_right.xml
index d3b77c4..2ca67af 100644
--- a/app/src/main/res/drawable/shap_search_right.xml
+++ b/app/src/main/res/drawable/shap_search_right.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 内部颜色 -->
-    <solid
-        android:color="@color/backgroundcolor" />
+    <solid android:color="@color/backgroundcolor" />
     <!-- 圆角的幅度 -->
     <corners
-        android:topRightRadius="@dimen/dp_25"
-        android:bottomRightRadius="@dimen/dp_25" />
+        android:bottomRightRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+    <size
+        android:width="@dimen/dp_20"
+        android:height="@dimen/dp_20" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index a7a1b15..1ad1af1 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -9,7 +9,8 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/constraintLayout"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_30"
+        android:layout_height="@dimen/activity_title_height"
+        android:background="@drawable/background_title"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -17,12 +18,12 @@
 
         <ImageView
             android:id="@+id/iv_exit"
-            android:layout_width="@dimen/dp_15"
-            android:layout_height="@dimen/dp_15"
-            android:layout_marginLeft="@dimen/dp_5"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_marginStart="20dp"
             android:adjustViewBounds="true"
             android:scaleType="centerCrop"
-            android:src="@drawable/bt_return"
+            android:src="@drawable/ic_back"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -33,8 +34,8 @@
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
             android:text="关于"
-            android:textColor="#4b4b4b"
-            android:textSize="@dimen/sp_14"
+            android:textColor="#ffffff"
+            android:textSize="@dimen/activity_font_size"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -44,8 +45,8 @@
 
     <ImageView
         android:id="@+id/imageView3"
-        android:layout_width="@dimen/dp_100"
-        android:layout_height="@dimen/dp_100"
+        android:layout_width="@dimen/dp_200"
+        android:layout_height="@dimen/dp_200"
         android:layout_marginTop="64dp"
         android:adjustViewBounds="true"
         android:scaleType="fitCenter"
diff --git a/app/src/main/res/layout/activity_details.xml b/app/src/main/res/layout/activity_details.xml
index 45dfebc..168ee5d 100644
--- a/app/src/main/res/layout/activity_details.xml
+++ b/app/src/main/res/layout/activity_details.xml
@@ -7,14 +7,15 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_marginLeft="20dp"
+        android:layout_height="@dimen/activity_title_height"
+        android:background="@drawable/background_title"
         android:orientation="horizontal">
 
         <ImageView
             android:id="@+id/search_iv_back"
             android:layout_width="20dp"
             android:layout_height="20dp"
+            android:layout_marginStart="20dp"
             android:layout_gravity="center_vertical"
             android:adjustViewBounds="true"
             android:onClick="finish"
@@ -29,8 +30,8 @@
             android:gravity="center_vertical"
             android:singleLine="true"
             android:text="应用详情"
-            android:textColor="#8c8b8b"
-            android:textSize="@dimen/sp_15"
+            android:textColor="#ffffff"
+            android:textSize="@dimen/activity_font_size"
             android:textStyle="bold" />
 
     </LinearLayout>
@@ -39,11 +40,13 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:background="@color/white"
         android:layout_weight="1">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@color/white"
             android:orientation="vertical">
 
             <LinearLayout
@@ -79,7 +82,7 @@
                         android:singleLine="true"
                         android:text="今日头条"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/sp_11" />
+                        android:textSize="@dimen/sp_16" />
 
 
                     <RatingBar
@@ -106,6 +109,8 @@
                 android:id="@+id/detail_rv_image"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="@color/white"
+
                 android:layout_marginTop="15dp"
                 android:layout_marginBottom="15dp" />
 
@@ -115,7 +120,7 @@
                 android:layout_marginLeft="@dimen/dp_15"
                 android:layout_marginRight="@dimen/dp_15"
                 android:text="应用介绍"
-                android:textSize="@dimen/sp_11"
+                android:textSize="@dimen/sp_16"
                 android:textStyle="bold">
 
             </TextView>
@@ -137,7 +142,7 @@
                 android:layout_marginTop="@dimen/dp_2"
                 android:layout_marginRight="@dimen/dp_15"
                 android:text="更新"
-                android:textSize="@dimen/sp_11"
+                android:textSize="@dimen/sp_16"
                 android:textStyle="bold">
 
             </TextView>
@@ -160,7 +165,7 @@
                 android:layout_marginTop="@dimen/dp_2"
                 android:layout_marginRight="@dimen/dp_15"
                 android:text="信息"
-                android:textSize="@dimen/sp_11"
+                android:textSize="@dimen/sp_16"
                 android:textStyle="bold">
 
             </TextView>
@@ -196,7 +201,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_15"
                 android:layout_marginRight="@dimen/dp_15"
-                android:text="供应商" />
+                android:text="开发者" />
 
 
         </LinearLayout>
@@ -207,13 +212,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/dp_15"
+        android:background="@color/white"
         android:orientation="horizontal">
 
 
         <Button
             android:id="@+id/detail_tv_download"
-            android:layout_width="280dp"
-            android:layout_height="40dp"
+            android:layout_width="@dimen/dp_340"
+            android:layout_height="@dimen/dp_60"
             android:layout_centerInParent="true"
             android:background="@drawable/btn_style_open"
             android:clickable="true"
@@ -221,7 +227,7 @@
             android:stateListAnimator="@null"
             android:text="安装"
             android:textColor="#ffffff"
-            android:textSize="15sp" />
+            android:textSize="@dimen/sp_18" />
 
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_download_manager.xml b/app/src/main/res/layout/activity_download_manager.xml
index 571451e..2509f06 100644
--- a/app/src/main/res/layout/activity_download_manager.xml
+++ b/app/src/main/res/layout/activity_download_manager.xml
@@ -9,8 +9,8 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_marginLeft="20dp"
+        android:layout_height="@dimen/activity_title_height"
+        android:background="@drawable/background_title"
         android:orientation="horizontal">
 
         <ImageView
@@ -20,6 +20,7 @@
             android:layout_gravity="center_vertical"
             android:adjustViewBounds="true"
             android:onClick="finish"
+            android:layout_marginStart="20dp"
             android:scaleType="centerInside"
             android:src="@drawable/ic_back" />
 
@@ -30,13 +31,14 @@
             android:gravity="center_vertical"
             android:singleLine="true"
             android:text="下载管理"
-            android:textColor="#8c8b8b"
-            android:textSize="17sp"
+            android:textColor="#ffffff"
+            android:textSize="@dimen/activity_font_size"
             android:textStyle="bold" />
 
     </LinearLayout>
 
     <RelativeLayout
+        android:background="@color/white"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/activity_kind_detail.xml b/app/src/main/res/layout/activity_kind_detail.xml
index 5b2b678..5c8e946 100644
--- a/app/src/main/res/layout/activity_kind_detail.xml
+++ b/app/src/main/res/layout/activity_kind_detail.xml
@@ -4,19 +4,21 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/white"
     android:orientation="vertical">
 
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_marginLeft="20dp"
+        android:layout_height="@dimen/activity_title_height"
+        android:background="@drawable/background_title"
         android:orientation="horizontal">
 
         <ImageView
             android:layout_width="20dp"
             android:layout_height="20dp"
             android:layout_gravity="center_vertical"
+            android:layout_marginStart="20dp"
             android:adjustViewBounds="true"
             android:onClick="finish"
             android:scaleType="centerInside"
@@ -29,7 +31,7 @@
             android:layout_marginLeft="10dp"
             android:gravity="center_vertical"
             android:singleLine="true"
-            android:textColor="#8c8b8b"
+            android:textColor="@color/white"
             android:textSize="17sp"
             android:textStyle="bold" />
 
diff --git a/app/src/main/res/layout/activity_local_manager.xml b/app/src/main/res/layout/activity_local_manager.xml
index fd9e54f..f049bc2 100644
--- a/app/src/main/res/layout/activity_local_manager.xml
+++ b/app/src/main/res/layout/activity_local_manager.xml
@@ -9,8 +9,8 @@
     <LinearLayout
         android:id="@+id/linearLayout2"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_marginLeft="20dp"
+        android:layout_height="@dimen/activity_title_height"
+        android:background="@drawable/background_title"
         android:orientation="horizontal"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -20,6 +20,7 @@
             android:layout_width="20dp"
             android:layout_height="20dp"
             android:layout_gravity="center_vertical"
+            android:layout_marginStart="20dp"
             android:adjustViewBounds="true"
             android:onClick="finish"
             android:scaleType="centerInside"
@@ -32,7 +33,7 @@
             android:gravity="center_vertical"
             android:singleLine="true"
             android:text="本地管理"
-            android:textColor="#8c8b8b"
+            android:textColor="@color/white"
             android:textSize="17sp"
             android:textStyle="bold" />
 
@@ -46,6 +47,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        android:background="@color/white"
         app:layout_constraintTop_toBottomOf="@+id/linearLayout2">
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d8afd38..a45ba82 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,14 +9,13 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
-        >
+        android:orientation="vertical">
 
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="60dp"
-            android:layout_margin="10dp"
+            android:background="@drawable/background_title"
             android:orientation="horizontal">
 
 
@@ -24,8 +23,8 @@
                 android:id="@+id/iv_appicon"
                 android:layout_width="50dp"
                 android:layout_height="50dp"
-                android:layout_marginLeft="20dp"
                 android:layout_gravity="center_vertical"
+                android:layout_marginLeft="20dp"
                 android:adjustViewBounds="true"
                 android:background="@drawable/ic_place_holder"
                 android:scaleType="centerInside" />
@@ -41,31 +40,32 @@
 
 
 
+
                     <LinearLayout
                         android:id="@+id/search_ll"
                         android:layout_width="match_parent"
-                        android:layout_height="@dimen/dp_24"
+                        android:layout_height="@dimen/dp_40"
                         android:layout_centerInParent="true"
                         android:gravity="center_vertical">
 
 
                         <ImageView
-                            android:layout_width="@dimen/dp_12"
-                            android:layout_height="@dimen/dp_24"
+                            android:layout_width="@dimen/dp_20"
+                            android:layout_height="@dimen/dp_40"
                             android:gravity="center_vertical"
                             android:src="@drawable/shap_search_left" />
 
                         <ImageView
-                            android:layout_width="@dimen/dp_15"
-                            android:layout_height="@dimen/dp_24"
+                            android:layout_width="@dimen/dp_20"
+                            android:layout_height="@dimen/dp_40"
                             android:adjustViewBounds="true"
                             android:background="@color/backgroundcolor"
                             android:scaleType="centerInside"
-                            android:src="@drawable/icon_serach"></ImageView>
+                            android:src="@drawable/icon_search" />
 
                         <TextView
                             android:layout_width="match_parent"
-                            android:layout_height="@dimen/dp_24"
+                            android:layout_height="@dimen/dp_40"
                             android:background="@drawable/shap_search_right"
                             android:gravity="center_vertical"
                             android:text="@string/search_edit"
@@ -74,7 +74,6 @@
                         </TextView>
                     </LinearLayout>
 
-
             </RelativeLayout>
 
             <ImageView
@@ -83,8 +82,8 @@
                 android:layout_height="30dp"
                 android:layout_gravity="center_vertical"
                 android:layout_marginRight="20dp"
-                android:visibility="gone"
-                android:src="@drawable/ic_action_bar">
+                android:src="@drawable/ic_action_bar"
+                android:visibility="gone">
 
             </ImageView>
 
@@ -98,7 +97,8 @@
             app:tl_indicator_style="TRIANGLE"
             app:tl_tab_space_equal="true"
             app:tl_textBold="SELECT"
-            app:tl_textSelectColor="@color/green"
+            app:tl_textsize="@dimen/sp_15"
+            app:tl_textSelectColor="@color/red"
             app:tl_textUnselectColor="@color/install" />
 
         <androidx.viewpager.widget.ViewPager
diff --git a/app/src/main/res/layout/activity_searcher.xml b/app/src/main/res/layout/activity_searcher.xml
index 8fcacbe..4414d24 100644
--- a/app/src/main/res/layout/activity_searcher.xml
+++ b/app/src/main/res/layout/activity_searcher.xml
@@ -9,7 +9,8 @@
     <LinearLayout
         android:id="@+id/linearLayout3"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="@dimen/activity_title_height"
+        android:background="@drawable/background_title"
         android:orientation="horizontal"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -30,8 +31,10 @@
             android:layout_height="match_parent"
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="@dimen/dp_40"
+            android:textColor="@color/white"
             app:iconifiedByDefault="false"
-            app:queryHint="@string/search_edit">
+            app:queryHint="@string/search_edit"
+            app:searchIcon="@drawable/ic_menu_search">
 
         </androidx.appcompat.widget.SearchView>
 
@@ -44,6 +47,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        android:background="@color/white"
         app:layout_constraintTop_toBottomOf="@+id/linearLayout3">
 
         <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/fragment_featured.xml b/app/src/main/res/layout/fragment_featured.xml
index 11ce6f9..85ebf71 100644
--- a/app/src/main/res/layout/fragment_featured.xml
+++ b/app/src/main/res/layout/fragment_featured.xml
@@ -15,13 +15,13 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:orientation="vertical">
 
                 <com.zhpan.bannerview.BannerViewPager
                     android:id="@+id/banner_view"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/dp_150"
+                    android:layout_height="@dimen/dp_230"
                     android:layout_margin="10dp" />
 
                 <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_kind.xml b/app/src/main/res/layout/fragment_kind.xml
index 34b9d80..d920e0e 100644
--- a/app/src/main/res/layout/fragment_kind.xml
+++ b/app/src/main/res/layout/fragment_kind.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/fragment_manage.xml b/app/src/main/res/layout/fragment_manage.xml
index 1fdc7ec..67c67ec 100644
--- a/app/src/main/res/layout/fragment_manage.xml
+++ b/app/src/main/res/layout/fragment_manage.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -158,6 +159,7 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/manage_rv_local"
             android:layout_width="match_parent"
+            android:background="@color/white"
             android:layout_height="match_parent" />
 
         <ImageView
diff --git a/app/src/main/res/layout/fragment_rank.xml b/app/src/main/res/layout/fragment_rank.xml
index e0b79fa..137b382 100644
--- a/app/src/main/res/layout/fragment_rank.xml
+++ b/app/src/main/res/layout/fragment_rank.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <com.scwang.smartrefresh.layout.SmartRefreshLayout
diff --git a/app/src/main/res/layout/item_app.xml b/app/src/main/res/layout/item_app.xml
index 9f1ee0a..3f0709d 100644
--- a/app/src/main/res/layout/item_app.xml
+++ b/app/src/main/res/layout/item_app.xml
@@ -5,7 +5,6 @@
     android:layout_height="80dp"
     android:background="@drawable/ll_selector"
     android:clickable="true"
-
     android:orientation="vertical">
 
     <LinearLayout
@@ -23,7 +22,7 @@
             android:layout_height="55dp"
             android:layout_gravity="center_vertical"
             android:layout_marginRight="10dp"
-            android:background="@mipmap/ic_launcher" />
+            />
 
         <LinearLayout
             android:layout_width="0dp"
@@ -73,15 +72,15 @@
 
             <Button
                 android:id="@+id/app_btn_download"
-                android:layout_width="@dimen/dp_40"
-                android:layout_height="@dimen/dp_20"
+                android:layout_width="@dimen/dp_80"
+                android:layout_height="@dimen/dp_40"
                 android:textColor="#000000"
                 android:stateListAnimator="@null"
                 android:layout_gravity="center_vertical"
                 android:layout_marginRight="10dp"
                 android:background="@drawable/btn_style_none"
                 android:text="下载中"
-                android:textSize="@dimen/sp_10"
+                android:textSize="@dimen/sp_16"
                 android:visibility="visible" />
 
 
diff --git a/app/src/main/res/layout/item_donwloadfinish.xml b/app/src/main/res/layout/item_donwloadfinish.xml
index 4b111d6..b10d167 100644
--- a/app/src/main/res/layout/item_donwloadfinish.xml
+++ b/app/src/main/res/layout/item_donwloadfinish.xml
@@ -41,8 +41,8 @@
 
     <Button
         android:id="@+id/item_finish_btn_install"
-        android:layout_width="40dp"
-        android:layout_height="20dp"
+        android:layout_width="@dimen/dp_80"
+        android:layout_height="@dimen/dp_40"
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="20dp"
diff --git a/app/src/main/res/layout/item_donwloading.xml b/app/src/main/res/layout/item_donwloading.xml
index 9425472..4307922 100644
--- a/app/src/main/res/layout/item_donwloading.xml
+++ b/app/src/main/res/layout/item_donwloading.xml
@@ -32,7 +32,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginRight="10dp" />
+            android:layout_marginEnd="10dp" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -52,7 +52,7 @@
                 android:id="@+id/item_downloading_tv_state"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
                 />
         </LinearLayout>
 
@@ -60,11 +60,11 @@
 
     <Button
         android:id="@+id/item_downloading_btn_donwload"
-        android:layout_width="40dp"
-        android:layout_height="20dp"
+        android:layout_width="@dimen/dp_80"
+        android:layout_height="@dimen/dp_40"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="20dp"
         android:background="@drawable/btn_selector"
         android:text="开始" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_download_manager.xml b/app/src/main/res/layout/item_download_manager.xml
index 42ae6fe..11032fa 100644
--- a/app/src/main/res/layout/item_download_manager.xml
+++ b/app/src/main/res/layout/item_download_manager.xml
@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_60">
+    android:layout_height="@dimen/dp_80">
 
     <LinearLayout
         android:id="@+id/linearLayout"
@@ -16,9 +16,10 @@
 
         <ImageView
             android:id="@+id/icon"
-            android:layout_width="@dimen/dp_40"
-            android:layout_height="@dimen/dp_40"
+            android:layout_width="@dimen/dp_45"
+            android:layout_height="@dimen/dp_45"
             android:layout_margin="@dimen/dp_5"
+            android:layout_gravity="center"
             android:adjustViewBounds="true"
             android:scaleType="centerInside"
             android:src="@mipmap/ic_launcher">
@@ -28,6 +29,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_marginLeft="@dimen/dp_20"
             android:layout_weight="2"
             android:orientation="vertical">
 
@@ -92,6 +94,7 @@
                 android:layout_width="@dimen/dp_15"
                 android:layout_height="@dimen/dp_15"
                 android:layout_gravity="center"
+                android:layout_margin="@dimen/dp_20"
                 android:adjustViewBounds="true"
                 android:scaleType="centerInside"
                 android:src="@drawable/bt_delete">
@@ -100,7 +103,7 @@
 
             <Button
                 android:id="@+id/start"
-                android:layout_width="60dp"
+                android:layout_width="@dimen/dp_80"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:text="暂停"
@@ -112,12 +115,14 @@
 
     <ImageView
         android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_340"
+        android:layout_width="match_parent"
         android:layout_height="1dp"
+        android:layout_marginLeft="@dimen/dp_20"
+        android:layout_marginRight="@dimen/dp_20"
         android:src="#9B9B9B"
         app:layout_constraintBottom_toBottomOf="@+id/linearLayout"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
+        app:layout_constraintEnd_toEndOf="@+id/linearLayout"
+        app:layout_constraintStart_toStartOf="@+id/linearLayout">
 
     </ImageView>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_local_app.xml b/app/src/main/res/layout/item_local_app.xml
index b9536a3..90ea364 100644
--- a/app/src/main/res/layout/item_local_app.xml
+++ b/app/src/main/res/layout/item_local_app.xml
@@ -18,7 +18,7 @@
             android:layout_height="60dp"
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="20dp"
-            android:background="@mipmap/ic_launcher" />
+            />
 
         <LinearLayout
             android:layout_width="0dp"
@@ -37,7 +37,6 @@
                 android:layout_weight="1"
                 android:gravity="center_vertical"
                 android:singleLine="true"
-                android:text="王者荣耀"
                 android:textColor="@color/black"
                 android:textSize="17sp" />
 
@@ -62,8 +61,8 @@
 
         <Button
             android:id="@+id/local_app_btn_download"
-            android:layout_width="@dimen/dp_40"
-            android:layout_height="@dimen/dp_20"
+            android:layout_width="@dimen/dp_80"
+            android:layout_height="@dimen/dp_40"
             android:layout_gravity="center_vertical"
             android:layout_marginRight="10dp"
             android:background="@drawable/btn_style_delete"
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.png b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.png
index 7cc1c63..b296b31 100644
Binary files a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.png and b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 7cc1c63..b296b31 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 7cc1c63..b296b31 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 7cc1c63..b296b31 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 7cc1c63..b296b31 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 7cc1c63..b296b31 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/values-sw1024dp/dimens.xml b/app/src/main/res/values-sw1024dp/dimens.xml
deleted file mode 100644
index b629e60..0000000
--- a/app/src/main/res/values-sw1024dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-170.6667dp</dimen>
-	<dimen name="dp_m_30">-85.3333dp</dimen>
-	<dimen name="dp_m_20">-56.8889dp</dimen>
-	<dimen name="dp_m_12">-34.1333dp</dimen>
-	<dimen name="dp_m_10">-28.4444dp</dimen>
-	<dimen name="dp_m_8">-22.7556dp</dimen>
-	<dimen name="dp_m_5">-14.2222dp</dimen>
-	<dimen name="dp_m_2">-5.6889dp</dimen>
-	<dimen name="dp_m_1">-2.8444dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.2844dp</dimen>
-	<dimen name="dp_0_5">1.4222dp</dimen>
-	<dimen name="dp_1">2.8444dp</dimen>
-	<dimen name="dp_1_5">4.2667dp</dimen>
-	<dimen name="dp_2">5.6889dp</dimen>
-	<dimen name="dp_2_5">7.1111dp</dimen>
-	<dimen name="dp_3">8.5333dp</dimen>
-	<dimen name="dp_3_5">9.9556dp</dimen>
-	<dimen name="dp_4">11.3778dp</dimen>
-	<dimen name="dp_4_5">12.8000dp</dimen>
-	<dimen name="dp_5">14.2222dp</dimen>
-	<dimen name="dp_6">17.0667dp</dimen>
-	<dimen name="dp_7">19.9111dp</dimen>
-	<dimen name="dp_8">22.7556dp</dimen>
-	<dimen name="dp_9">25.6000dp</dimen>
-	<dimen name="dp_10">28.4444dp</dimen>
-	<dimen name="dp_11">31.2889dp</dimen>
-	<dimen name="dp_12">34.1333dp</dimen>
-	<dimen name="dp_13">36.9778dp</dimen>
-	<dimen name="dp_14">39.8222dp</dimen>
-	<dimen name="dp_15">42.6667dp</dimen>
-	<dimen name="dp_16">45.5111dp</dimen>
-	<dimen name="dp_17">48.3556dp</dimen>
-	<dimen name="dp_18">51.2000dp</dimen>
-	<dimen name="dp_19">54.0444dp</dimen>
-	<dimen name="dp_20">56.8889dp</dimen>
-	<dimen name="dp_21">59.7333dp</dimen>
-	<dimen name="dp_22">62.5778dp</dimen>
-	<dimen name="dp_23">65.4222dp</dimen>
-	<dimen name="dp_24">68.2667dp</dimen>
-	<dimen name="dp_25">71.1111dp</dimen>
-	<dimen name="dp_26">73.9556dp</dimen>
-	<dimen name="dp_27">76.8000dp</dimen>
-	<dimen name="dp_28">79.6444dp</dimen>
-	<dimen name="dp_29">82.4889dp</dimen>
-	<dimen name="dp_30">85.3333dp</dimen>
-	<dimen name="dp_31">88.1778dp</dimen>
-	<dimen name="dp_32">91.0222dp</dimen>
-	<dimen name="dp_33">93.8667dp</dimen>
-	<dimen name="dp_34">96.7111dp</dimen>
-	<dimen name="dp_35">99.5556dp</dimen>
-	<dimen name="dp_36">102.4000dp</dimen>
-	<dimen name="dp_37">105.2444dp</dimen>
-	<dimen name="dp_38">108.0889dp</dimen>
-	<dimen name="dp_39">110.9333dp</dimen>
-	<dimen name="dp_40">113.7778dp</dimen>
-	<dimen name="dp_41">116.6222dp</dimen>
-	<dimen name="dp_42">119.4667dp</dimen>
-	<dimen name="dp_43">122.3111dp</dimen>
-	<dimen name="dp_44">125.1556dp</dimen>
-	<dimen name="dp_45">128.0000dp</dimen>
-	<dimen name="dp_46">130.8444dp</dimen>
-	<dimen name="dp_47">133.6889dp</dimen>
-	<dimen name="dp_48">136.5333dp</dimen>
-	<dimen name="dp_49">139.3778dp</dimen>
-	<dimen name="dp_50">142.2222dp</dimen>
-	<dimen name="dp_51">145.0667dp</dimen>
-	<dimen name="dp_52">147.9111dp</dimen>
-	<dimen name="dp_53">150.7556dp</dimen>
-	<dimen name="dp_54">153.6000dp</dimen>
-	<dimen name="dp_55">156.4444dp</dimen>
-	<dimen name="dp_56">159.2889dp</dimen>
-	<dimen name="dp_57">162.1333dp</dimen>
-	<dimen name="dp_58">164.9778dp</dimen>
-	<dimen name="dp_59">167.8222dp</dimen>
-	<dimen name="dp_60">170.6667dp</dimen>
-	<dimen name="dp_61">173.5111dp</dimen>
-	<dimen name="dp_62">176.3556dp</dimen>
-	<dimen name="dp_63">179.2000dp</dimen>
-	<dimen name="dp_64">182.0444dp</dimen>
-	<dimen name="dp_65">184.8889dp</dimen>
-	<dimen name="dp_66">187.7333dp</dimen>
-	<dimen name="dp_67">190.5778dp</dimen>
-	<dimen name="dp_68">193.4222dp</dimen>
-	<dimen name="dp_69">196.2667dp</dimen>
-	<dimen name="dp_70">199.1111dp</dimen>
-	<dimen name="dp_71">201.9556dp</dimen>
-	<dimen name="dp_72">204.8000dp</dimen>
-	<dimen name="dp_73">207.6444dp</dimen>
-	<dimen name="dp_74">210.4889dp</dimen>
-	<dimen name="dp_75">213.3333dp</dimen>
-	<dimen name="dp_76">216.1778dp</dimen>
-	<dimen name="dp_77">219.0222dp</dimen>
-	<dimen name="dp_78">221.8667dp</dimen>
-	<dimen name="dp_79">224.7111dp</dimen>
-	<dimen name="dp_80">227.5556dp</dimen>
-	<dimen name="dp_81">230.4000dp</dimen>
-	<dimen name="dp_82">233.2444dp</dimen>
-	<dimen name="dp_83">236.0889dp</dimen>
-	<dimen name="dp_84">238.9333dp</dimen>
-	<dimen name="dp_85">241.7778dp</dimen>
-	<dimen name="dp_86">244.6222dp</dimen>
-	<dimen name="dp_87">247.4667dp</dimen>
-	<dimen name="dp_88">250.3111dp</dimen>
-	<dimen name="dp_89">253.1556dp</dimen>
-	<dimen name="dp_90">256.0000dp</dimen>
-	<dimen name="dp_91">258.8444dp</dimen>
-	<dimen name="dp_92">261.6889dp</dimen>
-	<dimen name="dp_93">264.5333dp</dimen>
-	<dimen name="dp_94">267.3778dp</dimen>
-	<dimen name="dp_95">270.2222dp</dimen>
-	<dimen name="dp_96">273.0667dp</dimen>
-	<dimen name="dp_97">275.9111dp</dimen>
-	<dimen name="dp_98">278.7556dp</dimen>
-	<dimen name="dp_99">281.6000dp</dimen>
-	<dimen name="dp_100">284.4444dp</dimen>
-	<dimen name="dp_101">287.2889dp</dimen>
-	<dimen name="dp_102">290.1333dp</dimen>
-	<dimen name="dp_103">292.9778dp</dimen>
-	<dimen name="dp_104">295.8222dp</dimen>
-	<dimen name="dp_105">298.6667dp</dimen>
-	<dimen name="dp_106">301.5111dp</dimen>
-	<dimen name="dp_107">304.3556dp</dimen>
-	<dimen name="dp_108">307.2000dp</dimen>
-	<dimen name="dp_109">310.0444dp</dimen>
-	<dimen name="dp_110">312.8889dp</dimen>
-	<dimen name="dp_111">315.7333dp</dimen>
-	<dimen name="dp_112">318.5778dp</dimen>
-	<dimen name="dp_113">321.4222dp</dimen>
-	<dimen name="dp_114">324.2667dp</dimen>
-	<dimen name="dp_115">327.1111dp</dimen>
-	<dimen name="dp_116">329.9556dp</dimen>
-	<dimen name="dp_117">332.8000dp</dimen>
-	<dimen name="dp_118">335.6444dp</dimen>
-	<dimen name="dp_119">338.4889dp</dimen>
-	<dimen name="dp_120">341.3333dp</dimen>
-	<dimen name="dp_121">344.1778dp</dimen>
-	<dimen name="dp_122">347.0222dp</dimen>
-	<dimen name="dp_123">349.8667dp</dimen>
-	<dimen name="dp_124">352.7111dp</dimen>
-	<dimen name="dp_125">355.5556dp</dimen>
-	<dimen name="dp_126">358.4000dp</dimen>
-	<dimen name="dp_127">361.2444dp</dimen>
-	<dimen name="dp_128">364.0889dp</dimen>
-	<dimen name="dp_129">366.9333dp</dimen>
-	<dimen name="dp_130">369.7778dp</dimen>
-	<dimen name="dp_131">372.6222dp</dimen>
-	<dimen name="dp_132">375.4667dp</dimen>
-	<dimen name="dp_133">378.3111dp</dimen>
-	<dimen name="dp_134">381.1556dp</dimen>
-	<dimen name="dp_135">384.0000dp</dimen>
-	<dimen name="dp_136">386.8444dp</dimen>
-	<dimen name="dp_137">389.6889dp</dimen>
-	<dimen name="dp_138">392.5333dp</dimen>
-	<dimen name="dp_139">395.3778dp</dimen>
-	<dimen name="dp_140">398.2222dp</dimen>
-	<dimen name="dp_141">401.0667dp</dimen>
-	<dimen name="dp_142">403.9111dp</dimen>
-	<dimen name="dp_143">406.7556dp</dimen>
-	<dimen name="dp_144">409.6000dp</dimen>
-	<dimen name="dp_145">412.4444dp</dimen>
-	<dimen name="dp_146">415.2889dp</dimen>
-	<dimen name="dp_147">418.1333dp</dimen>
-	<dimen name="dp_148">420.9778dp</dimen>
-	<dimen name="dp_149">423.8222dp</dimen>
-	<dimen name="dp_150">426.6667dp</dimen>
-	<dimen name="dp_151">429.5111dp</dimen>
-	<dimen name="dp_152">432.3556dp</dimen>
-	<dimen name="dp_153">435.2000dp</dimen>
-	<dimen name="dp_154">438.0444dp</dimen>
-	<dimen name="dp_155">440.8889dp</dimen>
-	<dimen name="dp_156">443.7333dp</dimen>
-	<dimen name="dp_157">446.5778dp</dimen>
-	<dimen name="dp_158">449.4222dp</dimen>
-	<dimen name="dp_159">452.2667dp</dimen>
-	<dimen name="dp_160">455.1111dp</dimen>
-	<dimen name="dp_161">457.9556dp</dimen>
-	<dimen name="dp_162">460.8000dp</dimen>
-	<dimen name="dp_163">463.6444dp</dimen>
-	<dimen name="dp_164">466.4889dp</dimen>
-	<dimen name="dp_165">469.3333dp</dimen>
-	<dimen name="dp_166">472.1778dp</dimen>
-	<dimen name="dp_167">475.0222dp</dimen>
-	<dimen name="dp_168">477.8667dp</dimen>
-	<dimen name="dp_169">480.7111dp</dimen>
-	<dimen name="dp_170">483.5556dp</dimen>
-	<dimen name="dp_171">486.4000dp</dimen>
-	<dimen name="dp_172">489.2444dp</dimen>
-	<dimen name="dp_173">492.0889dp</dimen>
-	<dimen name="dp_174">494.9333dp</dimen>
-	<dimen name="dp_175">497.7778dp</dimen>
-	<dimen name="dp_176">500.6222dp</dimen>
-	<dimen name="dp_177">503.4667dp</dimen>
-	<dimen name="dp_178">506.3111dp</dimen>
-	<dimen name="dp_179">509.1556dp</dimen>
-	<dimen name="dp_180">512.0000dp</dimen>
-	<dimen name="dp_181">514.8444dp</dimen>
-	<dimen name="dp_182">517.6889dp</dimen>
-	<dimen name="dp_183">520.5333dp</dimen>
-	<dimen name="dp_184">523.3778dp</dimen>
-	<dimen name="dp_185">526.2222dp</dimen>
-	<dimen name="dp_186">529.0667dp</dimen>
-	<dimen name="dp_187">531.9111dp</dimen>
-	<dimen name="dp_188">534.7556dp</dimen>
-	<dimen name="dp_189">537.6000dp</dimen>
-	<dimen name="dp_190">540.4444dp</dimen>
-	<dimen name="dp_191">543.2889dp</dimen>
-	<dimen name="dp_192">546.1333dp</dimen>
-	<dimen name="dp_193">548.9778dp</dimen>
-	<dimen name="dp_194">551.8222dp</dimen>
-	<dimen name="dp_195">554.6667dp</dimen>
-	<dimen name="dp_196">557.5111dp</dimen>
-	<dimen name="dp_197">560.3556dp</dimen>
-	<dimen name="dp_198">563.2000dp</dimen>
-	<dimen name="dp_199">566.0444dp</dimen>
-	<dimen name="dp_200">568.8889dp</dimen>
-	<dimen name="dp_201">571.7333dp</dimen>
-	<dimen name="dp_202">574.5778dp</dimen>
-	<dimen name="dp_203">577.4222dp</dimen>
-	<dimen name="dp_204">580.2667dp</dimen>
-	<dimen name="dp_205">583.1111dp</dimen>
-	<dimen name="dp_206">585.9556dp</dimen>
-	<dimen name="dp_207">588.8000dp</dimen>
-	<dimen name="dp_208">591.6444dp</dimen>
-	<dimen name="dp_209">594.4889dp</dimen>
-	<dimen name="dp_210">597.3333dp</dimen>
-	<dimen name="dp_211">600.1778dp</dimen>
-	<dimen name="dp_212">603.0222dp</dimen>
-	<dimen name="dp_213">605.8667dp</dimen>
-	<dimen name="dp_214">608.7111dp</dimen>
-	<dimen name="dp_215">611.5556dp</dimen>
-	<dimen name="dp_216">614.4000dp</dimen>
-	<dimen name="dp_217">617.2444dp</dimen>
-	<dimen name="dp_218">620.0889dp</dimen>
-	<dimen name="dp_219">622.9333dp</dimen>
-	<dimen name="dp_220">625.7778dp</dimen>
-	<dimen name="dp_221">628.6222dp</dimen>
-	<dimen name="dp_222">631.4667dp</dimen>
-	<dimen name="dp_223">634.3111dp</dimen>
-	<dimen name="dp_224">637.1556dp</dimen>
-	<dimen name="dp_225">640.0000dp</dimen>
-	<dimen name="dp_226">642.8444dp</dimen>
-	<dimen name="dp_227">645.6889dp</dimen>
-	<dimen name="dp_228">648.5333dp</dimen>
-	<dimen name="dp_229">651.3778dp</dimen>
-	<dimen name="dp_230">654.2222dp</dimen>
-	<dimen name="dp_231">657.0667dp</dimen>
-	<dimen name="dp_232">659.9111dp</dimen>
-	<dimen name="dp_233">662.7556dp</dimen>
-	<dimen name="dp_234">665.6000dp</dimen>
-	<dimen name="dp_235">668.4444dp</dimen>
-	<dimen name="dp_236">671.2889dp</dimen>
-	<dimen name="dp_237">674.1333dp</dimen>
-	<dimen name="dp_238">676.9778dp</dimen>
-	<dimen name="dp_239">679.8222dp</dimen>
-	<dimen name="dp_240">682.6667dp</dimen>
-	<dimen name="dp_241">685.5111dp</dimen>
-	<dimen name="dp_242">688.3556dp</dimen>
-	<dimen name="dp_243">691.2000dp</dimen>
-	<dimen name="dp_244">694.0444dp</dimen>
-	<dimen name="dp_245">696.8889dp</dimen>
-	<dimen name="dp_246">699.7333dp</dimen>
-	<dimen name="dp_247">702.5778dp</dimen>
-	<dimen name="dp_248">705.4222dp</dimen>
-	<dimen name="dp_249">708.2667dp</dimen>
-	<dimen name="dp_250">711.1111dp</dimen>
-	<dimen name="dp_251">713.9556dp</dimen>
-	<dimen name="dp_252">716.8000dp</dimen>
-	<dimen name="dp_253">719.6444dp</dimen>
-	<dimen name="dp_254">722.4889dp</dimen>
-	<dimen name="dp_255">725.3333dp</dimen>
-	<dimen name="dp_256">728.1778dp</dimen>
-	<dimen name="dp_257">731.0222dp</dimen>
-	<dimen name="dp_258">733.8667dp</dimen>
-	<dimen name="dp_259">736.7111dp</dimen>
-	<dimen name="dp_260">739.5556dp</dimen>
-	<dimen name="dp_261">742.4000dp</dimen>
-	<dimen name="dp_262">745.2444dp</dimen>
-	<dimen name="dp_263">748.0889dp</dimen>
-	<dimen name="dp_264">750.9333dp</dimen>
-	<dimen name="dp_265">753.7778dp</dimen>
-	<dimen name="dp_266">756.6222dp</dimen>
-	<dimen name="dp_267">759.4667dp</dimen>
-	<dimen name="dp_268">762.3111dp</dimen>
-	<dimen name="dp_269">765.1556dp</dimen>
-	<dimen name="dp_270">768.0000dp</dimen>
-	<dimen name="dp_271">770.8444dp</dimen>
-	<dimen name="dp_272">773.6889dp</dimen>
-	<dimen name="dp_273">776.5333dp</dimen>
-	<dimen name="dp_274">779.3778dp</dimen>
-	<dimen name="dp_275">782.2222dp</dimen>
-	<dimen name="dp_276">785.0667dp</dimen>
-	<dimen name="dp_277">787.9111dp</dimen>
-	<dimen name="dp_278">790.7556dp</dimen>
-	<dimen name="dp_279">793.6000dp</dimen>
-	<dimen name="dp_280">796.4444dp</dimen>
-	<dimen name="dp_281">799.2889dp</dimen>
-	<dimen name="dp_282">802.1333dp</dimen>
-	<dimen name="dp_283">804.9778dp</dimen>
-	<dimen name="dp_284">807.8222dp</dimen>
-	<dimen name="dp_285">810.6667dp</dimen>
-	<dimen name="dp_286">813.5111dp</dimen>
-	<dimen name="dp_287">816.3556dp</dimen>
-	<dimen name="dp_288">819.2000dp</dimen>
-	<dimen name="dp_289">822.0444dp</dimen>
-	<dimen name="dp_290">824.8889dp</dimen>
-	<dimen name="dp_291">827.7333dp</dimen>
-	<dimen name="dp_292">830.5778dp</dimen>
-	<dimen name="dp_293">833.4222dp</dimen>
-	<dimen name="dp_294">836.2667dp</dimen>
-	<dimen name="dp_295">839.1111dp</dimen>
-	<dimen name="dp_296">841.9556dp</dimen>
-	<dimen name="dp_297">844.8000dp</dimen>
-	<dimen name="dp_298">847.6444dp</dimen>
-	<dimen name="dp_299">850.4889dp</dimen>
-	<dimen name="dp_300">853.3333dp</dimen>
-	<dimen name="dp_301">856.1778dp</dimen>
-	<dimen name="dp_302">859.0222dp</dimen>
-	<dimen name="dp_303">861.8667dp</dimen>
-	<dimen name="dp_304">864.7111dp</dimen>
-	<dimen name="dp_305">867.5556dp</dimen>
-	<dimen name="dp_306">870.4000dp</dimen>
-	<dimen name="dp_307">873.2444dp</dimen>
-	<dimen name="dp_308">876.0889dp</dimen>
-	<dimen name="dp_309">878.9333dp</dimen>
-	<dimen name="dp_310">881.7778dp</dimen>
-	<dimen name="dp_311">884.6222dp</dimen>
-	<dimen name="dp_312">887.4667dp</dimen>
-	<dimen name="dp_313">890.3111dp</dimen>
-	<dimen name="dp_314">893.1556dp</dimen>
-	<dimen name="dp_315">896.0000dp</dimen>
-	<dimen name="dp_316">898.8444dp</dimen>
-	<dimen name="dp_317">901.6889dp</dimen>
-	<dimen name="dp_318">904.5333dp</dimen>
-	<dimen name="dp_319">907.3778dp</dimen>
-	<dimen name="dp_320">910.2222dp</dimen>
-	<dimen name="dp_321">913.0667dp</dimen>
-	<dimen name="dp_322">915.9111dp</dimen>
-	<dimen name="dp_323">918.7556dp</dimen>
-	<dimen name="dp_324">921.6000dp</dimen>
-	<dimen name="dp_325">924.4444dp</dimen>
-	<dimen name="dp_326">927.2889dp</dimen>
-	<dimen name="dp_327">930.1333dp</dimen>
-	<dimen name="dp_328">932.9778dp</dimen>
-	<dimen name="dp_329">935.8222dp</dimen>
-	<dimen name="dp_330">938.6667dp</dimen>
-	<dimen name="dp_331">941.5111dp</dimen>
-	<dimen name="dp_332">944.3556dp</dimen>
-	<dimen name="dp_333">947.2000dp</dimen>
-	<dimen name="dp_334">950.0444dp</dimen>
-	<dimen name="dp_335">952.8889dp</dimen>
-	<dimen name="dp_336">955.7333dp</dimen>
-	<dimen name="dp_337">958.5778dp</dimen>
-	<dimen name="dp_338">961.4222dp</dimen>
-	<dimen name="dp_339">964.2667dp</dimen>
-	<dimen name="dp_340">967.1111dp</dimen>
-	<dimen name="dp_341">969.9556dp</dimen>
-	<dimen name="dp_342">972.8000dp</dimen>
-	<dimen name="dp_343">975.6444dp</dimen>
-	<dimen name="dp_344">978.4889dp</dimen>
-	<dimen name="dp_345">981.3333dp</dimen>
-	<dimen name="dp_346">984.1778dp</dimen>
-	<dimen name="dp_347">987.0222dp</dimen>
-	<dimen name="dp_348">989.8667dp</dimen>
-	<dimen name="dp_349">992.7111dp</dimen>
-	<dimen name="dp_350">995.5556dp</dimen>
-	<dimen name="dp_351">998.4000dp</dimen>
-	<dimen name="dp_352">1001.2444dp</dimen>
-	<dimen name="dp_353">1004.0889dp</dimen>
-	<dimen name="dp_354">1006.9333dp</dimen>
-	<dimen name="dp_355">1009.7778dp</dimen>
-	<dimen name="dp_356">1012.6222dp</dimen>
-	<dimen name="dp_357">1015.4667dp</dimen>
-	<dimen name="dp_358">1018.3111dp</dimen>
-	<dimen name="dp_359">1021.1556dp</dimen>
-	<dimen name="dp_360">1024.0000dp</dimen>
-	<dimen name="dp_365">1038.2222dp</dimen>
-	<dimen name="dp_370">1052.4444dp</dimen>
-	<dimen name="dp_400">1137.7778dp</dimen>
-	<dimen name="dp_410">1166.2222dp</dimen>
-	<dimen name="dp_422">1200.3556dp</dimen>
-	<dimen name="dp_472">1342.5778dp</dimen>
-	<dimen name="dp_500">1422.2222dp</dimen>
-	<dimen name="dp_600">1706.6667dp</dimen>
-	<dimen name="dp_640">1820.4444dp</dimen>
-	<dimen name="dp_720">2048.0000dp</dimen>
-	<dimen name="sp_6">17.0667sp</dimen>
-	<dimen name="sp_7">19.9111sp</dimen>
-	<dimen name="sp_8">22.7556sp</dimen>
-	<dimen name="sp_9">25.6000sp</dimen>
-	<dimen name="sp_10">28.4444sp</dimen>
-	<dimen name="sp_11">31.2889sp</dimen>
-	<dimen name="sp_12">34.1333sp</dimen>
-	<dimen name="sp_13">36.9778sp</dimen>
-	<dimen name="sp_14">39.8222sp</dimen>
-	<dimen name="sp_15">42.6667sp</dimen>
-	<dimen name="sp_16">45.5111sp</dimen>
-	<dimen name="sp_17">48.3556sp</dimen>
-	<dimen name="sp_18">51.2000sp</dimen>
-	<dimen name="sp_19">54.0444sp</dimen>
-	<dimen name="sp_20">56.8889sp</dimen>
-	<dimen name="sp_21">59.7333sp</dimen>
-	<dimen name="sp_22">62.5778sp</dimen>
-	<dimen name="sp_23">65.4222sp</dimen>
-	<dimen name="sp_24">68.2667sp</dimen>
-	<dimen name="sp_25">71.1111sp</dimen>
-	<dimen name="sp_28">79.6444sp</dimen>
-	<dimen name="sp_30">85.3333sp</dimen>
-	<dimen name="sp_32">91.0222sp</dimen>
-	<dimen name="sp_34">96.7111sp</dimen>
-	<dimen name="sp_36">102.4000sp</dimen>
-	<dimen name="sp_38">108.0889sp</dimen>
-	<dimen name="sp_40">113.7778sp</dimen>
-	<dimen name="sp_42">119.4667sp</dimen>
-	<dimen name="sp_48">136.5333sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw1280dp/dimens.xml b/app/src/main/res/values-sw1280dp/dimens.xml
deleted file mode 100644
index d690618..0000000
--- a/app/src/main/res/values-sw1280dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-213.3333dp</dimen>
-	<dimen name="dp_m_30">-106.6667dp</dimen>
-	<dimen name="dp_m_20">-71.1111dp</dimen>
-	<dimen name="dp_m_12">-42.6667dp</dimen>
-	<dimen name="dp_m_10">-35.5556dp</dimen>
-	<dimen name="dp_m_8">-28.4444dp</dimen>
-	<dimen name="dp_m_5">-17.7778dp</dimen>
-	<dimen name="dp_m_2">-7.1111dp</dimen>
-	<dimen name="dp_m_1">-3.5556dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.3556dp</dimen>
-	<dimen name="dp_0_5">1.7778dp</dimen>
-	<dimen name="dp_1">3.5556dp</dimen>
-	<dimen name="dp_1_5">5.3333dp</dimen>
-	<dimen name="dp_2">7.1111dp</dimen>
-	<dimen name="dp_2_5">8.8889dp</dimen>
-	<dimen name="dp_3">10.6667dp</dimen>
-	<dimen name="dp_3_5">12.4444dp</dimen>
-	<dimen name="dp_4">14.2222dp</dimen>
-	<dimen name="dp_4_5">16.0000dp</dimen>
-	<dimen name="dp_5">17.7778dp</dimen>
-	<dimen name="dp_6">21.3333dp</dimen>
-	<dimen name="dp_7">24.8889dp</dimen>
-	<dimen name="dp_8">28.4444dp</dimen>
-	<dimen name="dp_9">32.0000dp</dimen>
-	<dimen name="dp_10">35.5556dp</dimen>
-	<dimen name="dp_11">39.1111dp</dimen>
-	<dimen name="dp_12">42.6667dp</dimen>
-	<dimen name="dp_13">46.2222dp</dimen>
-	<dimen name="dp_14">49.7778dp</dimen>
-	<dimen name="dp_15">53.3333dp</dimen>
-	<dimen name="dp_16">56.8889dp</dimen>
-	<dimen name="dp_17">60.4444dp</dimen>
-	<dimen name="dp_18">64.0000dp</dimen>
-	<dimen name="dp_19">67.5556dp</dimen>
-	<dimen name="dp_20">71.1111dp</dimen>
-	<dimen name="dp_21">74.6667dp</dimen>
-	<dimen name="dp_22">78.2222dp</dimen>
-	<dimen name="dp_23">81.7778dp</dimen>
-	<dimen name="dp_24">85.3333dp</dimen>
-	<dimen name="dp_25">88.8889dp</dimen>
-	<dimen name="dp_26">92.4444dp</dimen>
-	<dimen name="dp_27">96.0000dp</dimen>
-	<dimen name="dp_28">99.5556dp</dimen>
-	<dimen name="dp_29">103.1111dp</dimen>
-	<dimen name="dp_30">106.6667dp</dimen>
-	<dimen name="dp_31">110.2222dp</dimen>
-	<dimen name="dp_32">113.7778dp</dimen>
-	<dimen name="dp_33">117.3333dp</dimen>
-	<dimen name="dp_34">120.8889dp</dimen>
-	<dimen name="dp_35">124.4444dp</dimen>
-	<dimen name="dp_36">128.0000dp</dimen>
-	<dimen name="dp_37">131.5556dp</dimen>
-	<dimen name="dp_38">135.1111dp</dimen>
-	<dimen name="dp_39">138.6667dp</dimen>
-	<dimen name="dp_40">142.2222dp</dimen>
-	<dimen name="dp_41">145.7778dp</dimen>
-	<dimen name="dp_42">149.3333dp</dimen>
-	<dimen name="dp_43">152.8889dp</dimen>
-	<dimen name="dp_44">156.4444dp</dimen>
-	<dimen name="dp_45">160.0000dp</dimen>
-	<dimen name="dp_46">163.5556dp</dimen>
-	<dimen name="dp_47">167.1111dp</dimen>
-	<dimen name="dp_48">170.6667dp</dimen>
-	<dimen name="dp_49">174.2222dp</dimen>
-	<dimen name="dp_50">177.7778dp</dimen>
-	<dimen name="dp_51">181.3333dp</dimen>
-	<dimen name="dp_52">184.8889dp</dimen>
-	<dimen name="dp_53">188.4444dp</dimen>
-	<dimen name="dp_54">192.0000dp</dimen>
-	<dimen name="dp_55">195.5556dp</dimen>
-	<dimen name="dp_56">199.1111dp</dimen>
-	<dimen name="dp_57">202.6667dp</dimen>
-	<dimen name="dp_58">206.2222dp</dimen>
-	<dimen name="dp_59">209.7778dp</dimen>
-	<dimen name="dp_60">213.3333dp</dimen>
-	<dimen name="dp_61">216.8889dp</dimen>
-	<dimen name="dp_62">220.4444dp</dimen>
-	<dimen name="dp_63">224.0000dp</dimen>
-	<dimen name="dp_64">227.5556dp</dimen>
-	<dimen name="dp_65">231.1111dp</dimen>
-	<dimen name="dp_66">234.6667dp</dimen>
-	<dimen name="dp_67">238.2222dp</dimen>
-	<dimen name="dp_68">241.7778dp</dimen>
-	<dimen name="dp_69">245.3333dp</dimen>
-	<dimen name="dp_70">248.8889dp</dimen>
-	<dimen name="dp_71">252.4444dp</dimen>
-	<dimen name="dp_72">256.0000dp</dimen>
-	<dimen name="dp_73">259.5556dp</dimen>
-	<dimen name="dp_74">263.1111dp</dimen>
-	<dimen name="dp_75">266.6667dp</dimen>
-	<dimen name="dp_76">270.2222dp</dimen>
-	<dimen name="dp_77">273.7778dp</dimen>
-	<dimen name="dp_78">277.3333dp</dimen>
-	<dimen name="dp_79">280.8889dp</dimen>
-	<dimen name="dp_80">284.4444dp</dimen>
-	<dimen name="dp_81">288.0000dp</dimen>
-	<dimen name="dp_82">291.5556dp</dimen>
-	<dimen name="dp_83">295.1111dp</dimen>
-	<dimen name="dp_84">298.6667dp</dimen>
-	<dimen name="dp_85">302.2222dp</dimen>
-	<dimen name="dp_86">305.7778dp</dimen>
-	<dimen name="dp_87">309.3333dp</dimen>
-	<dimen name="dp_88">312.8889dp</dimen>
-	<dimen name="dp_89">316.4444dp</dimen>
-	<dimen name="dp_90">320.0000dp</dimen>
-	<dimen name="dp_91">323.5556dp</dimen>
-	<dimen name="dp_92">327.1111dp</dimen>
-	<dimen name="dp_93">330.6667dp</dimen>
-	<dimen name="dp_94">334.2222dp</dimen>
-	<dimen name="dp_95">337.7778dp</dimen>
-	<dimen name="dp_96">341.3333dp</dimen>
-	<dimen name="dp_97">344.8889dp</dimen>
-	<dimen name="dp_98">348.4444dp</dimen>
-	<dimen name="dp_99">352.0000dp</dimen>
-	<dimen name="dp_100">355.5556dp</dimen>
-	<dimen name="dp_101">359.1111dp</dimen>
-	<dimen name="dp_102">362.6667dp</dimen>
-	<dimen name="dp_103">366.2222dp</dimen>
-	<dimen name="dp_104">369.7778dp</dimen>
-	<dimen name="dp_105">373.3333dp</dimen>
-	<dimen name="dp_106">376.8889dp</dimen>
-	<dimen name="dp_107">380.4444dp</dimen>
-	<dimen name="dp_108">384.0000dp</dimen>
-	<dimen name="dp_109">387.5556dp</dimen>
-	<dimen name="dp_110">391.1111dp</dimen>
-	<dimen name="dp_111">394.6667dp</dimen>
-	<dimen name="dp_112">398.2222dp</dimen>
-	<dimen name="dp_113">401.7778dp</dimen>
-	<dimen name="dp_114">405.3333dp</dimen>
-	<dimen name="dp_115">408.8889dp</dimen>
-	<dimen name="dp_116">412.4444dp</dimen>
-	<dimen name="dp_117">416.0000dp</dimen>
-	<dimen name="dp_118">419.5556dp</dimen>
-	<dimen name="dp_119">423.1111dp</dimen>
-	<dimen name="dp_120">426.6667dp</dimen>
-	<dimen name="dp_121">430.2222dp</dimen>
-	<dimen name="dp_122">433.7778dp</dimen>
-	<dimen name="dp_123">437.3333dp</dimen>
-	<dimen name="dp_124">440.8889dp</dimen>
-	<dimen name="dp_125">444.4444dp</dimen>
-	<dimen name="dp_126">448.0000dp</dimen>
-	<dimen name="dp_127">451.5556dp</dimen>
-	<dimen name="dp_128">455.1111dp</dimen>
-	<dimen name="dp_129">458.6667dp</dimen>
-	<dimen name="dp_130">462.2222dp</dimen>
-	<dimen name="dp_131">465.7778dp</dimen>
-	<dimen name="dp_132">469.3333dp</dimen>
-	<dimen name="dp_133">472.8889dp</dimen>
-	<dimen name="dp_134">476.4444dp</dimen>
-	<dimen name="dp_135">480.0000dp</dimen>
-	<dimen name="dp_136">483.5556dp</dimen>
-	<dimen name="dp_137">487.1111dp</dimen>
-	<dimen name="dp_138">490.6667dp</dimen>
-	<dimen name="dp_139">494.2222dp</dimen>
-	<dimen name="dp_140">497.7778dp</dimen>
-	<dimen name="dp_141">501.3333dp</dimen>
-	<dimen name="dp_142">504.8889dp</dimen>
-	<dimen name="dp_143">508.4444dp</dimen>
-	<dimen name="dp_144">512.0000dp</dimen>
-	<dimen name="dp_145">515.5556dp</dimen>
-	<dimen name="dp_146">519.1111dp</dimen>
-	<dimen name="dp_147">522.6667dp</dimen>
-	<dimen name="dp_148">526.2222dp</dimen>
-	<dimen name="dp_149">529.7778dp</dimen>
-	<dimen name="dp_150">533.3333dp</dimen>
-	<dimen name="dp_151">536.8889dp</dimen>
-	<dimen name="dp_152">540.4444dp</dimen>
-	<dimen name="dp_153">544.0000dp</dimen>
-	<dimen name="dp_154">547.5556dp</dimen>
-	<dimen name="dp_155">551.1111dp</dimen>
-	<dimen name="dp_156">554.6667dp</dimen>
-	<dimen name="dp_157">558.2222dp</dimen>
-	<dimen name="dp_158">561.7778dp</dimen>
-	<dimen name="dp_159">565.3333dp</dimen>
-	<dimen name="dp_160">568.8889dp</dimen>
-	<dimen name="dp_161">572.4444dp</dimen>
-	<dimen name="dp_162">576.0000dp</dimen>
-	<dimen name="dp_163">579.5556dp</dimen>
-	<dimen name="dp_164">583.1111dp</dimen>
-	<dimen name="dp_165">586.6667dp</dimen>
-	<dimen name="dp_166">590.2222dp</dimen>
-	<dimen name="dp_167">593.7778dp</dimen>
-	<dimen name="dp_168">597.3333dp</dimen>
-	<dimen name="dp_169">600.8889dp</dimen>
-	<dimen name="dp_170">604.4444dp</dimen>
-	<dimen name="dp_171">608.0000dp</dimen>
-	<dimen name="dp_172">611.5556dp</dimen>
-	<dimen name="dp_173">615.1111dp</dimen>
-	<dimen name="dp_174">618.6667dp</dimen>
-	<dimen name="dp_175">622.2222dp</dimen>
-	<dimen name="dp_176">625.7778dp</dimen>
-	<dimen name="dp_177">629.3333dp</dimen>
-	<dimen name="dp_178">632.8889dp</dimen>
-	<dimen name="dp_179">636.4444dp</dimen>
-	<dimen name="dp_180">640.0000dp</dimen>
-	<dimen name="dp_181">643.5556dp</dimen>
-	<dimen name="dp_182">647.1111dp</dimen>
-	<dimen name="dp_183">650.6667dp</dimen>
-	<dimen name="dp_184">654.2222dp</dimen>
-	<dimen name="dp_185">657.7778dp</dimen>
-	<dimen name="dp_186">661.3333dp</dimen>
-	<dimen name="dp_187">664.8889dp</dimen>
-	<dimen name="dp_188">668.4444dp</dimen>
-	<dimen name="dp_189">672.0000dp</dimen>
-	<dimen name="dp_190">675.5556dp</dimen>
-	<dimen name="dp_191">679.1111dp</dimen>
-	<dimen name="dp_192">682.6667dp</dimen>
-	<dimen name="dp_193">686.2222dp</dimen>
-	<dimen name="dp_194">689.7778dp</dimen>
-	<dimen name="dp_195">693.3333dp</dimen>
-	<dimen name="dp_196">696.8889dp</dimen>
-	<dimen name="dp_197">700.4444dp</dimen>
-	<dimen name="dp_198">704.0000dp</dimen>
-	<dimen name="dp_199">707.5556dp</dimen>
-	<dimen name="dp_200">711.1111dp</dimen>
-	<dimen name="dp_201">714.6667dp</dimen>
-	<dimen name="dp_202">718.2222dp</dimen>
-	<dimen name="dp_203">721.7778dp</dimen>
-	<dimen name="dp_204">725.3333dp</dimen>
-	<dimen name="dp_205">728.8889dp</dimen>
-	<dimen name="dp_206">732.4444dp</dimen>
-	<dimen name="dp_207">736.0000dp</dimen>
-	<dimen name="dp_208">739.5556dp</dimen>
-	<dimen name="dp_209">743.1111dp</dimen>
-	<dimen name="dp_210">746.6667dp</dimen>
-	<dimen name="dp_211">750.2222dp</dimen>
-	<dimen name="dp_212">753.7778dp</dimen>
-	<dimen name="dp_213">757.3333dp</dimen>
-	<dimen name="dp_214">760.8889dp</dimen>
-	<dimen name="dp_215">764.4444dp</dimen>
-	<dimen name="dp_216">768.0000dp</dimen>
-	<dimen name="dp_217">771.5556dp</dimen>
-	<dimen name="dp_218">775.1111dp</dimen>
-	<dimen name="dp_219">778.6667dp</dimen>
-	<dimen name="dp_220">782.2222dp</dimen>
-	<dimen name="dp_221">785.7778dp</dimen>
-	<dimen name="dp_222">789.3333dp</dimen>
-	<dimen name="dp_223">792.8889dp</dimen>
-	<dimen name="dp_224">796.4444dp</dimen>
-	<dimen name="dp_225">800.0000dp</dimen>
-	<dimen name="dp_226">803.5556dp</dimen>
-	<dimen name="dp_227">807.1111dp</dimen>
-	<dimen name="dp_228">810.6667dp</dimen>
-	<dimen name="dp_229">814.2222dp</dimen>
-	<dimen name="dp_230">817.7778dp</dimen>
-	<dimen name="dp_231">821.3333dp</dimen>
-	<dimen name="dp_232">824.8889dp</dimen>
-	<dimen name="dp_233">828.4444dp</dimen>
-	<dimen name="dp_234">832.0000dp</dimen>
-	<dimen name="dp_235">835.5556dp</dimen>
-	<dimen name="dp_236">839.1111dp</dimen>
-	<dimen name="dp_237">842.6667dp</dimen>
-	<dimen name="dp_238">846.2222dp</dimen>
-	<dimen name="dp_239">849.7778dp</dimen>
-	<dimen name="dp_240">853.3333dp</dimen>
-	<dimen name="dp_241">856.8889dp</dimen>
-	<dimen name="dp_242">860.4444dp</dimen>
-	<dimen name="dp_243">864.0000dp</dimen>
-	<dimen name="dp_244">867.5556dp</dimen>
-	<dimen name="dp_245">871.1111dp</dimen>
-	<dimen name="dp_246">874.6667dp</dimen>
-	<dimen name="dp_247">878.2222dp</dimen>
-	<dimen name="dp_248">881.7778dp</dimen>
-	<dimen name="dp_249">885.3333dp</dimen>
-	<dimen name="dp_250">888.8889dp</dimen>
-	<dimen name="dp_251">892.4444dp</dimen>
-	<dimen name="dp_252">896.0000dp</dimen>
-	<dimen name="dp_253">899.5556dp</dimen>
-	<dimen name="dp_254">903.1111dp</dimen>
-	<dimen name="dp_255">906.6667dp</dimen>
-	<dimen name="dp_256">910.2222dp</dimen>
-	<dimen name="dp_257">913.7778dp</dimen>
-	<dimen name="dp_258">917.3333dp</dimen>
-	<dimen name="dp_259">920.8889dp</dimen>
-	<dimen name="dp_260">924.4444dp</dimen>
-	<dimen name="dp_261">928.0000dp</dimen>
-	<dimen name="dp_262">931.5556dp</dimen>
-	<dimen name="dp_263">935.1111dp</dimen>
-	<dimen name="dp_264">938.6667dp</dimen>
-	<dimen name="dp_265">942.2222dp</dimen>
-	<dimen name="dp_266">945.7778dp</dimen>
-	<dimen name="dp_267">949.3333dp</dimen>
-	<dimen name="dp_268">952.8889dp</dimen>
-	<dimen name="dp_269">956.4444dp</dimen>
-	<dimen name="dp_270">960.0000dp</dimen>
-	<dimen name="dp_271">963.5556dp</dimen>
-	<dimen name="dp_272">967.1111dp</dimen>
-	<dimen name="dp_273">970.6667dp</dimen>
-	<dimen name="dp_274">974.2222dp</dimen>
-	<dimen name="dp_275">977.7778dp</dimen>
-	<dimen name="dp_276">981.3333dp</dimen>
-	<dimen name="dp_277">984.8889dp</dimen>
-	<dimen name="dp_278">988.4444dp</dimen>
-	<dimen name="dp_279">992.0000dp</dimen>
-	<dimen name="dp_280">995.5556dp</dimen>
-	<dimen name="dp_281">999.1111dp</dimen>
-	<dimen name="dp_282">1002.6667dp</dimen>
-	<dimen name="dp_283">1006.2222dp</dimen>
-	<dimen name="dp_284">1009.7778dp</dimen>
-	<dimen name="dp_285">1013.3333dp</dimen>
-	<dimen name="dp_286">1016.8889dp</dimen>
-	<dimen name="dp_287">1020.4444dp</dimen>
-	<dimen name="dp_288">1024.0000dp</dimen>
-	<dimen name="dp_289">1027.5556dp</dimen>
-	<dimen name="dp_290">1031.1111dp</dimen>
-	<dimen name="dp_291">1034.6667dp</dimen>
-	<dimen name="dp_292">1038.2222dp</dimen>
-	<dimen name="dp_293">1041.7778dp</dimen>
-	<dimen name="dp_294">1045.3333dp</dimen>
-	<dimen name="dp_295">1048.8889dp</dimen>
-	<dimen name="dp_296">1052.4444dp</dimen>
-	<dimen name="dp_297">1056.0000dp</dimen>
-	<dimen name="dp_298">1059.5556dp</dimen>
-	<dimen name="dp_299">1063.1111dp</dimen>
-	<dimen name="dp_300">1066.6667dp</dimen>
-	<dimen name="dp_301">1070.2222dp</dimen>
-	<dimen name="dp_302">1073.7778dp</dimen>
-	<dimen name="dp_303">1077.3333dp</dimen>
-	<dimen name="dp_304">1080.8889dp</dimen>
-	<dimen name="dp_305">1084.4444dp</dimen>
-	<dimen name="dp_306">1088.0000dp</dimen>
-	<dimen name="dp_307">1091.5556dp</dimen>
-	<dimen name="dp_308">1095.1111dp</dimen>
-	<dimen name="dp_309">1098.6667dp</dimen>
-	<dimen name="dp_310">1102.2222dp</dimen>
-	<dimen name="dp_311">1105.7778dp</dimen>
-	<dimen name="dp_312">1109.3333dp</dimen>
-	<dimen name="dp_313">1112.8889dp</dimen>
-	<dimen name="dp_314">1116.4444dp</dimen>
-	<dimen name="dp_315">1120.0000dp</dimen>
-	<dimen name="dp_316">1123.5556dp</dimen>
-	<dimen name="dp_317">1127.1111dp</dimen>
-	<dimen name="dp_318">1130.6667dp</dimen>
-	<dimen name="dp_319">1134.2222dp</dimen>
-	<dimen name="dp_320">1137.7778dp</dimen>
-	<dimen name="dp_321">1141.3333dp</dimen>
-	<dimen name="dp_322">1144.8889dp</dimen>
-	<dimen name="dp_323">1148.4444dp</dimen>
-	<dimen name="dp_324">1152.0000dp</dimen>
-	<dimen name="dp_325">1155.5556dp</dimen>
-	<dimen name="dp_326">1159.1111dp</dimen>
-	<dimen name="dp_327">1162.6667dp</dimen>
-	<dimen name="dp_328">1166.2222dp</dimen>
-	<dimen name="dp_329">1169.7778dp</dimen>
-	<dimen name="dp_330">1173.3333dp</dimen>
-	<dimen name="dp_331">1176.8889dp</dimen>
-	<dimen name="dp_332">1180.4444dp</dimen>
-	<dimen name="dp_333">1184.0000dp</dimen>
-	<dimen name="dp_334">1187.5556dp</dimen>
-	<dimen name="dp_335">1191.1111dp</dimen>
-	<dimen name="dp_336">1194.6667dp</dimen>
-	<dimen name="dp_337">1198.2222dp</dimen>
-	<dimen name="dp_338">1201.7778dp</dimen>
-	<dimen name="dp_339">1205.3333dp</dimen>
-	<dimen name="dp_340">1208.8889dp</dimen>
-	<dimen name="dp_341">1212.4444dp</dimen>
-	<dimen name="dp_342">1216.0000dp</dimen>
-	<dimen name="dp_343">1219.5556dp</dimen>
-	<dimen name="dp_344">1223.1111dp</dimen>
-	<dimen name="dp_345">1226.6667dp</dimen>
-	<dimen name="dp_346">1230.2222dp</dimen>
-	<dimen name="dp_347">1233.7778dp</dimen>
-	<dimen name="dp_348">1237.3333dp</dimen>
-	<dimen name="dp_349">1240.8889dp</dimen>
-	<dimen name="dp_350">1244.4444dp</dimen>
-	<dimen name="dp_351">1248.0000dp</dimen>
-	<dimen name="dp_352">1251.5556dp</dimen>
-	<dimen name="dp_353">1255.1111dp</dimen>
-	<dimen name="dp_354">1258.6667dp</dimen>
-	<dimen name="dp_355">1262.2222dp</dimen>
-	<dimen name="dp_356">1265.7778dp</dimen>
-	<dimen name="dp_357">1269.3333dp</dimen>
-	<dimen name="dp_358">1272.8889dp</dimen>
-	<dimen name="dp_359">1276.4444dp</dimen>
-	<dimen name="dp_360">1280.0000dp</dimen>
-	<dimen name="dp_365">1297.7778dp</dimen>
-	<dimen name="dp_370">1315.5556dp</dimen>
-	<dimen name="dp_400">1422.2222dp</dimen>
-	<dimen name="dp_410">1457.7778dp</dimen>
-	<dimen name="dp_422">1500.4444dp</dimen>
-	<dimen name="dp_472">1678.2222dp</dimen>
-	<dimen name="dp_500">1777.7778dp</dimen>
-	<dimen name="dp_600">2133.3333dp</dimen>
-	<dimen name="dp_640">2275.5556dp</dimen>
-	<dimen name="dp_720">2560.0000dp</dimen>
-	<dimen name="sp_6">21.3333sp</dimen>
-	<dimen name="sp_7">24.8889sp</dimen>
-	<dimen name="sp_8">28.4444sp</dimen>
-	<dimen name="sp_9">32.0000sp</dimen>
-	<dimen name="sp_10">35.5556sp</dimen>
-	<dimen name="sp_11">39.1111sp</dimen>
-	<dimen name="sp_12">42.6667sp</dimen>
-	<dimen name="sp_13">46.2222sp</dimen>
-	<dimen name="sp_14">49.7778sp</dimen>
-	<dimen name="sp_15">53.3333sp</dimen>
-	<dimen name="sp_16">56.8889sp</dimen>
-	<dimen name="sp_17">60.4444sp</dimen>
-	<dimen name="sp_18">64.0000sp</dimen>
-	<dimen name="sp_19">67.5556sp</dimen>
-	<dimen name="sp_20">71.1111sp</dimen>
-	<dimen name="sp_21">74.6667sp</dimen>
-	<dimen name="sp_22">78.2222sp</dimen>
-	<dimen name="sp_23">81.7778sp</dimen>
-	<dimen name="sp_24">85.3333sp</dimen>
-	<dimen name="sp_25">88.8889sp</dimen>
-	<dimen name="sp_28">99.5556sp</dimen>
-	<dimen name="sp_30">106.6667sp</dimen>
-	<dimen name="sp_32">113.7778sp</dimen>
-	<dimen name="sp_34">120.8889sp</dimen>
-	<dimen name="sp_36">128.0000sp</dimen>
-	<dimen name="sp_38">135.1111sp</dimen>
-	<dimen name="sp_40">142.2222sp</dimen>
-	<dimen name="sp_42">149.3333sp</dimen>
-	<dimen name="sp_48">170.6667sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw1365dp/dimens.xml b/app/src/main/res/values-sw1365dp/dimens.xml
deleted file mode 100644
index 5a0e4e0..0000000
--- a/app/src/main/res/values-sw1365dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-227.5000dp</dimen>
-	<dimen name="dp_m_30">-113.7500dp</dimen>
-	<dimen name="dp_m_20">-75.8333dp</dimen>
-	<dimen name="dp_m_12">-45.5000dp</dimen>
-	<dimen name="dp_m_10">-37.9167dp</dimen>
-	<dimen name="dp_m_8">-30.3333dp</dimen>
-	<dimen name="dp_m_5">-18.9583dp</dimen>
-	<dimen name="dp_m_2">-7.5833dp</dimen>
-	<dimen name="dp_m_1">-3.7917dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.3792dp</dimen>
-	<dimen name="dp_0_5">1.8958dp</dimen>
-	<dimen name="dp_1">3.7917dp</dimen>
-	<dimen name="dp_1_5">5.6875dp</dimen>
-	<dimen name="dp_2">7.5833dp</dimen>
-	<dimen name="dp_2_5">9.4792dp</dimen>
-	<dimen name="dp_3">11.3750dp</dimen>
-	<dimen name="dp_3_5">13.2708dp</dimen>
-	<dimen name="dp_4">15.1667dp</dimen>
-	<dimen name="dp_4_5">17.0625dp</dimen>
-	<dimen name="dp_5">18.9583dp</dimen>
-	<dimen name="dp_6">22.7500dp</dimen>
-	<dimen name="dp_7">26.5417dp</dimen>
-	<dimen name="dp_8">30.3333dp</dimen>
-	<dimen name="dp_9">34.1250dp</dimen>
-	<dimen name="dp_10">37.9167dp</dimen>
-	<dimen name="dp_11">41.7083dp</dimen>
-	<dimen name="dp_12">45.5000dp</dimen>
-	<dimen name="dp_13">49.2917dp</dimen>
-	<dimen name="dp_14">53.0833dp</dimen>
-	<dimen name="dp_15">56.8750dp</dimen>
-	<dimen name="dp_16">60.6667dp</dimen>
-	<dimen name="dp_17">64.4583dp</dimen>
-	<dimen name="dp_18">68.2500dp</dimen>
-	<dimen name="dp_19">72.0417dp</dimen>
-	<dimen name="dp_20">75.8333dp</dimen>
-	<dimen name="dp_21">79.6250dp</dimen>
-	<dimen name="dp_22">83.4167dp</dimen>
-	<dimen name="dp_23">87.2083dp</dimen>
-	<dimen name="dp_24">91.0000dp</dimen>
-	<dimen name="dp_25">94.7917dp</dimen>
-	<dimen name="dp_26">98.5833dp</dimen>
-	<dimen name="dp_27">102.3750dp</dimen>
-	<dimen name="dp_28">106.1667dp</dimen>
-	<dimen name="dp_29">109.9583dp</dimen>
-	<dimen name="dp_30">113.7500dp</dimen>
-	<dimen name="dp_31">117.5417dp</dimen>
-	<dimen name="dp_32">121.3333dp</dimen>
-	<dimen name="dp_33">125.1250dp</dimen>
-	<dimen name="dp_34">128.9167dp</dimen>
-	<dimen name="dp_35">132.7083dp</dimen>
-	<dimen name="dp_36">136.5000dp</dimen>
-	<dimen name="dp_37">140.2917dp</dimen>
-	<dimen name="dp_38">144.0833dp</dimen>
-	<dimen name="dp_39">147.8750dp</dimen>
-	<dimen name="dp_40">151.6667dp</dimen>
-	<dimen name="dp_41">155.4583dp</dimen>
-	<dimen name="dp_42">159.2500dp</dimen>
-	<dimen name="dp_43">163.0417dp</dimen>
-	<dimen name="dp_44">166.8333dp</dimen>
-	<dimen name="dp_45">170.6250dp</dimen>
-	<dimen name="dp_46">174.4167dp</dimen>
-	<dimen name="dp_47">178.2083dp</dimen>
-	<dimen name="dp_48">182.0000dp</dimen>
-	<dimen name="dp_49">185.7917dp</dimen>
-	<dimen name="dp_50">189.5833dp</dimen>
-	<dimen name="dp_51">193.3750dp</dimen>
-	<dimen name="dp_52">197.1667dp</dimen>
-	<dimen name="dp_53">200.9583dp</dimen>
-	<dimen name="dp_54">204.7500dp</dimen>
-	<dimen name="dp_55">208.5417dp</dimen>
-	<dimen name="dp_56">212.3333dp</dimen>
-	<dimen name="dp_57">216.1250dp</dimen>
-	<dimen name="dp_58">219.9167dp</dimen>
-	<dimen name="dp_59">223.7083dp</dimen>
-	<dimen name="dp_60">227.5000dp</dimen>
-	<dimen name="dp_61">231.2917dp</dimen>
-	<dimen name="dp_62">235.0833dp</dimen>
-	<dimen name="dp_63">238.8750dp</dimen>
-	<dimen name="dp_64">242.6667dp</dimen>
-	<dimen name="dp_65">246.4583dp</dimen>
-	<dimen name="dp_66">250.2500dp</dimen>
-	<dimen name="dp_67">254.0417dp</dimen>
-	<dimen name="dp_68">257.8333dp</dimen>
-	<dimen name="dp_69">261.6250dp</dimen>
-	<dimen name="dp_70">265.4167dp</dimen>
-	<dimen name="dp_71">269.2083dp</dimen>
-	<dimen name="dp_72">273.0000dp</dimen>
-	<dimen name="dp_73">276.7917dp</dimen>
-	<dimen name="dp_74">280.5833dp</dimen>
-	<dimen name="dp_75">284.3750dp</dimen>
-	<dimen name="dp_76">288.1667dp</dimen>
-	<dimen name="dp_77">291.9583dp</dimen>
-	<dimen name="dp_78">295.7500dp</dimen>
-	<dimen name="dp_79">299.5417dp</dimen>
-	<dimen name="dp_80">303.3333dp</dimen>
-	<dimen name="dp_81">307.1250dp</dimen>
-	<dimen name="dp_82">310.9167dp</dimen>
-	<dimen name="dp_83">314.7083dp</dimen>
-	<dimen name="dp_84">318.5000dp</dimen>
-	<dimen name="dp_85">322.2917dp</dimen>
-	<dimen name="dp_86">326.0833dp</dimen>
-	<dimen name="dp_87">329.8750dp</dimen>
-	<dimen name="dp_88">333.6667dp</dimen>
-	<dimen name="dp_89">337.4583dp</dimen>
-	<dimen name="dp_90">341.2500dp</dimen>
-	<dimen name="dp_91">345.0417dp</dimen>
-	<dimen name="dp_92">348.8333dp</dimen>
-	<dimen name="dp_93">352.6250dp</dimen>
-	<dimen name="dp_94">356.4167dp</dimen>
-	<dimen name="dp_95">360.2083dp</dimen>
-	<dimen name="dp_96">364.0000dp</dimen>
-	<dimen name="dp_97">367.7917dp</dimen>
-	<dimen name="dp_98">371.5833dp</dimen>
-	<dimen name="dp_99">375.3750dp</dimen>
-	<dimen name="dp_100">379.1667dp</dimen>
-	<dimen name="dp_101">382.9583dp</dimen>
-	<dimen name="dp_102">386.7500dp</dimen>
-	<dimen name="dp_103">390.5417dp</dimen>
-	<dimen name="dp_104">394.3333dp</dimen>
-	<dimen name="dp_105">398.1250dp</dimen>
-	<dimen name="dp_106">401.9167dp</dimen>
-	<dimen name="dp_107">405.7083dp</dimen>
-	<dimen name="dp_108">409.5000dp</dimen>
-	<dimen name="dp_109">413.2917dp</dimen>
-	<dimen name="dp_110">417.0833dp</dimen>
-	<dimen name="dp_111">420.8750dp</dimen>
-	<dimen name="dp_112">424.6667dp</dimen>
-	<dimen name="dp_113">428.4583dp</dimen>
-	<dimen name="dp_114">432.2500dp</dimen>
-	<dimen name="dp_115">436.0417dp</dimen>
-	<dimen name="dp_116">439.8333dp</dimen>
-	<dimen name="dp_117">443.6250dp</dimen>
-	<dimen name="dp_118">447.4167dp</dimen>
-	<dimen name="dp_119">451.2083dp</dimen>
-	<dimen name="dp_120">455.0000dp</dimen>
-	<dimen name="dp_121">458.7917dp</dimen>
-	<dimen name="dp_122">462.5833dp</dimen>
-	<dimen name="dp_123">466.3750dp</dimen>
-	<dimen name="dp_124">470.1667dp</dimen>
-	<dimen name="dp_125">473.9583dp</dimen>
-	<dimen name="dp_126">477.7500dp</dimen>
-	<dimen name="dp_127">481.5417dp</dimen>
-	<dimen name="dp_128">485.3333dp</dimen>
-	<dimen name="dp_129">489.1250dp</dimen>
-	<dimen name="dp_130">492.9167dp</dimen>
-	<dimen name="dp_131">496.7083dp</dimen>
-	<dimen name="dp_132">500.5000dp</dimen>
-	<dimen name="dp_133">504.2917dp</dimen>
-	<dimen name="dp_134">508.0833dp</dimen>
-	<dimen name="dp_135">511.8750dp</dimen>
-	<dimen name="dp_136">515.6667dp</dimen>
-	<dimen name="dp_137">519.4583dp</dimen>
-	<dimen name="dp_138">523.2500dp</dimen>
-	<dimen name="dp_139">527.0417dp</dimen>
-	<dimen name="dp_140">530.8333dp</dimen>
-	<dimen name="dp_141">534.6250dp</dimen>
-	<dimen name="dp_142">538.4167dp</dimen>
-	<dimen name="dp_143">542.2083dp</dimen>
-	<dimen name="dp_144">546.0000dp</dimen>
-	<dimen name="dp_145">549.7917dp</dimen>
-	<dimen name="dp_146">553.5833dp</dimen>
-	<dimen name="dp_147">557.3750dp</dimen>
-	<dimen name="dp_148">561.1667dp</dimen>
-	<dimen name="dp_149">564.9583dp</dimen>
-	<dimen name="dp_150">568.7500dp</dimen>
-	<dimen name="dp_151">572.5417dp</dimen>
-	<dimen name="dp_152">576.3333dp</dimen>
-	<dimen name="dp_153">580.1250dp</dimen>
-	<dimen name="dp_154">583.9167dp</dimen>
-	<dimen name="dp_155">587.7083dp</dimen>
-	<dimen name="dp_156">591.5000dp</dimen>
-	<dimen name="dp_157">595.2917dp</dimen>
-	<dimen name="dp_158">599.0833dp</dimen>
-	<dimen name="dp_159">602.8750dp</dimen>
-	<dimen name="dp_160">606.6667dp</dimen>
-	<dimen name="dp_161">610.4583dp</dimen>
-	<dimen name="dp_162">614.2500dp</dimen>
-	<dimen name="dp_163">618.0417dp</dimen>
-	<dimen name="dp_164">621.8333dp</dimen>
-	<dimen name="dp_165">625.6250dp</dimen>
-	<dimen name="dp_166">629.4167dp</dimen>
-	<dimen name="dp_167">633.2083dp</dimen>
-	<dimen name="dp_168">637.0000dp</dimen>
-	<dimen name="dp_169">640.7917dp</dimen>
-	<dimen name="dp_170">644.5833dp</dimen>
-	<dimen name="dp_171">648.3750dp</dimen>
-	<dimen name="dp_172">652.1667dp</dimen>
-	<dimen name="dp_173">655.9583dp</dimen>
-	<dimen name="dp_174">659.7500dp</dimen>
-	<dimen name="dp_175">663.5417dp</dimen>
-	<dimen name="dp_176">667.3333dp</dimen>
-	<dimen name="dp_177">671.1250dp</dimen>
-	<dimen name="dp_178">674.9167dp</dimen>
-	<dimen name="dp_179">678.7083dp</dimen>
-	<dimen name="dp_180">682.5000dp</dimen>
-	<dimen name="dp_181">686.2917dp</dimen>
-	<dimen name="dp_182">690.0833dp</dimen>
-	<dimen name="dp_183">693.8750dp</dimen>
-	<dimen name="dp_184">697.6667dp</dimen>
-	<dimen name="dp_185">701.4583dp</dimen>
-	<dimen name="dp_186">705.2500dp</dimen>
-	<dimen name="dp_187">709.0417dp</dimen>
-	<dimen name="dp_188">712.8333dp</dimen>
-	<dimen name="dp_189">716.6250dp</dimen>
-	<dimen name="dp_190">720.4167dp</dimen>
-	<dimen name="dp_191">724.2083dp</dimen>
-	<dimen name="dp_192">728.0000dp</dimen>
-	<dimen name="dp_193">731.7917dp</dimen>
-	<dimen name="dp_194">735.5833dp</dimen>
-	<dimen name="dp_195">739.3750dp</dimen>
-	<dimen name="dp_196">743.1667dp</dimen>
-	<dimen name="dp_197">746.9583dp</dimen>
-	<dimen name="dp_198">750.7500dp</dimen>
-	<dimen name="dp_199">754.5417dp</dimen>
-	<dimen name="dp_200">758.3333dp</dimen>
-	<dimen name="dp_201">762.1250dp</dimen>
-	<dimen name="dp_202">765.9167dp</dimen>
-	<dimen name="dp_203">769.7083dp</dimen>
-	<dimen name="dp_204">773.5000dp</dimen>
-	<dimen name="dp_205">777.2917dp</dimen>
-	<dimen name="dp_206">781.0833dp</dimen>
-	<dimen name="dp_207">784.8750dp</dimen>
-	<dimen name="dp_208">788.6667dp</dimen>
-	<dimen name="dp_209">792.4583dp</dimen>
-	<dimen name="dp_210">796.2500dp</dimen>
-	<dimen name="dp_211">800.0417dp</dimen>
-	<dimen name="dp_212">803.8333dp</dimen>
-	<dimen name="dp_213">807.6250dp</dimen>
-	<dimen name="dp_214">811.4167dp</dimen>
-	<dimen name="dp_215">815.2083dp</dimen>
-	<dimen name="dp_216">819.0000dp</dimen>
-	<dimen name="dp_217">822.7917dp</dimen>
-	<dimen name="dp_218">826.5833dp</dimen>
-	<dimen name="dp_219">830.3750dp</dimen>
-	<dimen name="dp_220">834.1667dp</dimen>
-	<dimen name="dp_221">837.9583dp</dimen>
-	<dimen name="dp_222">841.7500dp</dimen>
-	<dimen name="dp_223">845.5417dp</dimen>
-	<dimen name="dp_224">849.3333dp</dimen>
-	<dimen name="dp_225">853.1250dp</dimen>
-	<dimen name="dp_226">856.9167dp</dimen>
-	<dimen name="dp_227">860.7083dp</dimen>
-	<dimen name="dp_228">864.5000dp</dimen>
-	<dimen name="dp_229">868.2917dp</dimen>
-	<dimen name="dp_230">872.0833dp</dimen>
-	<dimen name="dp_231">875.8750dp</dimen>
-	<dimen name="dp_232">879.6667dp</dimen>
-	<dimen name="dp_233">883.4583dp</dimen>
-	<dimen name="dp_234">887.2500dp</dimen>
-	<dimen name="dp_235">891.0417dp</dimen>
-	<dimen name="dp_236">894.8333dp</dimen>
-	<dimen name="dp_237">898.6250dp</dimen>
-	<dimen name="dp_238">902.4167dp</dimen>
-	<dimen name="dp_239">906.2083dp</dimen>
-	<dimen name="dp_240">910.0000dp</dimen>
-	<dimen name="dp_241">913.7917dp</dimen>
-	<dimen name="dp_242">917.5833dp</dimen>
-	<dimen name="dp_243">921.3750dp</dimen>
-	<dimen name="dp_244">925.1667dp</dimen>
-	<dimen name="dp_245">928.9583dp</dimen>
-	<dimen name="dp_246">932.7500dp</dimen>
-	<dimen name="dp_247">936.5417dp</dimen>
-	<dimen name="dp_248">940.3333dp</dimen>
-	<dimen name="dp_249">944.1250dp</dimen>
-	<dimen name="dp_250">947.9167dp</dimen>
-	<dimen name="dp_251">951.7083dp</dimen>
-	<dimen name="dp_252">955.5000dp</dimen>
-	<dimen name="dp_253">959.2917dp</dimen>
-	<dimen name="dp_254">963.0833dp</dimen>
-	<dimen name="dp_255">966.8750dp</dimen>
-	<dimen name="dp_256">970.6667dp</dimen>
-	<dimen name="dp_257">974.4583dp</dimen>
-	<dimen name="dp_258">978.2500dp</dimen>
-	<dimen name="dp_259">982.0417dp</dimen>
-	<dimen name="dp_260">985.8333dp</dimen>
-	<dimen name="dp_261">989.6250dp</dimen>
-	<dimen name="dp_262">993.4167dp</dimen>
-	<dimen name="dp_263">997.2083dp</dimen>
-	<dimen name="dp_264">1001.0000dp</dimen>
-	<dimen name="dp_265">1004.7917dp</dimen>
-	<dimen name="dp_266">1008.5833dp</dimen>
-	<dimen name="dp_267">1012.3750dp</dimen>
-	<dimen name="dp_268">1016.1667dp</dimen>
-	<dimen name="dp_269">1019.9583dp</dimen>
-	<dimen name="dp_270">1023.7500dp</dimen>
-	<dimen name="dp_271">1027.5417dp</dimen>
-	<dimen name="dp_272">1031.3333dp</dimen>
-	<dimen name="dp_273">1035.1250dp</dimen>
-	<dimen name="dp_274">1038.9167dp</dimen>
-	<dimen name="dp_275">1042.7083dp</dimen>
-	<dimen name="dp_276">1046.5000dp</dimen>
-	<dimen name="dp_277">1050.2917dp</dimen>
-	<dimen name="dp_278">1054.0833dp</dimen>
-	<dimen name="dp_279">1057.8750dp</dimen>
-	<dimen name="dp_280">1061.6667dp</dimen>
-	<dimen name="dp_281">1065.4583dp</dimen>
-	<dimen name="dp_282">1069.2500dp</dimen>
-	<dimen name="dp_283">1073.0417dp</dimen>
-	<dimen name="dp_284">1076.8333dp</dimen>
-	<dimen name="dp_285">1080.6250dp</dimen>
-	<dimen name="dp_286">1084.4167dp</dimen>
-	<dimen name="dp_287">1088.2083dp</dimen>
-	<dimen name="dp_288">1092.0000dp</dimen>
-	<dimen name="dp_289">1095.7917dp</dimen>
-	<dimen name="dp_290">1099.5833dp</dimen>
-	<dimen name="dp_291">1103.3750dp</dimen>
-	<dimen name="dp_292">1107.1667dp</dimen>
-	<dimen name="dp_293">1110.9583dp</dimen>
-	<dimen name="dp_294">1114.7500dp</dimen>
-	<dimen name="dp_295">1118.5417dp</dimen>
-	<dimen name="dp_296">1122.3333dp</dimen>
-	<dimen name="dp_297">1126.1250dp</dimen>
-	<dimen name="dp_298">1129.9167dp</dimen>
-	<dimen name="dp_299">1133.7083dp</dimen>
-	<dimen name="dp_300">1137.5000dp</dimen>
-	<dimen name="dp_301">1141.2917dp</dimen>
-	<dimen name="dp_302">1145.0833dp</dimen>
-	<dimen name="dp_303">1148.8750dp</dimen>
-	<dimen name="dp_304">1152.6667dp</dimen>
-	<dimen name="dp_305">1156.4583dp</dimen>
-	<dimen name="dp_306">1160.2500dp</dimen>
-	<dimen name="dp_307">1164.0417dp</dimen>
-	<dimen name="dp_308">1167.8333dp</dimen>
-	<dimen name="dp_309">1171.6250dp</dimen>
-	<dimen name="dp_310">1175.4167dp</dimen>
-	<dimen name="dp_311">1179.2083dp</dimen>
-	<dimen name="dp_312">1183.0000dp</dimen>
-	<dimen name="dp_313">1186.7917dp</dimen>
-	<dimen name="dp_314">1190.5833dp</dimen>
-	<dimen name="dp_315">1194.3750dp</dimen>
-	<dimen name="dp_316">1198.1667dp</dimen>
-	<dimen name="dp_317">1201.9583dp</dimen>
-	<dimen name="dp_318">1205.7500dp</dimen>
-	<dimen name="dp_319">1209.5417dp</dimen>
-	<dimen name="dp_320">1213.3333dp</dimen>
-	<dimen name="dp_321">1217.1250dp</dimen>
-	<dimen name="dp_322">1220.9167dp</dimen>
-	<dimen name="dp_323">1224.7083dp</dimen>
-	<dimen name="dp_324">1228.5000dp</dimen>
-	<dimen name="dp_325">1232.2917dp</dimen>
-	<dimen name="dp_326">1236.0833dp</dimen>
-	<dimen name="dp_327">1239.8750dp</dimen>
-	<dimen name="dp_328">1243.6667dp</dimen>
-	<dimen name="dp_329">1247.4583dp</dimen>
-	<dimen name="dp_330">1251.2500dp</dimen>
-	<dimen name="dp_331">1255.0417dp</dimen>
-	<dimen name="dp_332">1258.8333dp</dimen>
-	<dimen name="dp_333">1262.6250dp</dimen>
-	<dimen name="dp_334">1266.4167dp</dimen>
-	<dimen name="dp_335">1270.2083dp</dimen>
-	<dimen name="dp_336">1274.0000dp</dimen>
-	<dimen name="dp_337">1277.7917dp</dimen>
-	<dimen name="dp_338">1281.5833dp</dimen>
-	<dimen name="dp_339">1285.3750dp</dimen>
-	<dimen name="dp_340">1289.1667dp</dimen>
-	<dimen name="dp_341">1292.9583dp</dimen>
-	<dimen name="dp_342">1296.7500dp</dimen>
-	<dimen name="dp_343">1300.5417dp</dimen>
-	<dimen name="dp_344">1304.3333dp</dimen>
-	<dimen name="dp_345">1308.1250dp</dimen>
-	<dimen name="dp_346">1311.9167dp</dimen>
-	<dimen name="dp_347">1315.7083dp</dimen>
-	<dimen name="dp_348">1319.5000dp</dimen>
-	<dimen name="dp_349">1323.2917dp</dimen>
-	<dimen name="dp_350">1327.0833dp</dimen>
-	<dimen name="dp_351">1330.8750dp</dimen>
-	<dimen name="dp_352">1334.6667dp</dimen>
-	<dimen name="dp_353">1338.4583dp</dimen>
-	<dimen name="dp_354">1342.2500dp</dimen>
-	<dimen name="dp_355">1346.0417dp</dimen>
-	<dimen name="dp_356">1349.8333dp</dimen>
-	<dimen name="dp_357">1353.6250dp</dimen>
-	<dimen name="dp_358">1357.4167dp</dimen>
-	<dimen name="dp_359">1361.2083dp</dimen>
-	<dimen name="dp_360">1365.0000dp</dimen>
-	<dimen name="dp_365">1383.9583dp</dimen>
-	<dimen name="dp_370">1402.9167dp</dimen>
-	<dimen name="dp_400">1516.6667dp</dimen>
-	<dimen name="dp_410">1554.5833dp</dimen>
-	<dimen name="dp_422">1600.0833dp</dimen>
-	<dimen name="dp_472">1789.6667dp</dimen>
-	<dimen name="dp_500">1895.8333dp</dimen>
-	<dimen name="dp_600">2275.0000dp</dimen>
-	<dimen name="dp_640">2426.6667dp</dimen>
-	<dimen name="dp_720">2730.0000dp</dimen>
-	<dimen name="sp_6">22.7500sp</dimen>
-	<dimen name="sp_7">26.5417sp</dimen>
-	<dimen name="sp_8">30.3333sp</dimen>
-	<dimen name="sp_9">34.1250sp</dimen>
-	<dimen name="sp_10">37.9167sp</dimen>
-	<dimen name="sp_11">41.7083sp</dimen>
-	<dimen name="sp_12">45.5000sp</dimen>
-	<dimen name="sp_13">49.2917sp</dimen>
-	<dimen name="sp_14">53.0833sp</dimen>
-	<dimen name="sp_15">56.8750sp</dimen>
-	<dimen name="sp_16">60.6667sp</dimen>
-	<dimen name="sp_17">64.4583sp</dimen>
-	<dimen name="sp_18">68.2500sp</dimen>
-	<dimen name="sp_19">72.0417sp</dimen>
-	<dimen name="sp_20">75.8333sp</dimen>
-	<dimen name="sp_21">79.6250sp</dimen>
-	<dimen name="sp_22">83.4167sp</dimen>
-	<dimen name="sp_23">87.2083sp</dimen>
-	<dimen name="sp_24">91.0000sp</dimen>
-	<dimen name="sp_25">94.7917sp</dimen>
-	<dimen name="sp_28">106.1667sp</dimen>
-	<dimen name="sp_30">113.7500sp</dimen>
-	<dimen name="sp_32">121.3333sp</dimen>
-	<dimen name="sp_34">128.9167sp</dimen>
-	<dimen name="sp_36">136.5000sp</dimen>
-	<dimen name="sp_38">144.0833sp</dimen>
-	<dimen name="sp_40">151.6667sp</dimen>
-	<dimen name="sp_42">159.2500sp</dimen>
-	<dimen name="sp_48">182.0000sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw320dp/dimens.xml b/app/src/main/res/values-sw320dp/dimens.xml
deleted file mode 100644
index 554264f..0000000
--- a/app/src/main/res/values-sw320dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-53.3333dp</dimen>
-	<dimen name="dp_m_30">-26.6667dp</dimen>
-	<dimen name="dp_m_20">-17.7778dp</dimen>
-	<dimen name="dp_m_12">-10.6667dp</dimen>
-	<dimen name="dp_m_10">-8.8889dp</dimen>
-	<dimen name="dp_m_8">-7.1111dp</dimen>
-	<dimen name="dp_m_5">-4.4444dp</dimen>
-	<dimen name="dp_m_2">-1.7778dp</dimen>
-	<dimen name="dp_m_1">-0.8889dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.0889dp</dimen>
-	<dimen name="dp_0_5">0.4444dp</dimen>
-	<dimen name="dp_1">0.8889dp</dimen>
-	<dimen name="dp_1_5">1.3333dp</dimen>
-	<dimen name="dp_2">1.7778dp</dimen>
-	<dimen name="dp_2_5">2.2222dp</dimen>
-	<dimen name="dp_3">2.6667dp</dimen>
-	<dimen name="dp_3_5">3.1111dp</dimen>
-	<dimen name="dp_4">3.5556dp</dimen>
-	<dimen name="dp_4_5">4.0000dp</dimen>
-	<dimen name="dp_5">4.4444dp</dimen>
-	<dimen name="dp_6">5.3333dp</dimen>
-	<dimen name="dp_7">6.2222dp</dimen>
-	<dimen name="dp_8">7.1111dp</dimen>
-	<dimen name="dp_9">8.0000dp</dimen>
-	<dimen name="dp_10">8.8889dp</dimen>
-	<dimen name="dp_11">9.7778dp</dimen>
-	<dimen name="dp_12">10.6667dp</dimen>
-	<dimen name="dp_13">11.5556dp</dimen>
-	<dimen name="dp_14">12.4444dp</dimen>
-	<dimen name="dp_15">13.3333dp</dimen>
-	<dimen name="dp_16">14.2222dp</dimen>
-	<dimen name="dp_17">15.1111dp</dimen>
-	<dimen name="dp_18">16.0000dp</dimen>
-	<dimen name="dp_19">16.8889dp</dimen>
-	<dimen name="dp_20">17.7778dp</dimen>
-	<dimen name="dp_21">18.6667dp</dimen>
-	<dimen name="dp_22">19.5556dp</dimen>
-	<dimen name="dp_23">20.4444dp</dimen>
-	<dimen name="dp_24">21.3333dp</dimen>
-	<dimen name="dp_25">22.2222dp</dimen>
-	<dimen name="dp_26">23.1111dp</dimen>
-	<dimen name="dp_27">24.0000dp</dimen>
-	<dimen name="dp_28">24.8889dp</dimen>
-	<dimen name="dp_29">25.7778dp</dimen>
-	<dimen name="dp_30">26.6667dp</dimen>
-	<dimen name="dp_31">27.5556dp</dimen>
-	<dimen name="dp_32">28.4444dp</dimen>
-	<dimen name="dp_33">29.3333dp</dimen>
-	<dimen name="dp_34">30.2222dp</dimen>
-	<dimen name="dp_35">31.1111dp</dimen>
-	<dimen name="dp_36">32.0000dp</dimen>
-	<dimen name="dp_37">32.8889dp</dimen>
-	<dimen name="dp_38">33.7778dp</dimen>
-	<dimen name="dp_39">34.6667dp</dimen>
-	<dimen name="dp_40">35.5556dp</dimen>
-	<dimen name="dp_41">36.4444dp</dimen>
-	<dimen name="dp_42">37.3333dp</dimen>
-	<dimen name="dp_43">38.2222dp</dimen>
-	<dimen name="dp_44">39.1111dp</dimen>
-	<dimen name="dp_45">40.0000dp</dimen>
-	<dimen name="dp_46">40.8889dp</dimen>
-	<dimen name="dp_47">41.7778dp</dimen>
-	<dimen name="dp_48">42.6667dp</dimen>
-	<dimen name="dp_49">43.5556dp</dimen>
-	<dimen name="dp_50">44.4444dp</dimen>
-	<dimen name="dp_51">45.3333dp</dimen>
-	<dimen name="dp_52">46.2222dp</dimen>
-	<dimen name="dp_53">47.1111dp</dimen>
-	<dimen name="dp_54">48.0000dp</dimen>
-	<dimen name="dp_55">48.8889dp</dimen>
-	<dimen name="dp_56">49.7778dp</dimen>
-	<dimen name="dp_57">50.6667dp</dimen>
-	<dimen name="dp_58">51.5556dp</dimen>
-	<dimen name="dp_59">52.4444dp</dimen>
-	<dimen name="dp_60">53.3333dp</dimen>
-	<dimen name="dp_61">54.2222dp</dimen>
-	<dimen name="dp_62">55.1111dp</dimen>
-	<dimen name="dp_63">56.0000dp</dimen>
-	<dimen name="dp_64">56.8889dp</dimen>
-	<dimen name="dp_65">57.7778dp</dimen>
-	<dimen name="dp_66">58.6667dp</dimen>
-	<dimen name="dp_67">59.5556dp</dimen>
-	<dimen name="dp_68">60.4444dp</dimen>
-	<dimen name="dp_69">61.3333dp</dimen>
-	<dimen name="dp_70">62.2222dp</dimen>
-	<dimen name="dp_71">63.1111dp</dimen>
-	<dimen name="dp_72">64.0000dp</dimen>
-	<dimen name="dp_73">64.8889dp</dimen>
-	<dimen name="dp_74">65.7778dp</dimen>
-	<dimen name="dp_75">66.6667dp</dimen>
-	<dimen name="dp_76">67.5556dp</dimen>
-	<dimen name="dp_77">68.4444dp</dimen>
-	<dimen name="dp_78">69.3333dp</dimen>
-	<dimen name="dp_79">70.2222dp</dimen>
-	<dimen name="dp_80">71.1111dp</dimen>
-	<dimen name="dp_81">72.0000dp</dimen>
-	<dimen name="dp_82">72.8889dp</dimen>
-	<dimen name="dp_83">73.7778dp</dimen>
-	<dimen name="dp_84">74.6667dp</dimen>
-	<dimen name="dp_85">75.5556dp</dimen>
-	<dimen name="dp_86">76.4444dp</dimen>
-	<dimen name="dp_87">77.3333dp</dimen>
-	<dimen name="dp_88">78.2222dp</dimen>
-	<dimen name="dp_89">79.1111dp</dimen>
-	<dimen name="dp_90">80.0000dp</dimen>
-	<dimen name="dp_91">80.8889dp</dimen>
-	<dimen name="dp_92">81.7778dp</dimen>
-	<dimen name="dp_93">82.6667dp</dimen>
-	<dimen name="dp_94">83.5556dp</dimen>
-	<dimen name="dp_95">84.4444dp</dimen>
-	<dimen name="dp_96">85.3333dp</dimen>
-	<dimen name="dp_97">86.2222dp</dimen>
-	<dimen name="dp_98">87.1111dp</dimen>
-	<dimen name="dp_99">88.0000dp</dimen>
-	<dimen name="dp_100">88.8889dp</dimen>
-	<dimen name="dp_101">89.7778dp</dimen>
-	<dimen name="dp_102">90.6667dp</dimen>
-	<dimen name="dp_103">91.5556dp</dimen>
-	<dimen name="dp_104">92.4444dp</dimen>
-	<dimen name="dp_105">93.3333dp</dimen>
-	<dimen name="dp_106">94.2222dp</dimen>
-	<dimen name="dp_107">95.1111dp</dimen>
-	<dimen name="dp_108">96.0000dp</dimen>
-	<dimen name="dp_109">96.8889dp</dimen>
-	<dimen name="dp_110">97.7778dp</dimen>
-	<dimen name="dp_111">98.6667dp</dimen>
-	<dimen name="dp_112">99.5556dp</dimen>
-	<dimen name="dp_113">100.4444dp</dimen>
-	<dimen name="dp_114">101.3333dp</dimen>
-	<dimen name="dp_115">102.2222dp</dimen>
-	<dimen name="dp_116">103.1111dp</dimen>
-	<dimen name="dp_117">104.0000dp</dimen>
-	<dimen name="dp_118">104.8889dp</dimen>
-	<dimen name="dp_119">105.7778dp</dimen>
-	<dimen name="dp_120">106.6667dp</dimen>
-	<dimen name="dp_121">107.5556dp</dimen>
-	<dimen name="dp_122">108.4444dp</dimen>
-	<dimen name="dp_123">109.3333dp</dimen>
-	<dimen name="dp_124">110.2222dp</dimen>
-	<dimen name="dp_125">111.1111dp</dimen>
-	<dimen name="dp_126">112.0000dp</dimen>
-	<dimen name="dp_127">112.8889dp</dimen>
-	<dimen name="dp_128">113.7778dp</dimen>
-	<dimen name="dp_129">114.6667dp</dimen>
-	<dimen name="dp_130">115.5556dp</dimen>
-	<dimen name="dp_131">116.4444dp</dimen>
-	<dimen name="dp_132">117.3333dp</dimen>
-	<dimen name="dp_133">118.2222dp</dimen>
-	<dimen name="dp_134">119.1111dp</dimen>
-	<dimen name="dp_135">120.0000dp</dimen>
-	<dimen name="dp_136">120.8889dp</dimen>
-	<dimen name="dp_137">121.7778dp</dimen>
-	<dimen name="dp_138">122.6667dp</dimen>
-	<dimen name="dp_139">123.5556dp</dimen>
-	<dimen name="dp_140">124.4444dp</dimen>
-	<dimen name="dp_141">125.3333dp</dimen>
-	<dimen name="dp_142">126.2222dp</dimen>
-	<dimen name="dp_143">127.1111dp</dimen>
-	<dimen name="dp_144">128.0000dp</dimen>
-	<dimen name="dp_145">128.8889dp</dimen>
-	<dimen name="dp_146">129.7778dp</dimen>
-	<dimen name="dp_147">130.6667dp</dimen>
-	<dimen name="dp_148">131.5556dp</dimen>
-	<dimen name="dp_149">132.4444dp</dimen>
-	<dimen name="dp_150">133.3333dp</dimen>
-	<dimen name="dp_151">134.2222dp</dimen>
-	<dimen name="dp_152">135.1111dp</dimen>
-	<dimen name="dp_153">136.0000dp</dimen>
-	<dimen name="dp_154">136.8889dp</dimen>
-	<dimen name="dp_155">137.7778dp</dimen>
-	<dimen name="dp_156">138.6667dp</dimen>
-	<dimen name="dp_157">139.5556dp</dimen>
-	<dimen name="dp_158">140.4444dp</dimen>
-	<dimen name="dp_159">141.3333dp</dimen>
-	<dimen name="dp_160">142.2222dp</dimen>
-	<dimen name="dp_161">143.1111dp</dimen>
-	<dimen name="dp_162">144.0000dp</dimen>
-	<dimen name="dp_163">144.8889dp</dimen>
-	<dimen name="dp_164">145.7778dp</dimen>
-	<dimen name="dp_165">146.6667dp</dimen>
-	<dimen name="dp_166">147.5556dp</dimen>
-	<dimen name="dp_167">148.4444dp</dimen>
-	<dimen name="dp_168">149.3333dp</dimen>
-	<dimen name="dp_169">150.2222dp</dimen>
-	<dimen name="dp_170">151.1111dp</dimen>
-	<dimen name="dp_171">152.0000dp</dimen>
-	<dimen name="dp_172">152.8889dp</dimen>
-	<dimen name="dp_173">153.7778dp</dimen>
-	<dimen name="dp_174">154.6667dp</dimen>
-	<dimen name="dp_175">155.5556dp</dimen>
-	<dimen name="dp_176">156.4444dp</dimen>
-	<dimen name="dp_177">157.3333dp</dimen>
-	<dimen name="dp_178">158.2222dp</dimen>
-	<dimen name="dp_179">159.1111dp</dimen>
-	<dimen name="dp_180">160.0000dp</dimen>
-	<dimen name="dp_181">160.8889dp</dimen>
-	<dimen name="dp_182">161.7778dp</dimen>
-	<dimen name="dp_183">162.6667dp</dimen>
-	<dimen name="dp_184">163.5556dp</dimen>
-	<dimen name="dp_185">164.4444dp</dimen>
-	<dimen name="dp_186">165.3333dp</dimen>
-	<dimen name="dp_187">166.2222dp</dimen>
-	<dimen name="dp_188">167.1111dp</dimen>
-	<dimen name="dp_189">168.0000dp</dimen>
-	<dimen name="dp_190">168.8889dp</dimen>
-	<dimen name="dp_191">169.7778dp</dimen>
-	<dimen name="dp_192">170.6667dp</dimen>
-	<dimen name="dp_193">171.5556dp</dimen>
-	<dimen name="dp_194">172.4444dp</dimen>
-	<dimen name="dp_195">173.3333dp</dimen>
-	<dimen name="dp_196">174.2222dp</dimen>
-	<dimen name="dp_197">175.1111dp</dimen>
-	<dimen name="dp_198">176.0000dp</dimen>
-	<dimen name="dp_199">176.8889dp</dimen>
-	<dimen name="dp_200">177.7778dp</dimen>
-	<dimen name="dp_201">178.6667dp</dimen>
-	<dimen name="dp_202">179.5556dp</dimen>
-	<dimen name="dp_203">180.4444dp</dimen>
-	<dimen name="dp_204">181.3333dp</dimen>
-	<dimen name="dp_205">182.2222dp</dimen>
-	<dimen name="dp_206">183.1111dp</dimen>
-	<dimen name="dp_207">184.0000dp</dimen>
-	<dimen name="dp_208">184.8889dp</dimen>
-	<dimen name="dp_209">185.7778dp</dimen>
-	<dimen name="dp_210">186.6667dp</dimen>
-	<dimen name="dp_211">187.5556dp</dimen>
-	<dimen name="dp_212">188.4444dp</dimen>
-	<dimen name="dp_213">189.3333dp</dimen>
-	<dimen name="dp_214">190.2222dp</dimen>
-	<dimen name="dp_215">191.1111dp</dimen>
-	<dimen name="dp_216">192.0000dp</dimen>
-	<dimen name="dp_217">192.8889dp</dimen>
-	<dimen name="dp_218">193.7778dp</dimen>
-	<dimen name="dp_219">194.6667dp</dimen>
-	<dimen name="dp_220">195.5556dp</dimen>
-	<dimen name="dp_221">196.4444dp</dimen>
-	<dimen name="dp_222">197.3333dp</dimen>
-	<dimen name="dp_223">198.2222dp</dimen>
-	<dimen name="dp_224">199.1111dp</dimen>
-	<dimen name="dp_225">200.0000dp</dimen>
-	<dimen name="dp_226">200.8889dp</dimen>
-	<dimen name="dp_227">201.7778dp</dimen>
-	<dimen name="dp_228">202.6667dp</dimen>
-	<dimen name="dp_229">203.5556dp</dimen>
-	<dimen name="dp_230">204.4444dp</dimen>
-	<dimen name="dp_231">205.3333dp</dimen>
-	<dimen name="dp_232">206.2222dp</dimen>
-	<dimen name="dp_233">207.1111dp</dimen>
-	<dimen name="dp_234">208.0000dp</dimen>
-	<dimen name="dp_235">208.8889dp</dimen>
-	<dimen name="dp_236">209.7778dp</dimen>
-	<dimen name="dp_237">210.6667dp</dimen>
-	<dimen name="dp_238">211.5556dp</dimen>
-	<dimen name="dp_239">212.4444dp</dimen>
-	<dimen name="dp_240">213.3333dp</dimen>
-	<dimen name="dp_241">214.2222dp</dimen>
-	<dimen name="dp_242">215.1111dp</dimen>
-	<dimen name="dp_243">216.0000dp</dimen>
-	<dimen name="dp_244">216.8889dp</dimen>
-	<dimen name="dp_245">217.7778dp</dimen>
-	<dimen name="dp_246">218.6667dp</dimen>
-	<dimen name="dp_247">219.5556dp</dimen>
-	<dimen name="dp_248">220.4444dp</dimen>
-	<dimen name="dp_249">221.3333dp</dimen>
-	<dimen name="dp_250">222.2222dp</dimen>
-	<dimen name="dp_251">223.1111dp</dimen>
-	<dimen name="dp_252">224.0000dp</dimen>
-	<dimen name="dp_253">224.8889dp</dimen>
-	<dimen name="dp_254">225.7778dp</dimen>
-	<dimen name="dp_255">226.6667dp</dimen>
-	<dimen name="dp_256">227.5556dp</dimen>
-	<dimen name="dp_257">228.4444dp</dimen>
-	<dimen name="dp_258">229.3333dp</dimen>
-	<dimen name="dp_259">230.2222dp</dimen>
-	<dimen name="dp_260">231.1111dp</dimen>
-	<dimen name="dp_261">232.0000dp</dimen>
-	<dimen name="dp_262">232.8889dp</dimen>
-	<dimen name="dp_263">233.7778dp</dimen>
-	<dimen name="dp_264">234.6667dp</dimen>
-	<dimen name="dp_265">235.5556dp</dimen>
-	<dimen name="dp_266">236.4444dp</dimen>
-	<dimen name="dp_267">237.3333dp</dimen>
-	<dimen name="dp_268">238.2222dp</dimen>
-	<dimen name="dp_269">239.1111dp</dimen>
-	<dimen name="dp_270">240.0000dp</dimen>
-	<dimen name="dp_271">240.8889dp</dimen>
-	<dimen name="dp_272">241.7778dp</dimen>
-	<dimen name="dp_273">242.6667dp</dimen>
-	<dimen name="dp_274">243.5556dp</dimen>
-	<dimen name="dp_275">244.4444dp</dimen>
-	<dimen name="dp_276">245.3333dp</dimen>
-	<dimen name="dp_277">246.2222dp</dimen>
-	<dimen name="dp_278">247.1111dp</dimen>
-	<dimen name="dp_279">248.0000dp</dimen>
-	<dimen name="dp_280">248.8889dp</dimen>
-	<dimen name="dp_281">249.7778dp</dimen>
-	<dimen name="dp_282">250.6667dp</dimen>
-	<dimen name="dp_283">251.5556dp</dimen>
-	<dimen name="dp_284">252.4444dp</dimen>
-	<dimen name="dp_285">253.3333dp</dimen>
-	<dimen name="dp_286">254.2222dp</dimen>
-	<dimen name="dp_287">255.1111dp</dimen>
-	<dimen name="dp_288">256.0000dp</dimen>
-	<dimen name="dp_289">256.8889dp</dimen>
-	<dimen name="dp_290">257.7778dp</dimen>
-	<dimen name="dp_291">258.6667dp</dimen>
-	<dimen name="dp_292">259.5556dp</dimen>
-	<dimen name="dp_293">260.4444dp</dimen>
-	<dimen name="dp_294">261.3333dp</dimen>
-	<dimen name="dp_295">262.2222dp</dimen>
-	<dimen name="dp_296">263.1111dp</dimen>
-	<dimen name="dp_297">264.0000dp</dimen>
-	<dimen name="dp_298">264.8889dp</dimen>
-	<dimen name="dp_299">265.7778dp</dimen>
-	<dimen name="dp_300">266.6667dp</dimen>
-	<dimen name="dp_301">267.5556dp</dimen>
-	<dimen name="dp_302">268.4444dp</dimen>
-	<dimen name="dp_303">269.3333dp</dimen>
-	<dimen name="dp_304">270.2222dp</dimen>
-	<dimen name="dp_305">271.1111dp</dimen>
-	<dimen name="dp_306">272.0000dp</dimen>
-	<dimen name="dp_307">272.8889dp</dimen>
-	<dimen name="dp_308">273.7778dp</dimen>
-	<dimen name="dp_309">274.6667dp</dimen>
-	<dimen name="dp_310">275.5556dp</dimen>
-	<dimen name="dp_311">276.4444dp</dimen>
-	<dimen name="dp_312">277.3333dp</dimen>
-	<dimen name="dp_313">278.2222dp</dimen>
-	<dimen name="dp_314">279.1111dp</dimen>
-	<dimen name="dp_315">280.0000dp</dimen>
-	<dimen name="dp_316">280.8889dp</dimen>
-	<dimen name="dp_317">281.7778dp</dimen>
-	<dimen name="dp_318">282.6667dp</dimen>
-	<dimen name="dp_319">283.5556dp</dimen>
-	<dimen name="dp_320">284.4444dp</dimen>
-	<dimen name="dp_321">285.3333dp</dimen>
-	<dimen name="dp_322">286.2222dp</dimen>
-	<dimen name="dp_323">287.1111dp</dimen>
-	<dimen name="dp_324">288.0000dp</dimen>
-	<dimen name="dp_325">288.8889dp</dimen>
-	<dimen name="dp_326">289.7778dp</dimen>
-	<dimen name="dp_327">290.6667dp</dimen>
-	<dimen name="dp_328">291.5556dp</dimen>
-	<dimen name="dp_329">292.4444dp</dimen>
-	<dimen name="dp_330">293.3333dp</dimen>
-	<dimen name="dp_331">294.2222dp</dimen>
-	<dimen name="dp_332">295.1111dp</dimen>
-	<dimen name="dp_333">296.0000dp</dimen>
-	<dimen name="dp_334">296.8889dp</dimen>
-	<dimen name="dp_335">297.7778dp</dimen>
-	<dimen name="dp_336">298.6667dp</dimen>
-	<dimen name="dp_337">299.5556dp</dimen>
-	<dimen name="dp_338">300.4444dp</dimen>
-	<dimen name="dp_339">301.3333dp</dimen>
-	<dimen name="dp_340">302.2222dp</dimen>
-	<dimen name="dp_341">303.1111dp</dimen>
-	<dimen name="dp_342">304.0000dp</dimen>
-	<dimen name="dp_343">304.8889dp</dimen>
-	<dimen name="dp_344">305.7778dp</dimen>
-	<dimen name="dp_345">306.6667dp</dimen>
-	<dimen name="dp_346">307.5556dp</dimen>
-	<dimen name="dp_347">308.4444dp</dimen>
-	<dimen name="dp_348">309.3333dp</dimen>
-	<dimen name="dp_349">310.2222dp</dimen>
-	<dimen name="dp_350">311.1111dp</dimen>
-	<dimen name="dp_351">312.0000dp</dimen>
-	<dimen name="dp_352">312.8889dp</dimen>
-	<dimen name="dp_353">313.7778dp</dimen>
-	<dimen name="dp_354">314.6667dp</dimen>
-	<dimen name="dp_355">315.5556dp</dimen>
-	<dimen name="dp_356">316.4444dp</dimen>
-	<dimen name="dp_357">317.3333dp</dimen>
-	<dimen name="dp_358">318.2222dp</dimen>
-	<dimen name="dp_359">319.1111dp</dimen>
-	<dimen name="dp_360">320.0000dp</dimen>
-	<dimen name="dp_365">324.4444dp</dimen>
-	<dimen name="dp_370">328.8889dp</dimen>
-	<dimen name="dp_400">355.5556dp</dimen>
-	<dimen name="dp_410">364.4444dp</dimen>
-	<dimen name="dp_422">375.1111dp</dimen>
-	<dimen name="dp_472">419.5556dp</dimen>
-	<dimen name="dp_500">444.4444dp</dimen>
-	<dimen name="dp_600">533.3333dp</dimen>
-	<dimen name="dp_640">568.8889dp</dimen>
-	<dimen name="dp_720">640.0000dp</dimen>
-	<dimen name="sp_6">5.3333sp</dimen>
-	<dimen name="sp_7">6.2222sp</dimen>
-	<dimen name="sp_8">7.1111sp</dimen>
-	<dimen name="sp_9">8.0000sp</dimen>
-	<dimen name="sp_10">8.8889sp</dimen>
-	<dimen name="sp_11">9.7778sp</dimen>
-	<dimen name="sp_12">10.6667sp</dimen>
-	<dimen name="sp_13">11.5556sp</dimen>
-	<dimen name="sp_14">12.4444sp</dimen>
-	<dimen name="sp_15">13.3333sp</dimen>
-	<dimen name="sp_16">14.2222sp</dimen>
-	<dimen name="sp_17">15.1111sp</dimen>
-	<dimen name="sp_18">16.0000sp</dimen>
-	<dimen name="sp_19">16.8889sp</dimen>
-	<dimen name="sp_20">17.7778sp</dimen>
-	<dimen name="sp_21">18.6667sp</dimen>
-	<dimen name="sp_22">19.5556sp</dimen>
-	<dimen name="sp_23">20.4444sp</dimen>
-	<dimen name="sp_24">21.3333sp</dimen>
-	<dimen name="sp_25">22.2222sp</dimen>
-	<dimen name="sp_28">24.8889sp</dimen>
-	<dimen name="sp_30">26.6667sp</dimen>
-	<dimen name="sp_32">28.4444sp</dimen>
-	<dimen name="sp_34">30.2222sp</dimen>
-	<dimen name="sp_36">32.0000sp</dimen>
-	<dimen name="sp_38">33.7778sp</dimen>
-	<dimen name="sp_40">35.5556sp</dimen>
-	<dimen name="sp_42">37.3333sp</dimen>
-	<dimen name="sp_48">42.6667sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw360dp/dimens.xml b/app/src/main/res/values-sw360dp/dimens.xml
deleted file mode 100644
index 7a4ffaf..0000000
--- a/app/src/main/res/values-sw360dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-60.0000dp</dimen>
-	<dimen name="dp_m_30">-30.0000dp</dimen>
-	<dimen name="dp_m_20">-20.0000dp</dimen>
-	<dimen name="dp_m_12">-12.0000dp</dimen>
-	<dimen name="dp_m_10">-10.0000dp</dimen>
-	<dimen name="dp_m_8">-8.0000dp</dimen>
-	<dimen name="dp_m_5">-5.0000dp</dimen>
-	<dimen name="dp_m_2">-2.0000dp</dimen>
-	<dimen name="dp_m_1">-1.0000dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.1000dp</dimen>
-	<dimen name="dp_0_5">0.5000dp</dimen>
-	<dimen name="dp_1">1.0000dp</dimen>
-	<dimen name="dp_1_5">1.5000dp</dimen>
-	<dimen name="dp_2">2.0000dp</dimen>
-	<dimen name="dp_2_5">2.5000dp</dimen>
-	<dimen name="dp_3">3.0000dp</dimen>
-	<dimen name="dp_3_5">3.5000dp</dimen>
-	<dimen name="dp_4">4.0000dp</dimen>
-	<dimen name="dp_4_5">4.5000dp</dimen>
-	<dimen name="dp_5">5.0000dp</dimen>
-	<dimen name="dp_6">6.0000dp</dimen>
-	<dimen name="dp_7">7.0000dp</dimen>
-	<dimen name="dp_8">8.0000dp</dimen>
-	<dimen name="dp_9">9.0000dp</dimen>
-	<dimen name="dp_10">10.0000dp</dimen>
-	<dimen name="dp_11">11.0000dp</dimen>
-	<dimen name="dp_12">12.0000dp</dimen>
-	<dimen name="dp_13">13.0000dp</dimen>
-	<dimen name="dp_14">14.0000dp</dimen>
-	<dimen name="dp_15">15.0000dp</dimen>
-	<dimen name="dp_16">16.0000dp</dimen>
-	<dimen name="dp_17">17.0000dp</dimen>
-	<dimen name="dp_18">18.0000dp</dimen>
-	<dimen name="dp_19">19.0000dp</dimen>
-	<dimen name="dp_20">20.0000dp</dimen>
-	<dimen name="dp_21">21.0000dp</dimen>
-	<dimen name="dp_22">22.0000dp</dimen>
-	<dimen name="dp_23">23.0000dp</dimen>
-	<dimen name="dp_24">24.0000dp</dimen>
-	<dimen name="dp_25">25.0000dp</dimen>
-	<dimen name="dp_26">26.0000dp</dimen>
-	<dimen name="dp_27">27.0000dp</dimen>
-	<dimen name="dp_28">28.0000dp</dimen>
-	<dimen name="dp_29">29.0000dp</dimen>
-	<dimen name="dp_30">30.0000dp</dimen>
-	<dimen name="dp_31">31.0000dp</dimen>
-	<dimen name="dp_32">32.0000dp</dimen>
-	<dimen name="dp_33">33.0000dp</dimen>
-	<dimen name="dp_34">34.0000dp</dimen>
-	<dimen name="dp_35">35.0000dp</dimen>
-	<dimen name="dp_36">36.0000dp</dimen>
-	<dimen name="dp_37">37.0000dp</dimen>
-	<dimen name="dp_38">38.0000dp</dimen>
-	<dimen name="dp_39">39.0000dp</dimen>
-	<dimen name="dp_40">40.0000dp</dimen>
-	<dimen name="dp_41">41.0000dp</dimen>
-	<dimen name="dp_42">42.0000dp</dimen>
-	<dimen name="dp_43">43.0000dp</dimen>
-	<dimen name="dp_44">44.0000dp</dimen>
-	<dimen name="dp_45">45.0000dp</dimen>
-	<dimen name="dp_46">46.0000dp</dimen>
-	<dimen name="dp_47">47.0000dp</dimen>
-	<dimen name="dp_48">48.0000dp</dimen>
-	<dimen name="dp_49">49.0000dp</dimen>
-	<dimen name="dp_50">50.0000dp</dimen>
-	<dimen name="dp_51">51.0000dp</dimen>
-	<dimen name="dp_52">52.0000dp</dimen>
-	<dimen name="dp_53">53.0000dp</dimen>
-	<dimen name="dp_54">54.0000dp</dimen>
-	<dimen name="dp_55">55.0000dp</dimen>
-	<dimen name="dp_56">56.0000dp</dimen>
-	<dimen name="dp_57">57.0000dp</dimen>
-	<dimen name="dp_58">58.0000dp</dimen>
-	<dimen name="dp_59">59.0000dp</dimen>
-	<dimen name="dp_60">60.0000dp</dimen>
-	<dimen name="dp_61">61.0000dp</dimen>
-	<dimen name="dp_62">62.0000dp</dimen>
-	<dimen name="dp_63">63.0000dp</dimen>
-	<dimen name="dp_64">64.0000dp</dimen>
-	<dimen name="dp_65">65.0000dp</dimen>
-	<dimen name="dp_66">66.0000dp</dimen>
-	<dimen name="dp_67">67.0000dp</dimen>
-	<dimen name="dp_68">68.0000dp</dimen>
-	<dimen name="dp_69">69.0000dp</dimen>
-	<dimen name="dp_70">70.0000dp</dimen>
-	<dimen name="dp_71">71.0000dp</dimen>
-	<dimen name="dp_72">72.0000dp</dimen>
-	<dimen name="dp_73">73.0000dp</dimen>
-	<dimen name="dp_74">74.0000dp</dimen>
-	<dimen name="dp_75">75.0000dp</dimen>
-	<dimen name="dp_76">76.0000dp</dimen>
-	<dimen name="dp_77">77.0000dp</dimen>
-	<dimen name="dp_78">78.0000dp</dimen>
-	<dimen name="dp_79">79.0000dp</dimen>
-	<dimen name="dp_80">80.0000dp</dimen>
-	<dimen name="dp_81">81.0000dp</dimen>
-	<dimen name="dp_82">82.0000dp</dimen>
-	<dimen name="dp_83">83.0000dp</dimen>
-	<dimen name="dp_84">84.0000dp</dimen>
-	<dimen name="dp_85">85.0000dp</dimen>
-	<dimen name="dp_86">86.0000dp</dimen>
-	<dimen name="dp_87">87.0000dp</dimen>
-	<dimen name="dp_88">88.0000dp</dimen>
-	<dimen name="dp_89">89.0000dp</dimen>
-	<dimen name="dp_90">90.0000dp</dimen>
-	<dimen name="dp_91">91.0000dp</dimen>
-	<dimen name="dp_92">92.0000dp</dimen>
-	<dimen name="dp_93">93.0000dp</dimen>
-	<dimen name="dp_94">94.0000dp</dimen>
-	<dimen name="dp_95">95.0000dp</dimen>
-	<dimen name="dp_96">96.0000dp</dimen>
-	<dimen name="dp_97">97.0000dp</dimen>
-	<dimen name="dp_98">98.0000dp</dimen>
-	<dimen name="dp_99">99.0000dp</dimen>
-	<dimen name="dp_100">100.0000dp</dimen>
-	<dimen name="dp_101">101.0000dp</dimen>
-	<dimen name="dp_102">102.0000dp</dimen>
-	<dimen name="dp_103">103.0000dp</dimen>
-	<dimen name="dp_104">104.0000dp</dimen>
-	<dimen name="dp_105">105.0000dp</dimen>
-	<dimen name="dp_106">106.0000dp</dimen>
-	<dimen name="dp_107">107.0000dp</dimen>
-	<dimen name="dp_108">108.0000dp</dimen>
-	<dimen name="dp_109">109.0000dp</dimen>
-	<dimen name="dp_110">110.0000dp</dimen>
-	<dimen name="dp_111">111.0000dp</dimen>
-	<dimen name="dp_112">112.0000dp</dimen>
-	<dimen name="dp_113">113.0000dp</dimen>
-	<dimen name="dp_114">114.0000dp</dimen>
-	<dimen name="dp_115">115.0000dp</dimen>
-	<dimen name="dp_116">116.0000dp</dimen>
-	<dimen name="dp_117">117.0000dp</dimen>
-	<dimen name="dp_118">118.0000dp</dimen>
-	<dimen name="dp_119">119.0000dp</dimen>
-	<dimen name="dp_120">120.0000dp</dimen>
-	<dimen name="dp_121">121.0000dp</dimen>
-	<dimen name="dp_122">122.0000dp</dimen>
-	<dimen name="dp_123">123.0000dp</dimen>
-	<dimen name="dp_124">124.0000dp</dimen>
-	<dimen name="dp_125">125.0000dp</dimen>
-	<dimen name="dp_126">126.0000dp</dimen>
-	<dimen name="dp_127">127.0000dp</dimen>
-	<dimen name="dp_128">128.0000dp</dimen>
-	<dimen name="dp_129">129.0000dp</dimen>
-	<dimen name="dp_130">130.0000dp</dimen>
-	<dimen name="dp_131">131.0000dp</dimen>
-	<dimen name="dp_132">132.0000dp</dimen>
-	<dimen name="dp_133">133.0000dp</dimen>
-	<dimen name="dp_134">134.0000dp</dimen>
-	<dimen name="dp_135">135.0000dp</dimen>
-	<dimen name="dp_136">136.0000dp</dimen>
-	<dimen name="dp_137">137.0000dp</dimen>
-	<dimen name="dp_138">138.0000dp</dimen>
-	<dimen name="dp_139">139.0000dp</dimen>
-	<dimen name="dp_140">140.0000dp</dimen>
-	<dimen name="dp_141">141.0000dp</dimen>
-	<dimen name="dp_142">142.0000dp</dimen>
-	<dimen name="dp_143">143.0000dp</dimen>
-	<dimen name="dp_144">144.0000dp</dimen>
-	<dimen name="dp_145">145.0000dp</dimen>
-	<dimen name="dp_146">146.0000dp</dimen>
-	<dimen name="dp_147">147.0000dp</dimen>
-	<dimen name="dp_148">148.0000dp</dimen>
-	<dimen name="dp_149">149.0000dp</dimen>
-	<dimen name="dp_150">150.0000dp</dimen>
-	<dimen name="dp_151">151.0000dp</dimen>
-	<dimen name="dp_152">152.0000dp</dimen>
-	<dimen name="dp_153">153.0000dp</dimen>
-	<dimen name="dp_154">154.0000dp</dimen>
-	<dimen name="dp_155">155.0000dp</dimen>
-	<dimen name="dp_156">156.0000dp</dimen>
-	<dimen name="dp_157">157.0000dp</dimen>
-	<dimen name="dp_158">158.0000dp</dimen>
-	<dimen name="dp_159">159.0000dp</dimen>
-	<dimen name="dp_160">160.0000dp</dimen>
-	<dimen name="dp_161">161.0000dp</dimen>
-	<dimen name="dp_162">162.0000dp</dimen>
-	<dimen name="dp_163">163.0000dp</dimen>
-	<dimen name="dp_164">164.0000dp</dimen>
-	<dimen name="dp_165">165.0000dp</dimen>
-	<dimen name="dp_166">166.0000dp</dimen>
-	<dimen name="dp_167">167.0000dp</dimen>
-	<dimen name="dp_168">168.0000dp</dimen>
-	<dimen name="dp_169">169.0000dp</dimen>
-	<dimen name="dp_170">170.0000dp</dimen>
-	<dimen name="dp_171">171.0000dp</dimen>
-	<dimen name="dp_172">172.0000dp</dimen>
-	<dimen name="dp_173">173.0000dp</dimen>
-	<dimen name="dp_174">174.0000dp</dimen>
-	<dimen name="dp_175">175.0000dp</dimen>
-	<dimen name="dp_176">176.0000dp</dimen>
-	<dimen name="dp_177">177.0000dp</dimen>
-	<dimen name="dp_178">178.0000dp</dimen>
-	<dimen name="dp_179">179.0000dp</dimen>
-	<dimen name="dp_180">180.0000dp</dimen>
-	<dimen name="dp_181">181.0000dp</dimen>
-	<dimen name="dp_182">182.0000dp</dimen>
-	<dimen name="dp_183">183.0000dp</dimen>
-	<dimen name="dp_184">184.0000dp</dimen>
-	<dimen name="dp_185">185.0000dp</dimen>
-	<dimen name="dp_186">186.0000dp</dimen>
-	<dimen name="dp_187">187.0000dp</dimen>
-	<dimen name="dp_188">188.0000dp</dimen>
-	<dimen name="dp_189">189.0000dp</dimen>
-	<dimen name="dp_190">190.0000dp</dimen>
-	<dimen name="dp_191">191.0000dp</dimen>
-	<dimen name="dp_192">192.0000dp</dimen>
-	<dimen name="dp_193">193.0000dp</dimen>
-	<dimen name="dp_194">194.0000dp</dimen>
-	<dimen name="dp_195">195.0000dp</dimen>
-	<dimen name="dp_196">196.0000dp</dimen>
-	<dimen name="dp_197">197.0000dp</dimen>
-	<dimen name="dp_198">198.0000dp</dimen>
-	<dimen name="dp_199">199.0000dp</dimen>
-	<dimen name="dp_200">200.0000dp</dimen>
-	<dimen name="dp_201">201.0000dp</dimen>
-	<dimen name="dp_202">202.0000dp</dimen>
-	<dimen name="dp_203">203.0000dp</dimen>
-	<dimen name="dp_204">204.0000dp</dimen>
-	<dimen name="dp_205">205.0000dp</dimen>
-	<dimen name="dp_206">206.0000dp</dimen>
-	<dimen name="dp_207">207.0000dp</dimen>
-	<dimen name="dp_208">208.0000dp</dimen>
-	<dimen name="dp_209">209.0000dp</dimen>
-	<dimen name="dp_210">210.0000dp</dimen>
-	<dimen name="dp_211">211.0000dp</dimen>
-	<dimen name="dp_212">212.0000dp</dimen>
-	<dimen name="dp_213">213.0000dp</dimen>
-	<dimen name="dp_214">214.0000dp</dimen>
-	<dimen name="dp_215">215.0000dp</dimen>
-	<dimen name="dp_216">216.0000dp</dimen>
-	<dimen name="dp_217">217.0000dp</dimen>
-	<dimen name="dp_218">218.0000dp</dimen>
-	<dimen name="dp_219">219.0000dp</dimen>
-	<dimen name="dp_220">220.0000dp</dimen>
-	<dimen name="dp_221">221.0000dp</dimen>
-	<dimen name="dp_222">222.0000dp</dimen>
-	<dimen name="dp_223">223.0000dp</dimen>
-	<dimen name="dp_224">224.0000dp</dimen>
-	<dimen name="dp_225">225.0000dp</dimen>
-	<dimen name="dp_226">226.0000dp</dimen>
-	<dimen name="dp_227">227.0000dp</dimen>
-	<dimen name="dp_228">228.0000dp</dimen>
-	<dimen name="dp_229">229.0000dp</dimen>
-	<dimen name="dp_230">230.0000dp</dimen>
-	<dimen name="dp_231">231.0000dp</dimen>
-	<dimen name="dp_232">232.0000dp</dimen>
-	<dimen name="dp_233">233.0000dp</dimen>
-	<dimen name="dp_234">234.0000dp</dimen>
-	<dimen name="dp_235">235.0000dp</dimen>
-	<dimen name="dp_236">236.0000dp</dimen>
-	<dimen name="dp_237">237.0000dp</dimen>
-	<dimen name="dp_238">238.0000dp</dimen>
-	<dimen name="dp_239">239.0000dp</dimen>
-	<dimen name="dp_240">240.0000dp</dimen>
-	<dimen name="dp_241">241.0000dp</dimen>
-	<dimen name="dp_242">242.0000dp</dimen>
-	<dimen name="dp_243">243.0000dp</dimen>
-	<dimen name="dp_244">244.0000dp</dimen>
-	<dimen name="dp_245">245.0000dp</dimen>
-	<dimen name="dp_246">246.0000dp</dimen>
-	<dimen name="dp_247">247.0000dp</dimen>
-	<dimen name="dp_248">248.0000dp</dimen>
-	<dimen name="dp_249">249.0000dp</dimen>
-	<dimen name="dp_250">250.0000dp</dimen>
-	<dimen name="dp_251">251.0000dp</dimen>
-	<dimen name="dp_252">252.0000dp</dimen>
-	<dimen name="dp_253">253.0000dp</dimen>
-	<dimen name="dp_254">254.0000dp</dimen>
-	<dimen name="dp_255">255.0000dp</dimen>
-	<dimen name="dp_256">256.0000dp</dimen>
-	<dimen name="dp_257">257.0000dp</dimen>
-	<dimen name="dp_258">258.0000dp</dimen>
-	<dimen name="dp_259">259.0000dp</dimen>
-	<dimen name="dp_260">260.0000dp</dimen>
-	<dimen name="dp_261">261.0000dp</dimen>
-	<dimen name="dp_262">262.0000dp</dimen>
-	<dimen name="dp_263">263.0000dp</dimen>
-	<dimen name="dp_264">264.0000dp</dimen>
-	<dimen name="dp_265">265.0000dp</dimen>
-	<dimen name="dp_266">266.0000dp</dimen>
-	<dimen name="dp_267">267.0000dp</dimen>
-	<dimen name="dp_268">268.0000dp</dimen>
-	<dimen name="dp_269">269.0000dp</dimen>
-	<dimen name="dp_270">270.0000dp</dimen>
-	<dimen name="dp_271">271.0000dp</dimen>
-	<dimen name="dp_272">272.0000dp</dimen>
-	<dimen name="dp_273">273.0000dp</dimen>
-	<dimen name="dp_274">274.0000dp</dimen>
-	<dimen name="dp_275">275.0000dp</dimen>
-	<dimen name="dp_276">276.0000dp</dimen>
-	<dimen name="dp_277">277.0000dp</dimen>
-	<dimen name="dp_278">278.0000dp</dimen>
-	<dimen name="dp_279">279.0000dp</dimen>
-	<dimen name="dp_280">280.0000dp</dimen>
-	<dimen name="dp_281">281.0000dp</dimen>
-	<dimen name="dp_282">282.0000dp</dimen>
-	<dimen name="dp_283">283.0000dp</dimen>
-	<dimen name="dp_284">284.0000dp</dimen>
-	<dimen name="dp_285">285.0000dp</dimen>
-	<dimen name="dp_286">286.0000dp</dimen>
-	<dimen name="dp_287">287.0000dp</dimen>
-	<dimen name="dp_288">288.0000dp</dimen>
-	<dimen name="dp_289">289.0000dp</dimen>
-	<dimen name="dp_290">290.0000dp</dimen>
-	<dimen name="dp_291">291.0000dp</dimen>
-	<dimen name="dp_292">292.0000dp</dimen>
-	<dimen name="dp_293">293.0000dp</dimen>
-	<dimen name="dp_294">294.0000dp</dimen>
-	<dimen name="dp_295">295.0000dp</dimen>
-	<dimen name="dp_296">296.0000dp</dimen>
-	<dimen name="dp_297">297.0000dp</dimen>
-	<dimen name="dp_298">298.0000dp</dimen>
-	<dimen name="dp_299">299.0000dp</dimen>
-	<dimen name="dp_300">300.0000dp</dimen>
-	<dimen name="dp_301">301.0000dp</dimen>
-	<dimen name="dp_302">302.0000dp</dimen>
-	<dimen name="dp_303">303.0000dp</dimen>
-	<dimen name="dp_304">304.0000dp</dimen>
-	<dimen name="dp_305">305.0000dp</dimen>
-	<dimen name="dp_306">306.0000dp</dimen>
-	<dimen name="dp_307">307.0000dp</dimen>
-	<dimen name="dp_308">308.0000dp</dimen>
-	<dimen name="dp_309">309.0000dp</dimen>
-	<dimen name="dp_310">310.0000dp</dimen>
-	<dimen name="dp_311">311.0000dp</dimen>
-	<dimen name="dp_312">312.0000dp</dimen>
-	<dimen name="dp_313">313.0000dp</dimen>
-	<dimen name="dp_314">314.0000dp</dimen>
-	<dimen name="dp_315">315.0000dp</dimen>
-	<dimen name="dp_316">316.0000dp</dimen>
-	<dimen name="dp_317">317.0000dp</dimen>
-	<dimen name="dp_318">318.0000dp</dimen>
-	<dimen name="dp_319">319.0000dp</dimen>
-	<dimen name="dp_320">320.0000dp</dimen>
-	<dimen name="dp_321">321.0000dp</dimen>
-	<dimen name="dp_322">322.0000dp</dimen>
-	<dimen name="dp_323">323.0000dp</dimen>
-	<dimen name="dp_324">324.0000dp</dimen>
-	<dimen name="dp_325">325.0000dp</dimen>
-	<dimen name="dp_326">326.0000dp</dimen>
-	<dimen name="dp_327">327.0000dp</dimen>
-	<dimen name="dp_328">328.0000dp</dimen>
-	<dimen name="dp_329">329.0000dp</dimen>
-	<dimen name="dp_330">330.0000dp</dimen>
-	<dimen name="dp_331">331.0000dp</dimen>
-	<dimen name="dp_332">332.0000dp</dimen>
-	<dimen name="dp_333">333.0000dp</dimen>
-	<dimen name="dp_334">334.0000dp</dimen>
-	<dimen name="dp_335">335.0000dp</dimen>
-	<dimen name="dp_336">336.0000dp</dimen>
-	<dimen name="dp_337">337.0000dp</dimen>
-	<dimen name="dp_338">338.0000dp</dimen>
-	<dimen name="dp_339">339.0000dp</dimen>
-	<dimen name="dp_340">340.0000dp</dimen>
-	<dimen name="dp_341">341.0000dp</dimen>
-	<dimen name="dp_342">342.0000dp</dimen>
-	<dimen name="dp_343">343.0000dp</dimen>
-	<dimen name="dp_344">344.0000dp</dimen>
-	<dimen name="dp_345">345.0000dp</dimen>
-	<dimen name="dp_346">346.0000dp</dimen>
-	<dimen name="dp_347">347.0000dp</dimen>
-	<dimen name="dp_348">348.0000dp</dimen>
-	<dimen name="dp_349">349.0000dp</dimen>
-	<dimen name="dp_350">350.0000dp</dimen>
-	<dimen name="dp_351">351.0000dp</dimen>
-	<dimen name="dp_352">352.0000dp</dimen>
-	<dimen name="dp_353">353.0000dp</dimen>
-	<dimen name="dp_354">354.0000dp</dimen>
-	<dimen name="dp_355">355.0000dp</dimen>
-	<dimen name="dp_356">356.0000dp</dimen>
-	<dimen name="dp_357">357.0000dp</dimen>
-	<dimen name="dp_358">358.0000dp</dimen>
-	<dimen name="dp_359">359.0000dp</dimen>
-	<dimen name="dp_360">360.0000dp</dimen>
-	<dimen name="dp_365">365.0000dp</dimen>
-	<dimen name="dp_370">370.0000dp</dimen>
-	<dimen name="dp_400">400.0000dp</dimen>
-	<dimen name="dp_410">410.0000dp</dimen>
-	<dimen name="dp_422">422.0000dp</dimen>
-	<dimen name="dp_472">472.0000dp</dimen>
-	<dimen name="dp_500">500.0000dp</dimen>
-	<dimen name="dp_600">600.0000dp</dimen>
-	<dimen name="dp_640">640.0000dp</dimen>
-	<dimen name="dp_720">720.0000dp</dimen>
-	<dimen name="sp_6">6.0000sp</dimen>
-	<dimen name="sp_7">7.0000sp</dimen>
-	<dimen name="sp_8">8.0000sp</dimen>
-	<dimen name="sp_9">9.0000sp</dimen>
-	<dimen name="sp_10">10.0000sp</dimen>
-	<dimen name="sp_11">11.0000sp</dimen>
-	<dimen name="sp_12">12.0000sp</dimen>
-	<dimen name="sp_13">13.0000sp</dimen>
-	<dimen name="sp_14">14.0000sp</dimen>
-	<dimen name="sp_15">15.0000sp</dimen>
-	<dimen name="sp_16">16.0000sp</dimen>
-	<dimen name="sp_17">17.0000sp</dimen>
-	<dimen name="sp_18">18.0000sp</dimen>
-	<dimen name="sp_19">19.0000sp</dimen>
-	<dimen name="sp_20">20.0000sp</dimen>
-	<dimen name="sp_21">21.0000sp</dimen>
-	<dimen name="sp_22">22.0000sp</dimen>
-	<dimen name="sp_23">23.0000sp</dimen>
-	<dimen name="sp_24">24.0000sp</dimen>
-	<dimen name="sp_25">25.0000sp</dimen>
-	<dimen name="sp_28">28.0000sp</dimen>
-	<dimen name="sp_30">30.0000sp</dimen>
-	<dimen name="sp_32">32.0000sp</dimen>
-	<dimen name="sp_34">34.0000sp</dimen>
-	<dimen name="sp_36">36.0000sp</dimen>
-	<dimen name="sp_38">38.0000sp</dimen>
-	<dimen name="sp_40">40.0000sp</dimen>
-	<dimen name="sp_42">42.0000sp</dimen>
-	<dimen name="sp_48">48.0000sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw384dp/dimens.xml b/app/src/main/res/values-sw384dp/dimens.xml
deleted file mode 100644
index af5661a..0000000
--- a/app/src/main/res/values-sw384dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-64.0000dp</dimen>
-	<dimen name="dp_m_30">-32.0000dp</dimen>
-	<dimen name="dp_m_20">-21.3333dp</dimen>
-	<dimen name="dp_m_12">-12.8000dp</dimen>
-	<dimen name="dp_m_10">-10.6667dp</dimen>
-	<dimen name="dp_m_8">-8.5333dp</dimen>
-	<dimen name="dp_m_5">-5.3333dp</dimen>
-	<dimen name="dp_m_2">-2.1333dp</dimen>
-	<dimen name="dp_m_1">-1.0667dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.1067dp</dimen>
-	<dimen name="dp_0_5">0.5333dp</dimen>
-	<dimen name="dp_1">1.0667dp</dimen>
-	<dimen name="dp_1_5">1.6000dp</dimen>
-	<dimen name="dp_2">2.1333dp</dimen>
-	<dimen name="dp_2_5">2.6667dp</dimen>
-	<dimen name="dp_3">3.2000dp</dimen>
-	<dimen name="dp_3_5">3.7333dp</dimen>
-	<dimen name="dp_4">4.2667dp</dimen>
-	<dimen name="dp_4_5">4.8000dp</dimen>
-	<dimen name="dp_5">5.3333dp</dimen>
-	<dimen name="dp_6">6.4000dp</dimen>
-	<dimen name="dp_7">7.4667dp</dimen>
-	<dimen name="dp_8">8.5333dp</dimen>
-	<dimen name="dp_9">9.6000dp</dimen>
-	<dimen name="dp_10">10.6667dp</dimen>
-	<dimen name="dp_11">11.7333dp</dimen>
-	<dimen name="dp_12">12.8000dp</dimen>
-	<dimen name="dp_13">13.8667dp</dimen>
-	<dimen name="dp_14">14.9333dp</dimen>
-	<dimen name="dp_15">16.0000dp</dimen>
-	<dimen name="dp_16">17.0667dp</dimen>
-	<dimen name="dp_17">18.1333dp</dimen>
-	<dimen name="dp_18">19.2000dp</dimen>
-	<dimen name="dp_19">20.2667dp</dimen>
-	<dimen name="dp_20">21.3333dp</dimen>
-	<dimen name="dp_21">22.4000dp</dimen>
-	<dimen name="dp_22">23.4667dp</dimen>
-	<dimen name="dp_23">24.5333dp</dimen>
-	<dimen name="dp_24">25.6000dp</dimen>
-	<dimen name="dp_25">26.6667dp</dimen>
-	<dimen name="dp_26">27.7333dp</dimen>
-	<dimen name="dp_27">28.8000dp</dimen>
-	<dimen name="dp_28">29.8667dp</dimen>
-	<dimen name="dp_29">30.9333dp</dimen>
-	<dimen name="dp_30">32.0000dp</dimen>
-	<dimen name="dp_31">33.0667dp</dimen>
-	<dimen name="dp_32">34.1333dp</dimen>
-	<dimen name="dp_33">35.2000dp</dimen>
-	<dimen name="dp_34">36.2667dp</dimen>
-	<dimen name="dp_35">37.3333dp</dimen>
-	<dimen name="dp_36">38.4000dp</dimen>
-	<dimen name="dp_37">39.4667dp</dimen>
-	<dimen name="dp_38">40.5333dp</dimen>
-	<dimen name="dp_39">41.6000dp</dimen>
-	<dimen name="dp_40">42.6667dp</dimen>
-	<dimen name="dp_41">43.7333dp</dimen>
-	<dimen name="dp_42">44.8000dp</dimen>
-	<dimen name="dp_43">45.8667dp</dimen>
-	<dimen name="dp_44">46.9333dp</dimen>
-	<dimen name="dp_45">48.0000dp</dimen>
-	<dimen name="dp_46">49.0667dp</dimen>
-	<dimen name="dp_47">50.1333dp</dimen>
-	<dimen name="dp_48">51.2000dp</dimen>
-	<dimen name="dp_49">52.2667dp</dimen>
-	<dimen name="dp_50">53.3333dp</dimen>
-	<dimen name="dp_51">54.4000dp</dimen>
-	<dimen name="dp_52">55.4667dp</dimen>
-	<dimen name="dp_53">56.5333dp</dimen>
-	<dimen name="dp_54">57.6000dp</dimen>
-	<dimen name="dp_55">58.6667dp</dimen>
-	<dimen name="dp_56">59.7333dp</dimen>
-	<dimen name="dp_57">60.8000dp</dimen>
-	<dimen name="dp_58">61.8667dp</dimen>
-	<dimen name="dp_59">62.9333dp</dimen>
-	<dimen name="dp_60">64.0000dp</dimen>
-	<dimen name="dp_61">65.0667dp</dimen>
-	<dimen name="dp_62">66.1333dp</dimen>
-	<dimen name="dp_63">67.2000dp</dimen>
-	<dimen name="dp_64">68.2667dp</dimen>
-	<dimen name="dp_65">69.3333dp</dimen>
-	<dimen name="dp_66">70.4000dp</dimen>
-	<dimen name="dp_67">71.4667dp</dimen>
-	<dimen name="dp_68">72.5333dp</dimen>
-	<dimen name="dp_69">73.6000dp</dimen>
-	<dimen name="dp_70">74.6667dp</dimen>
-	<dimen name="dp_71">75.7333dp</dimen>
-	<dimen name="dp_72">76.8000dp</dimen>
-	<dimen name="dp_73">77.8667dp</dimen>
-	<dimen name="dp_74">78.9333dp</dimen>
-	<dimen name="dp_75">80.0000dp</dimen>
-	<dimen name="dp_76">81.0667dp</dimen>
-	<dimen name="dp_77">82.1333dp</dimen>
-	<dimen name="dp_78">83.2000dp</dimen>
-	<dimen name="dp_79">84.2667dp</dimen>
-	<dimen name="dp_80">85.3333dp</dimen>
-	<dimen name="dp_81">86.4000dp</dimen>
-	<dimen name="dp_82">87.4667dp</dimen>
-	<dimen name="dp_83">88.5333dp</dimen>
-	<dimen name="dp_84">89.6000dp</dimen>
-	<dimen name="dp_85">90.6667dp</dimen>
-	<dimen name="dp_86">91.7333dp</dimen>
-	<dimen name="dp_87">92.8000dp</dimen>
-	<dimen name="dp_88">93.8667dp</dimen>
-	<dimen name="dp_89">94.9333dp</dimen>
-	<dimen name="dp_90">96.0000dp</dimen>
-	<dimen name="dp_91">97.0667dp</dimen>
-	<dimen name="dp_92">98.1333dp</dimen>
-	<dimen name="dp_93">99.2000dp</dimen>
-	<dimen name="dp_94">100.2667dp</dimen>
-	<dimen name="dp_95">101.3333dp</dimen>
-	<dimen name="dp_96">102.4000dp</dimen>
-	<dimen name="dp_97">103.4667dp</dimen>
-	<dimen name="dp_98">104.5333dp</dimen>
-	<dimen name="dp_99">105.6000dp</dimen>
-	<dimen name="dp_100">106.6667dp</dimen>
-	<dimen name="dp_101">107.7333dp</dimen>
-	<dimen name="dp_102">108.8000dp</dimen>
-	<dimen name="dp_103">109.8667dp</dimen>
-	<dimen name="dp_104">110.9333dp</dimen>
-	<dimen name="dp_105">112.0000dp</dimen>
-	<dimen name="dp_106">113.0667dp</dimen>
-	<dimen name="dp_107">114.1333dp</dimen>
-	<dimen name="dp_108">115.2000dp</dimen>
-	<dimen name="dp_109">116.2667dp</dimen>
-	<dimen name="dp_110">117.3333dp</dimen>
-	<dimen name="dp_111">118.4000dp</dimen>
-	<dimen name="dp_112">119.4667dp</dimen>
-	<dimen name="dp_113">120.5333dp</dimen>
-	<dimen name="dp_114">121.6000dp</dimen>
-	<dimen name="dp_115">122.6667dp</dimen>
-	<dimen name="dp_116">123.7333dp</dimen>
-	<dimen name="dp_117">124.8000dp</dimen>
-	<dimen name="dp_118">125.8667dp</dimen>
-	<dimen name="dp_119">126.9333dp</dimen>
-	<dimen name="dp_120">128.0000dp</dimen>
-	<dimen name="dp_121">129.0667dp</dimen>
-	<dimen name="dp_122">130.1333dp</dimen>
-	<dimen name="dp_123">131.2000dp</dimen>
-	<dimen name="dp_124">132.2667dp</dimen>
-	<dimen name="dp_125">133.3333dp</dimen>
-	<dimen name="dp_126">134.4000dp</dimen>
-	<dimen name="dp_127">135.4667dp</dimen>
-	<dimen name="dp_128">136.5333dp</dimen>
-	<dimen name="dp_129">137.6000dp</dimen>
-	<dimen name="dp_130">138.6667dp</dimen>
-	<dimen name="dp_131">139.7333dp</dimen>
-	<dimen name="dp_132">140.8000dp</dimen>
-	<dimen name="dp_133">141.8667dp</dimen>
-	<dimen name="dp_134">142.9333dp</dimen>
-	<dimen name="dp_135">144.0000dp</dimen>
-	<dimen name="dp_136">145.0667dp</dimen>
-	<dimen name="dp_137">146.1333dp</dimen>
-	<dimen name="dp_138">147.2000dp</dimen>
-	<dimen name="dp_139">148.2667dp</dimen>
-	<dimen name="dp_140">149.3333dp</dimen>
-	<dimen name="dp_141">150.4000dp</dimen>
-	<dimen name="dp_142">151.4667dp</dimen>
-	<dimen name="dp_143">152.5333dp</dimen>
-	<dimen name="dp_144">153.6000dp</dimen>
-	<dimen name="dp_145">154.6667dp</dimen>
-	<dimen name="dp_146">155.7333dp</dimen>
-	<dimen name="dp_147">156.8000dp</dimen>
-	<dimen name="dp_148">157.8667dp</dimen>
-	<dimen name="dp_149">158.9333dp</dimen>
-	<dimen name="dp_150">160.0000dp</dimen>
-	<dimen name="dp_151">161.0667dp</dimen>
-	<dimen name="dp_152">162.1333dp</dimen>
-	<dimen name="dp_153">163.2000dp</dimen>
-	<dimen name="dp_154">164.2667dp</dimen>
-	<dimen name="dp_155">165.3333dp</dimen>
-	<dimen name="dp_156">166.4000dp</dimen>
-	<dimen name="dp_157">167.4667dp</dimen>
-	<dimen name="dp_158">168.5333dp</dimen>
-	<dimen name="dp_159">169.6000dp</dimen>
-	<dimen name="dp_160">170.6667dp</dimen>
-	<dimen name="dp_161">171.7333dp</dimen>
-	<dimen name="dp_162">172.8000dp</dimen>
-	<dimen name="dp_163">173.8667dp</dimen>
-	<dimen name="dp_164">174.9333dp</dimen>
-	<dimen name="dp_165">176.0000dp</dimen>
-	<dimen name="dp_166">177.0667dp</dimen>
-	<dimen name="dp_167">178.1333dp</dimen>
-	<dimen name="dp_168">179.2000dp</dimen>
-	<dimen name="dp_169">180.2667dp</dimen>
-	<dimen name="dp_170">181.3333dp</dimen>
-	<dimen name="dp_171">182.4000dp</dimen>
-	<dimen name="dp_172">183.4667dp</dimen>
-	<dimen name="dp_173">184.5333dp</dimen>
-	<dimen name="dp_174">185.6000dp</dimen>
-	<dimen name="dp_175">186.6667dp</dimen>
-	<dimen name="dp_176">187.7333dp</dimen>
-	<dimen name="dp_177">188.8000dp</dimen>
-	<dimen name="dp_178">189.8667dp</dimen>
-	<dimen name="dp_179">190.9333dp</dimen>
-	<dimen name="dp_180">192.0000dp</dimen>
-	<dimen name="dp_181">193.0667dp</dimen>
-	<dimen name="dp_182">194.1333dp</dimen>
-	<dimen name="dp_183">195.2000dp</dimen>
-	<dimen name="dp_184">196.2667dp</dimen>
-	<dimen name="dp_185">197.3333dp</dimen>
-	<dimen name="dp_186">198.4000dp</dimen>
-	<dimen name="dp_187">199.4667dp</dimen>
-	<dimen name="dp_188">200.5333dp</dimen>
-	<dimen name="dp_189">201.6000dp</dimen>
-	<dimen name="dp_190">202.6667dp</dimen>
-	<dimen name="dp_191">203.7333dp</dimen>
-	<dimen name="dp_192">204.8000dp</dimen>
-	<dimen name="dp_193">205.8667dp</dimen>
-	<dimen name="dp_194">206.9333dp</dimen>
-	<dimen name="dp_195">208.0000dp</dimen>
-	<dimen name="dp_196">209.0667dp</dimen>
-	<dimen name="dp_197">210.1333dp</dimen>
-	<dimen name="dp_198">211.2000dp</dimen>
-	<dimen name="dp_199">212.2667dp</dimen>
-	<dimen name="dp_200">213.3333dp</dimen>
-	<dimen name="dp_201">214.4000dp</dimen>
-	<dimen name="dp_202">215.4667dp</dimen>
-	<dimen name="dp_203">216.5333dp</dimen>
-	<dimen name="dp_204">217.6000dp</dimen>
-	<dimen name="dp_205">218.6667dp</dimen>
-	<dimen name="dp_206">219.7333dp</dimen>
-	<dimen name="dp_207">220.8000dp</dimen>
-	<dimen name="dp_208">221.8667dp</dimen>
-	<dimen name="dp_209">222.9333dp</dimen>
-	<dimen name="dp_210">224.0000dp</dimen>
-	<dimen name="dp_211">225.0667dp</dimen>
-	<dimen name="dp_212">226.1333dp</dimen>
-	<dimen name="dp_213">227.2000dp</dimen>
-	<dimen name="dp_214">228.2667dp</dimen>
-	<dimen name="dp_215">229.3333dp</dimen>
-	<dimen name="dp_216">230.4000dp</dimen>
-	<dimen name="dp_217">231.4667dp</dimen>
-	<dimen name="dp_218">232.5333dp</dimen>
-	<dimen name="dp_219">233.6000dp</dimen>
-	<dimen name="dp_220">234.6667dp</dimen>
-	<dimen name="dp_221">235.7333dp</dimen>
-	<dimen name="dp_222">236.8000dp</dimen>
-	<dimen name="dp_223">237.8667dp</dimen>
-	<dimen name="dp_224">238.9333dp</dimen>
-	<dimen name="dp_225">240.0000dp</dimen>
-	<dimen name="dp_226">241.0667dp</dimen>
-	<dimen name="dp_227">242.1333dp</dimen>
-	<dimen name="dp_228">243.2000dp</dimen>
-	<dimen name="dp_229">244.2667dp</dimen>
-	<dimen name="dp_230">245.3333dp</dimen>
-	<dimen name="dp_231">246.4000dp</dimen>
-	<dimen name="dp_232">247.4667dp</dimen>
-	<dimen name="dp_233">248.5333dp</dimen>
-	<dimen name="dp_234">249.6000dp</dimen>
-	<dimen name="dp_235">250.6667dp</dimen>
-	<dimen name="dp_236">251.7333dp</dimen>
-	<dimen name="dp_237">252.8000dp</dimen>
-	<dimen name="dp_238">253.8667dp</dimen>
-	<dimen name="dp_239">254.9333dp</dimen>
-	<dimen name="dp_240">256.0000dp</dimen>
-	<dimen name="dp_241">257.0667dp</dimen>
-	<dimen name="dp_242">258.1333dp</dimen>
-	<dimen name="dp_243">259.2000dp</dimen>
-	<dimen name="dp_244">260.2667dp</dimen>
-	<dimen name="dp_245">261.3333dp</dimen>
-	<dimen name="dp_246">262.4000dp</dimen>
-	<dimen name="dp_247">263.4667dp</dimen>
-	<dimen name="dp_248">264.5333dp</dimen>
-	<dimen name="dp_249">265.6000dp</dimen>
-	<dimen name="dp_250">266.6667dp</dimen>
-	<dimen name="dp_251">267.7333dp</dimen>
-	<dimen name="dp_252">268.8000dp</dimen>
-	<dimen name="dp_253">269.8667dp</dimen>
-	<dimen name="dp_254">270.9333dp</dimen>
-	<dimen name="dp_255">272.0000dp</dimen>
-	<dimen name="dp_256">273.0667dp</dimen>
-	<dimen name="dp_257">274.1333dp</dimen>
-	<dimen name="dp_258">275.2000dp</dimen>
-	<dimen name="dp_259">276.2667dp</dimen>
-	<dimen name="dp_260">277.3333dp</dimen>
-	<dimen name="dp_261">278.4000dp</dimen>
-	<dimen name="dp_262">279.4667dp</dimen>
-	<dimen name="dp_263">280.5333dp</dimen>
-	<dimen name="dp_264">281.6000dp</dimen>
-	<dimen name="dp_265">282.6667dp</dimen>
-	<dimen name="dp_266">283.7333dp</dimen>
-	<dimen name="dp_267">284.8000dp</dimen>
-	<dimen name="dp_268">285.8667dp</dimen>
-	<dimen name="dp_269">286.9333dp</dimen>
-	<dimen name="dp_270">288.0000dp</dimen>
-	<dimen name="dp_271">289.0667dp</dimen>
-	<dimen name="dp_272">290.1333dp</dimen>
-	<dimen name="dp_273">291.2000dp</dimen>
-	<dimen name="dp_274">292.2667dp</dimen>
-	<dimen name="dp_275">293.3333dp</dimen>
-	<dimen name="dp_276">294.4000dp</dimen>
-	<dimen name="dp_277">295.4667dp</dimen>
-	<dimen name="dp_278">296.5333dp</dimen>
-	<dimen name="dp_279">297.6000dp</dimen>
-	<dimen name="dp_280">298.6667dp</dimen>
-	<dimen name="dp_281">299.7333dp</dimen>
-	<dimen name="dp_282">300.8000dp</dimen>
-	<dimen name="dp_283">301.8667dp</dimen>
-	<dimen name="dp_284">302.9333dp</dimen>
-	<dimen name="dp_285">304.0000dp</dimen>
-	<dimen name="dp_286">305.0667dp</dimen>
-	<dimen name="dp_287">306.1333dp</dimen>
-	<dimen name="dp_288">307.2000dp</dimen>
-	<dimen name="dp_289">308.2667dp</dimen>
-	<dimen name="dp_290">309.3333dp</dimen>
-	<dimen name="dp_291">310.4000dp</dimen>
-	<dimen name="dp_292">311.4667dp</dimen>
-	<dimen name="dp_293">312.5333dp</dimen>
-	<dimen name="dp_294">313.6000dp</dimen>
-	<dimen name="dp_295">314.6667dp</dimen>
-	<dimen name="dp_296">315.7333dp</dimen>
-	<dimen name="dp_297">316.8000dp</dimen>
-	<dimen name="dp_298">317.8667dp</dimen>
-	<dimen name="dp_299">318.9333dp</dimen>
-	<dimen name="dp_300">320.0000dp</dimen>
-	<dimen name="dp_301">321.0667dp</dimen>
-	<dimen name="dp_302">322.1333dp</dimen>
-	<dimen name="dp_303">323.2000dp</dimen>
-	<dimen name="dp_304">324.2667dp</dimen>
-	<dimen name="dp_305">325.3333dp</dimen>
-	<dimen name="dp_306">326.4000dp</dimen>
-	<dimen name="dp_307">327.4667dp</dimen>
-	<dimen name="dp_308">328.5333dp</dimen>
-	<dimen name="dp_309">329.6000dp</dimen>
-	<dimen name="dp_310">330.6667dp</dimen>
-	<dimen name="dp_311">331.7333dp</dimen>
-	<dimen name="dp_312">332.8000dp</dimen>
-	<dimen name="dp_313">333.8667dp</dimen>
-	<dimen name="dp_314">334.9333dp</dimen>
-	<dimen name="dp_315">336.0000dp</dimen>
-	<dimen name="dp_316">337.0667dp</dimen>
-	<dimen name="dp_317">338.1333dp</dimen>
-	<dimen name="dp_318">339.2000dp</dimen>
-	<dimen name="dp_319">340.2667dp</dimen>
-	<dimen name="dp_320">341.3333dp</dimen>
-	<dimen name="dp_321">342.4000dp</dimen>
-	<dimen name="dp_322">343.4667dp</dimen>
-	<dimen name="dp_323">344.5333dp</dimen>
-	<dimen name="dp_324">345.6000dp</dimen>
-	<dimen name="dp_325">346.6667dp</dimen>
-	<dimen name="dp_326">347.7333dp</dimen>
-	<dimen name="dp_327">348.8000dp</dimen>
-	<dimen name="dp_328">349.8667dp</dimen>
-	<dimen name="dp_329">350.9333dp</dimen>
-	<dimen name="dp_330">352.0000dp</dimen>
-	<dimen name="dp_331">353.0667dp</dimen>
-	<dimen name="dp_332">354.1333dp</dimen>
-	<dimen name="dp_333">355.2000dp</dimen>
-	<dimen name="dp_334">356.2667dp</dimen>
-	<dimen name="dp_335">357.3333dp</dimen>
-	<dimen name="dp_336">358.4000dp</dimen>
-	<dimen name="dp_337">359.4667dp</dimen>
-	<dimen name="dp_338">360.5333dp</dimen>
-	<dimen name="dp_339">361.6000dp</dimen>
-	<dimen name="dp_340">362.6667dp</dimen>
-	<dimen name="dp_341">363.7333dp</dimen>
-	<dimen name="dp_342">364.8000dp</dimen>
-	<dimen name="dp_343">365.8667dp</dimen>
-	<dimen name="dp_344">366.9333dp</dimen>
-	<dimen name="dp_345">368.0000dp</dimen>
-	<dimen name="dp_346">369.0667dp</dimen>
-	<dimen name="dp_347">370.1333dp</dimen>
-	<dimen name="dp_348">371.2000dp</dimen>
-	<dimen name="dp_349">372.2667dp</dimen>
-	<dimen name="dp_350">373.3333dp</dimen>
-	<dimen name="dp_351">374.4000dp</dimen>
-	<dimen name="dp_352">375.4667dp</dimen>
-	<dimen name="dp_353">376.5333dp</dimen>
-	<dimen name="dp_354">377.6000dp</dimen>
-	<dimen name="dp_355">378.6667dp</dimen>
-	<dimen name="dp_356">379.7333dp</dimen>
-	<dimen name="dp_357">380.8000dp</dimen>
-	<dimen name="dp_358">381.8667dp</dimen>
-	<dimen name="dp_359">382.9333dp</dimen>
-	<dimen name="dp_360">384.0000dp</dimen>
-	<dimen name="dp_365">389.3333dp</dimen>
-	<dimen name="dp_370">394.6667dp</dimen>
-	<dimen name="dp_400">426.6667dp</dimen>
-	<dimen name="dp_410">437.3333dp</dimen>
-	<dimen name="dp_422">450.1333dp</dimen>
-	<dimen name="dp_472">503.4667dp</dimen>
-	<dimen name="dp_500">533.3333dp</dimen>
-	<dimen name="dp_600">640.0000dp</dimen>
-	<dimen name="dp_640">682.6667dp</dimen>
-	<dimen name="dp_720">768.0000dp</dimen>
-	<dimen name="sp_6">6.4000sp</dimen>
-	<dimen name="sp_7">7.4667sp</dimen>
-	<dimen name="sp_8">8.5333sp</dimen>
-	<dimen name="sp_9">9.6000sp</dimen>
-	<dimen name="sp_10">10.6667sp</dimen>
-	<dimen name="sp_11">11.7333sp</dimen>
-	<dimen name="sp_12">12.8000sp</dimen>
-	<dimen name="sp_13">13.8667sp</dimen>
-	<dimen name="sp_14">14.9333sp</dimen>
-	<dimen name="sp_15">16.0000sp</dimen>
-	<dimen name="sp_16">17.0667sp</dimen>
-	<dimen name="sp_17">18.1333sp</dimen>
-	<dimen name="sp_18">19.2000sp</dimen>
-	<dimen name="sp_19">20.2667sp</dimen>
-	<dimen name="sp_20">21.3333sp</dimen>
-	<dimen name="sp_21">22.4000sp</dimen>
-	<dimen name="sp_22">23.4667sp</dimen>
-	<dimen name="sp_23">24.5333sp</dimen>
-	<dimen name="sp_24">25.6000sp</dimen>
-	<dimen name="sp_25">26.6667sp</dimen>
-	<dimen name="sp_28">29.8667sp</dimen>
-	<dimen name="sp_30">32.0000sp</dimen>
-	<dimen name="sp_32">34.1333sp</dimen>
-	<dimen name="sp_34">36.2667sp</dimen>
-	<dimen name="sp_36">38.4000sp</dimen>
-	<dimen name="sp_38">40.5333sp</dimen>
-	<dimen name="sp_40">42.6667sp</dimen>
-	<dimen name="sp_42">44.8000sp</dimen>
-	<dimen name="sp_48">51.2000sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw392dp/dimens.xml b/app/src/main/res/values-sw392dp/dimens.xml
deleted file mode 100644
index 07f6688..0000000
--- a/app/src/main/res/values-sw392dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-65.4545dp</dimen>
-	<dimen name="dp_m_30">-32.7273dp</dimen>
-	<dimen name="dp_m_20">-21.8182dp</dimen>
-	<dimen name="dp_m_12">-13.0909dp</dimen>
-	<dimen name="dp_m_10">-10.9091dp</dimen>
-	<dimen name="dp_m_8">-8.7273dp</dimen>
-	<dimen name="dp_m_5">-5.4545dp</dimen>
-	<dimen name="dp_m_2">-2.1818dp</dimen>
-	<dimen name="dp_m_1">-1.0909dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.1091dp</dimen>
-	<dimen name="dp_0_5">0.5455dp</dimen>
-	<dimen name="dp_1">1.0909dp</dimen>
-	<dimen name="dp_1_5">1.6364dp</dimen>
-	<dimen name="dp_2">2.1818dp</dimen>
-	<dimen name="dp_2_5">2.7273dp</dimen>
-	<dimen name="dp_3">3.2727dp</dimen>
-	<dimen name="dp_3_5">3.8182dp</dimen>
-	<dimen name="dp_4">4.3636dp</dimen>
-	<dimen name="dp_4_5">4.9091dp</dimen>
-	<dimen name="dp_5">5.4545dp</dimen>
-	<dimen name="dp_6">6.5455dp</dimen>
-	<dimen name="dp_7">7.6364dp</dimen>
-	<dimen name="dp_8">8.7273dp</dimen>
-	<dimen name="dp_9">9.8182dp</dimen>
-	<dimen name="dp_10">10.9091dp</dimen>
-	<dimen name="dp_11">12.0000dp</dimen>
-	<dimen name="dp_12">13.0909dp</dimen>
-	<dimen name="dp_13">14.1818dp</dimen>
-	<dimen name="dp_14">15.2727dp</dimen>
-	<dimen name="dp_15">16.3636dp</dimen>
-	<dimen name="dp_16">17.4545dp</dimen>
-	<dimen name="dp_17">18.5455dp</dimen>
-	<dimen name="dp_18">19.6364dp</dimen>
-	<dimen name="dp_19">20.7273dp</dimen>
-	<dimen name="dp_20">21.8182dp</dimen>
-	<dimen name="dp_21">22.9091dp</dimen>
-	<dimen name="dp_22">24.0000dp</dimen>
-	<dimen name="dp_23">25.0909dp</dimen>
-	<dimen name="dp_24">26.1818dp</dimen>
-	<dimen name="dp_25">27.2727dp</dimen>
-	<dimen name="dp_26">28.3636dp</dimen>
-	<dimen name="dp_27">29.4545dp</dimen>
-	<dimen name="dp_28">30.5454dp</dimen>
-	<dimen name="dp_29">31.6364dp</dimen>
-	<dimen name="dp_30">32.7273dp</dimen>
-	<dimen name="dp_31">33.8182dp</dimen>
-	<dimen name="dp_32">34.9091dp</dimen>
-	<dimen name="dp_33">36.0000dp</dimen>
-	<dimen name="dp_34">37.0909dp</dimen>
-	<dimen name="dp_35">38.1818dp</dimen>
-	<dimen name="dp_36">39.2727dp</dimen>
-	<dimen name="dp_37">40.3636dp</dimen>
-	<dimen name="dp_38">41.4545dp</dimen>
-	<dimen name="dp_39">42.5454dp</dimen>
-	<dimen name="dp_40">43.6364dp</dimen>
-	<dimen name="dp_41">44.7273dp</dimen>
-	<dimen name="dp_42">45.8182dp</dimen>
-	<dimen name="dp_43">46.9091dp</dimen>
-	<dimen name="dp_44">48.0000dp</dimen>
-	<dimen name="dp_45">49.0909dp</dimen>
-	<dimen name="dp_46">50.1818dp</dimen>
-	<dimen name="dp_47">51.2727dp</dimen>
-	<dimen name="dp_48">52.3636dp</dimen>
-	<dimen name="dp_49">53.4545dp</dimen>
-	<dimen name="dp_50">54.5454dp</dimen>
-	<dimen name="dp_51">55.6364dp</dimen>
-	<dimen name="dp_52">56.7273dp</dimen>
-	<dimen name="dp_53">57.8182dp</dimen>
-	<dimen name="dp_54">58.9091dp</dimen>
-	<dimen name="dp_55">60.0000dp</dimen>
-	<dimen name="dp_56">61.0909dp</dimen>
-	<dimen name="dp_57">62.1818dp</dimen>
-	<dimen name="dp_58">63.2727dp</dimen>
-	<dimen name="dp_59">64.3636dp</dimen>
-	<dimen name="dp_60">65.4545dp</dimen>
-	<dimen name="dp_61">66.5454dp</dimen>
-	<dimen name="dp_62">67.6364dp</dimen>
-	<dimen name="dp_63">68.7273dp</dimen>
-	<dimen name="dp_64">69.8182dp</dimen>
-	<dimen name="dp_65">70.9091dp</dimen>
-	<dimen name="dp_66">72.0000dp</dimen>
-	<dimen name="dp_67">73.0909dp</dimen>
-	<dimen name="dp_68">74.1818dp</dimen>
-	<dimen name="dp_69">75.2727dp</dimen>
-	<dimen name="dp_70">76.3636dp</dimen>
-	<dimen name="dp_71">77.4545dp</dimen>
-	<dimen name="dp_72">78.5454dp</dimen>
-	<dimen name="dp_73">79.6363dp</dimen>
-	<dimen name="dp_74">80.7273dp</dimen>
-	<dimen name="dp_75">81.8182dp</dimen>
-	<dimen name="dp_76">82.9091dp</dimen>
-	<dimen name="dp_77">84.0000dp</dimen>
-	<dimen name="dp_78">85.0909dp</dimen>
-	<dimen name="dp_79">86.1818dp</dimen>
-	<dimen name="dp_80">87.2727dp</dimen>
-	<dimen name="dp_81">88.3636dp</dimen>
-	<dimen name="dp_82">89.4545dp</dimen>
-	<dimen name="dp_83">90.5454dp</dimen>
-	<dimen name="dp_84">91.6363dp</dimen>
-	<dimen name="dp_85">92.7273dp</dimen>
-	<dimen name="dp_86">93.8182dp</dimen>
-	<dimen name="dp_87">94.9091dp</dimen>
-	<dimen name="dp_88">96.0000dp</dimen>
-	<dimen name="dp_89">97.0909dp</dimen>
-	<dimen name="dp_90">98.1818dp</dimen>
-	<dimen name="dp_91">99.2727dp</dimen>
-	<dimen name="dp_92">100.3636dp</dimen>
-	<dimen name="dp_93">101.4545dp</dimen>
-	<dimen name="dp_94">102.5454dp</dimen>
-	<dimen name="dp_95">103.6363dp</dimen>
-	<dimen name="dp_96">104.7273dp</dimen>
-	<dimen name="dp_97">105.8182dp</dimen>
-	<dimen name="dp_98">106.9091dp</dimen>
-	<dimen name="dp_99">108.0000dp</dimen>
-	<dimen name="dp_100">109.0909dp</dimen>
-	<dimen name="dp_101">110.1818dp</dimen>
-	<dimen name="dp_102">111.2727dp</dimen>
-	<dimen name="dp_103">112.3636dp</dimen>
-	<dimen name="dp_104">113.4545dp</dimen>
-	<dimen name="dp_105">114.5454dp</dimen>
-	<dimen name="dp_106">115.6363dp</dimen>
-	<dimen name="dp_107">116.7273dp</dimen>
-	<dimen name="dp_108">117.8182dp</dimen>
-	<dimen name="dp_109">118.9091dp</dimen>
-	<dimen name="dp_110">120.0000dp</dimen>
-	<dimen name="dp_111">121.0909dp</dimen>
-	<dimen name="dp_112">122.1818dp</dimen>
-	<dimen name="dp_113">123.2727dp</dimen>
-	<dimen name="dp_114">124.3636dp</dimen>
-	<dimen name="dp_115">125.4545dp</dimen>
-	<dimen name="dp_116">126.5454dp</dimen>
-	<dimen name="dp_117">127.6363dp</dimen>
-	<dimen name="dp_118">128.7272dp</dimen>
-	<dimen name="dp_119">129.8182dp</dimen>
-	<dimen name="dp_120">130.9091dp</dimen>
-	<dimen name="dp_121">132.0000dp</dimen>
-	<dimen name="dp_122">133.0909dp</dimen>
-	<dimen name="dp_123">134.1818dp</dimen>
-	<dimen name="dp_124">135.2727dp</dimen>
-	<dimen name="dp_125">136.3636dp</dimen>
-	<dimen name="dp_126">137.4545dp</dimen>
-	<dimen name="dp_127">138.5454dp</dimen>
-	<dimen name="dp_128">139.6363dp</dimen>
-	<dimen name="dp_129">140.7272dp</dimen>
-	<dimen name="dp_130">141.8182dp</dimen>
-	<dimen name="dp_131">142.9091dp</dimen>
-	<dimen name="dp_132">144.0000dp</dimen>
-	<dimen name="dp_133">145.0909dp</dimen>
-	<dimen name="dp_134">146.1818dp</dimen>
-	<dimen name="dp_135">147.2727dp</dimen>
-	<dimen name="dp_136">148.3636dp</dimen>
-	<dimen name="dp_137">149.4545dp</dimen>
-	<dimen name="dp_138">150.5454dp</dimen>
-	<dimen name="dp_139">151.6363dp</dimen>
-	<dimen name="dp_140">152.7272dp</dimen>
-	<dimen name="dp_141">153.8182dp</dimen>
-	<dimen name="dp_142">154.9091dp</dimen>
-	<dimen name="dp_143">156.0000dp</dimen>
-	<dimen name="dp_144">157.0909dp</dimen>
-	<dimen name="dp_145">158.1818dp</dimen>
-	<dimen name="dp_146">159.2727dp</dimen>
-	<dimen name="dp_147">160.3636dp</dimen>
-	<dimen name="dp_148">161.4545dp</dimen>
-	<dimen name="dp_149">162.5454dp</dimen>
-	<dimen name="dp_150">163.6363dp</dimen>
-	<dimen name="dp_151">164.7272dp</dimen>
-	<dimen name="dp_152">165.8182dp</dimen>
-	<dimen name="dp_153">166.9091dp</dimen>
-	<dimen name="dp_154">168.0000dp</dimen>
-	<dimen name="dp_155">169.0909dp</dimen>
-	<dimen name="dp_156">170.1818dp</dimen>
-	<dimen name="dp_157">171.2727dp</dimen>
-	<dimen name="dp_158">172.3636dp</dimen>
-	<dimen name="dp_159">173.4545dp</dimen>
-	<dimen name="dp_160">174.5454dp</dimen>
-	<dimen name="dp_161">175.6363dp</dimen>
-	<dimen name="dp_162">176.7272dp</dimen>
-	<dimen name="dp_163">177.8181dp</dimen>
-	<dimen name="dp_164">178.9091dp</dimen>
-	<dimen name="dp_165">180.0000dp</dimen>
-	<dimen name="dp_166">181.0909dp</dimen>
-	<dimen name="dp_167">182.1818dp</dimen>
-	<dimen name="dp_168">183.2727dp</dimen>
-	<dimen name="dp_169">184.3636dp</dimen>
-	<dimen name="dp_170">185.4545dp</dimen>
-	<dimen name="dp_171">186.5454dp</dimen>
-	<dimen name="dp_172">187.6363dp</dimen>
-	<dimen name="dp_173">188.7272dp</dimen>
-	<dimen name="dp_174">189.8181dp</dimen>
-	<dimen name="dp_175">190.9091dp</dimen>
-	<dimen name="dp_176">192.0000dp</dimen>
-	<dimen name="dp_177">193.0909dp</dimen>
-	<dimen name="dp_178">194.1818dp</dimen>
-	<dimen name="dp_179">195.2727dp</dimen>
-	<dimen name="dp_180">196.3636dp</dimen>
-	<dimen name="dp_181">197.4545dp</dimen>
-	<dimen name="dp_182">198.5454dp</dimen>
-	<dimen name="dp_183">199.6363dp</dimen>
-	<dimen name="dp_184">200.7272dp</dimen>
-	<dimen name="dp_185">201.8181dp</dimen>
-	<dimen name="dp_186">202.9091dp</dimen>
-	<dimen name="dp_187">204.0000dp</dimen>
-	<dimen name="dp_188">205.0909dp</dimen>
-	<dimen name="dp_189">206.1818dp</dimen>
-	<dimen name="dp_190">207.2727dp</dimen>
-	<dimen name="dp_191">208.3636dp</dimen>
-	<dimen name="dp_192">209.4545dp</dimen>
-	<dimen name="dp_193">210.5454dp</dimen>
-	<dimen name="dp_194">211.6363dp</dimen>
-	<dimen name="dp_195">212.7272dp</dimen>
-	<dimen name="dp_196">213.8181dp</dimen>
-	<dimen name="dp_197">214.9091dp</dimen>
-	<dimen name="dp_198">216.0000dp</dimen>
-	<dimen name="dp_199">217.0909dp</dimen>
-	<dimen name="dp_200">218.1818dp</dimen>
-	<dimen name="dp_201">219.2727dp</dimen>
-	<dimen name="dp_202">220.3636dp</dimen>
-	<dimen name="dp_203">221.4545dp</dimen>
-	<dimen name="dp_204">222.5454dp</dimen>
-	<dimen name="dp_205">223.6363dp</dimen>
-	<dimen name="dp_206">224.7272dp</dimen>
-	<dimen name="dp_207">225.8181dp</dimen>
-	<dimen name="dp_208">226.9090dp</dimen>
-	<dimen name="dp_209">228.0000dp</dimen>
-	<dimen name="dp_210">229.0909dp</dimen>
-	<dimen name="dp_211">230.1818dp</dimen>
-	<dimen name="dp_212">231.2727dp</dimen>
-	<dimen name="dp_213">232.3636dp</dimen>
-	<dimen name="dp_214">233.4545dp</dimen>
-	<dimen name="dp_215">234.5454dp</dimen>
-	<dimen name="dp_216">235.6363dp</dimen>
-	<dimen name="dp_217">236.7272dp</dimen>
-	<dimen name="dp_218">237.8181dp</dimen>
-	<dimen name="dp_219">238.9090dp</dimen>
-	<dimen name="dp_220">240.0000dp</dimen>
-	<dimen name="dp_221">241.0909dp</dimen>
-	<dimen name="dp_222">242.1818dp</dimen>
-	<dimen name="dp_223">243.2727dp</dimen>
-	<dimen name="dp_224">244.3636dp</dimen>
-	<dimen name="dp_225">245.4545dp</dimen>
-	<dimen name="dp_226">246.5454dp</dimen>
-	<dimen name="dp_227">247.6363dp</dimen>
-	<dimen name="dp_228">248.7272dp</dimen>
-	<dimen name="dp_229">249.8181dp</dimen>
-	<dimen name="dp_230">250.9090dp</dimen>
-	<dimen name="dp_231">252.0000dp</dimen>
-	<dimen name="dp_232">253.0909dp</dimen>
-	<dimen name="dp_233">254.1818dp</dimen>
-	<dimen name="dp_234">255.2727dp</dimen>
-	<dimen name="dp_235">256.3636dp</dimen>
-	<dimen name="dp_236">257.4545dp</dimen>
-	<dimen name="dp_237">258.5454dp</dimen>
-	<dimen name="dp_238">259.6363dp</dimen>
-	<dimen name="dp_239">260.7272dp</dimen>
-	<dimen name="dp_240">261.8181dp</dimen>
-	<dimen name="dp_241">262.9090dp</dimen>
-	<dimen name="dp_242">264.0000dp</dimen>
-	<dimen name="dp_243">265.0909dp</dimen>
-	<dimen name="dp_244">266.1818dp</dimen>
-	<dimen name="dp_245">267.2727dp</dimen>
-	<dimen name="dp_246">268.3636dp</dimen>
-	<dimen name="dp_247">269.4545dp</dimen>
-	<dimen name="dp_248">270.5454dp</dimen>
-	<dimen name="dp_249">271.6363dp</dimen>
-	<dimen name="dp_250">272.7272dp</dimen>
-	<dimen name="dp_251">273.8181dp</dimen>
-	<dimen name="dp_252">274.9090dp</dimen>
-	<dimen name="dp_253">275.9999dp</dimen>
-	<dimen name="dp_254">277.0909dp</dimen>
-	<dimen name="dp_255">278.1818dp</dimen>
-	<dimen name="dp_256">279.2727dp</dimen>
-	<dimen name="dp_257">280.3636dp</dimen>
-	<dimen name="dp_258">281.4545dp</dimen>
-	<dimen name="dp_259">282.5454dp</dimen>
-	<dimen name="dp_260">283.6363dp</dimen>
-	<dimen name="dp_261">284.7272dp</dimen>
-	<dimen name="dp_262">285.8181dp</dimen>
-	<dimen name="dp_263">286.9090dp</dimen>
-	<dimen name="dp_264">287.9999dp</dimen>
-	<dimen name="dp_265">289.0909dp</dimen>
-	<dimen name="dp_266">290.1818dp</dimen>
-	<dimen name="dp_267">291.2727dp</dimen>
-	<dimen name="dp_268">292.3636dp</dimen>
-	<dimen name="dp_269">293.4545dp</dimen>
-	<dimen name="dp_270">294.5454dp</dimen>
-	<dimen name="dp_271">295.6363dp</dimen>
-	<dimen name="dp_272">296.7272dp</dimen>
-	<dimen name="dp_273">297.8181dp</dimen>
-	<dimen name="dp_274">298.9090dp</dimen>
-	<dimen name="dp_275">299.9999dp</dimen>
-	<dimen name="dp_276">301.0909dp</dimen>
-	<dimen name="dp_277">302.1818dp</dimen>
-	<dimen name="dp_278">303.2727dp</dimen>
-	<dimen name="dp_279">304.3636dp</dimen>
-	<dimen name="dp_280">305.4545dp</dimen>
-	<dimen name="dp_281">306.5454dp</dimen>
-	<dimen name="dp_282">307.6363dp</dimen>
-	<dimen name="dp_283">308.7272dp</dimen>
-	<dimen name="dp_284">309.8181dp</dimen>
-	<dimen name="dp_285">310.9090dp</dimen>
-	<dimen name="dp_286">311.9999dp</dimen>
-	<dimen name="dp_287">313.0909dp</dimen>
-	<dimen name="dp_288">314.1818dp</dimen>
-	<dimen name="dp_289">315.2727dp</dimen>
-	<dimen name="dp_290">316.3636dp</dimen>
-	<dimen name="dp_291">317.4545dp</dimen>
-	<dimen name="dp_292">318.5454dp</dimen>
-	<dimen name="dp_293">319.6363dp</dimen>
-	<dimen name="dp_294">320.7272dp</dimen>
-	<dimen name="dp_295">321.8181dp</dimen>
-	<dimen name="dp_296">322.9090dp</dimen>
-	<dimen name="dp_297">323.9999dp</dimen>
-	<dimen name="dp_298">325.0908dp</dimen>
-	<dimen name="dp_299">326.1818dp</dimen>
-	<dimen name="dp_300">327.2727dp</dimen>
-	<dimen name="dp_301">328.3636dp</dimen>
-	<dimen name="dp_302">329.4545dp</dimen>
-	<dimen name="dp_303">330.5454dp</dimen>
-	<dimen name="dp_304">331.6363dp</dimen>
-	<dimen name="dp_305">332.7272dp</dimen>
-	<dimen name="dp_306">333.8181dp</dimen>
-	<dimen name="dp_307">334.9090dp</dimen>
-	<dimen name="dp_308">335.9999dp</dimen>
-	<dimen name="dp_309">337.0908dp</dimen>
-	<dimen name="dp_310">338.1818dp</dimen>
-	<dimen name="dp_311">339.2727dp</dimen>
-	<dimen name="dp_312">340.3636dp</dimen>
-	<dimen name="dp_313">341.4545dp</dimen>
-	<dimen name="dp_314">342.5454dp</dimen>
-	<dimen name="dp_315">343.6363dp</dimen>
-	<dimen name="dp_316">344.7272dp</dimen>
-	<dimen name="dp_317">345.8181dp</dimen>
-	<dimen name="dp_318">346.9090dp</dimen>
-	<dimen name="dp_319">347.9999dp</dimen>
-	<dimen name="dp_320">349.0908dp</dimen>
-	<dimen name="dp_321">350.1818dp</dimen>
-	<dimen name="dp_322">351.2727dp</dimen>
-	<dimen name="dp_323">352.3636dp</dimen>
-	<dimen name="dp_324">353.4545dp</dimen>
-	<dimen name="dp_325">354.5454dp</dimen>
-	<dimen name="dp_326">355.6363dp</dimen>
-	<dimen name="dp_327">356.7272dp</dimen>
-	<dimen name="dp_328">357.8181dp</dimen>
-	<dimen name="dp_329">358.9090dp</dimen>
-	<dimen name="dp_330">359.9999dp</dimen>
-	<dimen name="dp_331">361.0908dp</dimen>
-	<dimen name="dp_332">362.1818dp</dimen>
-	<dimen name="dp_333">363.2727dp</dimen>
-	<dimen name="dp_334">364.3636dp</dimen>
-	<dimen name="dp_335">365.4545dp</dimen>
-	<dimen name="dp_336">366.5454dp</dimen>
-	<dimen name="dp_337">367.6363dp</dimen>
-	<dimen name="dp_338">368.7272dp</dimen>
-	<dimen name="dp_339">369.8181dp</dimen>
-	<dimen name="dp_340">370.9090dp</dimen>
-	<dimen name="dp_341">371.9999dp</dimen>
-	<dimen name="dp_342">373.0908dp</dimen>
-	<dimen name="dp_343">374.1817dp</dimen>
-	<dimen name="dp_344">375.2727dp</dimen>
-	<dimen name="dp_345">376.3636dp</dimen>
-	<dimen name="dp_346">377.4545dp</dimen>
-	<dimen name="dp_347">378.5454dp</dimen>
-	<dimen name="dp_348">379.6363dp</dimen>
-	<dimen name="dp_349">380.7272dp</dimen>
-	<dimen name="dp_350">381.8181dp</dimen>
-	<dimen name="dp_351">382.9090dp</dimen>
-	<dimen name="dp_352">383.9999dp</dimen>
-	<dimen name="dp_353">385.0908dp</dimen>
-	<dimen name="dp_354">386.1817dp</dimen>
-	<dimen name="dp_355">387.2727dp</dimen>
-	<dimen name="dp_356">388.3636dp</dimen>
-	<dimen name="dp_357">389.4545dp</dimen>
-	<dimen name="dp_358">390.5454dp</dimen>
-	<dimen name="dp_359">391.6363dp</dimen>
-	<dimen name="dp_360">392.7272dp</dimen>
-	<dimen name="dp_365">398.1817dp</dimen>
-	<dimen name="dp_370">403.6363dp</dimen>
-	<dimen name="dp_400">436.3636dp</dimen>
-	<dimen name="dp_410">447.2726dp</dimen>
-	<dimen name="dp_422">460.3636dp</dimen>
-	<dimen name="dp_472">514.9090dp</dimen>
-	<dimen name="dp_500">545.4544dp</dimen>
-	<dimen name="dp_600">654.5453dp</dimen>
-	<dimen name="dp_640">698.1817dp</dimen>
-	<dimen name="dp_720">785.4544dp</dimen>
-	<dimen name="sp_6">6.5455sp</dimen>
-	<dimen name="sp_7">7.6364sp</dimen>
-	<dimen name="sp_8">8.7273sp</dimen>
-	<dimen name="sp_9">9.8182sp</dimen>
-	<dimen name="sp_10">10.9091sp</dimen>
-	<dimen name="sp_11">12.0000sp</dimen>
-	<dimen name="sp_12">13.0909sp</dimen>
-	<dimen name="sp_13">14.1818sp</dimen>
-	<dimen name="sp_14">15.2727sp</dimen>
-	<dimen name="sp_15">16.3636sp</dimen>
-	<dimen name="sp_16">17.4545sp</dimen>
-	<dimen name="sp_17">18.5455sp</dimen>
-	<dimen name="sp_18">19.6364sp</dimen>
-	<dimen name="sp_19">20.7273sp</dimen>
-	<dimen name="sp_20">21.8182sp</dimen>
-	<dimen name="sp_21">22.9091sp</dimen>
-	<dimen name="sp_22">24.0000sp</dimen>
-	<dimen name="sp_23">25.0909sp</dimen>
-	<dimen name="sp_24">26.1818sp</dimen>
-	<dimen name="sp_25">27.2727sp</dimen>
-	<dimen name="sp_28">30.5454sp</dimen>
-	<dimen name="sp_30">32.7273sp</dimen>
-	<dimen name="sp_32">34.9091sp</dimen>
-	<dimen name="sp_34">37.0909sp</dimen>
-	<dimen name="sp_36">39.2727sp</dimen>
-	<dimen name="sp_38">41.4545sp</dimen>
-	<dimen name="sp_40">43.6364sp</dimen>
-	<dimen name="sp_42">45.8182sp</dimen>
-	<dimen name="sp_48">52.3636sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw400dp/dimens.xml b/app/src/main/res/values-sw400dp/dimens.xml
deleted file mode 100644
index 6ed8f9b..0000000
--- a/app/src/main/res/values-sw400dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-66.6667dp</dimen>
-	<dimen name="dp_m_30">-33.3333dp</dimen>
-	<dimen name="dp_m_20">-22.2222dp</dimen>
-	<dimen name="dp_m_12">-13.3333dp</dimen>
-	<dimen name="dp_m_10">-11.1111dp</dimen>
-	<dimen name="dp_m_8">-8.8889dp</dimen>
-	<dimen name="dp_m_5">-5.5556dp</dimen>
-	<dimen name="dp_m_2">-2.2222dp</dimen>
-	<dimen name="dp_m_1">-1.1111dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.1111dp</dimen>
-	<dimen name="dp_0_5">0.5556dp</dimen>
-	<dimen name="dp_1">1.1111dp</dimen>
-	<dimen name="dp_1_5">1.6667dp</dimen>
-	<dimen name="dp_2">2.2222dp</dimen>
-	<dimen name="dp_2_5">2.7778dp</dimen>
-	<dimen name="dp_3">3.3333dp</dimen>
-	<dimen name="dp_3_5">3.8889dp</dimen>
-	<dimen name="dp_4">4.4444dp</dimen>
-	<dimen name="dp_4_5">5.0000dp</dimen>
-	<dimen name="dp_5">5.5556dp</dimen>
-	<dimen name="dp_6">6.6667dp</dimen>
-	<dimen name="dp_7">7.7778dp</dimen>
-	<dimen name="dp_8">8.8889dp</dimen>
-	<dimen name="dp_9">10.0000dp</dimen>
-	<dimen name="dp_10">11.1111dp</dimen>
-	<dimen name="dp_11">12.2222dp</dimen>
-	<dimen name="dp_12">13.3333dp</dimen>
-	<dimen name="dp_13">14.4444dp</dimen>
-	<dimen name="dp_14">15.5556dp</dimen>
-	<dimen name="dp_15">16.6667dp</dimen>
-	<dimen name="dp_16">17.7778dp</dimen>
-	<dimen name="dp_17">18.8889dp</dimen>
-	<dimen name="dp_18">20.0000dp</dimen>
-	<dimen name="dp_19">21.1111dp</dimen>
-	<dimen name="dp_20">22.2222dp</dimen>
-	<dimen name="dp_21">23.3333dp</dimen>
-	<dimen name="dp_22">24.4444dp</dimen>
-	<dimen name="dp_23">25.5556dp</dimen>
-	<dimen name="dp_24">26.6667dp</dimen>
-	<dimen name="dp_25">27.7778dp</dimen>
-	<dimen name="dp_26">28.8889dp</dimen>
-	<dimen name="dp_27">30.0000dp</dimen>
-	<dimen name="dp_28">31.1111dp</dimen>
-	<dimen name="dp_29">32.2222dp</dimen>
-	<dimen name="dp_30">33.3333dp</dimen>
-	<dimen name="dp_31">34.4444dp</dimen>
-	<dimen name="dp_32">35.5556dp</dimen>
-	<dimen name="dp_33">36.6667dp</dimen>
-	<dimen name="dp_34">37.7778dp</dimen>
-	<dimen name="dp_35">38.8889dp</dimen>
-	<dimen name="dp_36">40.0000dp</dimen>
-	<dimen name="dp_37">41.1111dp</dimen>
-	<dimen name="dp_38">42.2222dp</dimen>
-	<dimen name="dp_39">43.3333dp</dimen>
-	<dimen name="dp_40">44.4444dp</dimen>
-	<dimen name="dp_41">45.5556dp</dimen>
-	<dimen name="dp_42">46.6667dp</dimen>
-	<dimen name="dp_43">47.7778dp</dimen>
-	<dimen name="dp_44">48.8889dp</dimen>
-	<dimen name="dp_45">50.0000dp</dimen>
-	<dimen name="dp_46">51.1111dp</dimen>
-	<dimen name="dp_47">52.2222dp</dimen>
-	<dimen name="dp_48">53.3333dp</dimen>
-	<dimen name="dp_49">54.4444dp</dimen>
-	<dimen name="dp_50">55.5556dp</dimen>
-	<dimen name="dp_51">56.6667dp</dimen>
-	<dimen name="dp_52">57.7778dp</dimen>
-	<dimen name="dp_53">58.8889dp</dimen>
-	<dimen name="dp_54">60.0000dp</dimen>
-	<dimen name="dp_55">61.1111dp</dimen>
-	<dimen name="dp_56">62.2222dp</dimen>
-	<dimen name="dp_57">63.3333dp</dimen>
-	<dimen name="dp_58">64.4444dp</dimen>
-	<dimen name="dp_59">65.5556dp</dimen>
-	<dimen name="dp_60">66.6667dp</dimen>
-	<dimen name="dp_61">67.7778dp</dimen>
-	<dimen name="dp_62">68.8889dp</dimen>
-	<dimen name="dp_63">70.0000dp</dimen>
-	<dimen name="dp_64">71.1111dp</dimen>
-	<dimen name="dp_65">72.2222dp</dimen>
-	<dimen name="dp_66">73.3333dp</dimen>
-	<dimen name="dp_67">74.4444dp</dimen>
-	<dimen name="dp_68">75.5556dp</dimen>
-	<dimen name="dp_69">76.6667dp</dimen>
-	<dimen name="dp_70">77.7778dp</dimen>
-	<dimen name="dp_71">78.8889dp</dimen>
-	<dimen name="dp_72">80.0000dp</dimen>
-	<dimen name="dp_73">81.1111dp</dimen>
-	<dimen name="dp_74">82.2222dp</dimen>
-	<dimen name="dp_75">83.3333dp</dimen>
-	<dimen name="dp_76">84.4444dp</dimen>
-	<dimen name="dp_77">85.5556dp</dimen>
-	<dimen name="dp_78">86.6667dp</dimen>
-	<dimen name="dp_79">87.7778dp</dimen>
-	<dimen name="dp_80">88.8889dp</dimen>
-	<dimen name="dp_81">90.0000dp</dimen>
-	<dimen name="dp_82">91.1111dp</dimen>
-	<dimen name="dp_83">92.2222dp</dimen>
-	<dimen name="dp_84">93.3333dp</dimen>
-	<dimen name="dp_85">94.4444dp</dimen>
-	<dimen name="dp_86">95.5556dp</dimen>
-	<dimen name="dp_87">96.6667dp</dimen>
-	<dimen name="dp_88">97.7778dp</dimen>
-	<dimen name="dp_89">98.8889dp</dimen>
-	<dimen name="dp_90">100.0000dp</dimen>
-	<dimen name="dp_91">101.1111dp</dimen>
-	<dimen name="dp_92">102.2222dp</dimen>
-	<dimen name="dp_93">103.3333dp</dimen>
-	<dimen name="dp_94">104.4444dp</dimen>
-	<dimen name="dp_95">105.5556dp</dimen>
-	<dimen name="dp_96">106.6667dp</dimen>
-	<dimen name="dp_97">107.7778dp</dimen>
-	<dimen name="dp_98">108.8889dp</dimen>
-	<dimen name="dp_99">110.0000dp</dimen>
-	<dimen name="dp_100">111.1111dp</dimen>
-	<dimen name="dp_101">112.2222dp</dimen>
-	<dimen name="dp_102">113.3333dp</dimen>
-	<dimen name="dp_103">114.4444dp</dimen>
-	<dimen name="dp_104">115.5556dp</dimen>
-	<dimen name="dp_105">116.6667dp</dimen>
-	<dimen name="dp_106">117.7778dp</dimen>
-	<dimen name="dp_107">118.8889dp</dimen>
-	<dimen name="dp_108">120.0000dp</dimen>
-	<dimen name="dp_109">121.1111dp</dimen>
-	<dimen name="dp_110">122.2222dp</dimen>
-	<dimen name="dp_111">123.3333dp</dimen>
-	<dimen name="dp_112">124.4444dp</dimen>
-	<dimen name="dp_113">125.5556dp</dimen>
-	<dimen name="dp_114">126.6667dp</dimen>
-	<dimen name="dp_115">127.7778dp</dimen>
-	<dimen name="dp_116">128.8889dp</dimen>
-	<dimen name="dp_117">130.0000dp</dimen>
-	<dimen name="dp_118">131.1111dp</dimen>
-	<dimen name="dp_119">132.2222dp</dimen>
-	<dimen name="dp_120">133.3333dp</dimen>
-	<dimen name="dp_121">134.4444dp</dimen>
-	<dimen name="dp_122">135.5556dp</dimen>
-	<dimen name="dp_123">136.6667dp</dimen>
-	<dimen name="dp_124">137.7778dp</dimen>
-	<dimen name="dp_125">138.8889dp</dimen>
-	<dimen name="dp_126">140.0000dp</dimen>
-	<dimen name="dp_127">141.1111dp</dimen>
-	<dimen name="dp_128">142.2222dp</dimen>
-	<dimen name="dp_129">143.3333dp</dimen>
-	<dimen name="dp_130">144.4444dp</dimen>
-	<dimen name="dp_131">145.5556dp</dimen>
-	<dimen name="dp_132">146.6667dp</dimen>
-	<dimen name="dp_133">147.7778dp</dimen>
-	<dimen name="dp_134">148.8889dp</dimen>
-	<dimen name="dp_135">150.0000dp</dimen>
-	<dimen name="dp_136">151.1111dp</dimen>
-	<dimen name="dp_137">152.2222dp</dimen>
-	<dimen name="dp_138">153.3333dp</dimen>
-	<dimen name="dp_139">154.4444dp</dimen>
-	<dimen name="dp_140">155.5556dp</dimen>
-	<dimen name="dp_141">156.6667dp</dimen>
-	<dimen name="dp_142">157.7778dp</dimen>
-	<dimen name="dp_143">158.8889dp</dimen>
-	<dimen name="dp_144">160.0000dp</dimen>
-	<dimen name="dp_145">161.1111dp</dimen>
-	<dimen name="dp_146">162.2222dp</dimen>
-	<dimen name="dp_147">163.3333dp</dimen>
-	<dimen name="dp_148">164.4444dp</dimen>
-	<dimen name="dp_149">165.5556dp</dimen>
-	<dimen name="dp_150">166.6667dp</dimen>
-	<dimen name="dp_151">167.7778dp</dimen>
-	<dimen name="dp_152">168.8889dp</dimen>
-	<dimen name="dp_153">170.0000dp</dimen>
-	<dimen name="dp_154">171.1111dp</dimen>
-	<dimen name="dp_155">172.2222dp</dimen>
-	<dimen name="dp_156">173.3333dp</dimen>
-	<dimen name="dp_157">174.4444dp</dimen>
-	<dimen name="dp_158">175.5556dp</dimen>
-	<dimen name="dp_159">176.6667dp</dimen>
-	<dimen name="dp_160">177.7778dp</dimen>
-	<dimen name="dp_161">178.8889dp</dimen>
-	<dimen name="dp_162">180.0000dp</dimen>
-	<dimen name="dp_163">181.1111dp</dimen>
-	<dimen name="dp_164">182.2222dp</dimen>
-	<dimen name="dp_165">183.3333dp</dimen>
-	<dimen name="dp_166">184.4444dp</dimen>
-	<dimen name="dp_167">185.5556dp</dimen>
-	<dimen name="dp_168">186.6667dp</dimen>
-	<dimen name="dp_169">187.7778dp</dimen>
-	<dimen name="dp_170">188.8889dp</dimen>
-	<dimen name="dp_171">190.0000dp</dimen>
-	<dimen name="dp_172">191.1111dp</dimen>
-	<dimen name="dp_173">192.2222dp</dimen>
-	<dimen name="dp_174">193.3333dp</dimen>
-	<dimen name="dp_175">194.4444dp</dimen>
-	<dimen name="dp_176">195.5556dp</dimen>
-	<dimen name="dp_177">196.6667dp</dimen>
-	<dimen name="dp_178">197.7778dp</dimen>
-	<dimen name="dp_179">198.8889dp</dimen>
-	<dimen name="dp_180">200.0000dp</dimen>
-	<dimen name="dp_181">201.1111dp</dimen>
-	<dimen name="dp_182">202.2222dp</dimen>
-	<dimen name="dp_183">203.3333dp</dimen>
-	<dimen name="dp_184">204.4444dp</dimen>
-	<dimen name="dp_185">205.5556dp</dimen>
-	<dimen name="dp_186">206.6667dp</dimen>
-	<dimen name="dp_187">207.7778dp</dimen>
-	<dimen name="dp_188">208.8889dp</dimen>
-	<dimen name="dp_189">210.0000dp</dimen>
-	<dimen name="dp_190">211.1111dp</dimen>
-	<dimen name="dp_191">212.2222dp</dimen>
-	<dimen name="dp_192">213.3333dp</dimen>
-	<dimen name="dp_193">214.4444dp</dimen>
-	<dimen name="dp_194">215.5556dp</dimen>
-	<dimen name="dp_195">216.6667dp</dimen>
-	<dimen name="dp_196">217.7778dp</dimen>
-	<dimen name="dp_197">218.8889dp</dimen>
-	<dimen name="dp_198">220.0000dp</dimen>
-	<dimen name="dp_199">221.1111dp</dimen>
-	<dimen name="dp_200">222.2222dp</dimen>
-	<dimen name="dp_201">223.3333dp</dimen>
-	<dimen name="dp_202">224.4444dp</dimen>
-	<dimen name="dp_203">225.5556dp</dimen>
-	<dimen name="dp_204">226.6667dp</dimen>
-	<dimen name="dp_205">227.7778dp</dimen>
-	<dimen name="dp_206">228.8889dp</dimen>
-	<dimen name="dp_207">230.0000dp</dimen>
-	<dimen name="dp_208">231.1111dp</dimen>
-	<dimen name="dp_209">232.2222dp</dimen>
-	<dimen name="dp_210">233.3333dp</dimen>
-	<dimen name="dp_211">234.4444dp</dimen>
-	<dimen name="dp_212">235.5556dp</dimen>
-	<dimen name="dp_213">236.6667dp</dimen>
-	<dimen name="dp_214">237.7778dp</dimen>
-	<dimen name="dp_215">238.8889dp</dimen>
-	<dimen name="dp_216">240.0000dp</dimen>
-	<dimen name="dp_217">241.1111dp</dimen>
-	<dimen name="dp_218">242.2222dp</dimen>
-	<dimen name="dp_219">243.3333dp</dimen>
-	<dimen name="dp_220">244.4444dp</dimen>
-	<dimen name="dp_221">245.5556dp</dimen>
-	<dimen name="dp_222">246.6667dp</dimen>
-	<dimen name="dp_223">247.7778dp</dimen>
-	<dimen name="dp_224">248.8889dp</dimen>
-	<dimen name="dp_225">250.0000dp</dimen>
-	<dimen name="dp_226">251.1111dp</dimen>
-	<dimen name="dp_227">252.2222dp</dimen>
-	<dimen name="dp_228">253.3333dp</dimen>
-	<dimen name="dp_229">254.4444dp</dimen>
-	<dimen name="dp_230">255.5556dp</dimen>
-	<dimen name="dp_231">256.6667dp</dimen>
-	<dimen name="dp_232">257.7778dp</dimen>
-	<dimen name="dp_233">258.8889dp</dimen>
-	<dimen name="dp_234">260.0000dp</dimen>
-	<dimen name="dp_235">261.1111dp</dimen>
-	<dimen name="dp_236">262.2222dp</dimen>
-	<dimen name="dp_237">263.3333dp</dimen>
-	<dimen name="dp_238">264.4444dp</dimen>
-	<dimen name="dp_239">265.5556dp</dimen>
-	<dimen name="dp_240">266.6667dp</dimen>
-	<dimen name="dp_241">267.7778dp</dimen>
-	<dimen name="dp_242">268.8889dp</dimen>
-	<dimen name="dp_243">270.0000dp</dimen>
-	<dimen name="dp_244">271.1111dp</dimen>
-	<dimen name="dp_245">272.2222dp</dimen>
-	<dimen name="dp_246">273.3333dp</dimen>
-	<dimen name="dp_247">274.4444dp</dimen>
-	<dimen name="dp_248">275.5556dp</dimen>
-	<dimen name="dp_249">276.6667dp</dimen>
-	<dimen name="dp_250">277.7778dp</dimen>
-	<dimen name="dp_251">278.8889dp</dimen>
-	<dimen name="dp_252">280.0000dp</dimen>
-	<dimen name="dp_253">281.1111dp</dimen>
-	<dimen name="dp_254">282.2222dp</dimen>
-	<dimen name="dp_255">283.3333dp</dimen>
-	<dimen name="dp_256">284.4444dp</dimen>
-	<dimen name="dp_257">285.5556dp</dimen>
-	<dimen name="dp_258">286.6667dp</dimen>
-	<dimen name="dp_259">287.7778dp</dimen>
-	<dimen name="dp_260">288.8889dp</dimen>
-	<dimen name="dp_261">290.0000dp</dimen>
-	<dimen name="dp_262">291.1111dp</dimen>
-	<dimen name="dp_263">292.2222dp</dimen>
-	<dimen name="dp_264">293.3333dp</dimen>
-	<dimen name="dp_265">294.4444dp</dimen>
-	<dimen name="dp_266">295.5556dp</dimen>
-	<dimen name="dp_267">296.6667dp</dimen>
-	<dimen name="dp_268">297.7778dp</dimen>
-	<dimen name="dp_269">298.8889dp</dimen>
-	<dimen name="dp_270">300.0000dp</dimen>
-	<dimen name="dp_271">301.1111dp</dimen>
-	<dimen name="dp_272">302.2222dp</dimen>
-	<dimen name="dp_273">303.3333dp</dimen>
-	<dimen name="dp_274">304.4444dp</dimen>
-	<dimen name="dp_275">305.5556dp</dimen>
-	<dimen name="dp_276">306.6667dp</dimen>
-	<dimen name="dp_277">307.7778dp</dimen>
-	<dimen name="dp_278">308.8889dp</dimen>
-	<dimen name="dp_279">310.0000dp</dimen>
-	<dimen name="dp_280">311.1111dp</dimen>
-	<dimen name="dp_281">312.2222dp</dimen>
-	<dimen name="dp_282">313.3333dp</dimen>
-	<dimen name="dp_283">314.4444dp</dimen>
-	<dimen name="dp_284">315.5556dp</dimen>
-	<dimen name="dp_285">316.6667dp</dimen>
-	<dimen name="dp_286">317.7778dp</dimen>
-	<dimen name="dp_287">318.8889dp</dimen>
-	<dimen name="dp_288">320.0000dp</dimen>
-	<dimen name="dp_289">321.1111dp</dimen>
-	<dimen name="dp_290">322.2222dp</dimen>
-	<dimen name="dp_291">323.3333dp</dimen>
-	<dimen name="dp_292">324.4444dp</dimen>
-	<dimen name="dp_293">325.5556dp</dimen>
-	<dimen name="dp_294">326.6667dp</dimen>
-	<dimen name="dp_295">327.7778dp</dimen>
-	<dimen name="dp_296">328.8889dp</dimen>
-	<dimen name="dp_297">330.0000dp</dimen>
-	<dimen name="dp_298">331.1111dp</dimen>
-	<dimen name="dp_299">332.2222dp</dimen>
-	<dimen name="dp_300">333.3333dp</dimen>
-	<dimen name="dp_301">334.4444dp</dimen>
-	<dimen name="dp_302">335.5556dp</dimen>
-	<dimen name="dp_303">336.6667dp</dimen>
-	<dimen name="dp_304">337.7778dp</dimen>
-	<dimen name="dp_305">338.8889dp</dimen>
-	<dimen name="dp_306">340.0000dp</dimen>
-	<dimen name="dp_307">341.1111dp</dimen>
-	<dimen name="dp_308">342.2222dp</dimen>
-	<dimen name="dp_309">343.3333dp</dimen>
-	<dimen name="dp_310">344.4444dp</dimen>
-	<dimen name="dp_311">345.5556dp</dimen>
-	<dimen name="dp_312">346.6667dp</dimen>
-	<dimen name="dp_313">347.7778dp</dimen>
-	<dimen name="dp_314">348.8889dp</dimen>
-	<dimen name="dp_315">350.0000dp</dimen>
-	<dimen name="dp_316">351.1111dp</dimen>
-	<dimen name="dp_317">352.2222dp</dimen>
-	<dimen name="dp_318">353.3333dp</dimen>
-	<dimen name="dp_319">354.4444dp</dimen>
-	<dimen name="dp_320">355.5556dp</dimen>
-	<dimen name="dp_321">356.6667dp</dimen>
-	<dimen name="dp_322">357.7778dp</dimen>
-	<dimen name="dp_323">358.8889dp</dimen>
-	<dimen name="dp_324">360.0000dp</dimen>
-	<dimen name="dp_325">361.1111dp</dimen>
-	<dimen name="dp_326">362.2222dp</dimen>
-	<dimen name="dp_327">363.3333dp</dimen>
-	<dimen name="dp_328">364.4444dp</dimen>
-	<dimen name="dp_329">365.5556dp</dimen>
-	<dimen name="dp_330">366.6667dp</dimen>
-	<dimen name="dp_331">367.7778dp</dimen>
-	<dimen name="dp_332">368.8889dp</dimen>
-	<dimen name="dp_333">370.0000dp</dimen>
-	<dimen name="dp_334">371.1111dp</dimen>
-	<dimen name="dp_335">372.2222dp</dimen>
-	<dimen name="dp_336">373.3333dp</dimen>
-	<dimen name="dp_337">374.4444dp</dimen>
-	<dimen name="dp_338">375.5556dp</dimen>
-	<dimen name="dp_339">376.6667dp</dimen>
-	<dimen name="dp_340">377.7778dp</dimen>
-	<dimen name="dp_341">378.8889dp</dimen>
-	<dimen name="dp_342">380.0000dp</dimen>
-	<dimen name="dp_343">381.1111dp</dimen>
-	<dimen name="dp_344">382.2222dp</dimen>
-	<dimen name="dp_345">383.3333dp</dimen>
-	<dimen name="dp_346">384.4444dp</dimen>
-	<dimen name="dp_347">385.5556dp</dimen>
-	<dimen name="dp_348">386.6667dp</dimen>
-	<dimen name="dp_349">387.7778dp</dimen>
-	<dimen name="dp_350">388.8889dp</dimen>
-	<dimen name="dp_351">390.0000dp</dimen>
-	<dimen name="dp_352">391.1111dp</dimen>
-	<dimen name="dp_353">392.2222dp</dimen>
-	<dimen name="dp_354">393.3333dp</dimen>
-	<dimen name="dp_355">394.4444dp</dimen>
-	<dimen name="dp_356">395.5556dp</dimen>
-	<dimen name="dp_357">396.6667dp</dimen>
-	<dimen name="dp_358">397.7778dp</dimen>
-	<dimen name="dp_359">398.8889dp</dimen>
-	<dimen name="dp_360">400.0000dp</dimen>
-	<dimen name="dp_365">405.5556dp</dimen>
-	<dimen name="dp_370">411.1111dp</dimen>
-	<dimen name="dp_400">444.4444dp</dimen>
-	<dimen name="dp_410">455.5556dp</dimen>
-	<dimen name="dp_422">468.8889dp</dimen>
-	<dimen name="dp_472">524.4444dp</dimen>
-	<dimen name="dp_500">555.5556dp</dimen>
-	<dimen name="dp_600">666.6667dp</dimen>
-	<dimen name="dp_640">711.1111dp</dimen>
-	<dimen name="dp_720">800.0000dp</dimen>
-	<dimen name="sp_6">6.6667sp</dimen>
-	<dimen name="sp_7">7.7778sp</dimen>
-	<dimen name="sp_8">8.8889sp</dimen>
-	<dimen name="sp_9">10.0000sp</dimen>
-	<dimen name="sp_10">11.1111sp</dimen>
-	<dimen name="sp_11">12.2222sp</dimen>
-	<dimen name="sp_12">13.3333sp</dimen>
-	<dimen name="sp_13">14.4444sp</dimen>
-	<dimen name="sp_14">15.5556sp</dimen>
-	<dimen name="sp_15">16.6667sp</dimen>
-	<dimen name="sp_16">17.7778sp</dimen>
-	<dimen name="sp_17">18.8889sp</dimen>
-	<dimen name="sp_18">20.0000sp</dimen>
-	<dimen name="sp_19">21.1111sp</dimen>
-	<dimen name="sp_20">22.2222sp</dimen>
-	<dimen name="sp_21">23.3333sp</dimen>
-	<dimen name="sp_22">24.4444sp</dimen>
-	<dimen name="sp_23">25.5556sp</dimen>
-	<dimen name="sp_24">26.6667sp</dimen>
-	<dimen name="sp_25">27.7778sp</dimen>
-	<dimen name="sp_28">31.1111sp</dimen>
-	<dimen name="sp_30">33.3333sp</dimen>
-	<dimen name="sp_32">35.5556sp</dimen>
-	<dimen name="sp_34">37.7778sp</dimen>
-	<dimen name="sp_36">40.0000sp</dimen>
-	<dimen name="sp_38">42.2222sp</dimen>
-	<dimen name="sp_40">44.4444sp</dimen>
-	<dimen name="sp_42">46.6667sp</dimen>
-	<dimen name="sp_48">53.3333sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw410dp/dimens.xml b/app/src/main/res/values-sw410dp/dimens.xml
deleted file mode 100644
index c649a36..0000000
--- a/app/src/main/res/values-sw410dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-68.3333dp</dimen>
-	<dimen name="dp_m_30">-34.1667dp</dimen>
-	<dimen name="dp_m_20">-22.7778dp</dimen>
-	<dimen name="dp_m_12">-13.6667dp</dimen>
-	<dimen name="dp_m_10">-11.3889dp</dimen>
-	<dimen name="dp_m_8">-9.1111dp</dimen>
-	<dimen name="dp_m_5">-5.6944dp</dimen>
-	<dimen name="dp_m_2">-2.2778dp</dimen>
-	<dimen name="dp_m_1">-1.1389dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.1139dp</dimen>
-	<dimen name="dp_0_5">0.5694dp</dimen>
-	<dimen name="dp_1">1.1389dp</dimen>
-	<dimen name="dp_1_5">1.7083dp</dimen>
-	<dimen name="dp_2">2.2778dp</dimen>
-	<dimen name="dp_2_5">2.8472dp</dimen>
-	<dimen name="dp_3">3.4167dp</dimen>
-	<dimen name="dp_3_5">3.9861dp</dimen>
-	<dimen name="dp_4">4.5556dp</dimen>
-	<dimen name="dp_4_5">5.1250dp</dimen>
-	<dimen name="dp_5">5.6944dp</dimen>
-	<dimen name="dp_6">6.8333dp</dimen>
-	<dimen name="dp_7">7.9722dp</dimen>
-	<dimen name="dp_8">9.1111dp</dimen>
-	<dimen name="dp_9">10.2500dp</dimen>
-	<dimen name="dp_10">11.3889dp</dimen>
-	<dimen name="dp_11">12.5278dp</dimen>
-	<dimen name="dp_12">13.6667dp</dimen>
-	<dimen name="dp_13">14.8056dp</dimen>
-	<dimen name="dp_14">15.9444dp</dimen>
-	<dimen name="dp_15">17.0833dp</dimen>
-	<dimen name="dp_16">18.2222dp</dimen>
-	<dimen name="dp_17">19.3611dp</dimen>
-	<dimen name="dp_18">20.5000dp</dimen>
-	<dimen name="dp_19">21.6389dp</dimen>
-	<dimen name="dp_20">22.7778dp</dimen>
-	<dimen name="dp_21">23.9167dp</dimen>
-	<dimen name="dp_22">25.0556dp</dimen>
-	<dimen name="dp_23">26.1944dp</dimen>
-	<dimen name="dp_24">27.3333dp</dimen>
-	<dimen name="dp_25">28.4722dp</dimen>
-	<dimen name="dp_26">29.6111dp</dimen>
-	<dimen name="dp_27">30.7500dp</dimen>
-	<dimen name="dp_28">31.8889dp</dimen>
-	<dimen name="dp_29">33.0278dp</dimen>
-	<dimen name="dp_30">34.1667dp</dimen>
-	<dimen name="dp_31">35.3056dp</dimen>
-	<dimen name="dp_32">36.4444dp</dimen>
-	<dimen name="dp_33">37.5833dp</dimen>
-	<dimen name="dp_34">38.7222dp</dimen>
-	<dimen name="dp_35">39.8611dp</dimen>
-	<dimen name="dp_36">41.0000dp</dimen>
-	<dimen name="dp_37">42.1389dp</dimen>
-	<dimen name="dp_38">43.2778dp</dimen>
-	<dimen name="dp_39">44.4167dp</dimen>
-	<dimen name="dp_40">45.5556dp</dimen>
-	<dimen name="dp_41">46.6944dp</dimen>
-	<dimen name="dp_42">47.8333dp</dimen>
-	<dimen name="dp_43">48.9722dp</dimen>
-	<dimen name="dp_44">50.1111dp</dimen>
-	<dimen name="dp_45">51.2500dp</dimen>
-	<dimen name="dp_46">52.3889dp</dimen>
-	<dimen name="dp_47">53.5278dp</dimen>
-	<dimen name="dp_48">54.6667dp</dimen>
-	<dimen name="dp_49">55.8056dp</dimen>
-	<dimen name="dp_50">56.9444dp</dimen>
-	<dimen name="dp_51">58.0833dp</dimen>
-	<dimen name="dp_52">59.2222dp</dimen>
-	<dimen name="dp_53">60.3611dp</dimen>
-	<dimen name="dp_54">61.5000dp</dimen>
-	<dimen name="dp_55">62.6389dp</dimen>
-	<dimen name="dp_56">63.7778dp</dimen>
-	<dimen name="dp_57">64.9167dp</dimen>
-	<dimen name="dp_58">66.0556dp</dimen>
-	<dimen name="dp_59">67.1944dp</dimen>
-	<dimen name="dp_60">68.3333dp</dimen>
-	<dimen name="dp_61">69.4722dp</dimen>
-	<dimen name="dp_62">70.6111dp</dimen>
-	<dimen name="dp_63">71.7500dp</dimen>
-	<dimen name="dp_64">72.8889dp</dimen>
-	<dimen name="dp_65">74.0278dp</dimen>
-	<dimen name="dp_66">75.1667dp</dimen>
-	<dimen name="dp_67">76.3056dp</dimen>
-	<dimen name="dp_68">77.4444dp</dimen>
-	<dimen name="dp_69">78.5833dp</dimen>
-	<dimen name="dp_70">79.7222dp</dimen>
-	<dimen name="dp_71">80.8611dp</dimen>
-	<dimen name="dp_72">82.0000dp</dimen>
-	<dimen name="dp_73">83.1389dp</dimen>
-	<dimen name="dp_74">84.2778dp</dimen>
-	<dimen name="dp_75">85.4167dp</dimen>
-	<dimen name="dp_76">86.5556dp</dimen>
-	<dimen name="dp_77">87.6944dp</dimen>
-	<dimen name="dp_78">88.8333dp</dimen>
-	<dimen name="dp_79">89.9722dp</dimen>
-	<dimen name="dp_80">91.1111dp</dimen>
-	<dimen name="dp_81">92.2500dp</dimen>
-	<dimen name="dp_82">93.3889dp</dimen>
-	<dimen name="dp_83">94.5278dp</dimen>
-	<dimen name="dp_84">95.6667dp</dimen>
-	<dimen name="dp_85">96.8056dp</dimen>
-	<dimen name="dp_86">97.9444dp</dimen>
-	<dimen name="dp_87">99.0833dp</dimen>
-	<dimen name="dp_88">100.2222dp</dimen>
-	<dimen name="dp_89">101.3611dp</dimen>
-	<dimen name="dp_90">102.5000dp</dimen>
-	<dimen name="dp_91">103.6389dp</dimen>
-	<dimen name="dp_92">104.7778dp</dimen>
-	<dimen name="dp_93">105.9167dp</dimen>
-	<dimen name="dp_94">107.0556dp</dimen>
-	<dimen name="dp_95">108.1944dp</dimen>
-	<dimen name="dp_96">109.3333dp</dimen>
-	<dimen name="dp_97">110.4722dp</dimen>
-	<dimen name="dp_98">111.6111dp</dimen>
-	<dimen name="dp_99">112.7500dp</dimen>
-	<dimen name="dp_100">113.8889dp</dimen>
-	<dimen name="dp_101">115.0278dp</dimen>
-	<dimen name="dp_102">116.1667dp</dimen>
-	<dimen name="dp_103">117.3056dp</dimen>
-	<dimen name="dp_104">118.4444dp</dimen>
-	<dimen name="dp_105">119.5833dp</dimen>
-	<dimen name="dp_106">120.7222dp</dimen>
-	<dimen name="dp_107">121.8611dp</dimen>
-	<dimen name="dp_108">123.0000dp</dimen>
-	<dimen name="dp_109">124.1389dp</dimen>
-	<dimen name="dp_110">125.2778dp</dimen>
-	<dimen name="dp_111">126.4167dp</dimen>
-	<dimen name="dp_112">127.5556dp</dimen>
-	<dimen name="dp_113">128.6944dp</dimen>
-	<dimen name="dp_114">129.8333dp</dimen>
-	<dimen name="dp_115">130.9722dp</dimen>
-	<dimen name="dp_116">132.1111dp</dimen>
-	<dimen name="dp_117">133.2500dp</dimen>
-	<dimen name="dp_118">134.3889dp</dimen>
-	<dimen name="dp_119">135.5278dp</dimen>
-	<dimen name="dp_120">136.6667dp</dimen>
-	<dimen name="dp_121">137.8056dp</dimen>
-	<dimen name="dp_122">138.9444dp</dimen>
-	<dimen name="dp_123">140.0833dp</dimen>
-	<dimen name="dp_124">141.2222dp</dimen>
-	<dimen name="dp_125">142.3611dp</dimen>
-	<dimen name="dp_126">143.5000dp</dimen>
-	<dimen name="dp_127">144.6389dp</dimen>
-	<dimen name="dp_128">145.7778dp</dimen>
-	<dimen name="dp_129">146.9167dp</dimen>
-	<dimen name="dp_130">148.0556dp</dimen>
-	<dimen name="dp_131">149.1944dp</dimen>
-	<dimen name="dp_132">150.3333dp</dimen>
-	<dimen name="dp_133">151.4722dp</dimen>
-	<dimen name="dp_134">152.6111dp</dimen>
-	<dimen name="dp_135">153.7500dp</dimen>
-	<dimen name="dp_136">154.8889dp</dimen>
-	<dimen name="dp_137">156.0278dp</dimen>
-	<dimen name="dp_138">157.1667dp</dimen>
-	<dimen name="dp_139">158.3056dp</dimen>
-	<dimen name="dp_140">159.4444dp</dimen>
-	<dimen name="dp_141">160.5833dp</dimen>
-	<dimen name="dp_142">161.7222dp</dimen>
-	<dimen name="dp_143">162.8611dp</dimen>
-	<dimen name="dp_144">164.0000dp</dimen>
-	<dimen name="dp_145">165.1389dp</dimen>
-	<dimen name="dp_146">166.2778dp</dimen>
-	<dimen name="dp_147">167.4167dp</dimen>
-	<dimen name="dp_148">168.5556dp</dimen>
-	<dimen name="dp_149">169.6944dp</dimen>
-	<dimen name="dp_150">170.8333dp</dimen>
-	<dimen name="dp_151">171.9722dp</dimen>
-	<dimen name="dp_152">173.1111dp</dimen>
-	<dimen name="dp_153">174.2500dp</dimen>
-	<dimen name="dp_154">175.3889dp</dimen>
-	<dimen name="dp_155">176.5278dp</dimen>
-	<dimen name="dp_156">177.6667dp</dimen>
-	<dimen name="dp_157">178.8056dp</dimen>
-	<dimen name="dp_158">179.9444dp</dimen>
-	<dimen name="dp_159">181.0833dp</dimen>
-	<dimen name="dp_160">182.2222dp</dimen>
-	<dimen name="dp_161">183.3611dp</dimen>
-	<dimen name="dp_162">184.5000dp</dimen>
-	<dimen name="dp_163">185.6389dp</dimen>
-	<dimen name="dp_164">186.7778dp</dimen>
-	<dimen name="dp_165">187.9167dp</dimen>
-	<dimen name="dp_166">189.0556dp</dimen>
-	<dimen name="dp_167">190.1944dp</dimen>
-	<dimen name="dp_168">191.3333dp</dimen>
-	<dimen name="dp_169">192.4722dp</dimen>
-	<dimen name="dp_170">193.6111dp</dimen>
-	<dimen name="dp_171">194.7500dp</dimen>
-	<dimen name="dp_172">195.8889dp</dimen>
-	<dimen name="dp_173">197.0278dp</dimen>
-	<dimen name="dp_174">198.1667dp</dimen>
-	<dimen name="dp_175">199.3056dp</dimen>
-	<dimen name="dp_176">200.4444dp</dimen>
-	<dimen name="dp_177">201.5833dp</dimen>
-	<dimen name="dp_178">202.7222dp</dimen>
-	<dimen name="dp_179">203.8611dp</dimen>
-	<dimen name="dp_180">205.0000dp</dimen>
-	<dimen name="dp_181">206.1389dp</dimen>
-	<dimen name="dp_182">207.2778dp</dimen>
-	<dimen name="dp_183">208.4167dp</dimen>
-	<dimen name="dp_184">209.5556dp</dimen>
-	<dimen name="dp_185">210.6944dp</dimen>
-	<dimen name="dp_186">211.8333dp</dimen>
-	<dimen name="dp_187">212.9722dp</dimen>
-	<dimen name="dp_188">214.1111dp</dimen>
-	<dimen name="dp_189">215.2500dp</dimen>
-	<dimen name="dp_190">216.3889dp</dimen>
-	<dimen name="dp_191">217.5278dp</dimen>
-	<dimen name="dp_192">218.6667dp</dimen>
-	<dimen name="dp_193">219.8056dp</dimen>
-	<dimen name="dp_194">220.9444dp</dimen>
-	<dimen name="dp_195">222.0833dp</dimen>
-	<dimen name="dp_196">223.2222dp</dimen>
-	<dimen name="dp_197">224.3611dp</dimen>
-	<dimen name="dp_198">225.5000dp</dimen>
-	<dimen name="dp_199">226.6389dp</dimen>
-	<dimen name="dp_200">227.7778dp</dimen>
-	<dimen name="dp_201">228.9167dp</dimen>
-	<dimen name="dp_202">230.0556dp</dimen>
-	<dimen name="dp_203">231.1944dp</dimen>
-	<dimen name="dp_204">232.3333dp</dimen>
-	<dimen name="dp_205">233.4722dp</dimen>
-	<dimen name="dp_206">234.6111dp</dimen>
-	<dimen name="dp_207">235.7500dp</dimen>
-	<dimen name="dp_208">236.8889dp</dimen>
-	<dimen name="dp_209">238.0278dp</dimen>
-	<dimen name="dp_210">239.1667dp</dimen>
-	<dimen name="dp_211">240.3056dp</dimen>
-	<dimen name="dp_212">241.4444dp</dimen>
-	<dimen name="dp_213">242.5833dp</dimen>
-	<dimen name="dp_214">243.7222dp</dimen>
-	<dimen name="dp_215">244.8611dp</dimen>
-	<dimen name="dp_216">246.0000dp</dimen>
-	<dimen name="dp_217">247.1389dp</dimen>
-	<dimen name="dp_218">248.2778dp</dimen>
-	<dimen name="dp_219">249.4167dp</dimen>
-	<dimen name="dp_220">250.5556dp</dimen>
-	<dimen name="dp_221">251.6944dp</dimen>
-	<dimen name="dp_222">252.8333dp</dimen>
-	<dimen name="dp_223">253.9722dp</dimen>
-	<dimen name="dp_224">255.1111dp</dimen>
-	<dimen name="dp_225">256.2500dp</dimen>
-	<dimen name="dp_226">257.3889dp</dimen>
-	<dimen name="dp_227">258.5278dp</dimen>
-	<dimen name="dp_228">259.6667dp</dimen>
-	<dimen name="dp_229">260.8056dp</dimen>
-	<dimen name="dp_230">261.9444dp</dimen>
-	<dimen name="dp_231">263.0833dp</dimen>
-	<dimen name="dp_232">264.2222dp</dimen>
-	<dimen name="dp_233">265.3611dp</dimen>
-	<dimen name="dp_234">266.5000dp</dimen>
-	<dimen name="dp_235">267.6389dp</dimen>
-	<dimen name="dp_236">268.7778dp</dimen>
-	<dimen name="dp_237">269.9167dp</dimen>
-	<dimen name="dp_238">271.0556dp</dimen>
-	<dimen name="dp_239">272.1944dp</dimen>
-	<dimen name="dp_240">273.3333dp</dimen>
-	<dimen name="dp_241">274.4722dp</dimen>
-	<dimen name="dp_242">275.6111dp</dimen>
-	<dimen name="dp_243">276.7500dp</dimen>
-	<dimen name="dp_244">277.8889dp</dimen>
-	<dimen name="dp_245">279.0278dp</dimen>
-	<dimen name="dp_246">280.1667dp</dimen>
-	<dimen name="dp_247">281.3056dp</dimen>
-	<dimen name="dp_248">282.4444dp</dimen>
-	<dimen name="dp_249">283.5833dp</dimen>
-	<dimen name="dp_250">284.7222dp</dimen>
-	<dimen name="dp_251">285.8611dp</dimen>
-	<dimen name="dp_252">287.0000dp</dimen>
-	<dimen name="dp_253">288.1389dp</dimen>
-	<dimen name="dp_254">289.2778dp</dimen>
-	<dimen name="dp_255">290.4167dp</dimen>
-	<dimen name="dp_256">291.5556dp</dimen>
-	<dimen name="dp_257">292.6944dp</dimen>
-	<dimen name="dp_258">293.8333dp</dimen>
-	<dimen name="dp_259">294.9722dp</dimen>
-	<dimen name="dp_260">296.1111dp</dimen>
-	<dimen name="dp_261">297.2500dp</dimen>
-	<dimen name="dp_262">298.3889dp</dimen>
-	<dimen name="dp_263">299.5278dp</dimen>
-	<dimen name="dp_264">300.6667dp</dimen>
-	<dimen name="dp_265">301.8056dp</dimen>
-	<dimen name="dp_266">302.9444dp</dimen>
-	<dimen name="dp_267">304.0833dp</dimen>
-	<dimen name="dp_268">305.2222dp</dimen>
-	<dimen name="dp_269">306.3611dp</dimen>
-	<dimen name="dp_270">307.5000dp</dimen>
-	<dimen name="dp_271">308.6389dp</dimen>
-	<dimen name="dp_272">309.7778dp</dimen>
-	<dimen name="dp_273">310.9167dp</dimen>
-	<dimen name="dp_274">312.0556dp</dimen>
-	<dimen name="dp_275">313.1944dp</dimen>
-	<dimen name="dp_276">314.3333dp</dimen>
-	<dimen name="dp_277">315.4722dp</dimen>
-	<dimen name="dp_278">316.6111dp</dimen>
-	<dimen name="dp_279">317.7500dp</dimen>
-	<dimen name="dp_280">318.8889dp</dimen>
-	<dimen name="dp_281">320.0278dp</dimen>
-	<dimen name="dp_282">321.1667dp</dimen>
-	<dimen name="dp_283">322.3056dp</dimen>
-	<dimen name="dp_284">323.4444dp</dimen>
-	<dimen name="dp_285">324.5833dp</dimen>
-	<dimen name="dp_286">325.7222dp</dimen>
-	<dimen name="dp_287">326.8611dp</dimen>
-	<dimen name="dp_288">328.0000dp</dimen>
-	<dimen name="dp_289">329.1389dp</dimen>
-	<dimen name="dp_290">330.2778dp</dimen>
-	<dimen name="dp_291">331.4167dp</dimen>
-	<dimen name="dp_292">332.5556dp</dimen>
-	<dimen name="dp_293">333.6944dp</dimen>
-	<dimen name="dp_294">334.8333dp</dimen>
-	<dimen name="dp_295">335.9722dp</dimen>
-	<dimen name="dp_296">337.1111dp</dimen>
-	<dimen name="dp_297">338.2500dp</dimen>
-	<dimen name="dp_298">339.3889dp</dimen>
-	<dimen name="dp_299">340.5278dp</dimen>
-	<dimen name="dp_300">341.6667dp</dimen>
-	<dimen name="dp_301">342.8056dp</dimen>
-	<dimen name="dp_302">343.9444dp</dimen>
-	<dimen name="dp_303">345.0833dp</dimen>
-	<dimen name="dp_304">346.2222dp</dimen>
-	<dimen name="dp_305">347.3611dp</dimen>
-	<dimen name="dp_306">348.5000dp</dimen>
-	<dimen name="dp_307">349.6389dp</dimen>
-	<dimen name="dp_308">350.7778dp</dimen>
-	<dimen name="dp_309">351.9167dp</dimen>
-	<dimen name="dp_310">353.0556dp</dimen>
-	<dimen name="dp_311">354.1944dp</dimen>
-	<dimen name="dp_312">355.3333dp</dimen>
-	<dimen name="dp_313">356.4722dp</dimen>
-	<dimen name="dp_314">357.6111dp</dimen>
-	<dimen name="dp_315">358.7500dp</dimen>
-	<dimen name="dp_316">359.8889dp</dimen>
-	<dimen name="dp_317">361.0278dp</dimen>
-	<dimen name="dp_318">362.1667dp</dimen>
-	<dimen name="dp_319">363.3056dp</dimen>
-	<dimen name="dp_320">364.4444dp</dimen>
-	<dimen name="dp_321">365.5833dp</dimen>
-	<dimen name="dp_322">366.7222dp</dimen>
-	<dimen name="dp_323">367.8611dp</dimen>
-	<dimen name="dp_324">369.0000dp</dimen>
-	<dimen name="dp_325">370.1389dp</dimen>
-	<dimen name="dp_326">371.2778dp</dimen>
-	<dimen name="dp_327">372.4167dp</dimen>
-	<dimen name="dp_328">373.5556dp</dimen>
-	<dimen name="dp_329">374.6944dp</dimen>
-	<dimen name="dp_330">375.8333dp</dimen>
-	<dimen name="dp_331">376.9722dp</dimen>
-	<dimen name="dp_332">378.1111dp</dimen>
-	<dimen name="dp_333">379.2500dp</dimen>
-	<dimen name="dp_334">380.3889dp</dimen>
-	<dimen name="dp_335">381.5278dp</dimen>
-	<dimen name="dp_336">382.6667dp</dimen>
-	<dimen name="dp_337">383.8056dp</dimen>
-	<dimen name="dp_338">384.9444dp</dimen>
-	<dimen name="dp_339">386.0833dp</dimen>
-	<dimen name="dp_340">387.2222dp</dimen>
-	<dimen name="dp_341">388.3611dp</dimen>
-	<dimen name="dp_342">389.5000dp</dimen>
-	<dimen name="dp_343">390.6389dp</dimen>
-	<dimen name="dp_344">391.7778dp</dimen>
-	<dimen name="dp_345">392.9167dp</dimen>
-	<dimen name="dp_346">394.0556dp</dimen>
-	<dimen name="dp_347">395.1944dp</dimen>
-	<dimen name="dp_348">396.3333dp</dimen>
-	<dimen name="dp_349">397.4722dp</dimen>
-	<dimen name="dp_350">398.6111dp</dimen>
-	<dimen name="dp_351">399.7500dp</dimen>
-	<dimen name="dp_352">400.8889dp</dimen>
-	<dimen name="dp_353">402.0278dp</dimen>
-	<dimen name="dp_354">403.1667dp</dimen>
-	<dimen name="dp_355">404.3056dp</dimen>
-	<dimen name="dp_356">405.4444dp</dimen>
-	<dimen name="dp_357">406.5833dp</dimen>
-	<dimen name="dp_358">407.7222dp</dimen>
-	<dimen name="dp_359">408.8611dp</dimen>
-	<dimen name="dp_360">410.0000dp</dimen>
-	<dimen name="dp_365">415.6944dp</dimen>
-	<dimen name="dp_370">421.3889dp</dimen>
-	<dimen name="dp_400">455.5556dp</dimen>
-	<dimen name="dp_410">466.9444dp</dimen>
-	<dimen name="dp_422">480.6111dp</dimen>
-	<dimen name="dp_472">537.5556dp</dimen>
-	<dimen name="dp_500">569.4444dp</dimen>
-	<dimen name="dp_600">683.3333dp</dimen>
-	<dimen name="dp_640">728.8889dp</dimen>
-	<dimen name="dp_720">820.0000dp</dimen>
-	<dimen name="sp_6">6.8333sp</dimen>
-	<dimen name="sp_7">7.9722sp</dimen>
-	<dimen name="sp_8">9.1111sp</dimen>
-	<dimen name="sp_9">10.2500sp</dimen>
-	<dimen name="sp_10">11.3889sp</dimen>
-	<dimen name="sp_11">12.5278sp</dimen>
-	<dimen name="sp_12">13.6667sp</dimen>
-	<dimen name="sp_13">14.8056sp</dimen>
-	<dimen name="sp_14">15.9444sp</dimen>
-	<dimen name="sp_15">17.0833sp</dimen>
-	<dimen name="sp_16">18.2222sp</dimen>
-	<dimen name="sp_17">19.3611sp</dimen>
-	<dimen name="sp_18">20.5000sp</dimen>
-	<dimen name="sp_19">21.6389sp</dimen>
-	<dimen name="sp_20">22.7778sp</dimen>
-	<dimen name="sp_21">23.9167sp</dimen>
-	<dimen name="sp_22">25.0556sp</dimen>
-	<dimen name="sp_23">26.1944sp</dimen>
-	<dimen name="sp_24">27.3333sp</dimen>
-	<dimen name="sp_25">28.4722sp</dimen>
-	<dimen name="sp_28">31.8889sp</dimen>
-	<dimen name="sp_30">34.1667sp</dimen>
-	<dimen name="sp_32">36.4444sp</dimen>
-	<dimen name="sp_34">38.7222sp</dimen>
-	<dimen name="sp_36">41.0000sp</dimen>
-	<dimen name="sp_38">43.2778sp</dimen>
-	<dimen name="sp_40">45.5556sp</dimen>
-	<dimen name="sp_42">47.8333sp</dimen>
-	<dimen name="sp_48">54.6667sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw411dp/dimens.xml b/app/src/main/res/values-sw411dp/dimens.xml
deleted file mode 100644
index 4241e41..0000000
--- a/app/src/main/res/values-sw411dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-68.5714dp</dimen>
-	<dimen name="dp_m_30">-34.2857dp</dimen>
-	<dimen name="dp_m_20">-22.8571dp</dimen>
-	<dimen name="dp_m_12">-13.7143dp</dimen>
-	<dimen name="dp_m_10">-11.4286dp</dimen>
-	<dimen name="dp_m_8">-9.1429dp</dimen>
-	<dimen name="dp_m_5">-5.7143dp</dimen>
-	<dimen name="dp_m_2">-2.2857dp</dimen>
-	<dimen name="dp_m_1">-1.1429dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.1143dp</dimen>
-	<dimen name="dp_0_5">0.5714dp</dimen>
-	<dimen name="dp_1">1.1429dp</dimen>
-	<dimen name="dp_1_5">1.7143dp</dimen>
-	<dimen name="dp_2">2.2857dp</dimen>
-	<dimen name="dp_2_5">2.8571dp</dimen>
-	<dimen name="dp_3">3.4286dp</dimen>
-	<dimen name="dp_3_5">4.0000dp</dimen>
-	<dimen name="dp_4">4.5714dp</dimen>
-	<dimen name="dp_4_5">5.1429dp</dimen>
-	<dimen name="dp_5">5.7143dp</dimen>
-	<dimen name="dp_6">6.8571dp</dimen>
-	<dimen name="dp_7">8.0000dp</dimen>
-	<dimen name="dp_8">9.1429dp</dimen>
-	<dimen name="dp_9">10.2857dp</dimen>
-	<dimen name="dp_10">11.4286dp</dimen>
-	<dimen name="dp_11">12.5714dp</dimen>
-	<dimen name="dp_12">13.7143dp</dimen>
-	<dimen name="dp_13">14.8571dp</dimen>
-	<dimen name="dp_14">16.0000dp</dimen>
-	<dimen name="dp_15">17.1429dp</dimen>
-	<dimen name="dp_16">18.2857dp</dimen>
-	<dimen name="dp_17">19.4286dp</dimen>
-	<dimen name="dp_18">20.5714dp</dimen>
-	<dimen name="dp_19">21.7143dp</dimen>
-	<dimen name="dp_20">22.8571dp</dimen>
-	<dimen name="dp_21">24.0000dp</dimen>
-	<dimen name="dp_22">25.1429dp</dimen>
-	<dimen name="dp_23">26.2857dp</dimen>
-	<dimen name="dp_24">27.4286dp</dimen>
-	<dimen name="dp_25">28.5714dp</dimen>
-	<dimen name="dp_26">29.7143dp</dimen>
-	<dimen name="dp_27">30.8571dp</dimen>
-	<dimen name="dp_28">32.0000dp</dimen>
-	<dimen name="dp_29">33.1429dp</dimen>
-	<dimen name="dp_30">34.2857dp</dimen>
-	<dimen name="dp_31">35.4286dp</dimen>
-	<dimen name="dp_32">36.5714dp</dimen>
-	<dimen name="dp_33">37.7143dp</dimen>
-	<dimen name="dp_34">38.8571dp</dimen>
-	<dimen name="dp_35">40.0000dp</dimen>
-	<dimen name="dp_36">41.1428dp</dimen>
-	<dimen name="dp_37">42.2857dp</dimen>
-	<dimen name="dp_38">43.4286dp</dimen>
-	<dimen name="dp_39">44.5714dp</dimen>
-	<dimen name="dp_40">45.7143dp</dimen>
-	<dimen name="dp_41">46.8571dp</dimen>
-	<dimen name="dp_42">48.0000dp</dimen>
-	<dimen name="dp_43">49.1428dp</dimen>
-	<dimen name="dp_44">50.2857dp</dimen>
-	<dimen name="dp_45">51.4286dp</dimen>
-	<dimen name="dp_46">52.5714dp</dimen>
-	<dimen name="dp_47">53.7143dp</dimen>
-	<dimen name="dp_48">54.8571dp</dimen>
-	<dimen name="dp_49">56.0000dp</dimen>
-	<dimen name="dp_50">57.1428dp</dimen>
-	<dimen name="dp_51">58.2857dp</dimen>
-	<dimen name="dp_52">59.4286dp</dimen>
-	<dimen name="dp_53">60.5714dp</dimen>
-	<dimen name="dp_54">61.7143dp</dimen>
-	<dimen name="dp_55">62.8571dp</dimen>
-	<dimen name="dp_56">64.0000dp</dimen>
-	<dimen name="dp_57">65.1428dp</dimen>
-	<dimen name="dp_58">66.2857dp</dimen>
-	<dimen name="dp_59">67.4286dp</dimen>
-	<dimen name="dp_60">68.5714dp</dimen>
-	<dimen name="dp_61">69.7143dp</dimen>
-	<dimen name="dp_62">70.8571dp</dimen>
-	<dimen name="dp_63">72.0000dp</dimen>
-	<dimen name="dp_64">73.1428dp</dimen>
-	<dimen name="dp_65">74.2857dp</dimen>
-	<dimen name="dp_66">75.4286dp</dimen>
-	<dimen name="dp_67">76.5714dp</dimen>
-	<dimen name="dp_68">77.7143dp</dimen>
-	<dimen name="dp_69">78.8571dp</dimen>
-	<dimen name="dp_70">80.0000dp</dimen>
-	<dimen name="dp_71">81.1428dp</dimen>
-	<dimen name="dp_72">82.2857dp</dimen>
-	<dimen name="dp_73">83.4286dp</dimen>
-	<dimen name="dp_74">84.5714dp</dimen>
-	<dimen name="dp_75">85.7143dp</dimen>
-	<dimen name="dp_76">86.8571dp</dimen>
-	<dimen name="dp_77">88.0000dp</dimen>
-	<dimen name="dp_78">89.1428dp</dimen>
-	<dimen name="dp_79">90.2857dp</dimen>
-	<dimen name="dp_80">91.4286dp</dimen>
-	<dimen name="dp_81">92.5714dp</dimen>
-	<dimen name="dp_82">93.7143dp</dimen>
-	<dimen name="dp_83">94.8571dp</dimen>
-	<dimen name="dp_84">96.0000dp</dimen>
-	<dimen name="dp_85">97.1428dp</dimen>
-	<dimen name="dp_86">98.2857dp</dimen>
-	<dimen name="dp_87">99.4286dp</dimen>
-	<dimen name="dp_88">100.5714dp</dimen>
-	<dimen name="dp_89">101.7143dp</dimen>
-	<dimen name="dp_90">102.8571dp</dimen>
-	<dimen name="dp_91">104.0000dp</dimen>
-	<dimen name="dp_92">105.1428dp</dimen>
-	<dimen name="dp_93">106.2857dp</dimen>
-	<dimen name="dp_94">107.4286dp</dimen>
-	<dimen name="dp_95">108.5714dp</dimen>
-	<dimen name="dp_96">109.7143dp</dimen>
-	<dimen name="dp_97">110.8571dp</dimen>
-	<dimen name="dp_98">112.0000dp</dimen>
-	<dimen name="dp_99">113.1428dp</dimen>
-	<dimen name="dp_100">114.2857dp</dimen>
-	<dimen name="dp_101">115.4286dp</dimen>
-	<dimen name="dp_102">116.5714dp</dimen>
-	<dimen name="dp_103">117.7143dp</dimen>
-	<dimen name="dp_104">118.8571dp</dimen>
-	<dimen name="dp_105">120.0000dp</dimen>
-	<dimen name="dp_106">121.1428dp</dimen>
-	<dimen name="dp_107">122.2857dp</dimen>
-	<dimen name="dp_108">123.4285dp</dimen>
-	<dimen name="dp_109">124.5714dp</dimen>
-	<dimen name="dp_110">125.7143dp</dimen>
-	<dimen name="dp_111">126.8571dp</dimen>
-	<dimen name="dp_112">128.0000dp</dimen>
-	<dimen name="dp_113">129.1428dp</dimen>
-	<dimen name="dp_114">130.2857dp</dimen>
-	<dimen name="dp_115">131.4285dp</dimen>
-	<dimen name="dp_116">132.5714dp</dimen>
-	<dimen name="dp_117">133.7143dp</dimen>
-	<dimen name="dp_118">134.8571dp</dimen>
-	<dimen name="dp_119">136.0000dp</dimen>
-	<dimen name="dp_120">137.1428dp</dimen>
-	<dimen name="dp_121">138.2857dp</dimen>
-	<dimen name="dp_122">139.4285dp</dimen>
-	<dimen name="dp_123">140.5714dp</dimen>
-	<dimen name="dp_124">141.7143dp</dimen>
-	<dimen name="dp_125">142.8571dp</dimen>
-	<dimen name="dp_126">144.0000dp</dimen>
-	<dimen name="dp_127">145.1428dp</dimen>
-	<dimen name="dp_128">146.2857dp</dimen>
-	<dimen name="dp_129">147.4285dp</dimen>
-	<dimen name="dp_130">148.5714dp</dimen>
-	<dimen name="dp_131">149.7143dp</dimen>
-	<dimen name="dp_132">150.8571dp</dimen>
-	<dimen name="dp_133">152.0000dp</dimen>
-	<dimen name="dp_134">153.1428dp</dimen>
-	<dimen name="dp_135">154.2857dp</dimen>
-	<dimen name="dp_136">155.4285dp</dimen>
-	<dimen name="dp_137">156.5714dp</dimen>
-	<dimen name="dp_138">157.7143dp</dimen>
-	<dimen name="dp_139">158.8571dp</dimen>
-	<dimen name="dp_140">160.0000dp</dimen>
-	<dimen name="dp_141">161.1428dp</dimen>
-	<dimen name="dp_142">162.2857dp</dimen>
-	<dimen name="dp_143">163.4285dp</dimen>
-	<dimen name="dp_144">164.5714dp</dimen>
-	<dimen name="dp_145">165.7143dp</dimen>
-	<dimen name="dp_146">166.8571dp</dimen>
-	<dimen name="dp_147">168.0000dp</dimen>
-	<dimen name="dp_148">169.1428dp</dimen>
-	<dimen name="dp_149">170.2857dp</dimen>
-	<dimen name="dp_150">171.4285dp</dimen>
-	<dimen name="dp_151">172.5714dp</dimen>
-	<dimen name="dp_152">173.7143dp</dimen>
-	<dimen name="dp_153">174.8571dp</dimen>
-	<dimen name="dp_154">176.0000dp</dimen>
-	<dimen name="dp_155">177.1428dp</dimen>
-	<dimen name="dp_156">178.2857dp</dimen>
-	<dimen name="dp_157">179.4285dp</dimen>
-	<dimen name="dp_158">180.5714dp</dimen>
-	<dimen name="dp_159">181.7143dp</dimen>
-	<dimen name="dp_160">182.8571dp</dimen>
-	<dimen name="dp_161">184.0000dp</dimen>
-	<dimen name="dp_162">185.1428dp</dimen>
-	<dimen name="dp_163">186.2857dp</dimen>
-	<dimen name="dp_164">187.4285dp</dimen>
-	<dimen name="dp_165">188.5714dp</dimen>
-	<dimen name="dp_166">189.7143dp</dimen>
-	<dimen name="dp_167">190.8571dp</dimen>
-	<dimen name="dp_168">192.0000dp</dimen>
-	<dimen name="dp_169">193.1428dp</dimen>
-	<dimen name="dp_170">194.2857dp</dimen>
-	<dimen name="dp_171">195.4285dp</dimen>
-	<dimen name="dp_172">196.5714dp</dimen>
-	<dimen name="dp_173">197.7143dp</dimen>
-	<dimen name="dp_174">198.8571dp</dimen>
-	<dimen name="dp_175">200.0000dp</dimen>
-	<dimen name="dp_176">201.1428dp</dimen>
-	<dimen name="dp_177">202.2857dp</dimen>
-	<dimen name="dp_178">203.4285dp</dimen>
-	<dimen name="dp_179">204.5714dp</dimen>
-	<dimen name="dp_180">205.7142dp</dimen>
-	<dimen name="dp_181">206.8571dp</dimen>
-	<dimen name="dp_182">208.0000dp</dimen>
-	<dimen name="dp_183">209.1428dp</dimen>
-	<dimen name="dp_184">210.2857dp</dimen>
-	<dimen name="dp_185">211.4285dp</dimen>
-	<dimen name="dp_186">212.5714dp</dimen>
-	<dimen name="dp_187">213.7142dp</dimen>
-	<dimen name="dp_188">214.8571dp</dimen>
-	<dimen name="dp_189">216.0000dp</dimen>
-	<dimen name="dp_190">217.1428dp</dimen>
-	<dimen name="dp_191">218.2857dp</dimen>
-	<dimen name="dp_192">219.4285dp</dimen>
-	<dimen name="dp_193">220.5714dp</dimen>
-	<dimen name="dp_194">221.7142dp</dimen>
-	<dimen name="dp_195">222.8571dp</dimen>
-	<dimen name="dp_196">224.0000dp</dimen>
-	<dimen name="dp_197">225.1428dp</dimen>
-	<dimen name="dp_198">226.2857dp</dimen>
-	<dimen name="dp_199">227.4285dp</dimen>
-	<dimen name="dp_200">228.5714dp</dimen>
-	<dimen name="dp_201">229.7142dp</dimen>
-	<dimen name="dp_202">230.8571dp</dimen>
-	<dimen name="dp_203">232.0000dp</dimen>
-	<dimen name="dp_204">233.1428dp</dimen>
-	<dimen name="dp_205">234.2857dp</dimen>
-	<dimen name="dp_206">235.4285dp</dimen>
-	<dimen name="dp_207">236.5714dp</dimen>
-	<dimen name="dp_208">237.7142dp</dimen>
-	<dimen name="dp_209">238.8571dp</dimen>
-	<dimen name="dp_210">240.0000dp</dimen>
-	<dimen name="dp_211">241.1428dp</dimen>
-	<dimen name="dp_212">242.2857dp</dimen>
-	<dimen name="dp_213">243.4285dp</dimen>
-	<dimen name="dp_214">244.5714dp</dimen>
-	<dimen name="dp_215">245.7142dp</dimen>
-	<dimen name="dp_216">246.8571dp</dimen>
-	<dimen name="dp_217">248.0000dp</dimen>
-	<dimen name="dp_218">249.1428dp</dimen>
-	<dimen name="dp_219">250.2857dp</dimen>
-	<dimen name="dp_220">251.4285dp</dimen>
-	<dimen name="dp_221">252.5714dp</dimen>
-	<dimen name="dp_222">253.7142dp</dimen>
-	<dimen name="dp_223">254.8571dp</dimen>
-	<dimen name="dp_224">256.0000dp</dimen>
-	<dimen name="dp_225">257.1428dp</dimen>
-	<dimen name="dp_226">258.2857dp</dimen>
-	<dimen name="dp_227">259.4285dp</dimen>
-	<dimen name="dp_228">260.5714dp</dimen>
-	<dimen name="dp_229">261.7142dp</dimen>
-	<dimen name="dp_230">262.8571dp</dimen>
-	<dimen name="dp_231">264.0000dp</dimen>
-	<dimen name="dp_232">265.1428dp</dimen>
-	<dimen name="dp_233">266.2857dp</dimen>
-	<dimen name="dp_234">267.4285dp</dimen>
-	<dimen name="dp_235">268.5714dp</dimen>
-	<dimen name="dp_236">269.7142dp</dimen>
-	<dimen name="dp_237">270.8571dp</dimen>
-	<dimen name="dp_238">272.0000dp</dimen>
-	<dimen name="dp_239">273.1428dp</dimen>
-	<dimen name="dp_240">274.2857dp</dimen>
-	<dimen name="dp_241">275.4285dp</dimen>
-	<dimen name="dp_242">276.5714dp</dimen>
-	<dimen name="dp_243">277.7142dp</dimen>
-	<dimen name="dp_244">278.8571dp</dimen>
-	<dimen name="dp_245">280.0000dp</dimen>
-	<dimen name="dp_246">281.1428dp</dimen>
-	<dimen name="dp_247">282.2857dp</dimen>
-	<dimen name="dp_248">283.4285dp</dimen>
-	<dimen name="dp_249">284.5714dp</dimen>
-	<dimen name="dp_250">285.7142dp</dimen>
-	<dimen name="dp_251">286.8571dp</dimen>
-	<dimen name="dp_252">287.9999dp</dimen>
-	<dimen name="dp_253">289.1428dp</dimen>
-	<dimen name="dp_254">290.2857dp</dimen>
-	<dimen name="dp_255">291.4285dp</dimen>
-	<dimen name="dp_256">292.5714dp</dimen>
-	<dimen name="dp_257">293.7142dp</dimen>
-	<dimen name="dp_258">294.8571dp</dimen>
-	<dimen name="dp_259">295.9999dp</dimen>
-	<dimen name="dp_260">297.1428dp</dimen>
-	<dimen name="dp_261">298.2857dp</dimen>
-	<dimen name="dp_262">299.4285dp</dimen>
-	<dimen name="dp_263">300.5714dp</dimen>
-	<dimen name="dp_264">301.7142dp</dimen>
-	<dimen name="dp_265">302.8571dp</dimen>
-	<dimen name="dp_266">303.9999dp</dimen>
-	<dimen name="dp_267">305.1428dp</dimen>
-	<dimen name="dp_268">306.2857dp</dimen>
-	<dimen name="dp_269">307.4285dp</dimen>
-	<dimen name="dp_270">308.5714dp</dimen>
-	<dimen name="dp_271">309.7142dp</dimen>
-	<dimen name="dp_272">310.8571dp</dimen>
-	<dimen name="dp_273">311.9999dp</dimen>
-	<dimen name="dp_274">313.1428dp</dimen>
-	<dimen name="dp_275">314.2857dp</dimen>
-	<dimen name="dp_276">315.4285dp</dimen>
-	<dimen name="dp_277">316.5714dp</dimen>
-	<dimen name="dp_278">317.7142dp</dimen>
-	<dimen name="dp_279">318.8571dp</dimen>
-	<dimen name="dp_280">319.9999dp</dimen>
-	<dimen name="dp_281">321.1428dp</dimen>
-	<dimen name="dp_282">322.2857dp</dimen>
-	<dimen name="dp_283">323.4285dp</dimen>
-	<dimen name="dp_284">324.5714dp</dimen>
-	<dimen name="dp_285">325.7142dp</dimen>
-	<dimen name="dp_286">326.8571dp</dimen>
-	<dimen name="dp_287">327.9999dp</dimen>
-	<dimen name="dp_288">329.1428dp</dimen>
-	<dimen name="dp_289">330.2857dp</dimen>
-	<dimen name="dp_290">331.4285dp</dimen>
-	<dimen name="dp_291">332.5714dp</dimen>
-	<dimen name="dp_292">333.7142dp</dimen>
-	<dimen name="dp_293">334.8571dp</dimen>
-	<dimen name="dp_294">335.9999dp</dimen>
-	<dimen name="dp_295">337.1428dp</dimen>
-	<dimen name="dp_296">338.2857dp</dimen>
-	<dimen name="dp_297">339.4285dp</dimen>
-	<dimen name="dp_298">340.5714dp</dimen>
-	<dimen name="dp_299">341.7142dp</dimen>
-	<dimen name="dp_300">342.8571dp</dimen>
-	<dimen name="dp_301">343.9999dp</dimen>
-	<dimen name="dp_302">345.1428dp</dimen>
-	<dimen name="dp_303">346.2857dp</dimen>
-	<dimen name="dp_304">347.4285dp</dimen>
-	<dimen name="dp_305">348.5714dp</dimen>
-	<dimen name="dp_306">349.7142dp</dimen>
-	<dimen name="dp_307">350.8571dp</dimen>
-	<dimen name="dp_308">351.9999dp</dimen>
-	<dimen name="dp_309">353.1428dp</dimen>
-	<dimen name="dp_310">354.2857dp</dimen>
-	<dimen name="dp_311">355.4285dp</dimen>
-	<dimen name="dp_312">356.5714dp</dimen>
-	<dimen name="dp_313">357.7142dp</dimen>
-	<dimen name="dp_314">358.8571dp</dimen>
-	<dimen name="dp_315">359.9999dp</dimen>
-	<dimen name="dp_316">361.1428dp</dimen>
-	<dimen name="dp_317">362.2857dp</dimen>
-	<dimen name="dp_318">363.4285dp</dimen>
-	<dimen name="dp_319">364.5714dp</dimen>
-	<dimen name="dp_320">365.7142dp</dimen>
-	<dimen name="dp_321">366.8571dp</dimen>
-	<dimen name="dp_322">367.9999dp</dimen>
-	<dimen name="dp_323">369.1428dp</dimen>
-	<dimen name="dp_324">370.2856dp</dimen>
-	<dimen name="dp_325">371.4285dp</dimen>
-	<dimen name="dp_326">372.5714dp</dimen>
-	<dimen name="dp_327">373.7142dp</dimen>
-	<dimen name="dp_328">374.8571dp</dimen>
-	<dimen name="dp_329">375.9999dp</dimen>
-	<dimen name="dp_330">377.1428dp</dimen>
-	<dimen name="dp_331">378.2856dp</dimen>
-	<dimen name="dp_332">379.4285dp</dimen>
-	<dimen name="dp_333">380.5714dp</dimen>
-	<dimen name="dp_334">381.7142dp</dimen>
-	<dimen name="dp_335">382.8571dp</dimen>
-	<dimen name="dp_336">383.9999dp</dimen>
-	<dimen name="dp_337">385.1428dp</dimen>
-	<dimen name="dp_338">386.2856dp</dimen>
-	<dimen name="dp_339">387.4285dp</dimen>
-	<dimen name="dp_340">388.5714dp</dimen>
-	<dimen name="dp_341">389.7142dp</dimen>
-	<dimen name="dp_342">390.8571dp</dimen>
-	<dimen name="dp_343">391.9999dp</dimen>
-	<dimen name="dp_344">393.1428dp</dimen>
-	<dimen name="dp_345">394.2856dp</dimen>
-	<dimen name="dp_346">395.4285dp</dimen>
-	<dimen name="dp_347">396.5714dp</dimen>
-	<dimen name="dp_348">397.7142dp</dimen>
-	<dimen name="dp_349">398.8571dp</dimen>
-	<dimen name="dp_350">399.9999dp</dimen>
-	<dimen name="dp_351">401.1428dp</dimen>
-	<dimen name="dp_352">402.2856dp</dimen>
-	<dimen name="dp_353">403.4285dp</dimen>
-	<dimen name="dp_354">404.5714dp</dimen>
-	<dimen name="dp_355">405.7142dp</dimen>
-	<dimen name="dp_356">406.8571dp</dimen>
-	<dimen name="dp_357">407.9999dp</dimen>
-	<dimen name="dp_358">409.1428dp</dimen>
-	<dimen name="dp_359">410.2856dp</dimen>
-	<dimen name="dp_360">411.4285dp</dimen>
-	<dimen name="dp_365">417.1428dp</dimen>
-	<dimen name="dp_370">422.8571dp</dimen>
-	<dimen name="dp_400">457.1428dp</dimen>
-	<dimen name="dp_410">468.5713dp</dimen>
-	<dimen name="dp_422">482.2856dp</dimen>
-	<dimen name="dp_472">539.4285dp</dimen>
-	<dimen name="dp_500">571.4285dp</dimen>
-	<dimen name="dp_600">685.7142dp</dimen>
-	<dimen name="dp_640">731.4284dp</dimen>
-	<dimen name="dp_720">822.8570dp</dimen>
-	<dimen name="sp_6">6.8571sp</dimen>
-	<dimen name="sp_7">8.0000sp</dimen>
-	<dimen name="sp_8">9.1429sp</dimen>
-	<dimen name="sp_9">10.2857sp</dimen>
-	<dimen name="sp_10">11.4286sp</dimen>
-	<dimen name="sp_11">12.5714sp</dimen>
-	<dimen name="sp_12">13.7143sp</dimen>
-	<dimen name="sp_13">14.8571sp</dimen>
-	<dimen name="sp_14">16.0000sp</dimen>
-	<dimen name="sp_15">17.1429sp</dimen>
-	<dimen name="sp_16">18.2857sp</dimen>
-	<dimen name="sp_17">19.4286sp</dimen>
-	<dimen name="sp_18">20.5714sp</dimen>
-	<dimen name="sp_19">21.7143sp</dimen>
-	<dimen name="sp_20">22.8571sp</dimen>
-	<dimen name="sp_21">24.0000sp</dimen>
-	<dimen name="sp_22">25.1429sp</dimen>
-	<dimen name="sp_23">26.2857sp</dimen>
-	<dimen name="sp_24">27.4286sp</dimen>
-	<dimen name="sp_25">28.5714sp</dimen>
-	<dimen name="sp_28">32.0000sp</dimen>
-	<dimen name="sp_30">34.2857sp</dimen>
-	<dimen name="sp_32">36.5714sp</dimen>
-	<dimen name="sp_34">38.8571sp</dimen>
-	<dimen name="sp_36">41.1428sp</dimen>
-	<dimen name="sp_38">43.4286sp</dimen>
-	<dimen name="sp_40">45.7143sp</dimen>
-	<dimen name="sp_42">48.0000sp</dimen>
-	<dimen name="sp_48">54.8571sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw432dp/dimens.xml b/app/src/main/res/values-sw432dp/dimens.xml
deleted file mode 100644
index 5c42af7..0000000
--- a/app/src/main/res/values-sw432dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-72.0000dp</dimen>
-	<dimen name="dp_m_30">-36.0000dp</dimen>
-	<dimen name="dp_m_20">-24.0000dp</dimen>
-	<dimen name="dp_m_12">-14.4000dp</dimen>
-	<dimen name="dp_m_10">-12.0000dp</dimen>
-	<dimen name="dp_m_8">-9.6000dp</dimen>
-	<dimen name="dp_m_5">-6.0000dp</dimen>
-	<dimen name="dp_m_2">-2.4000dp</dimen>
-	<dimen name="dp_m_1">-1.2000dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.1200dp</dimen>
-	<dimen name="dp_0_5">0.6000dp</dimen>
-	<dimen name="dp_1">1.2000dp</dimen>
-	<dimen name="dp_1_5">1.8000dp</dimen>
-	<dimen name="dp_2">2.4000dp</dimen>
-	<dimen name="dp_2_5">3.0000dp</dimen>
-	<dimen name="dp_3">3.6000dp</dimen>
-	<dimen name="dp_3_5">4.2000dp</dimen>
-	<dimen name="dp_4">4.8000dp</dimen>
-	<dimen name="dp_4_5">5.4000dp</dimen>
-	<dimen name="dp_5">6.0000dp</dimen>
-	<dimen name="dp_6">7.2000dp</dimen>
-	<dimen name="dp_7">8.4000dp</dimen>
-	<dimen name="dp_8">9.6000dp</dimen>
-	<dimen name="dp_9">10.8000dp</dimen>
-	<dimen name="dp_10">12.0000dp</dimen>
-	<dimen name="dp_11">13.2000dp</dimen>
-	<dimen name="dp_12">14.4000dp</dimen>
-	<dimen name="dp_13">15.6000dp</dimen>
-	<dimen name="dp_14">16.8000dp</dimen>
-	<dimen name="dp_15">18.0000dp</dimen>
-	<dimen name="dp_16">19.2000dp</dimen>
-	<dimen name="dp_17">20.4000dp</dimen>
-	<dimen name="dp_18">21.6000dp</dimen>
-	<dimen name="dp_19">22.8000dp</dimen>
-	<dimen name="dp_20">24.0000dp</dimen>
-	<dimen name="dp_21">25.2000dp</dimen>
-	<dimen name="dp_22">26.4000dp</dimen>
-	<dimen name="dp_23">27.6000dp</dimen>
-	<dimen name="dp_24">28.8000dp</dimen>
-	<dimen name="dp_25">30.0000dp</dimen>
-	<dimen name="dp_26">31.2000dp</dimen>
-	<dimen name="dp_27">32.4000dp</dimen>
-	<dimen name="dp_28">33.6000dp</dimen>
-	<dimen name="dp_29">34.8000dp</dimen>
-	<dimen name="dp_30">36.0000dp</dimen>
-	<dimen name="dp_31">37.2000dp</dimen>
-	<dimen name="dp_32">38.4000dp</dimen>
-	<dimen name="dp_33">39.6000dp</dimen>
-	<dimen name="dp_34">40.8000dp</dimen>
-	<dimen name="dp_35">42.0000dp</dimen>
-	<dimen name="dp_36">43.2000dp</dimen>
-	<dimen name="dp_37">44.4000dp</dimen>
-	<dimen name="dp_38">45.6000dp</dimen>
-	<dimen name="dp_39">46.8000dp</dimen>
-	<dimen name="dp_40">48.0000dp</dimen>
-	<dimen name="dp_41">49.2000dp</dimen>
-	<dimen name="dp_42">50.4000dp</dimen>
-	<dimen name="dp_43">51.6000dp</dimen>
-	<dimen name="dp_44">52.8000dp</dimen>
-	<dimen name="dp_45">54.0000dp</dimen>
-	<dimen name="dp_46">55.2000dp</dimen>
-	<dimen name="dp_47">56.4000dp</dimen>
-	<dimen name="dp_48">57.6000dp</dimen>
-	<dimen name="dp_49">58.8000dp</dimen>
-	<dimen name="dp_50">60.0000dp</dimen>
-	<dimen name="dp_51">61.2000dp</dimen>
-	<dimen name="dp_52">62.4000dp</dimen>
-	<dimen name="dp_53">63.6000dp</dimen>
-	<dimen name="dp_54">64.8000dp</dimen>
-	<dimen name="dp_55">66.0000dp</dimen>
-	<dimen name="dp_56">67.2000dp</dimen>
-	<dimen name="dp_57">68.4000dp</dimen>
-	<dimen name="dp_58">69.6000dp</dimen>
-	<dimen name="dp_59">70.8000dp</dimen>
-	<dimen name="dp_60">72.0000dp</dimen>
-	<dimen name="dp_61">73.2000dp</dimen>
-	<dimen name="dp_62">74.4000dp</dimen>
-	<dimen name="dp_63">75.6000dp</dimen>
-	<dimen name="dp_64">76.8000dp</dimen>
-	<dimen name="dp_65">78.0000dp</dimen>
-	<dimen name="dp_66">79.2000dp</dimen>
-	<dimen name="dp_67">80.4000dp</dimen>
-	<dimen name="dp_68">81.6000dp</dimen>
-	<dimen name="dp_69">82.8000dp</dimen>
-	<dimen name="dp_70">84.0000dp</dimen>
-	<dimen name="dp_71">85.2000dp</dimen>
-	<dimen name="dp_72">86.4000dp</dimen>
-	<dimen name="dp_73">87.6000dp</dimen>
-	<dimen name="dp_74">88.8000dp</dimen>
-	<dimen name="dp_75">90.0000dp</dimen>
-	<dimen name="dp_76">91.2000dp</dimen>
-	<dimen name="dp_77">92.4000dp</dimen>
-	<dimen name="dp_78">93.6000dp</dimen>
-	<dimen name="dp_79">94.8000dp</dimen>
-	<dimen name="dp_80">96.0000dp</dimen>
-	<dimen name="dp_81">97.2000dp</dimen>
-	<dimen name="dp_82">98.4000dp</dimen>
-	<dimen name="dp_83">99.6000dp</dimen>
-	<dimen name="dp_84">100.8000dp</dimen>
-	<dimen name="dp_85">102.0000dp</dimen>
-	<dimen name="dp_86">103.2000dp</dimen>
-	<dimen name="dp_87">104.4000dp</dimen>
-	<dimen name="dp_88">105.6000dp</dimen>
-	<dimen name="dp_89">106.8000dp</dimen>
-	<dimen name="dp_90">108.0000dp</dimen>
-	<dimen name="dp_91">109.2000dp</dimen>
-	<dimen name="dp_92">110.4000dp</dimen>
-	<dimen name="dp_93">111.6000dp</dimen>
-	<dimen name="dp_94">112.8000dp</dimen>
-	<dimen name="dp_95">114.0000dp</dimen>
-	<dimen name="dp_96">115.2000dp</dimen>
-	<dimen name="dp_97">116.4000dp</dimen>
-	<dimen name="dp_98">117.6000dp</dimen>
-	<dimen name="dp_99">118.8000dp</dimen>
-	<dimen name="dp_100">120.0000dp</dimen>
-	<dimen name="dp_101">121.2000dp</dimen>
-	<dimen name="dp_102">122.4000dp</dimen>
-	<dimen name="dp_103">123.6000dp</dimen>
-	<dimen name="dp_104">124.8000dp</dimen>
-	<dimen name="dp_105">126.0000dp</dimen>
-	<dimen name="dp_106">127.2000dp</dimen>
-	<dimen name="dp_107">128.4000dp</dimen>
-	<dimen name="dp_108">129.6000dp</dimen>
-	<dimen name="dp_109">130.8000dp</dimen>
-	<dimen name="dp_110">132.0000dp</dimen>
-	<dimen name="dp_111">133.2000dp</dimen>
-	<dimen name="dp_112">134.4000dp</dimen>
-	<dimen name="dp_113">135.6000dp</dimen>
-	<dimen name="dp_114">136.8000dp</dimen>
-	<dimen name="dp_115">138.0000dp</dimen>
-	<dimen name="dp_116">139.2000dp</dimen>
-	<dimen name="dp_117">140.4000dp</dimen>
-	<dimen name="dp_118">141.6000dp</dimen>
-	<dimen name="dp_119">142.8000dp</dimen>
-	<dimen name="dp_120">144.0000dp</dimen>
-	<dimen name="dp_121">145.2000dp</dimen>
-	<dimen name="dp_122">146.4000dp</dimen>
-	<dimen name="dp_123">147.6000dp</dimen>
-	<dimen name="dp_124">148.8000dp</dimen>
-	<dimen name="dp_125">150.0000dp</dimen>
-	<dimen name="dp_126">151.2000dp</dimen>
-	<dimen name="dp_127">152.4000dp</dimen>
-	<dimen name="dp_128">153.6000dp</dimen>
-	<dimen name="dp_129">154.8000dp</dimen>
-	<dimen name="dp_130">156.0000dp</dimen>
-	<dimen name="dp_131">157.2000dp</dimen>
-	<dimen name="dp_132">158.4000dp</dimen>
-	<dimen name="dp_133">159.6000dp</dimen>
-	<dimen name="dp_134">160.8000dp</dimen>
-	<dimen name="dp_135">162.0000dp</dimen>
-	<dimen name="dp_136">163.2000dp</dimen>
-	<dimen name="dp_137">164.4000dp</dimen>
-	<dimen name="dp_138">165.6000dp</dimen>
-	<dimen name="dp_139">166.8000dp</dimen>
-	<dimen name="dp_140">168.0000dp</dimen>
-	<dimen name="dp_141">169.2000dp</dimen>
-	<dimen name="dp_142">170.4000dp</dimen>
-	<dimen name="dp_143">171.6000dp</dimen>
-	<dimen name="dp_144">172.8000dp</dimen>
-	<dimen name="dp_145">174.0000dp</dimen>
-	<dimen name="dp_146">175.2000dp</dimen>
-	<dimen name="dp_147">176.4000dp</dimen>
-	<dimen name="dp_148">177.6000dp</dimen>
-	<dimen name="dp_149">178.8000dp</dimen>
-	<dimen name="dp_150">180.0000dp</dimen>
-	<dimen name="dp_151">181.2000dp</dimen>
-	<dimen name="dp_152">182.4000dp</dimen>
-	<dimen name="dp_153">183.6000dp</dimen>
-	<dimen name="dp_154">184.8000dp</dimen>
-	<dimen name="dp_155">186.0000dp</dimen>
-	<dimen name="dp_156">187.2000dp</dimen>
-	<dimen name="dp_157">188.4000dp</dimen>
-	<dimen name="dp_158">189.6000dp</dimen>
-	<dimen name="dp_159">190.8000dp</dimen>
-	<dimen name="dp_160">192.0000dp</dimen>
-	<dimen name="dp_161">193.2000dp</dimen>
-	<dimen name="dp_162">194.4000dp</dimen>
-	<dimen name="dp_163">195.6000dp</dimen>
-	<dimen name="dp_164">196.8000dp</dimen>
-	<dimen name="dp_165">198.0000dp</dimen>
-	<dimen name="dp_166">199.2000dp</dimen>
-	<dimen name="dp_167">200.4000dp</dimen>
-	<dimen name="dp_168">201.6000dp</dimen>
-	<dimen name="dp_169">202.8000dp</dimen>
-	<dimen name="dp_170">204.0000dp</dimen>
-	<dimen name="dp_171">205.2000dp</dimen>
-	<dimen name="dp_172">206.4000dp</dimen>
-	<dimen name="dp_173">207.6000dp</dimen>
-	<dimen name="dp_174">208.8000dp</dimen>
-	<dimen name="dp_175">210.0000dp</dimen>
-	<dimen name="dp_176">211.2000dp</dimen>
-	<dimen name="dp_177">212.4000dp</dimen>
-	<dimen name="dp_178">213.6000dp</dimen>
-	<dimen name="dp_179">214.8000dp</dimen>
-	<dimen name="dp_180">216.0000dp</dimen>
-	<dimen name="dp_181">217.2000dp</dimen>
-	<dimen name="dp_182">218.4000dp</dimen>
-	<dimen name="dp_183">219.6000dp</dimen>
-	<dimen name="dp_184">220.8000dp</dimen>
-	<dimen name="dp_185">222.0000dp</dimen>
-	<dimen name="dp_186">223.2000dp</dimen>
-	<dimen name="dp_187">224.4000dp</dimen>
-	<dimen name="dp_188">225.6000dp</dimen>
-	<dimen name="dp_189">226.8000dp</dimen>
-	<dimen name="dp_190">228.0000dp</dimen>
-	<dimen name="dp_191">229.2000dp</dimen>
-	<dimen name="dp_192">230.4000dp</dimen>
-	<dimen name="dp_193">231.6000dp</dimen>
-	<dimen name="dp_194">232.8000dp</dimen>
-	<dimen name="dp_195">234.0000dp</dimen>
-	<dimen name="dp_196">235.2000dp</dimen>
-	<dimen name="dp_197">236.4000dp</dimen>
-	<dimen name="dp_198">237.6000dp</dimen>
-	<dimen name="dp_199">238.8000dp</dimen>
-	<dimen name="dp_200">240.0000dp</dimen>
-	<dimen name="dp_201">241.2000dp</dimen>
-	<dimen name="dp_202">242.4000dp</dimen>
-	<dimen name="dp_203">243.6000dp</dimen>
-	<dimen name="dp_204">244.8000dp</dimen>
-	<dimen name="dp_205">246.0000dp</dimen>
-	<dimen name="dp_206">247.2000dp</dimen>
-	<dimen name="dp_207">248.4000dp</dimen>
-	<dimen name="dp_208">249.6000dp</dimen>
-	<dimen name="dp_209">250.8000dp</dimen>
-	<dimen name="dp_210">252.0000dp</dimen>
-	<dimen name="dp_211">253.2000dp</dimen>
-	<dimen name="dp_212">254.4000dp</dimen>
-	<dimen name="dp_213">255.6000dp</dimen>
-	<dimen name="dp_214">256.8000dp</dimen>
-	<dimen name="dp_215">258.0000dp</dimen>
-	<dimen name="dp_216">259.2000dp</dimen>
-	<dimen name="dp_217">260.4000dp</dimen>
-	<dimen name="dp_218">261.6000dp</dimen>
-	<dimen name="dp_219">262.8000dp</dimen>
-	<dimen name="dp_220">264.0000dp</dimen>
-	<dimen name="dp_221">265.2000dp</dimen>
-	<dimen name="dp_222">266.4000dp</dimen>
-	<dimen name="dp_223">267.6000dp</dimen>
-	<dimen name="dp_224">268.8000dp</dimen>
-	<dimen name="dp_225">270.0000dp</dimen>
-	<dimen name="dp_226">271.2000dp</dimen>
-	<dimen name="dp_227">272.4000dp</dimen>
-	<dimen name="dp_228">273.6000dp</dimen>
-	<dimen name="dp_229">274.8000dp</dimen>
-	<dimen name="dp_230">276.0000dp</dimen>
-	<dimen name="dp_231">277.2000dp</dimen>
-	<dimen name="dp_232">278.4000dp</dimen>
-	<dimen name="dp_233">279.6000dp</dimen>
-	<dimen name="dp_234">280.8000dp</dimen>
-	<dimen name="dp_235">282.0000dp</dimen>
-	<dimen name="dp_236">283.2000dp</dimen>
-	<dimen name="dp_237">284.4000dp</dimen>
-	<dimen name="dp_238">285.6000dp</dimen>
-	<dimen name="dp_239">286.8000dp</dimen>
-	<dimen name="dp_240">288.0000dp</dimen>
-	<dimen name="dp_241">289.2000dp</dimen>
-	<dimen name="dp_242">290.4000dp</dimen>
-	<dimen name="dp_243">291.6000dp</dimen>
-	<dimen name="dp_244">292.8000dp</dimen>
-	<dimen name="dp_245">294.0000dp</dimen>
-	<dimen name="dp_246">295.2000dp</dimen>
-	<dimen name="dp_247">296.4000dp</dimen>
-	<dimen name="dp_248">297.6000dp</dimen>
-	<dimen name="dp_249">298.8000dp</dimen>
-	<dimen name="dp_250">300.0000dp</dimen>
-	<dimen name="dp_251">301.2000dp</dimen>
-	<dimen name="dp_252">302.4000dp</dimen>
-	<dimen name="dp_253">303.6000dp</dimen>
-	<dimen name="dp_254">304.8000dp</dimen>
-	<dimen name="dp_255">306.0000dp</dimen>
-	<dimen name="dp_256">307.2000dp</dimen>
-	<dimen name="dp_257">308.4000dp</dimen>
-	<dimen name="dp_258">309.6000dp</dimen>
-	<dimen name="dp_259">310.8000dp</dimen>
-	<dimen name="dp_260">312.0000dp</dimen>
-	<dimen name="dp_261">313.2000dp</dimen>
-	<dimen name="dp_262">314.4000dp</dimen>
-	<dimen name="dp_263">315.6000dp</dimen>
-	<dimen name="dp_264">316.8000dp</dimen>
-	<dimen name="dp_265">318.0000dp</dimen>
-	<dimen name="dp_266">319.2000dp</dimen>
-	<dimen name="dp_267">320.4000dp</dimen>
-	<dimen name="dp_268">321.6000dp</dimen>
-	<dimen name="dp_269">322.8000dp</dimen>
-	<dimen name="dp_270">324.0000dp</dimen>
-	<dimen name="dp_271">325.2000dp</dimen>
-	<dimen name="dp_272">326.4000dp</dimen>
-	<dimen name="dp_273">327.6000dp</dimen>
-	<dimen name="dp_274">328.8000dp</dimen>
-	<dimen name="dp_275">330.0000dp</dimen>
-	<dimen name="dp_276">331.2000dp</dimen>
-	<dimen name="dp_277">332.4000dp</dimen>
-	<dimen name="dp_278">333.6000dp</dimen>
-	<dimen name="dp_279">334.8000dp</dimen>
-	<dimen name="dp_280">336.0000dp</dimen>
-	<dimen name="dp_281">337.2000dp</dimen>
-	<dimen name="dp_282">338.4000dp</dimen>
-	<dimen name="dp_283">339.6000dp</dimen>
-	<dimen name="dp_284">340.8000dp</dimen>
-	<dimen name="dp_285">342.0000dp</dimen>
-	<dimen name="dp_286">343.2000dp</dimen>
-	<dimen name="dp_287">344.4000dp</dimen>
-	<dimen name="dp_288">345.6000dp</dimen>
-	<dimen name="dp_289">346.8000dp</dimen>
-	<dimen name="dp_290">348.0000dp</dimen>
-	<dimen name="dp_291">349.2000dp</dimen>
-	<dimen name="dp_292">350.4000dp</dimen>
-	<dimen name="dp_293">351.6000dp</dimen>
-	<dimen name="dp_294">352.8000dp</dimen>
-	<dimen name="dp_295">354.0000dp</dimen>
-	<dimen name="dp_296">355.2000dp</dimen>
-	<dimen name="dp_297">356.4000dp</dimen>
-	<dimen name="dp_298">357.6000dp</dimen>
-	<dimen name="dp_299">358.8000dp</dimen>
-	<dimen name="dp_300">360.0000dp</dimen>
-	<dimen name="dp_301">361.2000dp</dimen>
-	<dimen name="dp_302">362.4000dp</dimen>
-	<dimen name="dp_303">363.6000dp</dimen>
-	<dimen name="dp_304">364.8000dp</dimen>
-	<dimen name="dp_305">366.0000dp</dimen>
-	<dimen name="dp_306">367.2000dp</dimen>
-	<dimen name="dp_307">368.4000dp</dimen>
-	<dimen name="dp_308">369.6000dp</dimen>
-	<dimen name="dp_309">370.8000dp</dimen>
-	<dimen name="dp_310">372.0000dp</dimen>
-	<dimen name="dp_311">373.2000dp</dimen>
-	<dimen name="dp_312">374.4000dp</dimen>
-	<dimen name="dp_313">375.6000dp</dimen>
-	<dimen name="dp_314">376.8000dp</dimen>
-	<dimen name="dp_315">378.0000dp</dimen>
-	<dimen name="dp_316">379.2000dp</dimen>
-	<dimen name="dp_317">380.4000dp</dimen>
-	<dimen name="dp_318">381.6000dp</dimen>
-	<dimen name="dp_319">382.8000dp</dimen>
-	<dimen name="dp_320">384.0000dp</dimen>
-	<dimen name="dp_321">385.2000dp</dimen>
-	<dimen name="dp_322">386.4000dp</dimen>
-	<dimen name="dp_323">387.6000dp</dimen>
-	<dimen name="dp_324">388.8000dp</dimen>
-	<dimen name="dp_325">390.0000dp</dimen>
-	<dimen name="dp_326">391.2000dp</dimen>
-	<dimen name="dp_327">392.4000dp</dimen>
-	<dimen name="dp_328">393.6000dp</dimen>
-	<dimen name="dp_329">394.8000dp</dimen>
-	<dimen name="dp_330">396.0000dp</dimen>
-	<dimen name="dp_331">397.2000dp</dimen>
-	<dimen name="dp_332">398.4000dp</dimen>
-	<dimen name="dp_333">399.6000dp</dimen>
-	<dimen name="dp_334">400.8000dp</dimen>
-	<dimen name="dp_335">402.0000dp</dimen>
-	<dimen name="dp_336">403.2000dp</dimen>
-	<dimen name="dp_337">404.4000dp</dimen>
-	<dimen name="dp_338">405.6000dp</dimen>
-	<dimen name="dp_339">406.8000dp</dimen>
-	<dimen name="dp_340">408.0000dp</dimen>
-	<dimen name="dp_341">409.2000dp</dimen>
-	<dimen name="dp_342">410.4000dp</dimen>
-	<dimen name="dp_343">411.6000dp</dimen>
-	<dimen name="dp_344">412.8000dp</dimen>
-	<dimen name="dp_345">414.0000dp</dimen>
-	<dimen name="dp_346">415.2000dp</dimen>
-	<dimen name="dp_347">416.4000dp</dimen>
-	<dimen name="dp_348">417.6000dp</dimen>
-	<dimen name="dp_349">418.8000dp</dimen>
-	<dimen name="dp_350">420.0000dp</dimen>
-	<dimen name="dp_351">421.2000dp</dimen>
-	<dimen name="dp_352">422.4000dp</dimen>
-	<dimen name="dp_353">423.6000dp</dimen>
-	<dimen name="dp_354">424.8000dp</dimen>
-	<dimen name="dp_355">426.0000dp</dimen>
-	<dimen name="dp_356">427.2000dp</dimen>
-	<dimen name="dp_357">428.4000dp</dimen>
-	<dimen name="dp_358">429.6000dp</dimen>
-	<dimen name="dp_359">430.8000dp</dimen>
-	<dimen name="dp_360">432.0000dp</dimen>
-	<dimen name="dp_365">438.0000dp</dimen>
-	<dimen name="dp_370">444.0000dp</dimen>
-	<dimen name="dp_400">480.0000dp</dimen>
-	<dimen name="dp_410">492.0000dp</dimen>
-	<dimen name="dp_422">506.4000dp</dimen>
-	<dimen name="dp_472">566.4000dp</dimen>
-	<dimen name="dp_500">600.0000dp</dimen>
-	<dimen name="dp_600">720.0000dp</dimen>
-	<dimen name="dp_640">768.0000dp</dimen>
-	<dimen name="dp_720">864.0000dp</dimen>
-	<dimen name="sp_6">7.2000sp</dimen>
-	<dimen name="sp_7">8.4000sp</dimen>
-	<dimen name="sp_8">9.6000sp</dimen>
-	<dimen name="sp_9">10.8000sp</dimen>
-	<dimen name="sp_10">12.0000sp</dimen>
-	<dimen name="sp_11">13.2000sp</dimen>
-	<dimen name="sp_12">14.4000sp</dimen>
-	<dimen name="sp_13">15.6000sp</dimen>
-	<dimen name="sp_14">16.8000sp</dimen>
-	<dimen name="sp_15">18.0000sp</dimen>
-	<dimen name="sp_16">19.2000sp</dimen>
-	<dimen name="sp_17">20.4000sp</dimen>
-	<dimen name="sp_18">21.6000sp</dimen>
-	<dimen name="sp_19">22.8000sp</dimen>
-	<dimen name="sp_20">24.0000sp</dimen>
-	<dimen name="sp_21">25.2000sp</dimen>
-	<dimen name="sp_22">26.4000sp</dimen>
-	<dimen name="sp_23">27.6000sp</dimen>
-	<dimen name="sp_24">28.8000sp</dimen>
-	<dimen name="sp_25">30.0000sp</dimen>
-	<dimen name="sp_28">33.6000sp</dimen>
-	<dimen name="sp_30">36.0000sp</dimen>
-	<dimen name="sp_32">38.4000sp</dimen>
-	<dimen name="sp_34">40.8000sp</dimen>
-	<dimen name="sp_36">43.2000sp</dimen>
-	<dimen name="sp_38">45.6000sp</dimen>
-	<dimen name="sp_40">48.0000sp</dimen>
-	<dimen name="sp_42">50.4000sp</dimen>
-	<dimen name="sp_48">57.6000sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw480dp/dimens.xml b/app/src/main/res/values-sw480dp/dimens.xml
deleted file mode 100644
index 484b952..0000000
--- a/app/src/main/res/values-sw480dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-80.0000dp</dimen>
-	<dimen name="dp_m_30">-40.0000dp</dimen>
-	<dimen name="dp_m_20">-26.6667dp</dimen>
-	<dimen name="dp_m_12">-16.0000dp</dimen>
-	<dimen name="dp_m_10">-13.3333dp</dimen>
-	<dimen name="dp_m_8">-10.6667dp</dimen>
-	<dimen name="dp_m_5">-6.6667dp</dimen>
-	<dimen name="dp_m_2">-2.6667dp</dimen>
-	<dimen name="dp_m_1">-1.3333dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.1333dp</dimen>
-	<dimen name="dp_0_5">0.6667dp</dimen>
-	<dimen name="dp_1">1.3333dp</dimen>
-	<dimen name="dp_1_5">2.0000dp</dimen>
-	<dimen name="dp_2">2.6667dp</dimen>
-	<dimen name="dp_2_5">3.3333dp</dimen>
-	<dimen name="dp_3">4.0000dp</dimen>
-	<dimen name="dp_3_5">4.6667dp</dimen>
-	<dimen name="dp_4">5.3333dp</dimen>
-	<dimen name="dp_4_5">6.0000dp</dimen>
-	<dimen name="dp_5">6.6667dp</dimen>
-	<dimen name="dp_6">8.0000dp</dimen>
-	<dimen name="dp_7">9.3333dp</dimen>
-	<dimen name="dp_8">10.6667dp</dimen>
-	<dimen name="dp_9">12.0000dp</dimen>
-	<dimen name="dp_10">13.3333dp</dimen>
-	<dimen name="dp_11">14.6667dp</dimen>
-	<dimen name="dp_12">16.0000dp</dimen>
-	<dimen name="dp_13">17.3333dp</dimen>
-	<dimen name="dp_14">18.6667dp</dimen>
-	<dimen name="dp_15">20.0000dp</dimen>
-	<dimen name="dp_16">21.3333dp</dimen>
-	<dimen name="dp_17">22.6667dp</dimen>
-	<dimen name="dp_18">24.0000dp</dimen>
-	<dimen name="dp_19">25.3333dp</dimen>
-	<dimen name="dp_20">26.6667dp</dimen>
-	<dimen name="dp_21">28.0000dp</dimen>
-	<dimen name="dp_22">29.3333dp</dimen>
-	<dimen name="dp_23">30.6667dp</dimen>
-	<dimen name="dp_24">32.0000dp</dimen>
-	<dimen name="dp_25">33.3333dp</dimen>
-	<dimen name="dp_26">34.6667dp</dimen>
-	<dimen name="dp_27">36.0000dp</dimen>
-	<dimen name="dp_28">37.3333dp</dimen>
-	<dimen name="dp_29">38.6667dp</dimen>
-	<dimen name="dp_30">40.0000dp</dimen>
-	<dimen name="dp_31">41.3333dp</dimen>
-	<dimen name="dp_32">42.6667dp</dimen>
-	<dimen name="dp_33">44.0000dp</dimen>
-	<dimen name="dp_34">45.3333dp</dimen>
-	<dimen name="dp_35">46.6667dp</dimen>
-	<dimen name="dp_36">48.0000dp</dimen>
-	<dimen name="dp_37">49.3333dp</dimen>
-	<dimen name="dp_38">50.6667dp</dimen>
-	<dimen name="dp_39">52.0000dp</dimen>
-	<dimen name="dp_40">53.3333dp</dimen>
-	<dimen name="dp_41">54.6667dp</dimen>
-	<dimen name="dp_42">56.0000dp</dimen>
-	<dimen name="dp_43">57.3333dp</dimen>
-	<dimen name="dp_44">58.6667dp</dimen>
-	<dimen name="dp_45">60.0000dp</dimen>
-	<dimen name="dp_46">61.3333dp</dimen>
-	<dimen name="dp_47">62.6667dp</dimen>
-	<dimen name="dp_48">64.0000dp</dimen>
-	<dimen name="dp_49">65.3333dp</dimen>
-	<dimen name="dp_50">66.6667dp</dimen>
-	<dimen name="dp_51">68.0000dp</dimen>
-	<dimen name="dp_52">69.3333dp</dimen>
-	<dimen name="dp_53">70.6667dp</dimen>
-	<dimen name="dp_54">72.0000dp</dimen>
-	<dimen name="dp_55">73.3333dp</dimen>
-	<dimen name="dp_56">74.6667dp</dimen>
-	<dimen name="dp_57">76.0000dp</dimen>
-	<dimen name="dp_58">77.3333dp</dimen>
-	<dimen name="dp_59">78.6667dp</dimen>
-	<dimen name="dp_60">80.0000dp</dimen>
-	<dimen name="dp_61">81.3333dp</dimen>
-	<dimen name="dp_62">82.6667dp</dimen>
-	<dimen name="dp_63">84.0000dp</dimen>
-	<dimen name="dp_64">85.3333dp</dimen>
-	<dimen name="dp_65">86.6667dp</dimen>
-	<dimen name="dp_66">88.0000dp</dimen>
-	<dimen name="dp_67">89.3333dp</dimen>
-	<dimen name="dp_68">90.6667dp</dimen>
-	<dimen name="dp_69">92.0000dp</dimen>
-	<dimen name="dp_70">93.3333dp</dimen>
-	<dimen name="dp_71">94.6667dp</dimen>
-	<dimen name="dp_72">96.0000dp</dimen>
-	<dimen name="dp_73">97.3333dp</dimen>
-	<dimen name="dp_74">98.6667dp</dimen>
-	<dimen name="dp_75">100.0000dp</dimen>
-	<dimen name="dp_76">101.3333dp</dimen>
-	<dimen name="dp_77">102.6667dp</dimen>
-	<dimen name="dp_78">104.0000dp</dimen>
-	<dimen name="dp_79">105.3333dp</dimen>
-	<dimen name="dp_80">106.6667dp</dimen>
-	<dimen name="dp_81">108.0000dp</dimen>
-	<dimen name="dp_82">109.3333dp</dimen>
-	<dimen name="dp_83">110.6667dp</dimen>
-	<dimen name="dp_84">112.0000dp</dimen>
-	<dimen name="dp_85">113.3333dp</dimen>
-	<dimen name="dp_86">114.6667dp</dimen>
-	<dimen name="dp_87">116.0000dp</dimen>
-	<dimen name="dp_88">117.3333dp</dimen>
-	<dimen name="dp_89">118.6667dp</dimen>
-	<dimen name="dp_90">120.0000dp</dimen>
-	<dimen name="dp_91">121.3333dp</dimen>
-	<dimen name="dp_92">122.6667dp</dimen>
-	<dimen name="dp_93">124.0000dp</dimen>
-	<dimen name="dp_94">125.3333dp</dimen>
-	<dimen name="dp_95">126.6667dp</dimen>
-	<dimen name="dp_96">128.0000dp</dimen>
-	<dimen name="dp_97">129.3333dp</dimen>
-	<dimen name="dp_98">130.6667dp</dimen>
-	<dimen name="dp_99">132.0000dp</dimen>
-	<dimen name="dp_100">133.3333dp</dimen>
-	<dimen name="dp_101">134.6667dp</dimen>
-	<dimen name="dp_102">136.0000dp</dimen>
-	<dimen name="dp_103">137.3333dp</dimen>
-	<dimen name="dp_104">138.6667dp</dimen>
-	<dimen name="dp_105">140.0000dp</dimen>
-	<dimen name="dp_106">141.3333dp</dimen>
-	<dimen name="dp_107">142.6667dp</dimen>
-	<dimen name="dp_108">144.0000dp</dimen>
-	<dimen name="dp_109">145.3333dp</dimen>
-	<dimen name="dp_110">146.6667dp</dimen>
-	<dimen name="dp_111">148.0000dp</dimen>
-	<dimen name="dp_112">149.3333dp</dimen>
-	<dimen name="dp_113">150.6667dp</dimen>
-	<dimen name="dp_114">152.0000dp</dimen>
-	<dimen name="dp_115">153.3333dp</dimen>
-	<dimen name="dp_116">154.6667dp</dimen>
-	<dimen name="dp_117">156.0000dp</dimen>
-	<dimen name="dp_118">157.3333dp</dimen>
-	<dimen name="dp_119">158.6667dp</dimen>
-	<dimen name="dp_120">160.0000dp</dimen>
-	<dimen name="dp_121">161.3333dp</dimen>
-	<dimen name="dp_122">162.6667dp</dimen>
-	<dimen name="dp_123">164.0000dp</dimen>
-	<dimen name="dp_124">165.3333dp</dimen>
-	<dimen name="dp_125">166.6667dp</dimen>
-	<dimen name="dp_126">168.0000dp</dimen>
-	<dimen name="dp_127">169.3333dp</dimen>
-	<dimen name="dp_128">170.6667dp</dimen>
-	<dimen name="dp_129">172.0000dp</dimen>
-	<dimen name="dp_130">173.3333dp</dimen>
-	<dimen name="dp_131">174.6667dp</dimen>
-	<dimen name="dp_132">176.0000dp</dimen>
-	<dimen name="dp_133">177.3333dp</dimen>
-	<dimen name="dp_134">178.6667dp</dimen>
-	<dimen name="dp_135">180.0000dp</dimen>
-	<dimen name="dp_136">181.3333dp</dimen>
-	<dimen name="dp_137">182.6667dp</dimen>
-	<dimen name="dp_138">184.0000dp</dimen>
-	<dimen name="dp_139">185.3333dp</dimen>
-	<dimen name="dp_140">186.6667dp</dimen>
-	<dimen name="dp_141">188.0000dp</dimen>
-	<dimen name="dp_142">189.3333dp</dimen>
-	<dimen name="dp_143">190.6667dp</dimen>
-	<dimen name="dp_144">192.0000dp</dimen>
-	<dimen name="dp_145">193.3333dp</dimen>
-	<dimen name="dp_146">194.6667dp</dimen>
-	<dimen name="dp_147">196.0000dp</dimen>
-	<dimen name="dp_148">197.3333dp</dimen>
-	<dimen name="dp_149">198.6667dp</dimen>
-	<dimen name="dp_150">200.0000dp</dimen>
-	<dimen name="dp_151">201.3333dp</dimen>
-	<dimen name="dp_152">202.6667dp</dimen>
-	<dimen name="dp_153">204.0000dp</dimen>
-	<dimen name="dp_154">205.3333dp</dimen>
-	<dimen name="dp_155">206.6667dp</dimen>
-	<dimen name="dp_156">208.0000dp</dimen>
-	<dimen name="dp_157">209.3333dp</dimen>
-	<dimen name="dp_158">210.6667dp</dimen>
-	<dimen name="dp_159">212.0000dp</dimen>
-	<dimen name="dp_160">213.3333dp</dimen>
-	<dimen name="dp_161">214.6667dp</dimen>
-	<dimen name="dp_162">216.0000dp</dimen>
-	<dimen name="dp_163">217.3333dp</dimen>
-	<dimen name="dp_164">218.6667dp</dimen>
-	<dimen name="dp_165">220.0000dp</dimen>
-	<dimen name="dp_166">221.3333dp</dimen>
-	<dimen name="dp_167">222.6667dp</dimen>
-	<dimen name="dp_168">224.0000dp</dimen>
-	<dimen name="dp_169">225.3333dp</dimen>
-	<dimen name="dp_170">226.6667dp</dimen>
-	<dimen name="dp_171">228.0000dp</dimen>
-	<dimen name="dp_172">229.3333dp</dimen>
-	<dimen name="dp_173">230.6667dp</dimen>
-	<dimen name="dp_174">232.0000dp</dimen>
-	<dimen name="dp_175">233.3333dp</dimen>
-	<dimen name="dp_176">234.6667dp</dimen>
-	<dimen name="dp_177">236.0000dp</dimen>
-	<dimen name="dp_178">237.3333dp</dimen>
-	<dimen name="dp_179">238.6667dp</dimen>
-	<dimen name="dp_180">240.0000dp</dimen>
-	<dimen name="dp_181">241.3333dp</dimen>
-	<dimen name="dp_182">242.6667dp</dimen>
-	<dimen name="dp_183">244.0000dp</dimen>
-	<dimen name="dp_184">245.3333dp</dimen>
-	<dimen name="dp_185">246.6667dp</dimen>
-	<dimen name="dp_186">248.0000dp</dimen>
-	<dimen name="dp_187">249.3333dp</dimen>
-	<dimen name="dp_188">250.6667dp</dimen>
-	<dimen name="dp_189">252.0000dp</dimen>
-	<dimen name="dp_190">253.3333dp</dimen>
-	<dimen name="dp_191">254.6667dp</dimen>
-	<dimen name="dp_192">256.0000dp</dimen>
-	<dimen name="dp_193">257.3333dp</dimen>
-	<dimen name="dp_194">258.6667dp</dimen>
-	<dimen name="dp_195">260.0000dp</dimen>
-	<dimen name="dp_196">261.3333dp</dimen>
-	<dimen name="dp_197">262.6667dp</dimen>
-	<dimen name="dp_198">264.0000dp</dimen>
-	<dimen name="dp_199">265.3333dp</dimen>
-	<dimen name="dp_200">266.6667dp</dimen>
-	<dimen name="dp_201">268.0000dp</dimen>
-	<dimen name="dp_202">269.3333dp</dimen>
-	<dimen name="dp_203">270.6667dp</dimen>
-	<dimen name="dp_204">272.0000dp</dimen>
-	<dimen name="dp_205">273.3333dp</dimen>
-	<dimen name="dp_206">274.6667dp</dimen>
-	<dimen name="dp_207">276.0000dp</dimen>
-	<dimen name="dp_208">277.3333dp</dimen>
-	<dimen name="dp_209">278.6667dp</dimen>
-	<dimen name="dp_210">280.0000dp</dimen>
-	<dimen name="dp_211">281.3333dp</dimen>
-	<dimen name="dp_212">282.6667dp</dimen>
-	<dimen name="dp_213">284.0000dp</dimen>
-	<dimen name="dp_214">285.3333dp</dimen>
-	<dimen name="dp_215">286.6667dp</dimen>
-	<dimen name="dp_216">288.0000dp</dimen>
-	<dimen name="dp_217">289.3333dp</dimen>
-	<dimen name="dp_218">290.6667dp</dimen>
-	<dimen name="dp_219">292.0000dp</dimen>
-	<dimen name="dp_220">293.3333dp</dimen>
-	<dimen name="dp_221">294.6667dp</dimen>
-	<dimen name="dp_222">296.0000dp</dimen>
-	<dimen name="dp_223">297.3333dp</dimen>
-	<dimen name="dp_224">298.6667dp</dimen>
-	<dimen name="dp_225">300.0000dp</dimen>
-	<dimen name="dp_226">301.3333dp</dimen>
-	<dimen name="dp_227">302.6667dp</dimen>
-	<dimen name="dp_228">304.0000dp</dimen>
-	<dimen name="dp_229">305.3333dp</dimen>
-	<dimen name="dp_230">306.6667dp</dimen>
-	<dimen name="dp_231">308.0000dp</dimen>
-	<dimen name="dp_232">309.3333dp</dimen>
-	<dimen name="dp_233">310.6667dp</dimen>
-	<dimen name="dp_234">312.0000dp</dimen>
-	<dimen name="dp_235">313.3333dp</dimen>
-	<dimen name="dp_236">314.6667dp</dimen>
-	<dimen name="dp_237">316.0000dp</dimen>
-	<dimen name="dp_238">317.3333dp</dimen>
-	<dimen name="dp_239">318.6667dp</dimen>
-	<dimen name="dp_240">320.0000dp</dimen>
-	<dimen name="dp_241">321.3333dp</dimen>
-	<dimen name="dp_242">322.6667dp</dimen>
-	<dimen name="dp_243">324.0000dp</dimen>
-	<dimen name="dp_244">325.3333dp</dimen>
-	<dimen name="dp_245">326.6667dp</dimen>
-	<dimen name="dp_246">328.0000dp</dimen>
-	<dimen name="dp_247">329.3333dp</dimen>
-	<dimen name="dp_248">330.6667dp</dimen>
-	<dimen name="dp_249">332.0000dp</dimen>
-	<dimen name="dp_250">333.3333dp</dimen>
-	<dimen name="dp_251">334.6667dp</dimen>
-	<dimen name="dp_252">336.0000dp</dimen>
-	<dimen name="dp_253">337.3333dp</dimen>
-	<dimen name="dp_254">338.6667dp</dimen>
-	<dimen name="dp_255">340.0000dp</dimen>
-	<dimen name="dp_256">341.3333dp</dimen>
-	<dimen name="dp_257">342.6667dp</dimen>
-	<dimen name="dp_258">344.0000dp</dimen>
-	<dimen name="dp_259">345.3333dp</dimen>
-	<dimen name="dp_260">346.6667dp</dimen>
-	<dimen name="dp_261">348.0000dp</dimen>
-	<dimen name="dp_262">349.3333dp</dimen>
-	<dimen name="dp_263">350.6667dp</dimen>
-	<dimen name="dp_264">352.0000dp</dimen>
-	<dimen name="dp_265">353.3333dp</dimen>
-	<dimen name="dp_266">354.6667dp</dimen>
-	<dimen name="dp_267">356.0000dp</dimen>
-	<dimen name="dp_268">357.3333dp</dimen>
-	<dimen name="dp_269">358.6667dp</dimen>
-	<dimen name="dp_270">360.0000dp</dimen>
-	<dimen name="dp_271">361.3333dp</dimen>
-	<dimen name="dp_272">362.6667dp</dimen>
-	<dimen name="dp_273">364.0000dp</dimen>
-	<dimen name="dp_274">365.3333dp</dimen>
-	<dimen name="dp_275">366.6667dp</dimen>
-	<dimen name="dp_276">368.0000dp</dimen>
-	<dimen name="dp_277">369.3333dp</dimen>
-	<dimen name="dp_278">370.6667dp</dimen>
-	<dimen name="dp_279">372.0000dp</dimen>
-	<dimen name="dp_280">373.3333dp</dimen>
-	<dimen name="dp_281">374.6667dp</dimen>
-	<dimen name="dp_282">376.0000dp</dimen>
-	<dimen name="dp_283">377.3333dp</dimen>
-	<dimen name="dp_284">378.6667dp</dimen>
-	<dimen name="dp_285">380.0000dp</dimen>
-	<dimen name="dp_286">381.3333dp</dimen>
-	<dimen name="dp_287">382.6667dp</dimen>
-	<dimen name="dp_288">384.0000dp</dimen>
-	<dimen name="dp_289">385.3333dp</dimen>
-	<dimen name="dp_290">386.6667dp</dimen>
-	<dimen name="dp_291">388.0000dp</dimen>
-	<dimen name="dp_292">389.3333dp</dimen>
-	<dimen name="dp_293">390.6667dp</dimen>
-	<dimen name="dp_294">392.0000dp</dimen>
-	<dimen name="dp_295">393.3333dp</dimen>
-	<dimen name="dp_296">394.6667dp</dimen>
-	<dimen name="dp_297">396.0000dp</dimen>
-	<dimen name="dp_298">397.3333dp</dimen>
-	<dimen name="dp_299">398.6667dp</dimen>
-	<dimen name="dp_300">400.0000dp</dimen>
-	<dimen name="dp_301">401.3333dp</dimen>
-	<dimen name="dp_302">402.6667dp</dimen>
-	<dimen name="dp_303">404.0000dp</dimen>
-	<dimen name="dp_304">405.3333dp</dimen>
-	<dimen name="dp_305">406.6667dp</dimen>
-	<dimen name="dp_306">408.0000dp</dimen>
-	<dimen name="dp_307">409.3333dp</dimen>
-	<dimen name="dp_308">410.6667dp</dimen>
-	<dimen name="dp_309">412.0000dp</dimen>
-	<dimen name="dp_310">413.3333dp</dimen>
-	<dimen name="dp_311">414.6667dp</dimen>
-	<dimen name="dp_312">416.0000dp</dimen>
-	<dimen name="dp_313">417.3333dp</dimen>
-	<dimen name="dp_314">418.6667dp</dimen>
-	<dimen name="dp_315">420.0000dp</dimen>
-	<dimen name="dp_316">421.3333dp</dimen>
-	<dimen name="dp_317">422.6667dp</dimen>
-	<dimen name="dp_318">424.0000dp</dimen>
-	<dimen name="dp_319">425.3333dp</dimen>
-	<dimen name="dp_320">426.6667dp</dimen>
-	<dimen name="dp_321">428.0000dp</dimen>
-	<dimen name="dp_322">429.3333dp</dimen>
-	<dimen name="dp_323">430.6667dp</dimen>
-	<dimen name="dp_324">432.0000dp</dimen>
-	<dimen name="dp_325">433.3333dp</dimen>
-	<dimen name="dp_326">434.6667dp</dimen>
-	<dimen name="dp_327">436.0000dp</dimen>
-	<dimen name="dp_328">437.3333dp</dimen>
-	<dimen name="dp_329">438.6667dp</dimen>
-	<dimen name="dp_330">440.0000dp</dimen>
-	<dimen name="dp_331">441.3333dp</dimen>
-	<dimen name="dp_332">442.6667dp</dimen>
-	<dimen name="dp_333">444.0000dp</dimen>
-	<dimen name="dp_334">445.3333dp</dimen>
-	<dimen name="dp_335">446.6667dp</dimen>
-	<dimen name="dp_336">448.0000dp</dimen>
-	<dimen name="dp_337">449.3333dp</dimen>
-	<dimen name="dp_338">450.6667dp</dimen>
-	<dimen name="dp_339">452.0000dp</dimen>
-	<dimen name="dp_340">453.3333dp</dimen>
-	<dimen name="dp_341">454.6667dp</dimen>
-	<dimen name="dp_342">456.0000dp</dimen>
-	<dimen name="dp_343">457.3333dp</dimen>
-	<dimen name="dp_344">458.6667dp</dimen>
-	<dimen name="dp_345">460.0000dp</dimen>
-	<dimen name="dp_346">461.3333dp</dimen>
-	<dimen name="dp_347">462.6667dp</dimen>
-	<dimen name="dp_348">464.0000dp</dimen>
-	<dimen name="dp_349">465.3333dp</dimen>
-	<dimen name="dp_350">466.6667dp</dimen>
-	<dimen name="dp_351">468.0000dp</dimen>
-	<dimen name="dp_352">469.3333dp</dimen>
-	<dimen name="dp_353">470.6667dp</dimen>
-	<dimen name="dp_354">472.0000dp</dimen>
-	<dimen name="dp_355">473.3333dp</dimen>
-	<dimen name="dp_356">474.6667dp</dimen>
-	<dimen name="dp_357">476.0000dp</dimen>
-	<dimen name="dp_358">477.3333dp</dimen>
-	<dimen name="dp_359">478.6667dp</dimen>
-	<dimen name="dp_360">480.0000dp</dimen>
-	<dimen name="dp_365">486.6667dp</dimen>
-	<dimen name="dp_370">493.3333dp</dimen>
-	<dimen name="dp_400">533.3333dp</dimen>
-	<dimen name="dp_410">546.6667dp</dimen>
-	<dimen name="dp_422">562.6667dp</dimen>
-	<dimen name="dp_472">629.3333dp</dimen>
-	<dimen name="dp_500">666.6667dp</dimen>
-	<dimen name="dp_600">800.0000dp</dimen>
-	<dimen name="dp_640">853.3333dp</dimen>
-	<dimen name="dp_720">960.0000dp</dimen>
-	<dimen name="sp_6">8.0000sp</dimen>
-	<dimen name="sp_7">9.3333sp</dimen>
-	<dimen name="sp_8">10.6667sp</dimen>
-	<dimen name="sp_9">12.0000sp</dimen>
-	<dimen name="sp_10">13.3333sp</dimen>
-	<dimen name="sp_11">14.6667sp</dimen>
-	<dimen name="sp_12">16.0000sp</dimen>
-	<dimen name="sp_13">17.3333sp</dimen>
-	<dimen name="sp_14">18.6667sp</dimen>
-	<dimen name="sp_15">20.0000sp</dimen>
-	<dimen name="sp_16">21.3333sp</dimen>
-	<dimen name="sp_17">22.6667sp</dimen>
-	<dimen name="sp_18">24.0000sp</dimen>
-	<dimen name="sp_19">25.3333sp</dimen>
-	<dimen name="sp_20">26.6667sp</dimen>
-	<dimen name="sp_21">28.0000sp</dimen>
-	<dimen name="sp_22">29.3333sp</dimen>
-	<dimen name="sp_23">30.6667sp</dimen>
-	<dimen name="sp_24">32.0000sp</dimen>
-	<dimen name="sp_25">33.3333sp</dimen>
-	<dimen name="sp_28">37.3333sp</dimen>
-	<dimen name="sp_30">40.0000sp</dimen>
-	<dimen name="sp_32">42.6667sp</dimen>
-	<dimen name="sp_34">45.3333sp</dimen>
-	<dimen name="sp_36">48.0000sp</dimen>
-	<dimen name="sp_38">50.6667sp</dimen>
-	<dimen name="sp_40">53.3333sp</dimen>
-	<dimen name="sp_42">56.0000sp</dimen>
-	<dimen name="sp_48">64.0000sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw533dp/dimens.xml b/app/src/main/res/values-sw533dp/dimens.xml
deleted file mode 100644
index 684927b..0000000
--- a/app/src/main/res/values-sw533dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-88.8333dp</dimen>
-	<dimen name="dp_m_30">-44.4167dp</dimen>
-	<dimen name="dp_m_20">-29.6111dp</dimen>
-	<dimen name="dp_m_12">-17.7667dp</dimen>
-	<dimen name="dp_m_10">-14.8056dp</dimen>
-	<dimen name="dp_m_8">-11.8444dp</dimen>
-	<dimen name="dp_m_5">-7.4028dp</dimen>
-	<dimen name="dp_m_2">-2.9611dp</dimen>
-	<dimen name="dp_m_1">-1.4806dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.1481dp</dimen>
-	<dimen name="dp_0_5">0.7403dp</dimen>
-	<dimen name="dp_1">1.4806dp</dimen>
-	<dimen name="dp_1_5">2.2208dp</dimen>
-	<dimen name="dp_2">2.9611dp</dimen>
-	<dimen name="dp_2_5">3.7014dp</dimen>
-	<dimen name="dp_3">4.4417dp</dimen>
-	<dimen name="dp_3_5">5.1819dp</dimen>
-	<dimen name="dp_4">5.9222dp</dimen>
-	<dimen name="dp_4_5">6.6625dp</dimen>
-	<dimen name="dp_5">7.4028dp</dimen>
-	<dimen name="dp_6">8.8833dp</dimen>
-	<dimen name="dp_7">10.3639dp</dimen>
-	<dimen name="dp_8">11.8444dp</dimen>
-	<dimen name="dp_9">13.3250dp</dimen>
-	<dimen name="dp_10">14.8056dp</dimen>
-	<dimen name="dp_11">16.2861dp</dimen>
-	<dimen name="dp_12">17.7667dp</dimen>
-	<dimen name="dp_13">19.2472dp</dimen>
-	<dimen name="dp_14">20.7278dp</dimen>
-	<dimen name="dp_15">22.2083dp</dimen>
-	<dimen name="dp_16">23.6889dp</dimen>
-	<dimen name="dp_17">25.1694dp</dimen>
-	<dimen name="dp_18">26.6500dp</dimen>
-	<dimen name="dp_19">28.1306dp</dimen>
-	<dimen name="dp_20">29.6111dp</dimen>
-	<dimen name="dp_21">31.0917dp</dimen>
-	<dimen name="dp_22">32.5722dp</dimen>
-	<dimen name="dp_23">34.0528dp</dimen>
-	<dimen name="dp_24">35.5333dp</dimen>
-	<dimen name="dp_25">37.0139dp</dimen>
-	<dimen name="dp_26">38.4944dp</dimen>
-	<dimen name="dp_27">39.9750dp</dimen>
-	<dimen name="dp_28">41.4556dp</dimen>
-	<dimen name="dp_29">42.9361dp</dimen>
-	<dimen name="dp_30">44.4167dp</dimen>
-	<dimen name="dp_31">45.8972dp</dimen>
-	<dimen name="dp_32">47.3778dp</dimen>
-	<dimen name="dp_33">48.8583dp</dimen>
-	<dimen name="dp_34">50.3389dp</dimen>
-	<dimen name="dp_35">51.8194dp</dimen>
-	<dimen name="dp_36">53.3000dp</dimen>
-	<dimen name="dp_37">54.7806dp</dimen>
-	<dimen name="dp_38">56.2611dp</dimen>
-	<dimen name="dp_39">57.7417dp</dimen>
-	<dimen name="dp_40">59.2222dp</dimen>
-	<dimen name="dp_41">60.7028dp</dimen>
-	<dimen name="dp_42">62.1833dp</dimen>
-	<dimen name="dp_43">63.6639dp</dimen>
-	<dimen name="dp_44">65.1444dp</dimen>
-	<dimen name="dp_45">66.6250dp</dimen>
-	<dimen name="dp_46">68.1056dp</dimen>
-	<dimen name="dp_47">69.5861dp</dimen>
-	<dimen name="dp_48">71.0667dp</dimen>
-	<dimen name="dp_49">72.5472dp</dimen>
-	<dimen name="dp_50">74.0278dp</dimen>
-	<dimen name="dp_51">75.5083dp</dimen>
-	<dimen name="dp_52">76.9889dp</dimen>
-	<dimen name="dp_53">78.4694dp</dimen>
-	<dimen name="dp_54">79.9500dp</dimen>
-	<dimen name="dp_55">81.4306dp</dimen>
-	<dimen name="dp_56">82.9111dp</dimen>
-	<dimen name="dp_57">84.3917dp</dimen>
-	<dimen name="dp_58">85.8722dp</dimen>
-	<dimen name="dp_59">87.3528dp</dimen>
-	<dimen name="dp_60">88.8333dp</dimen>
-	<dimen name="dp_61">90.3139dp</dimen>
-	<dimen name="dp_62">91.7944dp</dimen>
-	<dimen name="dp_63">93.2750dp</dimen>
-	<dimen name="dp_64">94.7556dp</dimen>
-	<dimen name="dp_65">96.2361dp</dimen>
-	<dimen name="dp_66">97.7167dp</dimen>
-	<dimen name="dp_67">99.1972dp</dimen>
-	<dimen name="dp_68">100.6778dp</dimen>
-	<dimen name="dp_69">102.1583dp</dimen>
-	<dimen name="dp_70">103.6389dp</dimen>
-	<dimen name="dp_71">105.1194dp</dimen>
-	<dimen name="dp_72">106.6000dp</dimen>
-	<dimen name="dp_73">108.0806dp</dimen>
-	<dimen name="dp_74">109.5611dp</dimen>
-	<dimen name="dp_75">111.0417dp</dimen>
-	<dimen name="dp_76">112.5222dp</dimen>
-	<dimen name="dp_77">114.0028dp</dimen>
-	<dimen name="dp_78">115.4833dp</dimen>
-	<dimen name="dp_79">116.9639dp</dimen>
-	<dimen name="dp_80">118.4444dp</dimen>
-	<dimen name="dp_81">119.9250dp</dimen>
-	<dimen name="dp_82">121.4056dp</dimen>
-	<dimen name="dp_83">122.8861dp</dimen>
-	<dimen name="dp_84">124.3667dp</dimen>
-	<dimen name="dp_85">125.8472dp</dimen>
-	<dimen name="dp_86">127.3278dp</dimen>
-	<dimen name="dp_87">128.8083dp</dimen>
-	<dimen name="dp_88">130.2889dp</dimen>
-	<dimen name="dp_89">131.7694dp</dimen>
-	<dimen name="dp_90">133.2500dp</dimen>
-	<dimen name="dp_91">134.7306dp</dimen>
-	<dimen name="dp_92">136.2111dp</dimen>
-	<dimen name="dp_93">137.6917dp</dimen>
-	<dimen name="dp_94">139.1722dp</dimen>
-	<dimen name="dp_95">140.6528dp</dimen>
-	<dimen name="dp_96">142.1333dp</dimen>
-	<dimen name="dp_97">143.6139dp</dimen>
-	<dimen name="dp_98">145.0944dp</dimen>
-	<dimen name="dp_99">146.5750dp</dimen>
-	<dimen name="dp_100">148.0556dp</dimen>
-	<dimen name="dp_101">149.5361dp</dimen>
-	<dimen name="dp_102">151.0167dp</dimen>
-	<dimen name="dp_103">152.4972dp</dimen>
-	<dimen name="dp_104">153.9778dp</dimen>
-	<dimen name="dp_105">155.4583dp</dimen>
-	<dimen name="dp_106">156.9389dp</dimen>
-	<dimen name="dp_107">158.4194dp</dimen>
-	<dimen name="dp_108">159.9000dp</dimen>
-	<dimen name="dp_109">161.3806dp</dimen>
-	<dimen name="dp_110">162.8611dp</dimen>
-	<dimen name="dp_111">164.3417dp</dimen>
-	<dimen name="dp_112">165.8222dp</dimen>
-	<dimen name="dp_113">167.3028dp</dimen>
-	<dimen name="dp_114">168.7833dp</dimen>
-	<dimen name="dp_115">170.2639dp</dimen>
-	<dimen name="dp_116">171.7444dp</dimen>
-	<dimen name="dp_117">173.2250dp</dimen>
-	<dimen name="dp_118">174.7056dp</dimen>
-	<dimen name="dp_119">176.1861dp</dimen>
-	<dimen name="dp_120">177.6667dp</dimen>
-	<dimen name="dp_121">179.1472dp</dimen>
-	<dimen name="dp_122">180.6278dp</dimen>
-	<dimen name="dp_123">182.1083dp</dimen>
-	<dimen name="dp_124">183.5889dp</dimen>
-	<dimen name="dp_125">185.0694dp</dimen>
-	<dimen name="dp_126">186.5500dp</dimen>
-	<dimen name="dp_127">188.0306dp</dimen>
-	<dimen name="dp_128">189.5111dp</dimen>
-	<dimen name="dp_129">190.9917dp</dimen>
-	<dimen name="dp_130">192.4722dp</dimen>
-	<dimen name="dp_131">193.9528dp</dimen>
-	<dimen name="dp_132">195.4333dp</dimen>
-	<dimen name="dp_133">196.9139dp</dimen>
-	<dimen name="dp_134">198.3944dp</dimen>
-	<dimen name="dp_135">199.8750dp</dimen>
-	<dimen name="dp_136">201.3556dp</dimen>
-	<dimen name="dp_137">202.8361dp</dimen>
-	<dimen name="dp_138">204.3167dp</dimen>
-	<dimen name="dp_139">205.7972dp</dimen>
-	<dimen name="dp_140">207.2778dp</dimen>
-	<dimen name="dp_141">208.7583dp</dimen>
-	<dimen name="dp_142">210.2389dp</dimen>
-	<dimen name="dp_143">211.7194dp</dimen>
-	<dimen name="dp_144">213.2000dp</dimen>
-	<dimen name="dp_145">214.6806dp</dimen>
-	<dimen name="dp_146">216.1611dp</dimen>
-	<dimen name="dp_147">217.6417dp</dimen>
-	<dimen name="dp_148">219.1222dp</dimen>
-	<dimen name="dp_149">220.6028dp</dimen>
-	<dimen name="dp_150">222.0833dp</dimen>
-	<dimen name="dp_151">223.5639dp</dimen>
-	<dimen name="dp_152">225.0444dp</dimen>
-	<dimen name="dp_153">226.5250dp</dimen>
-	<dimen name="dp_154">228.0056dp</dimen>
-	<dimen name="dp_155">229.4861dp</dimen>
-	<dimen name="dp_156">230.9667dp</dimen>
-	<dimen name="dp_157">232.4472dp</dimen>
-	<dimen name="dp_158">233.9278dp</dimen>
-	<dimen name="dp_159">235.4083dp</dimen>
-	<dimen name="dp_160">236.8889dp</dimen>
-	<dimen name="dp_161">238.3694dp</dimen>
-	<dimen name="dp_162">239.8500dp</dimen>
-	<dimen name="dp_163">241.3306dp</dimen>
-	<dimen name="dp_164">242.8111dp</dimen>
-	<dimen name="dp_165">244.2917dp</dimen>
-	<dimen name="dp_166">245.7722dp</dimen>
-	<dimen name="dp_167">247.2528dp</dimen>
-	<dimen name="dp_168">248.7333dp</dimen>
-	<dimen name="dp_169">250.2139dp</dimen>
-	<dimen name="dp_170">251.6944dp</dimen>
-	<dimen name="dp_171">253.1750dp</dimen>
-	<dimen name="dp_172">254.6556dp</dimen>
-	<dimen name="dp_173">256.1361dp</dimen>
-	<dimen name="dp_174">257.6167dp</dimen>
-	<dimen name="dp_175">259.0972dp</dimen>
-	<dimen name="dp_176">260.5778dp</dimen>
-	<dimen name="dp_177">262.0583dp</dimen>
-	<dimen name="dp_178">263.5389dp</dimen>
-	<dimen name="dp_179">265.0194dp</dimen>
-	<dimen name="dp_180">266.5000dp</dimen>
-	<dimen name="dp_181">267.9806dp</dimen>
-	<dimen name="dp_182">269.4611dp</dimen>
-	<dimen name="dp_183">270.9417dp</dimen>
-	<dimen name="dp_184">272.4222dp</dimen>
-	<dimen name="dp_185">273.9028dp</dimen>
-	<dimen name="dp_186">275.3833dp</dimen>
-	<dimen name="dp_187">276.8639dp</dimen>
-	<dimen name="dp_188">278.3444dp</dimen>
-	<dimen name="dp_189">279.8250dp</dimen>
-	<dimen name="dp_190">281.3056dp</dimen>
-	<dimen name="dp_191">282.7861dp</dimen>
-	<dimen name="dp_192">284.2667dp</dimen>
-	<dimen name="dp_193">285.7472dp</dimen>
-	<dimen name="dp_194">287.2278dp</dimen>
-	<dimen name="dp_195">288.7083dp</dimen>
-	<dimen name="dp_196">290.1889dp</dimen>
-	<dimen name="dp_197">291.6694dp</dimen>
-	<dimen name="dp_198">293.1500dp</dimen>
-	<dimen name="dp_199">294.6306dp</dimen>
-	<dimen name="dp_200">296.1111dp</dimen>
-	<dimen name="dp_201">297.5917dp</dimen>
-	<dimen name="dp_202">299.0722dp</dimen>
-	<dimen name="dp_203">300.5528dp</dimen>
-	<dimen name="dp_204">302.0333dp</dimen>
-	<dimen name="dp_205">303.5139dp</dimen>
-	<dimen name="dp_206">304.9944dp</dimen>
-	<dimen name="dp_207">306.4750dp</dimen>
-	<dimen name="dp_208">307.9556dp</dimen>
-	<dimen name="dp_209">309.4361dp</dimen>
-	<dimen name="dp_210">310.9167dp</dimen>
-	<dimen name="dp_211">312.3972dp</dimen>
-	<dimen name="dp_212">313.8778dp</dimen>
-	<dimen name="dp_213">315.3583dp</dimen>
-	<dimen name="dp_214">316.8389dp</dimen>
-	<dimen name="dp_215">318.3194dp</dimen>
-	<dimen name="dp_216">319.8000dp</dimen>
-	<dimen name="dp_217">321.2806dp</dimen>
-	<dimen name="dp_218">322.7611dp</dimen>
-	<dimen name="dp_219">324.2417dp</dimen>
-	<dimen name="dp_220">325.7222dp</dimen>
-	<dimen name="dp_221">327.2028dp</dimen>
-	<dimen name="dp_222">328.6833dp</dimen>
-	<dimen name="dp_223">330.1639dp</dimen>
-	<dimen name="dp_224">331.6444dp</dimen>
-	<dimen name="dp_225">333.1250dp</dimen>
-	<dimen name="dp_226">334.6056dp</dimen>
-	<dimen name="dp_227">336.0861dp</dimen>
-	<dimen name="dp_228">337.5667dp</dimen>
-	<dimen name="dp_229">339.0472dp</dimen>
-	<dimen name="dp_230">340.5278dp</dimen>
-	<dimen name="dp_231">342.0083dp</dimen>
-	<dimen name="dp_232">343.4889dp</dimen>
-	<dimen name="dp_233">344.9694dp</dimen>
-	<dimen name="dp_234">346.4500dp</dimen>
-	<dimen name="dp_235">347.9306dp</dimen>
-	<dimen name="dp_236">349.4111dp</dimen>
-	<dimen name="dp_237">350.8917dp</dimen>
-	<dimen name="dp_238">352.3722dp</dimen>
-	<dimen name="dp_239">353.8528dp</dimen>
-	<dimen name="dp_240">355.3333dp</dimen>
-	<dimen name="dp_241">356.8139dp</dimen>
-	<dimen name="dp_242">358.2944dp</dimen>
-	<dimen name="dp_243">359.7750dp</dimen>
-	<dimen name="dp_244">361.2556dp</dimen>
-	<dimen name="dp_245">362.7361dp</dimen>
-	<dimen name="dp_246">364.2167dp</dimen>
-	<dimen name="dp_247">365.6972dp</dimen>
-	<dimen name="dp_248">367.1778dp</dimen>
-	<dimen name="dp_249">368.6583dp</dimen>
-	<dimen name="dp_250">370.1389dp</dimen>
-	<dimen name="dp_251">371.6194dp</dimen>
-	<dimen name="dp_252">373.1000dp</dimen>
-	<dimen name="dp_253">374.5806dp</dimen>
-	<dimen name="dp_254">376.0611dp</dimen>
-	<dimen name="dp_255">377.5417dp</dimen>
-	<dimen name="dp_256">379.0222dp</dimen>
-	<dimen name="dp_257">380.5028dp</dimen>
-	<dimen name="dp_258">381.9833dp</dimen>
-	<dimen name="dp_259">383.4639dp</dimen>
-	<dimen name="dp_260">384.9444dp</dimen>
-	<dimen name="dp_261">386.4250dp</dimen>
-	<dimen name="dp_262">387.9056dp</dimen>
-	<dimen name="dp_263">389.3861dp</dimen>
-	<dimen name="dp_264">390.8667dp</dimen>
-	<dimen name="dp_265">392.3472dp</dimen>
-	<dimen name="dp_266">393.8278dp</dimen>
-	<dimen name="dp_267">395.3083dp</dimen>
-	<dimen name="dp_268">396.7889dp</dimen>
-	<dimen name="dp_269">398.2694dp</dimen>
-	<dimen name="dp_270">399.7500dp</dimen>
-	<dimen name="dp_271">401.2306dp</dimen>
-	<dimen name="dp_272">402.7111dp</dimen>
-	<dimen name="dp_273">404.1917dp</dimen>
-	<dimen name="dp_274">405.6722dp</dimen>
-	<dimen name="dp_275">407.1528dp</dimen>
-	<dimen name="dp_276">408.6333dp</dimen>
-	<dimen name="dp_277">410.1139dp</dimen>
-	<dimen name="dp_278">411.5944dp</dimen>
-	<dimen name="dp_279">413.0750dp</dimen>
-	<dimen name="dp_280">414.5556dp</dimen>
-	<dimen name="dp_281">416.0361dp</dimen>
-	<dimen name="dp_282">417.5167dp</dimen>
-	<dimen name="dp_283">418.9972dp</dimen>
-	<dimen name="dp_284">420.4778dp</dimen>
-	<dimen name="dp_285">421.9583dp</dimen>
-	<dimen name="dp_286">423.4389dp</dimen>
-	<dimen name="dp_287">424.9194dp</dimen>
-	<dimen name="dp_288">426.4000dp</dimen>
-	<dimen name="dp_289">427.8806dp</dimen>
-	<dimen name="dp_290">429.3611dp</dimen>
-	<dimen name="dp_291">430.8417dp</dimen>
-	<dimen name="dp_292">432.3222dp</dimen>
-	<dimen name="dp_293">433.8028dp</dimen>
-	<dimen name="dp_294">435.2833dp</dimen>
-	<dimen name="dp_295">436.7639dp</dimen>
-	<dimen name="dp_296">438.2444dp</dimen>
-	<dimen name="dp_297">439.7250dp</dimen>
-	<dimen name="dp_298">441.2056dp</dimen>
-	<dimen name="dp_299">442.6861dp</dimen>
-	<dimen name="dp_300">444.1667dp</dimen>
-	<dimen name="dp_301">445.6472dp</dimen>
-	<dimen name="dp_302">447.1278dp</dimen>
-	<dimen name="dp_303">448.6083dp</dimen>
-	<dimen name="dp_304">450.0889dp</dimen>
-	<dimen name="dp_305">451.5694dp</dimen>
-	<dimen name="dp_306">453.0500dp</dimen>
-	<dimen name="dp_307">454.5306dp</dimen>
-	<dimen name="dp_308">456.0111dp</dimen>
-	<dimen name="dp_309">457.4917dp</dimen>
-	<dimen name="dp_310">458.9722dp</dimen>
-	<dimen name="dp_311">460.4528dp</dimen>
-	<dimen name="dp_312">461.9333dp</dimen>
-	<dimen name="dp_313">463.4139dp</dimen>
-	<dimen name="dp_314">464.8944dp</dimen>
-	<dimen name="dp_315">466.3750dp</dimen>
-	<dimen name="dp_316">467.8556dp</dimen>
-	<dimen name="dp_317">469.3361dp</dimen>
-	<dimen name="dp_318">470.8167dp</dimen>
-	<dimen name="dp_319">472.2972dp</dimen>
-	<dimen name="dp_320">473.7778dp</dimen>
-	<dimen name="dp_321">475.2583dp</dimen>
-	<dimen name="dp_322">476.7389dp</dimen>
-	<dimen name="dp_323">478.2194dp</dimen>
-	<dimen name="dp_324">479.7000dp</dimen>
-	<dimen name="dp_325">481.1806dp</dimen>
-	<dimen name="dp_326">482.6611dp</dimen>
-	<dimen name="dp_327">484.1417dp</dimen>
-	<dimen name="dp_328">485.6222dp</dimen>
-	<dimen name="dp_329">487.1028dp</dimen>
-	<dimen name="dp_330">488.5833dp</dimen>
-	<dimen name="dp_331">490.0639dp</dimen>
-	<dimen name="dp_332">491.5444dp</dimen>
-	<dimen name="dp_333">493.0250dp</dimen>
-	<dimen name="dp_334">494.5056dp</dimen>
-	<dimen name="dp_335">495.9861dp</dimen>
-	<dimen name="dp_336">497.4667dp</dimen>
-	<dimen name="dp_337">498.9472dp</dimen>
-	<dimen name="dp_338">500.4278dp</dimen>
-	<dimen name="dp_339">501.9083dp</dimen>
-	<dimen name="dp_340">503.3889dp</dimen>
-	<dimen name="dp_341">504.8694dp</dimen>
-	<dimen name="dp_342">506.3500dp</dimen>
-	<dimen name="dp_343">507.8306dp</dimen>
-	<dimen name="dp_344">509.3111dp</dimen>
-	<dimen name="dp_345">510.7917dp</dimen>
-	<dimen name="dp_346">512.2722dp</dimen>
-	<dimen name="dp_347">513.7528dp</dimen>
-	<dimen name="dp_348">515.2333dp</dimen>
-	<dimen name="dp_349">516.7139dp</dimen>
-	<dimen name="dp_350">518.1944dp</dimen>
-	<dimen name="dp_351">519.6750dp</dimen>
-	<dimen name="dp_352">521.1556dp</dimen>
-	<dimen name="dp_353">522.6361dp</dimen>
-	<dimen name="dp_354">524.1167dp</dimen>
-	<dimen name="dp_355">525.5972dp</dimen>
-	<dimen name="dp_356">527.0778dp</dimen>
-	<dimen name="dp_357">528.5583dp</dimen>
-	<dimen name="dp_358">530.0389dp</dimen>
-	<dimen name="dp_359">531.5194dp</dimen>
-	<dimen name="dp_360">533.0000dp</dimen>
-	<dimen name="dp_365">540.4028dp</dimen>
-	<dimen name="dp_370">547.8056dp</dimen>
-	<dimen name="dp_400">592.2222dp</dimen>
-	<dimen name="dp_410">607.0278dp</dimen>
-	<dimen name="dp_422">624.7944dp</dimen>
-	<dimen name="dp_472">698.8222dp</dimen>
-	<dimen name="dp_500">740.2778dp</dimen>
-	<dimen name="dp_600">888.3333dp</dimen>
-	<dimen name="dp_640">947.5556dp</dimen>
-	<dimen name="dp_720">1066.0000dp</dimen>
-	<dimen name="sp_6">8.8833sp</dimen>
-	<dimen name="sp_7">10.3639sp</dimen>
-	<dimen name="sp_8">11.8444sp</dimen>
-	<dimen name="sp_9">13.3250sp</dimen>
-	<dimen name="sp_10">14.8056sp</dimen>
-	<dimen name="sp_11">16.2861sp</dimen>
-	<dimen name="sp_12">17.7667sp</dimen>
-	<dimen name="sp_13">19.2472sp</dimen>
-	<dimen name="sp_14">20.7278sp</dimen>
-	<dimen name="sp_15">22.2083sp</dimen>
-	<dimen name="sp_16">23.6889sp</dimen>
-	<dimen name="sp_17">25.1694sp</dimen>
-	<dimen name="sp_18">26.6500sp</dimen>
-	<dimen name="sp_19">28.1306sp</dimen>
-	<dimen name="sp_20">29.6111sp</dimen>
-	<dimen name="sp_21">31.0917sp</dimen>
-	<dimen name="sp_22">32.5722sp</dimen>
-	<dimen name="sp_23">34.0528sp</dimen>
-	<dimen name="sp_24">35.5333sp</dimen>
-	<dimen name="sp_25">37.0139sp</dimen>
-	<dimen name="sp_28">41.4556sp</dimen>
-	<dimen name="sp_30">44.4167sp</dimen>
-	<dimen name="sp_32">47.3778sp</dimen>
-	<dimen name="sp_34">50.3389sp</dimen>
-	<dimen name="sp_36">53.3000sp</dimen>
-	<dimen name="sp_38">56.2611sp</dimen>
-	<dimen name="sp_40">59.2222sp</dimen>
-	<dimen name="sp_42">62.1833sp</dimen>
-	<dimen name="sp_48">71.0667sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw592dp/dimens.xml b/app/src/main/res/values-sw592dp/dimens.xml
deleted file mode 100644
index dd4830e..0000000
--- a/app/src/main/res/values-sw592dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-98.6667dp</dimen>
-	<dimen name="dp_m_30">-49.3333dp</dimen>
-	<dimen name="dp_m_20">-32.8889dp</dimen>
-	<dimen name="dp_m_12">-19.7333dp</dimen>
-	<dimen name="dp_m_10">-16.4444dp</dimen>
-	<dimen name="dp_m_8">-13.1556dp</dimen>
-	<dimen name="dp_m_5">-8.2222dp</dimen>
-	<dimen name="dp_m_2">-3.2889dp</dimen>
-	<dimen name="dp_m_1">-1.6444dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.1644dp</dimen>
-	<dimen name="dp_0_5">0.8222dp</dimen>
-	<dimen name="dp_1">1.6444dp</dimen>
-	<dimen name="dp_1_5">2.4667dp</dimen>
-	<dimen name="dp_2">3.2889dp</dimen>
-	<dimen name="dp_2_5">4.1111dp</dimen>
-	<dimen name="dp_3">4.9333dp</dimen>
-	<dimen name="dp_3_5">5.7556dp</dimen>
-	<dimen name="dp_4">6.5778dp</dimen>
-	<dimen name="dp_4_5">7.4000dp</dimen>
-	<dimen name="dp_5">8.2222dp</dimen>
-	<dimen name="dp_6">9.8667dp</dimen>
-	<dimen name="dp_7">11.5111dp</dimen>
-	<dimen name="dp_8">13.1556dp</dimen>
-	<dimen name="dp_9">14.8000dp</dimen>
-	<dimen name="dp_10">16.4444dp</dimen>
-	<dimen name="dp_11">18.0889dp</dimen>
-	<dimen name="dp_12">19.7333dp</dimen>
-	<dimen name="dp_13">21.3778dp</dimen>
-	<dimen name="dp_14">23.0222dp</dimen>
-	<dimen name="dp_15">24.6667dp</dimen>
-	<dimen name="dp_16">26.3111dp</dimen>
-	<dimen name="dp_17">27.9556dp</dimen>
-	<dimen name="dp_18">29.6000dp</dimen>
-	<dimen name="dp_19">31.2444dp</dimen>
-	<dimen name="dp_20">32.8889dp</dimen>
-	<dimen name="dp_21">34.5333dp</dimen>
-	<dimen name="dp_22">36.1778dp</dimen>
-	<dimen name="dp_23">37.8222dp</dimen>
-	<dimen name="dp_24">39.4667dp</dimen>
-	<dimen name="dp_25">41.1111dp</dimen>
-	<dimen name="dp_26">42.7556dp</dimen>
-	<dimen name="dp_27">44.4000dp</dimen>
-	<dimen name="dp_28">46.0444dp</dimen>
-	<dimen name="dp_29">47.6889dp</dimen>
-	<dimen name="dp_30">49.3333dp</dimen>
-	<dimen name="dp_31">50.9778dp</dimen>
-	<dimen name="dp_32">52.6222dp</dimen>
-	<dimen name="dp_33">54.2667dp</dimen>
-	<dimen name="dp_34">55.9111dp</dimen>
-	<dimen name="dp_35">57.5556dp</dimen>
-	<dimen name="dp_36">59.2000dp</dimen>
-	<dimen name="dp_37">60.8444dp</dimen>
-	<dimen name="dp_38">62.4889dp</dimen>
-	<dimen name="dp_39">64.1333dp</dimen>
-	<dimen name="dp_40">65.7778dp</dimen>
-	<dimen name="dp_41">67.4222dp</dimen>
-	<dimen name="dp_42">69.0667dp</dimen>
-	<dimen name="dp_43">70.7111dp</dimen>
-	<dimen name="dp_44">72.3556dp</dimen>
-	<dimen name="dp_45">74.0000dp</dimen>
-	<dimen name="dp_46">75.6444dp</dimen>
-	<dimen name="dp_47">77.2889dp</dimen>
-	<dimen name="dp_48">78.9333dp</dimen>
-	<dimen name="dp_49">80.5778dp</dimen>
-	<dimen name="dp_50">82.2222dp</dimen>
-	<dimen name="dp_51">83.8667dp</dimen>
-	<dimen name="dp_52">85.5111dp</dimen>
-	<dimen name="dp_53">87.1556dp</dimen>
-	<dimen name="dp_54">88.8000dp</dimen>
-	<dimen name="dp_55">90.4444dp</dimen>
-	<dimen name="dp_56">92.0889dp</dimen>
-	<dimen name="dp_57">93.7333dp</dimen>
-	<dimen name="dp_58">95.3778dp</dimen>
-	<dimen name="dp_59">97.0222dp</dimen>
-	<dimen name="dp_60">98.6667dp</dimen>
-	<dimen name="dp_61">100.3111dp</dimen>
-	<dimen name="dp_62">101.9556dp</dimen>
-	<dimen name="dp_63">103.6000dp</dimen>
-	<dimen name="dp_64">105.2444dp</dimen>
-	<dimen name="dp_65">106.8889dp</dimen>
-	<dimen name="dp_66">108.5333dp</dimen>
-	<dimen name="dp_67">110.1778dp</dimen>
-	<dimen name="dp_68">111.8222dp</dimen>
-	<dimen name="dp_69">113.4667dp</dimen>
-	<dimen name="dp_70">115.1111dp</dimen>
-	<dimen name="dp_71">116.7556dp</dimen>
-	<dimen name="dp_72">118.4000dp</dimen>
-	<dimen name="dp_73">120.0444dp</dimen>
-	<dimen name="dp_74">121.6889dp</dimen>
-	<dimen name="dp_75">123.3333dp</dimen>
-	<dimen name="dp_76">124.9778dp</dimen>
-	<dimen name="dp_77">126.6222dp</dimen>
-	<dimen name="dp_78">128.2667dp</dimen>
-	<dimen name="dp_79">129.9111dp</dimen>
-	<dimen name="dp_80">131.5556dp</dimen>
-	<dimen name="dp_81">133.2000dp</dimen>
-	<dimen name="dp_82">134.8444dp</dimen>
-	<dimen name="dp_83">136.4889dp</dimen>
-	<dimen name="dp_84">138.1333dp</dimen>
-	<dimen name="dp_85">139.7778dp</dimen>
-	<dimen name="dp_86">141.4222dp</dimen>
-	<dimen name="dp_87">143.0667dp</dimen>
-	<dimen name="dp_88">144.7111dp</dimen>
-	<dimen name="dp_89">146.3556dp</dimen>
-	<dimen name="dp_90">148.0000dp</dimen>
-	<dimen name="dp_91">149.6444dp</dimen>
-	<dimen name="dp_92">151.2889dp</dimen>
-	<dimen name="dp_93">152.9333dp</dimen>
-	<dimen name="dp_94">154.5778dp</dimen>
-	<dimen name="dp_95">156.2222dp</dimen>
-	<dimen name="dp_96">157.8667dp</dimen>
-	<dimen name="dp_97">159.5111dp</dimen>
-	<dimen name="dp_98">161.1556dp</dimen>
-	<dimen name="dp_99">162.8000dp</dimen>
-	<dimen name="dp_100">164.4444dp</dimen>
-	<dimen name="dp_101">166.0889dp</dimen>
-	<dimen name="dp_102">167.7333dp</dimen>
-	<dimen name="dp_103">169.3778dp</dimen>
-	<dimen name="dp_104">171.0222dp</dimen>
-	<dimen name="dp_105">172.6667dp</dimen>
-	<dimen name="dp_106">174.3111dp</dimen>
-	<dimen name="dp_107">175.9556dp</dimen>
-	<dimen name="dp_108">177.6000dp</dimen>
-	<dimen name="dp_109">179.2444dp</dimen>
-	<dimen name="dp_110">180.8889dp</dimen>
-	<dimen name="dp_111">182.5333dp</dimen>
-	<dimen name="dp_112">184.1778dp</dimen>
-	<dimen name="dp_113">185.8222dp</dimen>
-	<dimen name="dp_114">187.4667dp</dimen>
-	<dimen name="dp_115">189.1111dp</dimen>
-	<dimen name="dp_116">190.7556dp</dimen>
-	<dimen name="dp_117">192.4000dp</dimen>
-	<dimen name="dp_118">194.0444dp</dimen>
-	<dimen name="dp_119">195.6889dp</dimen>
-	<dimen name="dp_120">197.3333dp</dimen>
-	<dimen name="dp_121">198.9778dp</dimen>
-	<dimen name="dp_122">200.6222dp</dimen>
-	<dimen name="dp_123">202.2667dp</dimen>
-	<dimen name="dp_124">203.9111dp</dimen>
-	<dimen name="dp_125">205.5556dp</dimen>
-	<dimen name="dp_126">207.2000dp</dimen>
-	<dimen name="dp_127">208.8444dp</dimen>
-	<dimen name="dp_128">210.4889dp</dimen>
-	<dimen name="dp_129">212.1333dp</dimen>
-	<dimen name="dp_130">213.7778dp</dimen>
-	<dimen name="dp_131">215.4222dp</dimen>
-	<dimen name="dp_132">217.0667dp</dimen>
-	<dimen name="dp_133">218.7111dp</dimen>
-	<dimen name="dp_134">220.3556dp</dimen>
-	<dimen name="dp_135">222.0000dp</dimen>
-	<dimen name="dp_136">223.6444dp</dimen>
-	<dimen name="dp_137">225.2889dp</dimen>
-	<dimen name="dp_138">226.9333dp</dimen>
-	<dimen name="dp_139">228.5778dp</dimen>
-	<dimen name="dp_140">230.2222dp</dimen>
-	<dimen name="dp_141">231.8667dp</dimen>
-	<dimen name="dp_142">233.5111dp</dimen>
-	<dimen name="dp_143">235.1556dp</dimen>
-	<dimen name="dp_144">236.8000dp</dimen>
-	<dimen name="dp_145">238.4444dp</dimen>
-	<dimen name="dp_146">240.0889dp</dimen>
-	<dimen name="dp_147">241.7333dp</dimen>
-	<dimen name="dp_148">243.3778dp</dimen>
-	<dimen name="dp_149">245.0222dp</dimen>
-	<dimen name="dp_150">246.6667dp</dimen>
-	<dimen name="dp_151">248.3111dp</dimen>
-	<dimen name="dp_152">249.9556dp</dimen>
-	<dimen name="dp_153">251.6000dp</dimen>
-	<dimen name="dp_154">253.2444dp</dimen>
-	<dimen name="dp_155">254.8889dp</dimen>
-	<dimen name="dp_156">256.5333dp</dimen>
-	<dimen name="dp_157">258.1778dp</dimen>
-	<dimen name="dp_158">259.8222dp</dimen>
-	<dimen name="dp_159">261.4667dp</dimen>
-	<dimen name="dp_160">263.1111dp</dimen>
-	<dimen name="dp_161">264.7556dp</dimen>
-	<dimen name="dp_162">266.4000dp</dimen>
-	<dimen name="dp_163">268.0444dp</dimen>
-	<dimen name="dp_164">269.6889dp</dimen>
-	<dimen name="dp_165">271.3333dp</dimen>
-	<dimen name="dp_166">272.9778dp</dimen>
-	<dimen name="dp_167">274.6222dp</dimen>
-	<dimen name="dp_168">276.2667dp</dimen>
-	<dimen name="dp_169">277.9111dp</dimen>
-	<dimen name="dp_170">279.5556dp</dimen>
-	<dimen name="dp_171">281.2000dp</dimen>
-	<dimen name="dp_172">282.8444dp</dimen>
-	<dimen name="dp_173">284.4889dp</dimen>
-	<dimen name="dp_174">286.1333dp</dimen>
-	<dimen name="dp_175">287.7778dp</dimen>
-	<dimen name="dp_176">289.4222dp</dimen>
-	<dimen name="dp_177">291.0667dp</dimen>
-	<dimen name="dp_178">292.7111dp</dimen>
-	<dimen name="dp_179">294.3556dp</dimen>
-	<dimen name="dp_180">296.0000dp</dimen>
-	<dimen name="dp_181">297.6444dp</dimen>
-	<dimen name="dp_182">299.2889dp</dimen>
-	<dimen name="dp_183">300.9333dp</dimen>
-	<dimen name="dp_184">302.5778dp</dimen>
-	<dimen name="dp_185">304.2222dp</dimen>
-	<dimen name="dp_186">305.8667dp</dimen>
-	<dimen name="dp_187">307.5111dp</dimen>
-	<dimen name="dp_188">309.1556dp</dimen>
-	<dimen name="dp_189">310.8000dp</dimen>
-	<dimen name="dp_190">312.4444dp</dimen>
-	<dimen name="dp_191">314.0889dp</dimen>
-	<dimen name="dp_192">315.7333dp</dimen>
-	<dimen name="dp_193">317.3778dp</dimen>
-	<dimen name="dp_194">319.0222dp</dimen>
-	<dimen name="dp_195">320.6667dp</dimen>
-	<dimen name="dp_196">322.3111dp</dimen>
-	<dimen name="dp_197">323.9556dp</dimen>
-	<dimen name="dp_198">325.6000dp</dimen>
-	<dimen name="dp_199">327.2444dp</dimen>
-	<dimen name="dp_200">328.8889dp</dimen>
-	<dimen name="dp_201">330.5333dp</dimen>
-	<dimen name="dp_202">332.1778dp</dimen>
-	<dimen name="dp_203">333.8222dp</dimen>
-	<dimen name="dp_204">335.4667dp</dimen>
-	<dimen name="dp_205">337.1111dp</dimen>
-	<dimen name="dp_206">338.7556dp</dimen>
-	<dimen name="dp_207">340.4000dp</dimen>
-	<dimen name="dp_208">342.0444dp</dimen>
-	<dimen name="dp_209">343.6889dp</dimen>
-	<dimen name="dp_210">345.3333dp</dimen>
-	<dimen name="dp_211">346.9778dp</dimen>
-	<dimen name="dp_212">348.6222dp</dimen>
-	<dimen name="dp_213">350.2667dp</dimen>
-	<dimen name="dp_214">351.9111dp</dimen>
-	<dimen name="dp_215">353.5556dp</dimen>
-	<dimen name="dp_216">355.2000dp</dimen>
-	<dimen name="dp_217">356.8444dp</dimen>
-	<dimen name="dp_218">358.4889dp</dimen>
-	<dimen name="dp_219">360.1333dp</dimen>
-	<dimen name="dp_220">361.7778dp</dimen>
-	<dimen name="dp_221">363.4222dp</dimen>
-	<dimen name="dp_222">365.0667dp</dimen>
-	<dimen name="dp_223">366.7111dp</dimen>
-	<dimen name="dp_224">368.3556dp</dimen>
-	<dimen name="dp_225">370.0000dp</dimen>
-	<dimen name="dp_226">371.6444dp</dimen>
-	<dimen name="dp_227">373.2889dp</dimen>
-	<dimen name="dp_228">374.9333dp</dimen>
-	<dimen name="dp_229">376.5778dp</dimen>
-	<dimen name="dp_230">378.2222dp</dimen>
-	<dimen name="dp_231">379.8667dp</dimen>
-	<dimen name="dp_232">381.5111dp</dimen>
-	<dimen name="dp_233">383.1556dp</dimen>
-	<dimen name="dp_234">384.8000dp</dimen>
-	<dimen name="dp_235">386.4444dp</dimen>
-	<dimen name="dp_236">388.0889dp</dimen>
-	<dimen name="dp_237">389.7333dp</dimen>
-	<dimen name="dp_238">391.3778dp</dimen>
-	<dimen name="dp_239">393.0222dp</dimen>
-	<dimen name="dp_240">394.6667dp</dimen>
-	<dimen name="dp_241">396.3111dp</dimen>
-	<dimen name="dp_242">397.9556dp</dimen>
-	<dimen name="dp_243">399.6000dp</dimen>
-	<dimen name="dp_244">401.2444dp</dimen>
-	<dimen name="dp_245">402.8889dp</dimen>
-	<dimen name="dp_246">404.5333dp</dimen>
-	<dimen name="dp_247">406.1778dp</dimen>
-	<dimen name="dp_248">407.8222dp</dimen>
-	<dimen name="dp_249">409.4667dp</dimen>
-	<dimen name="dp_250">411.1111dp</dimen>
-	<dimen name="dp_251">412.7556dp</dimen>
-	<dimen name="dp_252">414.4000dp</dimen>
-	<dimen name="dp_253">416.0444dp</dimen>
-	<dimen name="dp_254">417.6889dp</dimen>
-	<dimen name="dp_255">419.3333dp</dimen>
-	<dimen name="dp_256">420.9778dp</dimen>
-	<dimen name="dp_257">422.6222dp</dimen>
-	<dimen name="dp_258">424.2667dp</dimen>
-	<dimen name="dp_259">425.9111dp</dimen>
-	<dimen name="dp_260">427.5556dp</dimen>
-	<dimen name="dp_261">429.2000dp</dimen>
-	<dimen name="dp_262">430.8444dp</dimen>
-	<dimen name="dp_263">432.4889dp</dimen>
-	<dimen name="dp_264">434.1333dp</dimen>
-	<dimen name="dp_265">435.7778dp</dimen>
-	<dimen name="dp_266">437.4222dp</dimen>
-	<dimen name="dp_267">439.0667dp</dimen>
-	<dimen name="dp_268">440.7111dp</dimen>
-	<dimen name="dp_269">442.3556dp</dimen>
-	<dimen name="dp_270">444.0000dp</dimen>
-	<dimen name="dp_271">445.6444dp</dimen>
-	<dimen name="dp_272">447.2889dp</dimen>
-	<dimen name="dp_273">448.9333dp</dimen>
-	<dimen name="dp_274">450.5778dp</dimen>
-	<dimen name="dp_275">452.2222dp</dimen>
-	<dimen name="dp_276">453.8667dp</dimen>
-	<dimen name="dp_277">455.5111dp</dimen>
-	<dimen name="dp_278">457.1556dp</dimen>
-	<dimen name="dp_279">458.8000dp</dimen>
-	<dimen name="dp_280">460.4444dp</dimen>
-	<dimen name="dp_281">462.0889dp</dimen>
-	<dimen name="dp_282">463.7333dp</dimen>
-	<dimen name="dp_283">465.3778dp</dimen>
-	<dimen name="dp_284">467.0222dp</dimen>
-	<dimen name="dp_285">468.6667dp</dimen>
-	<dimen name="dp_286">470.3111dp</dimen>
-	<dimen name="dp_287">471.9556dp</dimen>
-	<dimen name="dp_288">473.6000dp</dimen>
-	<dimen name="dp_289">475.2444dp</dimen>
-	<dimen name="dp_290">476.8889dp</dimen>
-	<dimen name="dp_291">478.5333dp</dimen>
-	<dimen name="dp_292">480.1778dp</dimen>
-	<dimen name="dp_293">481.8222dp</dimen>
-	<dimen name="dp_294">483.4667dp</dimen>
-	<dimen name="dp_295">485.1111dp</dimen>
-	<dimen name="dp_296">486.7556dp</dimen>
-	<dimen name="dp_297">488.4000dp</dimen>
-	<dimen name="dp_298">490.0444dp</dimen>
-	<dimen name="dp_299">491.6889dp</dimen>
-	<dimen name="dp_300">493.3333dp</dimen>
-	<dimen name="dp_301">494.9778dp</dimen>
-	<dimen name="dp_302">496.6222dp</dimen>
-	<dimen name="dp_303">498.2667dp</dimen>
-	<dimen name="dp_304">499.9111dp</dimen>
-	<dimen name="dp_305">501.5556dp</dimen>
-	<dimen name="dp_306">503.2000dp</dimen>
-	<dimen name="dp_307">504.8444dp</dimen>
-	<dimen name="dp_308">506.4889dp</dimen>
-	<dimen name="dp_309">508.1333dp</dimen>
-	<dimen name="dp_310">509.7778dp</dimen>
-	<dimen name="dp_311">511.4222dp</dimen>
-	<dimen name="dp_312">513.0667dp</dimen>
-	<dimen name="dp_313">514.7111dp</dimen>
-	<dimen name="dp_314">516.3556dp</dimen>
-	<dimen name="dp_315">518.0000dp</dimen>
-	<dimen name="dp_316">519.6444dp</dimen>
-	<dimen name="dp_317">521.2889dp</dimen>
-	<dimen name="dp_318">522.9333dp</dimen>
-	<dimen name="dp_319">524.5778dp</dimen>
-	<dimen name="dp_320">526.2222dp</dimen>
-	<dimen name="dp_321">527.8667dp</dimen>
-	<dimen name="dp_322">529.5111dp</dimen>
-	<dimen name="dp_323">531.1556dp</dimen>
-	<dimen name="dp_324">532.8000dp</dimen>
-	<dimen name="dp_325">534.4444dp</dimen>
-	<dimen name="dp_326">536.0889dp</dimen>
-	<dimen name="dp_327">537.7333dp</dimen>
-	<dimen name="dp_328">539.3778dp</dimen>
-	<dimen name="dp_329">541.0222dp</dimen>
-	<dimen name="dp_330">542.6667dp</dimen>
-	<dimen name="dp_331">544.3111dp</dimen>
-	<dimen name="dp_332">545.9556dp</dimen>
-	<dimen name="dp_333">547.6000dp</dimen>
-	<dimen name="dp_334">549.2444dp</dimen>
-	<dimen name="dp_335">550.8889dp</dimen>
-	<dimen name="dp_336">552.5333dp</dimen>
-	<dimen name="dp_337">554.1778dp</dimen>
-	<dimen name="dp_338">555.8222dp</dimen>
-	<dimen name="dp_339">557.4667dp</dimen>
-	<dimen name="dp_340">559.1111dp</dimen>
-	<dimen name="dp_341">560.7556dp</dimen>
-	<dimen name="dp_342">562.4000dp</dimen>
-	<dimen name="dp_343">564.0444dp</dimen>
-	<dimen name="dp_344">565.6889dp</dimen>
-	<dimen name="dp_345">567.3333dp</dimen>
-	<dimen name="dp_346">568.9778dp</dimen>
-	<dimen name="dp_347">570.6222dp</dimen>
-	<dimen name="dp_348">572.2667dp</dimen>
-	<dimen name="dp_349">573.9111dp</dimen>
-	<dimen name="dp_350">575.5556dp</dimen>
-	<dimen name="dp_351">577.2000dp</dimen>
-	<dimen name="dp_352">578.8444dp</dimen>
-	<dimen name="dp_353">580.4889dp</dimen>
-	<dimen name="dp_354">582.1333dp</dimen>
-	<dimen name="dp_355">583.7778dp</dimen>
-	<dimen name="dp_356">585.4222dp</dimen>
-	<dimen name="dp_357">587.0667dp</dimen>
-	<dimen name="dp_358">588.7111dp</dimen>
-	<dimen name="dp_359">590.3556dp</dimen>
-	<dimen name="dp_360">592.0000dp</dimen>
-	<dimen name="dp_365">600.2222dp</dimen>
-	<dimen name="dp_370">608.4444dp</dimen>
-	<dimen name="dp_400">657.7778dp</dimen>
-	<dimen name="dp_410">674.2222dp</dimen>
-	<dimen name="dp_422">693.9556dp</dimen>
-	<dimen name="dp_472">776.1778dp</dimen>
-	<dimen name="dp_500">822.2222dp</dimen>
-	<dimen name="dp_600">986.6667dp</dimen>
-	<dimen name="dp_640">1052.4444dp</dimen>
-	<dimen name="dp_720">1184.0000dp</dimen>
-	<dimen name="sp_6">9.8667sp</dimen>
-	<dimen name="sp_7">11.5111sp</dimen>
-	<dimen name="sp_8">13.1556sp</dimen>
-	<dimen name="sp_9">14.8000sp</dimen>
-	<dimen name="sp_10">16.4444sp</dimen>
-	<dimen name="sp_11">18.0889sp</dimen>
-	<dimen name="sp_12">19.7333sp</dimen>
-	<dimen name="sp_13">21.3778sp</dimen>
-	<dimen name="sp_14">23.0222sp</dimen>
-	<dimen name="sp_15">24.6667sp</dimen>
-	<dimen name="sp_16">26.3111sp</dimen>
-	<dimen name="sp_17">27.9556sp</dimen>
-	<dimen name="sp_18">29.6000sp</dimen>
-	<dimen name="sp_19">31.2444sp</dimen>
-	<dimen name="sp_20">32.8889sp</dimen>
-	<dimen name="sp_21">34.5333sp</dimen>
-	<dimen name="sp_22">36.1778sp</dimen>
-	<dimen name="sp_23">37.8222sp</dimen>
-	<dimen name="sp_24">39.4667sp</dimen>
-	<dimen name="sp_25">41.1111sp</dimen>
-	<dimen name="sp_28">46.0444sp</dimen>
-	<dimen name="sp_30">49.3333sp</dimen>
-	<dimen name="sp_32">52.6222sp</dimen>
-	<dimen name="sp_34">55.9111sp</dimen>
-	<dimen name="sp_36">59.2000sp</dimen>
-	<dimen name="sp_38">62.4889sp</dimen>
-	<dimen name="sp_40">65.7778sp</dimen>
-	<dimen name="sp_42">69.0667sp</dimen>
-	<dimen name="sp_48">78.9333sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
deleted file mode 100644
index aa7fe0d..0000000
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-100.0000dp</dimen>
-	<dimen name="dp_m_30">-50.0000dp</dimen>
-	<dimen name="dp_m_20">-33.3333dp</dimen>
-	<dimen name="dp_m_12">-20.0000dp</dimen>
-	<dimen name="dp_m_10">-16.6667dp</dimen>
-	<dimen name="dp_m_8">-13.3333dp</dimen>
-	<dimen name="dp_m_5">-8.3333dp</dimen>
-	<dimen name="dp_m_2">-3.3333dp</dimen>
-	<dimen name="dp_m_1">-1.6667dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.1667dp</dimen>
-	<dimen name="dp_0_5">0.8333dp</dimen>
-	<dimen name="dp_1">1.6667dp</dimen>
-	<dimen name="dp_1_5">2.5000dp</dimen>
-	<dimen name="dp_2">3.3333dp</dimen>
-	<dimen name="dp_2_5">4.1667dp</dimen>
-	<dimen name="dp_3">5.0000dp</dimen>
-	<dimen name="dp_3_5">5.8333dp</dimen>
-	<dimen name="dp_4">6.6667dp</dimen>
-	<dimen name="dp_4_5">7.5000dp</dimen>
-	<dimen name="dp_5">8.3333dp</dimen>
-	<dimen name="dp_6">10.0000dp</dimen>
-	<dimen name="dp_7">11.6667dp</dimen>
-	<dimen name="dp_8">13.3333dp</dimen>
-	<dimen name="dp_9">15.0000dp</dimen>
-	<dimen name="dp_10">16.6667dp</dimen>
-	<dimen name="dp_11">18.3333dp</dimen>
-	<dimen name="dp_12">20.0000dp</dimen>
-	<dimen name="dp_13">21.6667dp</dimen>
-	<dimen name="dp_14">23.3333dp</dimen>
-	<dimen name="dp_15">25.0000dp</dimen>
-	<dimen name="dp_16">26.6667dp</dimen>
-	<dimen name="dp_17">28.3333dp</dimen>
-	<dimen name="dp_18">30.0000dp</dimen>
-	<dimen name="dp_19">31.6667dp</dimen>
-	<dimen name="dp_20">33.3333dp</dimen>
-	<dimen name="dp_21">35.0000dp</dimen>
-	<dimen name="dp_22">36.6667dp</dimen>
-	<dimen name="dp_23">38.3333dp</dimen>
-	<dimen name="dp_24">40.0000dp</dimen>
-	<dimen name="dp_25">41.6667dp</dimen>
-	<dimen name="dp_26">43.3333dp</dimen>
-	<dimen name="dp_27">45.0000dp</dimen>
-	<dimen name="dp_28">46.6667dp</dimen>
-	<dimen name="dp_29">48.3333dp</dimen>
-	<dimen name="dp_30">50.0000dp</dimen>
-	<dimen name="dp_31">51.6667dp</dimen>
-	<dimen name="dp_32">53.3333dp</dimen>
-	<dimen name="dp_33">55.0000dp</dimen>
-	<dimen name="dp_34">56.6667dp</dimen>
-	<dimen name="dp_35">58.3333dp</dimen>
-	<dimen name="dp_36">60.0000dp</dimen>
-	<dimen name="dp_37">61.6667dp</dimen>
-	<dimen name="dp_38">63.3333dp</dimen>
-	<dimen name="dp_39">65.0000dp</dimen>
-	<dimen name="dp_40">66.6667dp</dimen>
-	<dimen name="dp_41">68.3333dp</dimen>
-	<dimen name="dp_42">70.0000dp</dimen>
-	<dimen name="dp_43">71.6667dp</dimen>
-	<dimen name="dp_44">73.3333dp</dimen>
-	<dimen name="dp_45">75.0000dp</dimen>
-	<dimen name="dp_46">76.6667dp</dimen>
-	<dimen name="dp_47">78.3333dp</dimen>
-	<dimen name="dp_48">80.0000dp</dimen>
-	<dimen name="dp_49">81.6667dp</dimen>
-	<dimen name="dp_50">83.3333dp</dimen>
-	<dimen name="dp_51">85.0000dp</dimen>
-	<dimen name="dp_52">86.6667dp</dimen>
-	<dimen name="dp_53">88.3333dp</dimen>
-	<dimen name="dp_54">90.0000dp</dimen>
-	<dimen name="dp_55">91.6667dp</dimen>
-	<dimen name="dp_56">93.3333dp</dimen>
-	<dimen name="dp_57">95.0000dp</dimen>
-	<dimen name="dp_58">96.6667dp</dimen>
-	<dimen name="dp_59">98.3333dp</dimen>
-	<dimen name="dp_60">100.0000dp</dimen>
-	<dimen name="dp_61">101.6667dp</dimen>
-	<dimen name="dp_62">103.3333dp</dimen>
-	<dimen name="dp_63">105.0000dp</dimen>
-	<dimen name="dp_64">106.6667dp</dimen>
-	<dimen name="dp_65">108.3333dp</dimen>
-	<dimen name="dp_66">110.0000dp</dimen>
-	<dimen name="dp_67">111.6667dp</dimen>
-	<dimen name="dp_68">113.3333dp</dimen>
-	<dimen name="dp_69">115.0000dp</dimen>
-	<dimen name="dp_70">116.6667dp</dimen>
-	<dimen name="dp_71">118.3333dp</dimen>
-	<dimen name="dp_72">120.0000dp</dimen>
-	<dimen name="dp_73">121.6667dp</dimen>
-	<dimen name="dp_74">123.3333dp</dimen>
-	<dimen name="dp_75">125.0000dp</dimen>
-	<dimen name="dp_76">126.6667dp</dimen>
-	<dimen name="dp_77">128.3333dp</dimen>
-	<dimen name="dp_78">130.0000dp</dimen>
-	<dimen name="dp_79">131.6667dp</dimen>
-	<dimen name="dp_80">133.3333dp</dimen>
-	<dimen name="dp_81">135.0000dp</dimen>
-	<dimen name="dp_82">136.6667dp</dimen>
-	<dimen name="dp_83">138.3333dp</dimen>
-	<dimen name="dp_84">140.0000dp</dimen>
-	<dimen name="dp_85">141.6667dp</dimen>
-	<dimen name="dp_86">143.3333dp</dimen>
-	<dimen name="dp_87">145.0000dp</dimen>
-	<dimen name="dp_88">146.6667dp</dimen>
-	<dimen name="dp_89">148.3333dp</dimen>
-	<dimen name="dp_90">150.0000dp</dimen>
-	<dimen name="dp_91">151.6667dp</dimen>
-	<dimen name="dp_92">153.3333dp</dimen>
-	<dimen name="dp_93">155.0000dp</dimen>
-	<dimen name="dp_94">156.6667dp</dimen>
-	<dimen name="dp_95">158.3333dp</dimen>
-	<dimen name="dp_96">160.0000dp</dimen>
-	<dimen name="dp_97">161.6667dp</dimen>
-	<dimen name="dp_98">163.3333dp</dimen>
-	<dimen name="dp_99">165.0000dp</dimen>
-	<dimen name="dp_100">166.6667dp</dimen>
-	<dimen name="dp_101">168.3333dp</dimen>
-	<dimen name="dp_102">170.0000dp</dimen>
-	<dimen name="dp_103">171.6667dp</dimen>
-	<dimen name="dp_104">173.3333dp</dimen>
-	<dimen name="dp_105">175.0000dp</dimen>
-	<dimen name="dp_106">176.6667dp</dimen>
-	<dimen name="dp_107">178.3333dp</dimen>
-	<dimen name="dp_108">180.0000dp</dimen>
-	<dimen name="dp_109">181.6667dp</dimen>
-	<dimen name="dp_110">183.3333dp</dimen>
-	<dimen name="dp_111">185.0000dp</dimen>
-	<dimen name="dp_112">186.6667dp</dimen>
-	<dimen name="dp_113">188.3333dp</dimen>
-	<dimen name="dp_114">190.0000dp</dimen>
-	<dimen name="dp_115">191.6667dp</dimen>
-	<dimen name="dp_116">193.3333dp</dimen>
-	<dimen name="dp_117">195.0000dp</dimen>
-	<dimen name="dp_118">196.6667dp</dimen>
-	<dimen name="dp_119">198.3333dp</dimen>
-	<dimen name="dp_120">200.0000dp</dimen>
-	<dimen name="dp_121">201.6667dp</dimen>
-	<dimen name="dp_122">203.3333dp</dimen>
-	<dimen name="dp_123">205.0000dp</dimen>
-	<dimen name="dp_124">206.6667dp</dimen>
-	<dimen name="dp_125">208.3333dp</dimen>
-	<dimen name="dp_126">210.0000dp</dimen>
-	<dimen name="dp_127">211.6667dp</dimen>
-	<dimen name="dp_128">213.3333dp</dimen>
-	<dimen name="dp_129">215.0000dp</dimen>
-	<dimen name="dp_130">216.6667dp</dimen>
-	<dimen name="dp_131">218.3333dp</dimen>
-	<dimen name="dp_132">220.0000dp</dimen>
-	<dimen name="dp_133">221.6667dp</dimen>
-	<dimen name="dp_134">223.3333dp</dimen>
-	<dimen name="dp_135">225.0000dp</dimen>
-	<dimen name="dp_136">226.6667dp</dimen>
-	<dimen name="dp_137">228.3333dp</dimen>
-	<dimen name="dp_138">230.0000dp</dimen>
-	<dimen name="dp_139">231.6667dp</dimen>
-	<dimen name="dp_140">233.3333dp</dimen>
-	<dimen name="dp_141">235.0000dp</dimen>
-	<dimen name="dp_142">236.6667dp</dimen>
-	<dimen name="dp_143">238.3333dp</dimen>
-	<dimen name="dp_144">240.0000dp</dimen>
-	<dimen name="dp_145">241.6667dp</dimen>
-	<dimen name="dp_146">243.3333dp</dimen>
-	<dimen name="dp_147">245.0000dp</dimen>
-	<dimen name="dp_148">246.6667dp</dimen>
-	<dimen name="dp_149">248.3333dp</dimen>
-	<dimen name="dp_150">250.0000dp</dimen>
-	<dimen name="dp_151">251.6667dp</dimen>
-	<dimen name="dp_152">253.3333dp</dimen>
-	<dimen name="dp_153">255.0000dp</dimen>
-	<dimen name="dp_154">256.6667dp</dimen>
-	<dimen name="dp_155">258.3333dp</dimen>
-	<dimen name="dp_156">260.0000dp</dimen>
-	<dimen name="dp_157">261.6667dp</dimen>
-	<dimen name="dp_158">263.3333dp</dimen>
-	<dimen name="dp_159">265.0000dp</dimen>
-	<dimen name="dp_160">266.6667dp</dimen>
-	<dimen name="dp_161">268.3333dp</dimen>
-	<dimen name="dp_162">270.0000dp</dimen>
-	<dimen name="dp_163">271.6667dp</dimen>
-	<dimen name="dp_164">273.3333dp</dimen>
-	<dimen name="dp_165">275.0000dp</dimen>
-	<dimen name="dp_166">276.6667dp</dimen>
-	<dimen name="dp_167">278.3333dp</dimen>
-	<dimen name="dp_168">280.0000dp</dimen>
-	<dimen name="dp_169">281.6667dp</dimen>
-	<dimen name="dp_170">283.3333dp</dimen>
-	<dimen name="dp_171">285.0000dp</dimen>
-	<dimen name="dp_172">286.6667dp</dimen>
-	<dimen name="dp_173">288.3333dp</dimen>
-	<dimen name="dp_174">290.0000dp</dimen>
-	<dimen name="dp_175">291.6667dp</dimen>
-	<dimen name="dp_176">293.3333dp</dimen>
-	<dimen name="dp_177">295.0000dp</dimen>
-	<dimen name="dp_178">296.6667dp</dimen>
-	<dimen name="dp_179">298.3333dp</dimen>
-	<dimen name="dp_180">300.0000dp</dimen>
-	<dimen name="dp_181">301.6667dp</dimen>
-	<dimen name="dp_182">303.3333dp</dimen>
-	<dimen name="dp_183">305.0000dp</dimen>
-	<dimen name="dp_184">306.6667dp</dimen>
-	<dimen name="dp_185">308.3333dp</dimen>
-	<dimen name="dp_186">310.0000dp</dimen>
-	<dimen name="dp_187">311.6667dp</dimen>
-	<dimen name="dp_188">313.3333dp</dimen>
-	<dimen name="dp_189">315.0000dp</dimen>
-	<dimen name="dp_190">316.6667dp</dimen>
-	<dimen name="dp_191">318.3333dp</dimen>
-	<dimen name="dp_192">320.0000dp</dimen>
-	<dimen name="dp_193">321.6667dp</dimen>
-	<dimen name="dp_194">323.3333dp</dimen>
-	<dimen name="dp_195">325.0000dp</dimen>
-	<dimen name="dp_196">326.6667dp</dimen>
-	<dimen name="dp_197">328.3333dp</dimen>
-	<dimen name="dp_198">330.0000dp</dimen>
-	<dimen name="dp_199">331.6667dp</dimen>
-	<dimen name="dp_200">333.3333dp</dimen>
-	<dimen name="dp_201">335.0000dp</dimen>
-	<dimen name="dp_202">336.6667dp</dimen>
-	<dimen name="dp_203">338.3333dp</dimen>
-	<dimen name="dp_204">340.0000dp</dimen>
-	<dimen name="dp_205">341.6667dp</dimen>
-	<dimen name="dp_206">343.3333dp</dimen>
-	<dimen name="dp_207">345.0000dp</dimen>
-	<dimen name="dp_208">346.6667dp</dimen>
-	<dimen name="dp_209">348.3333dp</dimen>
-	<dimen name="dp_210">350.0000dp</dimen>
-	<dimen name="dp_211">351.6667dp</dimen>
-	<dimen name="dp_212">353.3333dp</dimen>
-	<dimen name="dp_213">355.0000dp</dimen>
-	<dimen name="dp_214">356.6667dp</dimen>
-	<dimen name="dp_215">358.3333dp</dimen>
-	<dimen name="dp_216">360.0000dp</dimen>
-	<dimen name="dp_217">361.6667dp</dimen>
-	<dimen name="dp_218">363.3333dp</dimen>
-	<dimen name="dp_219">365.0000dp</dimen>
-	<dimen name="dp_220">366.6667dp</dimen>
-	<dimen name="dp_221">368.3333dp</dimen>
-	<dimen name="dp_222">370.0000dp</dimen>
-	<dimen name="dp_223">371.6667dp</dimen>
-	<dimen name="dp_224">373.3333dp</dimen>
-	<dimen name="dp_225">375.0000dp</dimen>
-	<dimen name="dp_226">376.6667dp</dimen>
-	<dimen name="dp_227">378.3333dp</dimen>
-	<dimen name="dp_228">380.0000dp</dimen>
-	<dimen name="dp_229">381.6667dp</dimen>
-	<dimen name="dp_230">383.3333dp</dimen>
-	<dimen name="dp_231">385.0000dp</dimen>
-	<dimen name="dp_232">386.6667dp</dimen>
-	<dimen name="dp_233">388.3333dp</dimen>
-	<dimen name="dp_234">390.0000dp</dimen>
-	<dimen name="dp_235">391.6667dp</dimen>
-	<dimen name="dp_236">393.3333dp</dimen>
-	<dimen name="dp_237">395.0000dp</dimen>
-	<dimen name="dp_238">396.6667dp</dimen>
-	<dimen name="dp_239">398.3333dp</dimen>
-	<dimen name="dp_240">400.0000dp</dimen>
-	<dimen name="dp_241">401.6667dp</dimen>
-	<dimen name="dp_242">403.3333dp</dimen>
-	<dimen name="dp_243">405.0000dp</dimen>
-	<dimen name="dp_244">406.6667dp</dimen>
-	<dimen name="dp_245">408.3333dp</dimen>
-	<dimen name="dp_246">410.0000dp</dimen>
-	<dimen name="dp_247">411.6667dp</dimen>
-	<dimen name="dp_248">413.3333dp</dimen>
-	<dimen name="dp_249">415.0000dp</dimen>
-	<dimen name="dp_250">416.6667dp</dimen>
-	<dimen name="dp_251">418.3333dp</dimen>
-	<dimen name="dp_252">420.0000dp</dimen>
-	<dimen name="dp_253">421.6667dp</dimen>
-	<dimen name="dp_254">423.3333dp</dimen>
-	<dimen name="dp_255">425.0000dp</dimen>
-	<dimen name="dp_256">426.6667dp</dimen>
-	<dimen name="dp_257">428.3333dp</dimen>
-	<dimen name="dp_258">430.0000dp</dimen>
-	<dimen name="dp_259">431.6667dp</dimen>
-	<dimen name="dp_260">433.3333dp</dimen>
-	<dimen name="dp_261">435.0000dp</dimen>
-	<dimen name="dp_262">436.6667dp</dimen>
-	<dimen name="dp_263">438.3333dp</dimen>
-	<dimen name="dp_264">440.0000dp</dimen>
-	<dimen name="dp_265">441.6667dp</dimen>
-	<dimen name="dp_266">443.3333dp</dimen>
-	<dimen name="dp_267">445.0000dp</dimen>
-	<dimen name="dp_268">446.6667dp</dimen>
-	<dimen name="dp_269">448.3333dp</dimen>
-	<dimen name="dp_270">450.0000dp</dimen>
-	<dimen name="dp_271">451.6667dp</dimen>
-	<dimen name="dp_272">453.3333dp</dimen>
-	<dimen name="dp_273">455.0000dp</dimen>
-	<dimen name="dp_274">456.6667dp</dimen>
-	<dimen name="dp_275">458.3333dp</dimen>
-	<dimen name="dp_276">460.0000dp</dimen>
-	<dimen name="dp_277">461.6667dp</dimen>
-	<dimen name="dp_278">463.3333dp</dimen>
-	<dimen name="dp_279">465.0000dp</dimen>
-	<dimen name="dp_280">466.6667dp</dimen>
-	<dimen name="dp_281">468.3333dp</dimen>
-	<dimen name="dp_282">470.0000dp</dimen>
-	<dimen name="dp_283">471.6667dp</dimen>
-	<dimen name="dp_284">473.3333dp</dimen>
-	<dimen name="dp_285">475.0000dp</dimen>
-	<dimen name="dp_286">476.6667dp</dimen>
-	<dimen name="dp_287">478.3333dp</dimen>
-	<dimen name="dp_288">480.0000dp</dimen>
-	<dimen name="dp_289">481.6667dp</dimen>
-	<dimen name="dp_290">483.3333dp</dimen>
-	<dimen name="dp_291">485.0000dp</dimen>
-	<dimen name="dp_292">486.6667dp</dimen>
-	<dimen name="dp_293">488.3333dp</dimen>
-	<dimen name="dp_294">490.0000dp</dimen>
-	<dimen name="dp_295">491.6667dp</dimen>
-	<dimen name="dp_296">493.3333dp</dimen>
-	<dimen name="dp_297">495.0000dp</dimen>
-	<dimen name="dp_298">496.6667dp</dimen>
-	<dimen name="dp_299">498.3333dp</dimen>
-	<dimen name="dp_300">500.0000dp</dimen>
-	<dimen name="dp_301">501.6667dp</dimen>
-	<dimen name="dp_302">503.3333dp</dimen>
-	<dimen name="dp_303">505.0000dp</dimen>
-	<dimen name="dp_304">506.6667dp</dimen>
-	<dimen name="dp_305">508.3333dp</dimen>
-	<dimen name="dp_306">510.0000dp</dimen>
-	<dimen name="dp_307">511.6667dp</dimen>
-	<dimen name="dp_308">513.3333dp</dimen>
-	<dimen name="dp_309">515.0000dp</dimen>
-	<dimen name="dp_310">516.6667dp</dimen>
-	<dimen name="dp_311">518.3333dp</dimen>
-	<dimen name="dp_312">520.0000dp</dimen>
-	<dimen name="dp_313">521.6667dp</dimen>
-	<dimen name="dp_314">523.3333dp</dimen>
-	<dimen name="dp_315">525.0000dp</dimen>
-	<dimen name="dp_316">526.6667dp</dimen>
-	<dimen name="dp_317">528.3333dp</dimen>
-	<dimen name="dp_318">530.0000dp</dimen>
-	<dimen name="dp_319">531.6667dp</dimen>
-	<dimen name="dp_320">533.3333dp</dimen>
-	<dimen name="dp_321">535.0000dp</dimen>
-	<dimen name="dp_322">536.6667dp</dimen>
-	<dimen name="dp_323">538.3333dp</dimen>
-	<dimen name="dp_324">540.0000dp</dimen>
-	<dimen name="dp_325">541.6667dp</dimen>
-	<dimen name="dp_326">543.3333dp</dimen>
-	<dimen name="dp_327">545.0000dp</dimen>
-	<dimen name="dp_328">546.6667dp</dimen>
-	<dimen name="dp_329">548.3333dp</dimen>
-	<dimen name="dp_330">550.0000dp</dimen>
-	<dimen name="dp_331">551.6667dp</dimen>
-	<dimen name="dp_332">553.3333dp</dimen>
-	<dimen name="dp_333">555.0000dp</dimen>
-	<dimen name="dp_334">556.6667dp</dimen>
-	<dimen name="dp_335">558.3333dp</dimen>
-	<dimen name="dp_336">560.0000dp</dimen>
-	<dimen name="dp_337">561.6667dp</dimen>
-	<dimen name="dp_338">563.3333dp</dimen>
-	<dimen name="dp_339">565.0000dp</dimen>
-	<dimen name="dp_340">566.6667dp</dimen>
-	<dimen name="dp_341">568.3333dp</dimen>
-	<dimen name="dp_342">570.0000dp</dimen>
-	<dimen name="dp_343">571.6667dp</dimen>
-	<dimen name="dp_344">573.3333dp</dimen>
-	<dimen name="dp_345">575.0000dp</dimen>
-	<dimen name="dp_346">576.6667dp</dimen>
-	<dimen name="dp_347">578.3333dp</dimen>
-	<dimen name="dp_348">580.0000dp</dimen>
-	<dimen name="dp_349">581.6667dp</dimen>
-	<dimen name="dp_350">583.3333dp</dimen>
-	<dimen name="dp_351">585.0000dp</dimen>
-	<dimen name="dp_352">586.6667dp</dimen>
-	<dimen name="dp_353">588.3333dp</dimen>
-	<dimen name="dp_354">590.0000dp</dimen>
-	<dimen name="dp_355">591.6667dp</dimen>
-	<dimen name="dp_356">593.3333dp</dimen>
-	<dimen name="dp_357">595.0000dp</dimen>
-	<dimen name="dp_358">596.6667dp</dimen>
-	<dimen name="dp_359">598.3333dp</dimen>
-	<dimen name="dp_360">600.0000dp</dimen>
-	<dimen name="dp_365">608.3333dp</dimen>
-	<dimen name="dp_370">616.6667dp</dimen>
-	<dimen name="dp_400">666.6667dp</dimen>
-	<dimen name="dp_410">683.3333dp</dimen>
-	<dimen name="dp_422">703.3333dp</dimen>
-	<dimen name="dp_472">786.6667dp</dimen>
-	<dimen name="dp_500">833.3333dp</dimen>
-	<dimen name="dp_600">1000.0000dp</dimen>
-	<dimen name="dp_640">1066.6667dp</dimen>
-	<dimen name="dp_720">1200.0000dp</dimen>
-	<dimen name="sp_6">10.0000sp</dimen>
-	<dimen name="sp_7">11.6667sp</dimen>
-	<dimen name="sp_8">13.3333sp</dimen>
-	<dimen name="sp_9">15.0000sp</dimen>
-	<dimen name="sp_10">16.6667sp</dimen>
-	<dimen name="sp_11">18.3333sp</dimen>
-	<dimen name="sp_12">20.0000sp</dimen>
-	<dimen name="sp_13">21.6667sp</dimen>
-	<dimen name="sp_14">23.3333sp</dimen>
-	<dimen name="sp_15">25.0000sp</dimen>
-	<dimen name="sp_16">26.6667sp</dimen>
-	<dimen name="sp_17">28.3333sp</dimen>
-	<dimen name="sp_18">30.0000sp</dimen>
-	<dimen name="sp_19">31.6667sp</dimen>
-	<dimen name="sp_20">33.3333sp</dimen>
-	<dimen name="sp_21">35.0000sp</dimen>
-	<dimen name="sp_22">36.6667sp</dimen>
-	<dimen name="sp_23">38.3333sp</dimen>
-	<dimen name="sp_24">40.0000sp</dimen>
-	<dimen name="sp_25">41.6667sp</dimen>
-	<dimen name="sp_28">46.6667sp</dimen>
-	<dimen name="sp_30">50.0000sp</dimen>
-	<dimen name="sp_32">53.3333sp</dimen>
-	<dimen name="sp_34">56.6667sp</dimen>
-	<dimen name="sp_36">60.0000sp</dimen>
-	<dimen name="sp_38">63.3333sp</dimen>
-	<dimen name="sp_40">66.6667sp</dimen>
-	<dimen name="sp_42">70.0000sp</dimen>
-	<dimen name="sp_48">80.0000sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw640dp/dimens.xml b/app/src/main/res/values-sw640dp/dimens.xml
deleted file mode 100644
index 2ae3b80..0000000
--- a/app/src/main/res/values-sw640dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-106.6667dp</dimen>
-	<dimen name="dp_m_30">-53.3333dp</dimen>
-	<dimen name="dp_m_20">-35.5556dp</dimen>
-	<dimen name="dp_m_12">-21.3333dp</dimen>
-	<dimen name="dp_m_10">-17.7778dp</dimen>
-	<dimen name="dp_m_8">-14.2222dp</dimen>
-	<dimen name="dp_m_5">-8.8889dp</dimen>
-	<dimen name="dp_m_2">-3.5556dp</dimen>
-	<dimen name="dp_m_1">-1.7778dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.1778dp</dimen>
-	<dimen name="dp_0_5">0.8889dp</dimen>
-	<dimen name="dp_1">1.7778dp</dimen>
-	<dimen name="dp_1_5">2.6667dp</dimen>
-	<dimen name="dp_2">3.5556dp</dimen>
-	<dimen name="dp_2_5">4.4444dp</dimen>
-	<dimen name="dp_3">5.3333dp</dimen>
-	<dimen name="dp_3_5">6.2222dp</dimen>
-	<dimen name="dp_4">7.1111dp</dimen>
-	<dimen name="dp_4_5">8.0000dp</dimen>
-	<dimen name="dp_5">8.8889dp</dimen>
-	<dimen name="dp_6">10.6667dp</dimen>
-	<dimen name="dp_7">12.4444dp</dimen>
-	<dimen name="dp_8">14.2222dp</dimen>
-	<dimen name="dp_9">16.0000dp</dimen>
-	<dimen name="dp_10">17.7778dp</dimen>
-	<dimen name="dp_11">19.5556dp</dimen>
-	<dimen name="dp_12">21.3333dp</dimen>
-	<dimen name="dp_13">23.1111dp</dimen>
-	<dimen name="dp_14">24.8889dp</dimen>
-	<dimen name="dp_15">26.6667dp</dimen>
-	<dimen name="dp_16">28.4444dp</dimen>
-	<dimen name="dp_17">30.2222dp</dimen>
-	<dimen name="dp_18">32.0000dp</dimen>
-	<dimen name="dp_19">33.7778dp</dimen>
-	<dimen name="dp_20">35.5556dp</dimen>
-	<dimen name="dp_21">37.3333dp</dimen>
-	<dimen name="dp_22">39.1111dp</dimen>
-	<dimen name="dp_23">40.8889dp</dimen>
-	<dimen name="dp_24">42.6667dp</dimen>
-	<dimen name="dp_25">44.4444dp</dimen>
-	<dimen name="dp_26">46.2222dp</dimen>
-	<dimen name="dp_27">48.0000dp</dimen>
-	<dimen name="dp_28">49.7778dp</dimen>
-	<dimen name="dp_29">51.5556dp</dimen>
-	<dimen name="dp_30">53.3333dp</dimen>
-	<dimen name="dp_31">55.1111dp</dimen>
-	<dimen name="dp_32">56.8889dp</dimen>
-	<dimen name="dp_33">58.6667dp</dimen>
-	<dimen name="dp_34">60.4444dp</dimen>
-	<dimen name="dp_35">62.2222dp</dimen>
-	<dimen name="dp_36">64.0000dp</dimen>
-	<dimen name="dp_37">65.7778dp</dimen>
-	<dimen name="dp_38">67.5556dp</dimen>
-	<dimen name="dp_39">69.3333dp</dimen>
-	<dimen name="dp_40">71.1111dp</dimen>
-	<dimen name="dp_41">72.8889dp</dimen>
-	<dimen name="dp_42">74.6667dp</dimen>
-	<dimen name="dp_43">76.4444dp</dimen>
-	<dimen name="dp_44">78.2222dp</dimen>
-	<dimen name="dp_45">80.0000dp</dimen>
-	<dimen name="dp_46">81.7778dp</dimen>
-	<dimen name="dp_47">83.5556dp</dimen>
-	<dimen name="dp_48">85.3333dp</dimen>
-	<dimen name="dp_49">87.1111dp</dimen>
-	<dimen name="dp_50">88.8889dp</dimen>
-	<dimen name="dp_51">90.6667dp</dimen>
-	<dimen name="dp_52">92.4444dp</dimen>
-	<dimen name="dp_53">94.2222dp</dimen>
-	<dimen name="dp_54">96.0000dp</dimen>
-	<dimen name="dp_55">97.7778dp</dimen>
-	<dimen name="dp_56">99.5556dp</dimen>
-	<dimen name="dp_57">101.3333dp</dimen>
-	<dimen name="dp_58">103.1111dp</dimen>
-	<dimen name="dp_59">104.8889dp</dimen>
-	<dimen name="dp_60">106.6667dp</dimen>
-	<dimen name="dp_61">108.4444dp</dimen>
-	<dimen name="dp_62">110.2222dp</dimen>
-	<dimen name="dp_63">112.0000dp</dimen>
-	<dimen name="dp_64">113.7778dp</dimen>
-	<dimen name="dp_65">115.5556dp</dimen>
-	<dimen name="dp_66">117.3333dp</dimen>
-	<dimen name="dp_67">119.1111dp</dimen>
-	<dimen name="dp_68">120.8889dp</dimen>
-	<dimen name="dp_69">122.6667dp</dimen>
-	<dimen name="dp_70">124.4444dp</dimen>
-	<dimen name="dp_71">126.2222dp</dimen>
-	<dimen name="dp_72">128.0000dp</dimen>
-	<dimen name="dp_73">129.7778dp</dimen>
-	<dimen name="dp_74">131.5556dp</dimen>
-	<dimen name="dp_75">133.3333dp</dimen>
-	<dimen name="dp_76">135.1111dp</dimen>
-	<dimen name="dp_77">136.8889dp</dimen>
-	<dimen name="dp_78">138.6667dp</dimen>
-	<dimen name="dp_79">140.4444dp</dimen>
-	<dimen name="dp_80">142.2222dp</dimen>
-	<dimen name="dp_81">144.0000dp</dimen>
-	<dimen name="dp_82">145.7778dp</dimen>
-	<dimen name="dp_83">147.5556dp</dimen>
-	<dimen name="dp_84">149.3333dp</dimen>
-	<dimen name="dp_85">151.1111dp</dimen>
-	<dimen name="dp_86">152.8889dp</dimen>
-	<dimen name="dp_87">154.6667dp</dimen>
-	<dimen name="dp_88">156.4444dp</dimen>
-	<dimen name="dp_89">158.2222dp</dimen>
-	<dimen name="dp_90">160.0000dp</dimen>
-	<dimen name="dp_91">161.7778dp</dimen>
-	<dimen name="dp_92">163.5556dp</dimen>
-	<dimen name="dp_93">165.3333dp</dimen>
-	<dimen name="dp_94">167.1111dp</dimen>
-	<dimen name="dp_95">168.8889dp</dimen>
-	<dimen name="dp_96">170.6667dp</dimen>
-	<dimen name="dp_97">172.4444dp</dimen>
-	<dimen name="dp_98">174.2222dp</dimen>
-	<dimen name="dp_99">176.0000dp</dimen>
-	<dimen name="dp_100">177.7778dp</dimen>
-	<dimen name="dp_101">179.5556dp</dimen>
-	<dimen name="dp_102">181.3333dp</dimen>
-	<dimen name="dp_103">183.1111dp</dimen>
-	<dimen name="dp_104">184.8889dp</dimen>
-	<dimen name="dp_105">186.6667dp</dimen>
-	<dimen name="dp_106">188.4444dp</dimen>
-	<dimen name="dp_107">190.2222dp</dimen>
-	<dimen name="dp_108">192.0000dp</dimen>
-	<dimen name="dp_109">193.7778dp</dimen>
-	<dimen name="dp_110">195.5556dp</dimen>
-	<dimen name="dp_111">197.3333dp</dimen>
-	<dimen name="dp_112">199.1111dp</dimen>
-	<dimen name="dp_113">200.8889dp</dimen>
-	<dimen name="dp_114">202.6667dp</dimen>
-	<dimen name="dp_115">204.4444dp</dimen>
-	<dimen name="dp_116">206.2222dp</dimen>
-	<dimen name="dp_117">208.0000dp</dimen>
-	<dimen name="dp_118">209.7778dp</dimen>
-	<dimen name="dp_119">211.5556dp</dimen>
-	<dimen name="dp_120">213.3333dp</dimen>
-	<dimen name="dp_121">215.1111dp</dimen>
-	<dimen name="dp_122">216.8889dp</dimen>
-	<dimen name="dp_123">218.6667dp</dimen>
-	<dimen name="dp_124">220.4444dp</dimen>
-	<dimen name="dp_125">222.2222dp</dimen>
-	<dimen name="dp_126">224.0000dp</dimen>
-	<dimen name="dp_127">225.7778dp</dimen>
-	<dimen name="dp_128">227.5556dp</dimen>
-	<dimen name="dp_129">229.3333dp</dimen>
-	<dimen name="dp_130">231.1111dp</dimen>
-	<dimen name="dp_131">232.8889dp</dimen>
-	<dimen name="dp_132">234.6667dp</dimen>
-	<dimen name="dp_133">236.4444dp</dimen>
-	<dimen name="dp_134">238.2222dp</dimen>
-	<dimen name="dp_135">240.0000dp</dimen>
-	<dimen name="dp_136">241.7778dp</dimen>
-	<dimen name="dp_137">243.5556dp</dimen>
-	<dimen name="dp_138">245.3333dp</dimen>
-	<dimen name="dp_139">247.1111dp</dimen>
-	<dimen name="dp_140">248.8889dp</dimen>
-	<dimen name="dp_141">250.6667dp</dimen>
-	<dimen name="dp_142">252.4444dp</dimen>
-	<dimen name="dp_143">254.2222dp</dimen>
-	<dimen name="dp_144">256.0000dp</dimen>
-	<dimen name="dp_145">257.7778dp</dimen>
-	<dimen name="dp_146">259.5556dp</dimen>
-	<dimen name="dp_147">261.3333dp</dimen>
-	<dimen name="dp_148">263.1111dp</dimen>
-	<dimen name="dp_149">264.8889dp</dimen>
-	<dimen name="dp_150">266.6667dp</dimen>
-	<dimen name="dp_151">268.4444dp</dimen>
-	<dimen name="dp_152">270.2222dp</dimen>
-	<dimen name="dp_153">272.0000dp</dimen>
-	<dimen name="dp_154">273.7778dp</dimen>
-	<dimen name="dp_155">275.5556dp</dimen>
-	<dimen name="dp_156">277.3333dp</dimen>
-	<dimen name="dp_157">279.1111dp</dimen>
-	<dimen name="dp_158">280.8889dp</dimen>
-	<dimen name="dp_159">282.6667dp</dimen>
-	<dimen name="dp_160">284.4444dp</dimen>
-	<dimen name="dp_161">286.2222dp</dimen>
-	<dimen name="dp_162">288.0000dp</dimen>
-	<dimen name="dp_163">289.7778dp</dimen>
-	<dimen name="dp_164">291.5556dp</dimen>
-	<dimen name="dp_165">293.3333dp</dimen>
-	<dimen name="dp_166">295.1111dp</dimen>
-	<dimen name="dp_167">296.8889dp</dimen>
-	<dimen name="dp_168">298.6667dp</dimen>
-	<dimen name="dp_169">300.4444dp</dimen>
-	<dimen name="dp_170">302.2222dp</dimen>
-	<dimen name="dp_171">304.0000dp</dimen>
-	<dimen name="dp_172">305.7778dp</dimen>
-	<dimen name="dp_173">307.5556dp</dimen>
-	<dimen name="dp_174">309.3333dp</dimen>
-	<dimen name="dp_175">311.1111dp</dimen>
-	<dimen name="dp_176">312.8889dp</dimen>
-	<dimen name="dp_177">314.6667dp</dimen>
-	<dimen name="dp_178">316.4444dp</dimen>
-	<dimen name="dp_179">318.2222dp</dimen>
-	<dimen name="dp_180">320.0000dp</dimen>
-	<dimen name="dp_181">321.7778dp</dimen>
-	<dimen name="dp_182">323.5556dp</dimen>
-	<dimen name="dp_183">325.3333dp</dimen>
-	<dimen name="dp_184">327.1111dp</dimen>
-	<dimen name="dp_185">328.8889dp</dimen>
-	<dimen name="dp_186">330.6667dp</dimen>
-	<dimen name="dp_187">332.4444dp</dimen>
-	<dimen name="dp_188">334.2222dp</dimen>
-	<dimen name="dp_189">336.0000dp</dimen>
-	<dimen name="dp_190">337.7778dp</dimen>
-	<dimen name="dp_191">339.5556dp</dimen>
-	<dimen name="dp_192">341.3333dp</dimen>
-	<dimen name="dp_193">343.1111dp</dimen>
-	<dimen name="dp_194">344.8889dp</dimen>
-	<dimen name="dp_195">346.6667dp</dimen>
-	<dimen name="dp_196">348.4444dp</dimen>
-	<dimen name="dp_197">350.2222dp</dimen>
-	<dimen name="dp_198">352.0000dp</dimen>
-	<dimen name="dp_199">353.7778dp</dimen>
-	<dimen name="dp_200">355.5556dp</dimen>
-	<dimen name="dp_201">357.3333dp</dimen>
-	<dimen name="dp_202">359.1111dp</dimen>
-	<dimen name="dp_203">360.8889dp</dimen>
-	<dimen name="dp_204">362.6667dp</dimen>
-	<dimen name="dp_205">364.4444dp</dimen>
-	<dimen name="dp_206">366.2222dp</dimen>
-	<dimen name="dp_207">368.0000dp</dimen>
-	<dimen name="dp_208">369.7778dp</dimen>
-	<dimen name="dp_209">371.5556dp</dimen>
-	<dimen name="dp_210">373.3333dp</dimen>
-	<dimen name="dp_211">375.1111dp</dimen>
-	<dimen name="dp_212">376.8889dp</dimen>
-	<dimen name="dp_213">378.6667dp</dimen>
-	<dimen name="dp_214">380.4444dp</dimen>
-	<dimen name="dp_215">382.2222dp</dimen>
-	<dimen name="dp_216">384.0000dp</dimen>
-	<dimen name="dp_217">385.7778dp</dimen>
-	<dimen name="dp_218">387.5556dp</dimen>
-	<dimen name="dp_219">389.3333dp</dimen>
-	<dimen name="dp_220">391.1111dp</dimen>
-	<dimen name="dp_221">392.8889dp</dimen>
-	<dimen name="dp_222">394.6667dp</dimen>
-	<dimen name="dp_223">396.4444dp</dimen>
-	<dimen name="dp_224">398.2222dp</dimen>
-	<dimen name="dp_225">400.0000dp</dimen>
-	<dimen name="dp_226">401.7778dp</dimen>
-	<dimen name="dp_227">403.5556dp</dimen>
-	<dimen name="dp_228">405.3333dp</dimen>
-	<dimen name="dp_229">407.1111dp</dimen>
-	<dimen name="dp_230">408.8889dp</dimen>
-	<dimen name="dp_231">410.6667dp</dimen>
-	<dimen name="dp_232">412.4444dp</dimen>
-	<dimen name="dp_233">414.2222dp</dimen>
-	<dimen name="dp_234">416.0000dp</dimen>
-	<dimen name="dp_235">417.7778dp</dimen>
-	<dimen name="dp_236">419.5556dp</dimen>
-	<dimen name="dp_237">421.3333dp</dimen>
-	<dimen name="dp_238">423.1111dp</dimen>
-	<dimen name="dp_239">424.8889dp</dimen>
-	<dimen name="dp_240">426.6667dp</dimen>
-	<dimen name="dp_241">428.4444dp</dimen>
-	<dimen name="dp_242">430.2222dp</dimen>
-	<dimen name="dp_243">432.0000dp</dimen>
-	<dimen name="dp_244">433.7778dp</dimen>
-	<dimen name="dp_245">435.5556dp</dimen>
-	<dimen name="dp_246">437.3333dp</dimen>
-	<dimen name="dp_247">439.1111dp</dimen>
-	<dimen name="dp_248">440.8889dp</dimen>
-	<dimen name="dp_249">442.6667dp</dimen>
-	<dimen name="dp_250">444.4444dp</dimen>
-	<dimen name="dp_251">446.2222dp</dimen>
-	<dimen name="dp_252">448.0000dp</dimen>
-	<dimen name="dp_253">449.7778dp</dimen>
-	<dimen name="dp_254">451.5556dp</dimen>
-	<dimen name="dp_255">453.3333dp</dimen>
-	<dimen name="dp_256">455.1111dp</dimen>
-	<dimen name="dp_257">456.8889dp</dimen>
-	<dimen name="dp_258">458.6667dp</dimen>
-	<dimen name="dp_259">460.4444dp</dimen>
-	<dimen name="dp_260">462.2222dp</dimen>
-	<dimen name="dp_261">464.0000dp</dimen>
-	<dimen name="dp_262">465.7778dp</dimen>
-	<dimen name="dp_263">467.5556dp</dimen>
-	<dimen name="dp_264">469.3333dp</dimen>
-	<dimen name="dp_265">471.1111dp</dimen>
-	<dimen name="dp_266">472.8889dp</dimen>
-	<dimen name="dp_267">474.6667dp</dimen>
-	<dimen name="dp_268">476.4444dp</dimen>
-	<dimen name="dp_269">478.2222dp</dimen>
-	<dimen name="dp_270">480.0000dp</dimen>
-	<dimen name="dp_271">481.7778dp</dimen>
-	<dimen name="dp_272">483.5556dp</dimen>
-	<dimen name="dp_273">485.3333dp</dimen>
-	<dimen name="dp_274">487.1111dp</dimen>
-	<dimen name="dp_275">488.8889dp</dimen>
-	<dimen name="dp_276">490.6667dp</dimen>
-	<dimen name="dp_277">492.4444dp</dimen>
-	<dimen name="dp_278">494.2222dp</dimen>
-	<dimen name="dp_279">496.0000dp</dimen>
-	<dimen name="dp_280">497.7778dp</dimen>
-	<dimen name="dp_281">499.5556dp</dimen>
-	<dimen name="dp_282">501.3333dp</dimen>
-	<dimen name="dp_283">503.1111dp</dimen>
-	<dimen name="dp_284">504.8889dp</dimen>
-	<dimen name="dp_285">506.6667dp</dimen>
-	<dimen name="dp_286">508.4444dp</dimen>
-	<dimen name="dp_287">510.2222dp</dimen>
-	<dimen name="dp_288">512.0000dp</dimen>
-	<dimen name="dp_289">513.7778dp</dimen>
-	<dimen name="dp_290">515.5556dp</dimen>
-	<dimen name="dp_291">517.3333dp</dimen>
-	<dimen name="dp_292">519.1111dp</dimen>
-	<dimen name="dp_293">520.8889dp</dimen>
-	<dimen name="dp_294">522.6667dp</dimen>
-	<dimen name="dp_295">524.4444dp</dimen>
-	<dimen name="dp_296">526.2222dp</dimen>
-	<dimen name="dp_297">528.0000dp</dimen>
-	<dimen name="dp_298">529.7778dp</dimen>
-	<dimen name="dp_299">531.5556dp</dimen>
-	<dimen name="dp_300">533.3333dp</dimen>
-	<dimen name="dp_301">535.1111dp</dimen>
-	<dimen name="dp_302">536.8889dp</dimen>
-	<dimen name="dp_303">538.6667dp</dimen>
-	<dimen name="dp_304">540.4444dp</dimen>
-	<dimen name="dp_305">542.2222dp</dimen>
-	<dimen name="dp_306">544.0000dp</dimen>
-	<dimen name="dp_307">545.7778dp</dimen>
-	<dimen name="dp_308">547.5556dp</dimen>
-	<dimen name="dp_309">549.3333dp</dimen>
-	<dimen name="dp_310">551.1111dp</dimen>
-	<dimen name="dp_311">552.8889dp</dimen>
-	<dimen name="dp_312">554.6667dp</dimen>
-	<dimen name="dp_313">556.4444dp</dimen>
-	<dimen name="dp_314">558.2222dp</dimen>
-	<dimen name="dp_315">560.0000dp</dimen>
-	<dimen name="dp_316">561.7778dp</dimen>
-	<dimen name="dp_317">563.5556dp</dimen>
-	<dimen name="dp_318">565.3333dp</dimen>
-	<dimen name="dp_319">567.1111dp</dimen>
-	<dimen name="dp_320">568.8889dp</dimen>
-	<dimen name="dp_321">570.6667dp</dimen>
-	<dimen name="dp_322">572.4444dp</dimen>
-	<dimen name="dp_323">574.2222dp</dimen>
-	<dimen name="dp_324">576.0000dp</dimen>
-	<dimen name="dp_325">577.7778dp</dimen>
-	<dimen name="dp_326">579.5556dp</dimen>
-	<dimen name="dp_327">581.3333dp</dimen>
-	<dimen name="dp_328">583.1111dp</dimen>
-	<dimen name="dp_329">584.8889dp</dimen>
-	<dimen name="dp_330">586.6667dp</dimen>
-	<dimen name="dp_331">588.4444dp</dimen>
-	<dimen name="dp_332">590.2222dp</dimen>
-	<dimen name="dp_333">592.0000dp</dimen>
-	<dimen name="dp_334">593.7778dp</dimen>
-	<dimen name="dp_335">595.5556dp</dimen>
-	<dimen name="dp_336">597.3333dp</dimen>
-	<dimen name="dp_337">599.1111dp</dimen>
-	<dimen name="dp_338">600.8889dp</dimen>
-	<dimen name="dp_339">602.6667dp</dimen>
-	<dimen name="dp_340">604.4444dp</dimen>
-	<dimen name="dp_341">606.2222dp</dimen>
-	<dimen name="dp_342">608.0000dp</dimen>
-	<dimen name="dp_343">609.7778dp</dimen>
-	<dimen name="dp_344">611.5556dp</dimen>
-	<dimen name="dp_345">613.3333dp</dimen>
-	<dimen name="dp_346">615.1111dp</dimen>
-	<dimen name="dp_347">616.8889dp</dimen>
-	<dimen name="dp_348">618.6667dp</dimen>
-	<dimen name="dp_349">620.4444dp</dimen>
-	<dimen name="dp_350">622.2222dp</dimen>
-	<dimen name="dp_351">624.0000dp</dimen>
-	<dimen name="dp_352">625.7778dp</dimen>
-	<dimen name="dp_353">627.5556dp</dimen>
-	<dimen name="dp_354">629.3333dp</dimen>
-	<dimen name="dp_355">631.1111dp</dimen>
-	<dimen name="dp_356">632.8889dp</dimen>
-	<dimen name="dp_357">634.6667dp</dimen>
-	<dimen name="dp_358">636.4444dp</dimen>
-	<dimen name="dp_359">638.2222dp</dimen>
-	<dimen name="dp_360">640.0000dp</dimen>
-	<dimen name="dp_365">648.8889dp</dimen>
-	<dimen name="dp_370">657.7778dp</dimen>
-	<dimen name="dp_400">711.1111dp</dimen>
-	<dimen name="dp_410">728.8889dp</dimen>
-	<dimen name="dp_422">750.2222dp</dimen>
-	<dimen name="dp_472">839.1111dp</dimen>
-	<dimen name="dp_500">888.8889dp</dimen>
-	<dimen name="dp_600">1066.6667dp</dimen>
-	<dimen name="dp_640">1137.7778dp</dimen>
-	<dimen name="dp_720">1280.0000dp</dimen>
-	<dimen name="sp_6">10.6667sp</dimen>
-	<dimen name="sp_7">12.4444sp</dimen>
-	<dimen name="sp_8">14.2222sp</dimen>
-	<dimen name="sp_9">16.0000sp</dimen>
-	<dimen name="sp_10">17.7778sp</dimen>
-	<dimen name="sp_11">19.5556sp</dimen>
-	<dimen name="sp_12">21.3333sp</dimen>
-	<dimen name="sp_13">23.1111sp</dimen>
-	<dimen name="sp_14">24.8889sp</dimen>
-	<dimen name="sp_15">26.6667sp</dimen>
-	<dimen name="sp_16">28.4444sp</dimen>
-	<dimen name="sp_17">30.2222sp</dimen>
-	<dimen name="sp_18">32.0000sp</dimen>
-	<dimen name="sp_19">33.7778sp</dimen>
-	<dimen name="sp_20">35.5556sp</dimen>
-	<dimen name="sp_21">37.3333sp</dimen>
-	<dimen name="sp_22">39.1111sp</dimen>
-	<dimen name="sp_23">40.8889sp</dimen>
-	<dimen name="sp_24">42.6667sp</dimen>
-	<dimen name="sp_25">44.4444sp</dimen>
-	<dimen name="sp_28">49.7778sp</dimen>
-	<dimen name="sp_30">53.3333sp</dimen>
-	<dimen name="sp_32">56.8889sp</dimen>
-	<dimen name="sp_34">60.4444sp</dimen>
-	<dimen name="sp_36">64.0000sp</dimen>
-	<dimen name="sp_38">67.5556sp</dimen>
-	<dimen name="sp_40">71.1111sp</dimen>
-	<dimen name="sp_42">74.6667sp</dimen>
-	<dimen name="sp_48">85.3333sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw662dp/dimens.xml b/app/src/main/res/values-sw662dp/dimens.xml
deleted file mode 100644
index bc981ab..0000000
--- a/app/src/main/res/values-sw662dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-110.3333dp</dimen>
-	<dimen name="dp_m_30">-55.1667dp</dimen>
-	<dimen name="dp_m_20">-36.7778dp</dimen>
-	<dimen name="dp_m_12">-22.0667dp</dimen>
-	<dimen name="dp_m_10">-18.3889dp</dimen>
-	<dimen name="dp_m_8">-14.7111dp</dimen>
-	<dimen name="dp_m_5">-9.1944dp</dimen>
-	<dimen name="dp_m_2">-3.6778dp</dimen>
-	<dimen name="dp_m_1">-1.8389dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.1839dp</dimen>
-	<dimen name="dp_0_5">0.9194dp</dimen>
-	<dimen name="dp_1">1.8389dp</dimen>
-	<dimen name="dp_1_5">2.7583dp</dimen>
-	<dimen name="dp_2">3.6778dp</dimen>
-	<dimen name="dp_2_5">4.5972dp</dimen>
-	<dimen name="dp_3">5.5167dp</dimen>
-	<dimen name="dp_3_5">6.4361dp</dimen>
-	<dimen name="dp_4">7.3556dp</dimen>
-	<dimen name="dp_4_5">8.2750dp</dimen>
-	<dimen name="dp_5">9.1944dp</dimen>
-	<dimen name="dp_6">11.0333dp</dimen>
-	<dimen name="dp_7">12.8722dp</dimen>
-	<dimen name="dp_8">14.7111dp</dimen>
-	<dimen name="dp_9">16.5500dp</dimen>
-	<dimen name="dp_10">18.3889dp</dimen>
-	<dimen name="dp_11">20.2278dp</dimen>
-	<dimen name="dp_12">22.0667dp</dimen>
-	<dimen name="dp_13">23.9056dp</dimen>
-	<dimen name="dp_14">25.7444dp</dimen>
-	<dimen name="dp_15">27.5833dp</dimen>
-	<dimen name="dp_16">29.4222dp</dimen>
-	<dimen name="dp_17">31.2611dp</dimen>
-	<dimen name="dp_18">33.1000dp</dimen>
-	<dimen name="dp_19">34.9389dp</dimen>
-	<dimen name="dp_20">36.7778dp</dimen>
-	<dimen name="dp_21">38.6167dp</dimen>
-	<dimen name="dp_22">40.4556dp</dimen>
-	<dimen name="dp_23">42.2944dp</dimen>
-	<dimen name="dp_24">44.1333dp</dimen>
-	<dimen name="dp_25">45.9722dp</dimen>
-	<dimen name="dp_26">47.8111dp</dimen>
-	<dimen name="dp_27">49.6500dp</dimen>
-	<dimen name="dp_28">51.4889dp</dimen>
-	<dimen name="dp_29">53.3278dp</dimen>
-	<dimen name="dp_30">55.1667dp</dimen>
-	<dimen name="dp_31">57.0056dp</dimen>
-	<dimen name="dp_32">58.8444dp</dimen>
-	<dimen name="dp_33">60.6833dp</dimen>
-	<dimen name="dp_34">62.5222dp</dimen>
-	<dimen name="dp_35">64.3611dp</dimen>
-	<dimen name="dp_36">66.2000dp</dimen>
-	<dimen name="dp_37">68.0389dp</dimen>
-	<dimen name="dp_38">69.8778dp</dimen>
-	<dimen name="dp_39">71.7167dp</dimen>
-	<dimen name="dp_40">73.5556dp</dimen>
-	<dimen name="dp_41">75.3944dp</dimen>
-	<dimen name="dp_42">77.2333dp</dimen>
-	<dimen name="dp_43">79.0722dp</dimen>
-	<dimen name="dp_44">80.9111dp</dimen>
-	<dimen name="dp_45">82.7500dp</dimen>
-	<dimen name="dp_46">84.5889dp</dimen>
-	<dimen name="dp_47">86.4278dp</dimen>
-	<dimen name="dp_48">88.2667dp</dimen>
-	<dimen name="dp_49">90.1056dp</dimen>
-	<dimen name="dp_50">91.9444dp</dimen>
-	<dimen name="dp_51">93.7833dp</dimen>
-	<dimen name="dp_52">95.6222dp</dimen>
-	<dimen name="dp_53">97.4611dp</dimen>
-	<dimen name="dp_54">99.3000dp</dimen>
-	<dimen name="dp_55">101.1389dp</dimen>
-	<dimen name="dp_56">102.9778dp</dimen>
-	<dimen name="dp_57">104.8167dp</dimen>
-	<dimen name="dp_58">106.6556dp</dimen>
-	<dimen name="dp_59">108.4944dp</dimen>
-	<dimen name="dp_60">110.3333dp</dimen>
-	<dimen name="dp_61">112.1722dp</dimen>
-	<dimen name="dp_62">114.0111dp</dimen>
-	<dimen name="dp_63">115.8500dp</dimen>
-	<dimen name="dp_64">117.6889dp</dimen>
-	<dimen name="dp_65">119.5278dp</dimen>
-	<dimen name="dp_66">121.3667dp</dimen>
-	<dimen name="dp_67">123.2056dp</dimen>
-	<dimen name="dp_68">125.0444dp</dimen>
-	<dimen name="dp_69">126.8833dp</dimen>
-	<dimen name="dp_70">128.7222dp</dimen>
-	<dimen name="dp_71">130.5611dp</dimen>
-	<dimen name="dp_72">132.4000dp</dimen>
-	<dimen name="dp_73">134.2389dp</dimen>
-	<dimen name="dp_74">136.0778dp</dimen>
-	<dimen name="dp_75">137.9167dp</dimen>
-	<dimen name="dp_76">139.7556dp</dimen>
-	<dimen name="dp_77">141.5944dp</dimen>
-	<dimen name="dp_78">143.4333dp</dimen>
-	<dimen name="dp_79">145.2722dp</dimen>
-	<dimen name="dp_80">147.1111dp</dimen>
-	<dimen name="dp_81">148.9500dp</dimen>
-	<dimen name="dp_82">150.7889dp</dimen>
-	<dimen name="dp_83">152.6278dp</dimen>
-	<dimen name="dp_84">154.4667dp</dimen>
-	<dimen name="dp_85">156.3056dp</dimen>
-	<dimen name="dp_86">158.1444dp</dimen>
-	<dimen name="dp_87">159.9833dp</dimen>
-	<dimen name="dp_88">161.8222dp</dimen>
-	<dimen name="dp_89">163.6611dp</dimen>
-	<dimen name="dp_90">165.5000dp</dimen>
-	<dimen name="dp_91">167.3389dp</dimen>
-	<dimen name="dp_92">169.1778dp</dimen>
-	<dimen name="dp_93">171.0167dp</dimen>
-	<dimen name="dp_94">172.8556dp</dimen>
-	<dimen name="dp_95">174.6944dp</dimen>
-	<dimen name="dp_96">176.5333dp</dimen>
-	<dimen name="dp_97">178.3722dp</dimen>
-	<dimen name="dp_98">180.2111dp</dimen>
-	<dimen name="dp_99">182.0500dp</dimen>
-	<dimen name="dp_100">183.8889dp</dimen>
-	<dimen name="dp_101">185.7278dp</dimen>
-	<dimen name="dp_102">187.5667dp</dimen>
-	<dimen name="dp_103">189.4056dp</dimen>
-	<dimen name="dp_104">191.2444dp</dimen>
-	<dimen name="dp_105">193.0833dp</dimen>
-	<dimen name="dp_106">194.9222dp</dimen>
-	<dimen name="dp_107">196.7611dp</dimen>
-	<dimen name="dp_108">198.6000dp</dimen>
-	<dimen name="dp_109">200.4389dp</dimen>
-	<dimen name="dp_110">202.2778dp</dimen>
-	<dimen name="dp_111">204.1167dp</dimen>
-	<dimen name="dp_112">205.9556dp</dimen>
-	<dimen name="dp_113">207.7944dp</dimen>
-	<dimen name="dp_114">209.6333dp</dimen>
-	<dimen name="dp_115">211.4722dp</dimen>
-	<dimen name="dp_116">213.3111dp</dimen>
-	<dimen name="dp_117">215.1500dp</dimen>
-	<dimen name="dp_118">216.9889dp</dimen>
-	<dimen name="dp_119">218.8278dp</dimen>
-	<dimen name="dp_120">220.6667dp</dimen>
-	<dimen name="dp_121">222.5056dp</dimen>
-	<dimen name="dp_122">224.3444dp</dimen>
-	<dimen name="dp_123">226.1833dp</dimen>
-	<dimen name="dp_124">228.0222dp</dimen>
-	<dimen name="dp_125">229.8611dp</dimen>
-	<dimen name="dp_126">231.7000dp</dimen>
-	<dimen name="dp_127">233.5389dp</dimen>
-	<dimen name="dp_128">235.3778dp</dimen>
-	<dimen name="dp_129">237.2167dp</dimen>
-	<dimen name="dp_130">239.0556dp</dimen>
-	<dimen name="dp_131">240.8944dp</dimen>
-	<dimen name="dp_132">242.7333dp</dimen>
-	<dimen name="dp_133">244.5722dp</dimen>
-	<dimen name="dp_134">246.4111dp</dimen>
-	<dimen name="dp_135">248.2500dp</dimen>
-	<dimen name="dp_136">250.0889dp</dimen>
-	<dimen name="dp_137">251.9278dp</dimen>
-	<dimen name="dp_138">253.7667dp</dimen>
-	<dimen name="dp_139">255.6056dp</dimen>
-	<dimen name="dp_140">257.4444dp</dimen>
-	<dimen name="dp_141">259.2833dp</dimen>
-	<dimen name="dp_142">261.1222dp</dimen>
-	<dimen name="dp_143">262.9611dp</dimen>
-	<dimen name="dp_144">264.8000dp</dimen>
-	<dimen name="dp_145">266.6389dp</dimen>
-	<dimen name="dp_146">268.4778dp</dimen>
-	<dimen name="dp_147">270.3167dp</dimen>
-	<dimen name="dp_148">272.1556dp</dimen>
-	<dimen name="dp_149">273.9944dp</dimen>
-	<dimen name="dp_150">275.8333dp</dimen>
-	<dimen name="dp_151">277.6722dp</dimen>
-	<dimen name="dp_152">279.5111dp</dimen>
-	<dimen name="dp_153">281.3500dp</dimen>
-	<dimen name="dp_154">283.1889dp</dimen>
-	<dimen name="dp_155">285.0278dp</dimen>
-	<dimen name="dp_156">286.8667dp</dimen>
-	<dimen name="dp_157">288.7056dp</dimen>
-	<dimen name="dp_158">290.5444dp</dimen>
-	<dimen name="dp_159">292.3833dp</dimen>
-	<dimen name="dp_160">294.2222dp</dimen>
-	<dimen name="dp_161">296.0611dp</dimen>
-	<dimen name="dp_162">297.9000dp</dimen>
-	<dimen name="dp_163">299.7389dp</dimen>
-	<dimen name="dp_164">301.5778dp</dimen>
-	<dimen name="dp_165">303.4167dp</dimen>
-	<dimen name="dp_166">305.2556dp</dimen>
-	<dimen name="dp_167">307.0944dp</dimen>
-	<dimen name="dp_168">308.9333dp</dimen>
-	<dimen name="dp_169">310.7722dp</dimen>
-	<dimen name="dp_170">312.6111dp</dimen>
-	<dimen name="dp_171">314.4500dp</dimen>
-	<dimen name="dp_172">316.2889dp</dimen>
-	<dimen name="dp_173">318.1278dp</dimen>
-	<dimen name="dp_174">319.9667dp</dimen>
-	<dimen name="dp_175">321.8056dp</dimen>
-	<dimen name="dp_176">323.6444dp</dimen>
-	<dimen name="dp_177">325.4833dp</dimen>
-	<dimen name="dp_178">327.3222dp</dimen>
-	<dimen name="dp_179">329.1611dp</dimen>
-	<dimen name="dp_180">331.0000dp</dimen>
-	<dimen name="dp_181">332.8389dp</dimen>
-	<dimen name="dp_182">334.6778dp</dimen>
-	<dimen name="dp_183">336.5167dp</dimen>
-	<dimen name="dp_184">338.3556dp</dimen>
-	<dimen name="dp_185">340.1944dp</dimen>
-	<dimen name="dp_186">342.0333dp</dimen>
-	<dimen name="dp_187">343.8722dp</dimen>
-	<dimen name="dp_188">345.7111dp</dimen>
-	<dimen name="dp_189">347.5500dp</dimen>
-	<dimen name="dp_190">349.3889dp</dimen>
-	<dimen name="dp_191">351.2278dp</dimen>
-	<dimen name="dp_192">353.0667dp</dimen>
-	<dimen name="dp_193">354.9056dp</dimen>
-	<dimen name="dp_194">356.7444dp</dimen>
-	<dimen name="dp_195">358.5833dp</dimen>
-	<dimen name="dp_196">360.4222dp</dimen>
-	<dimen name="dp_197">362.2611dp</dimen>
-	<dimen name="dp_198">364.1000dp</dimen>
-	<dimen name="dp_199">365.9389dp</dimen>
-	<dimen name="dp_200">367.7778dp</dimen>
-	<dimen name="dp_201">369.6167dp</dimen>
-	<dimen name="dp_202">371.4556dp</dimen>
-	<dimen name="dp_203">373.2944dp</dimen>
-	<dimen name="dp_204">375.1333dp</dimen>
-	<dimen name="dp_205">376.9722dp</dimen>
-	<dimen name="dp_206">378.8111dp</dimen>
-	<dimen name="dp_207">380.6500dp</dimen>
-	<dimen name="dp_208">382.4889dp</dimen>
-	<dimen name="dp_209">384.3278dp</dimen>
-	<dimen name="dp_210">386.1667dp</dimen>
-	<dimen name="dp_211">388.0056dp</dimen>
-	<dimen name="dp_212">389.8444dp</dimen>
-	<dimen name="dp_213">391.6833dp</dimen>
-	<dimen name="dp_214">393.5222dp</dimen>
-	<dimen name="dp_215">395.3611dp</dimen>
-	<dimen name="dp_216">397.2000dp</dimen>
-	<dimen name="dp_217">399.0389dp</dimen>
-	<dimen name="dp_218">400.8778dp</dimen>
-	<dimen name="dp_219">402.7167dp</dimen>
-	<dimen name="dp_220">404.5556dp</dimen>
-	<dimen name="dp_221">406.3944dp</dimen>
-	<dimen name="dp_222">408.2333dp</dimen>
-	<dimen name="dp_223">410.0722dp</dimen>
-	<dimen name="dp_224">411.9111dp</dimen>
-	<dimen name="dp_225">413.7500dp</dimen>
-	<dimen name="dp_226">415.5889dp</dimen>
-	<dimen name="dp_227">417.4278dp</dimen>
-	<dimen name="dp_228">419.2667dp</dimen>
-	<dimen name="dp_229">421.1056dp</dimen>
-	<dimen name="dp_230">422.9444dp</dimen>
-	<dimen name="dp_231">424.7833dp</dimen>
-	<dimen name="dp_232">426.6222dp</dimen>
-	<dimen name="dp_233">428.4611dp</dimen>
-	<dimen name="dp_234">430.3000dp</dimen>
-	<dimen name="dp_235">432.1389dp</dimen>
-	<dimen name="dp_236">433.9778dp</dimen>
-	<dimen name="dp_237">435.8167dp</dimen>
-	<dimen name="dp_238">437.6556dp</dimen>
-	<dimen name="dp_239">439.4944dp</dimen>
-	<dimen name="dp_240">441.3333dp</dimen>
-	<dimen name="dp_241">443.1722dp</dimen>
-	<dimen name="dp_242">445.0111dp</dimen>
-	<dimen name="dp_243">446.8500dp</dimen>
-	<dimen name="dp_244">448.6889dp</dimen>
-	<dimen name="dp_245">450.5278dp</dimen>
-	<dimen name="dp_246">452.3667dp</dimen>
-	<dimen name="dp_247">454.2056dp</dimen>
-	<dimen name="dp_248">456.0444dp</dimen>
-	<dimen name="dp_249">457.8833dp</dimen>
-	<dimen name="dp_250">459.7222dp</dimen>
-	<dimen name="dp_251">461.5611dp</dimen>
-	<dimen name="dp_252">463.4000dp</dimen>
-	<dimen name="dp_253">465.2389dp</dimen>
-	<dimen name="dp_254">467.0778dp</dimen>
-	<dimen name="dp_255">468.9167dp</dimen>
-	<dimen name="dp_256">470.7556dp</dimen>
-	<dimen name="dp_257">472.5944dp</dimen>
-	<dimen name="dp_258">474.4333dp</dimen>
-	<dimen name="dp_259">476.2722dp</dimen>
-	<dimen name="dp_260">478.1111dp</dimen>
-	<dimen name="dp_261">479.9500dp</dimen>
-	<dimen name="dp_262">481.7889dp</dimen>
-	<dimen name="dp_263">483.6278dp</dimen>
-	<dimen name="dp_264">485.4667dp</dimen>
-	<dimen name="dp_265">487.3056dp</dimen>
-	<dimen name="dp_266">489.1444dp</dimen>
-	<dimen name="dp_267">490.9833dp</dimen>
-	<dimen name="dp_268">492.8222dp</dimen>
-	<dimen name="dp_269">494.6611dp</dimen>
-	<dimen name="dp_270">496.5000dp</dimen>
-	<dimen name="dp_271">498.3389dp</dimen>
-	<dimen name="dp_272">500.1778dp</dimen>
-	<dimen name="dp_273">502.0167dp</dimen>
-	<dimen name="dp_274">503.8556dp</dimen>
-	<dimen name="dp_275">505.6944dp</dimen>
-	<dimen name="dp_276">507.5333dp</dimen>
-	<dimen name="dp_277">509.3722dp</dimen>
-	<dimen name="dp_278">511.2111dp</dimen>
-	<dimen name="dp_279">513.0500dp</dimen>
-	<dimen name="dp_280">514.8889dp</dimen>
-	<dimen name="dp_281">516.7278dp</dimen>
-	<dimen name="dp_282">518.5667dp</dimen>
-	<dimen name="dp_283">520.4056dp</dimen>
-	<dimen name="dp_284">522.2444dp</dimen>
-	<dimen name="dp_285">524.0833dp</dimen>
-	<dimen name="dp_286">525.9222dp</dimen>
-	<dimen name="dp_287">527.7611dp</dimen>
-	<dimen name="dp_288">529.6000dp</dimen>
-	<dimen name="dp_289">531.4389dp</dimen>
-	<dimen name="dp_290">533.2778dp</dimen>
-	<dimen name="dp_291">535.1167dp</dimen>
-	<dimen name="dp_292">536.9556dp</dimen>
-	<dimen name="dp_293">538.7944dp</dimen>
-	<dimen name="dp_294">540.6333dp</dimen>
-	<dimen name="dp_295">542.4722dp</dimen>
-	<dimen name="dp_296">544.3111dp</dimen>
-	<dimen name="dp_297">546.1500dp</dimen>
-	<dimen name="dp_298">547.9889dp</dimen>
-	<dimen name="dp_299">549.8278dp</dimen>
-	<dimen name="dp_300">551.6667dp</dimen>
-	<dimen name="dp_301">553.5056dp</dimen>
-	<dimen name="dp_302">555.3444dp</dimen>
-	<dimen name="dp_303">557.1833dp</dimen>
-	<dimen name="dp_304">559.0222dp</dimen>
-	<dimen name="dp_305">560.8611dp</dimen>
-	<dimen name="dp_306">562.7000dp</dimen>
-	<dimen name="dp_307">564.5389dp</dimen>
-	<dimen name="dp_308">566.3778dp</dimen>
-	<dimen name="dp_309">568.2167dp</dimen>
-	<dimen name="dp_310">570.0556dp</dimen>
-	<dimen name="dp_311">571.8944dp</dimen>
-	<dimen name="dp_312">573.7333dp</dimen>
-	<dimen name="dp_313">575.5722dp</dimen>
-	<dimen name="dp_314">577.4111dp</dimen>
-	<dimen name="dp_315">579.2500dp</dimen>
-	<dimen name="dp_316">581.0889dp</dimen>
-	<dimen name="dp_317">582.9278dp</dimen>
-	<dimen name="dp_318">584.7667dp</dimen>
-	<dimen name="dp_319">586.6056dp</dimen>
-	<dimen name="dp_320">588.4444dp</dimen>
-	<dimen name="dp_321">590.2833dp</dimen>
-	<dimen name="dp_322">592.1222dp</dimen>
-	<dimen name="dp_323">593.9611dp</dimen>
-	<dimen name="dp_324">595.8000dp</dimen>
-	<dimen name="dp_325">597.6389dp</dimen>
-	<dimen name="dp_326">599.4778dp</dimen>
-	<dimen name="dp_327">601.3167dp</dimen>
-	<dimen name="dp_328">603.1556dp</dimen>
-	<dimen name="dp_329">604.9944dp</dimen>
-	<dimen name="dp_330">606.8333dp</dimen>
-	<dimen name="dp_331">608.6722dp</dimen>
-	<dimen name="dp_332">610.5111dp</dimen>
-	<dimen name="dp_333">612.3500dp</dimen>
-	<dimen name="dp_334">614.1889dp</dimen>
-	<dimen name="dp_335">616.0278dp</dimen>
-	<dimen name="dp_336">617.8667dp</dimen>
-	<dimen name="dp_337">619.7056dp</dimen>
-	<dimen name="dp_338">621.5444dp</dimen>
-	<dimen name="dp_339">623.3833dp</dimen>
-	<dimen name="dp_340">625.2222dp</dimen>
-	<dimen name="dp_341">627.0611dp</dimen>
-	<dimen name="dp_342">628.9000dp</dimen>
-	<dimen name="dp_343">630.7389dp</dimen>
-	<dimen name="dp_344">632.5778dp</dimen>
-	<dimen name="dp_345">634.4167dp</dimen>
-	<dimen name="dp_346">636.2556dp</dimen>
-	<dimen name="dp_347">638.0944dp</dimen>
-	<dimen name="dp_348">639.9333dp</dimen>
-	<dimen name="dp_349">641.7722dp</dimen>
-	<dimen name="dp_350">643.6111dp</dimen>
-	<dimen name="dp_351">645.4500dp</dimen>
-	<dimen name="dp_352">647.2889dp</dimen>
-	<dimen name="dp_353">649.1278dp</dimen>
-	<dimen name="dp_354">650.9667dp</dimen>
-	<dimen name="dp_355">652.8056dp</dimen>
-	<dimen name="dp_356">654.6444dp</dimen>
-	<dimen name="dp_357">656.4833dp</dimen>
-	<dimen name="dp_358">658.3222dp</dimen>
-	<dimen name="dp_359">660.1611dp</dimen>
-	<dimen name="dp_360">662.0000dp</dimen>
-	<dimen name="dp_365">671.1944dp</dimen>
-	<dimen name="dp_370">680.3889dp</dimen>
-	<dimen name="dp_400">735.5556dp</dimen>
-	<dimen name="dp_410">753.9444dp</dimen>
-	<dimen name="dp_422">776.0111dp</dimen>
-	<dimen name="dp_472">867.9556dp</dimen>
-	<dimen name="dp_500">919.4444dp</dimen>
-	<dimen name="dp_600">1103.3333dp</dimen>
-	<dimen name="dp_640">1176.8889dp</dimen>
-	<dimen name="dp_720">1324.0000dp</dimen>
-	<dimen name="sp_6">11.0333sp</dimen>
-	<dimen name="sp_7">12.8722sp</dimen>
-	<dimen name="sp_8">14.7111sp</dimen>
-	<dimen name="sp_9">16.5500sp</dimen>
-	<dimen name="sp_10">18.3889sp</dimen>
-	<dimen name="sp_11">20.2278sp</dimen>
-	<dimen name="sp_12">22.0667sp</dimen>
-	<dimen name="sp_13">23.9056sp</dimen>
-	<dimen name="sp_14">25.7444sp</dimen>
-	<dimen name="sp_15">27.5833sp</dimen>
-	<dimen name="sp_16">29.4222sp</dimen>
-	<dimen name="sp_17">31.2611sp</dimen>
-	<dimen name="sp_18">33.1000sp</dimen>
-	<dimen name="sp_19">34.9389sp</dimen>
-	<dimen name="sp_20">36.7778sp</dimen>
-	<dimen name="sp_21">38.6167sp</dimen>
-	<dimen name="sp_22">40.4556sp</dimen>
-	<dimen name="sp_23">42.2944sp</dimen>
-	<dimen name="sp_24">44.1333sp</dimen>
-	<dimen name="sp_25">45.9722sp</dimen>
-	<dimen name="sp_28">51.4889sp</dimen>
-	<dimen name="sp_30">55.1667sp</dimen>
-	<dimen name="sp_32">58.8444sp</dimen>
-	<dimen name="sp_34">62.5222sp</dimen>
-	<dimen name="sp_36">66.2000sp</dimen>
-	<dimen name="sp_38">69.8778sp</dimen>
-	<dimen name="sp_40">73.5556sp</dimen>
-	<dimen name="sp_42">77.2333sp</dimen>
-	<dimen name="sp_48">88.2667sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw720dp/dimens.xml b/app/src/main/res/values-sw720dp/dimens.xml
deleted file mode 100644
index 0c84204..0000000
--- a/app/src/main/res/values-sw720dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-120.0000dp</dimen>
-	<dimen name="dp_m_30">-60.0000dp</dimen>
-	<dimen name="dp_m_20">-40.0000dp</dimen>
-	<dimen name="dp_m_12">-24.0000dp</dimen>
-	<dimen name="dp_m_10">-20.0000dp</dimen>
-	<dimen name="dp_m_8">-16.0000dp</dimen>
-	<dimen name="dp_m_5">-10.0000dp</dimen>
-	<dimen name="dp_m_2">-4.0000dp</dimen>
-	<dimen name="dp_m_1">-2.0000dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.2000dp</dimen>
-	<dimen name="dp_0_5">1.0000dp</dimen>
-	<dimen name="dp_1">2.0000dp</dimen>
-	<dimen name="dp_1_5">3.0000dp</dimen>
-	<dimen name="dp_2">4.0000dp</dimen>
-	<dimen name="dp_2_5">5.0000dp</dimen>
-	<dimen name="dp_3">6.0000dp</dimen>
-	<dimen name="dp_3_5">7.0000dp</dimen>
-	<dimen name="dp_4">8.0000dp</dimen>
-	<dimen name="dp_4_5">9.0000dp</dimen>
-	<dimen name="dp_5">10.0000dp</dimen>
-	<dimen name="dp_6">12.0000dp</dimen>
-	<dimen name="dp_7">14.0000dp</dimen>
-	<dimen name="dp_8">16.0000dp</dimen>
-	<dimen name="dp_9">18.0000dp</dimen>
-	<dimen name="dp_10">20.0000dp</dimen>
-	<dimen name="dp_11">22.0000dp</dimen>
-	<dimen name="dp_12">24.0000dp</dimen>
-	<dimen name="dp_13">26.0000dp</dimen>
-	<dimen name="dp_14">28.0000dp</dimen>
-	<dimen name="dp_15">30.0000dp</dimen>
-	<dimen name="dp_16">32.0000dp</dimen>
-	<dimen name="dp_17">34.0000dp</dimen>
-	<dimen name="dp_18">36.0000dp</dimen>
-	<dimen name="dp_19">38.0000dp</dimen>
-	<dimen name="dp_20">40.0000dp</dimen>
-	<dimen name="dp_21">42.0000dp</dimen>
-	<dimen name="dp_22">44.0000dp</dimen>
-	<dimen name="dp_23">46.0000dp</dimen>
-	<dimen name="dp_24">48.0000dp</dimen>
-	<dimen name="dp_25">50.0000dp</dimen>
-	<dimen name="dp_26">52.0000dp</dimen>
-	<dimen name="dp_27">54.0000dp</dimen>
-	<dimen name="dp_28">56.0000dp</dimen>
-	<dimen name="dp_29">58.0000dp</dimen>
-	<dimen name="dp_30">60.0000dp</dimen>
-	<dimen name="dp_31">62.0000dp</dimen>
-	<dimen name="dp_32">64.0000dp</dimen>
-	<dimen name="dp_33">66.0000dp</dimen>
-	<dimen name="dp_34">68.0000dp</dimen>
-	<dimen name="dp_35">70.0000dp</dimen>
-	<dimen name="dp_36">72.0000dp</dimen>
-	<dimen name="dp_37">74.0000dp</dimen>
-	<dimen name="dp_38">76.0000dp</dimen>
-	<dimen name="dp_39">78.0000dp</dimen>
-	<dimen name="dp_40">80.0000dp</dimen>
-	<dimen name="dp_41">82.0000dp</dimen>
-	<dimen name="dp_42">84.0000dp</dimen>
-	<dimen name="dp_43">86.0000dp</dimen>
-	<dimen name="dp_44">88.0000dp</dimen>
-	<dimen name="dp_45">90.0000dp</dimen>
-	<dimen name="dp_46">92.0000dp</dimen>
-	<dimen name="dp_47">94.0000dp</dimen>
-	<dimen name="dp_48">96.0000dp</dimen>
-	<dimen name="dp_49">98.0000dp</dimen>
-	<dimen name="dp_50">100.0000dp</dimen>
-	<dimen name="dp_51">102.0000dp</dimen>
-	<dimen name="dp_52">104.0000dp</dimen>
-	<dimen name="dp_53">106.0000dp</dimen>
-	<dimen name="dp_54">108.0000dp</dimen>
-	<dimen name="dp_55">110.0000dp</dimen>
-	<dimen name="dp_56">112.0000dp</dimen>
-	<dimen name="dp_57">114.0000dp</dimen>
-	<dimen name="dp_58">116.0000dp</dimen>
-	<dimen name="dp_59">118.0000dp</dimen>
-	<dimen name="dp_60">120.0000dp</dimen>
-	<dimen name="dp_61">122.0000dp</dimen>
-	<dimen name="dp_62">124.0000dp</dimen>
-	<dimen name="dp_63">126.0000dp</dimen>
-	<dimen name="dp_64">128.0000dp</dimen>
-	<dimen name="dp_65">130.0000dp</dimen>
-	<dimen name="dp_66">132.0000dp</dimen>
-	<dimen name="dp_67">134.0000dp</dimen>
-	<dimen name="dp_68">136.0000dp</dimen>
-	<dimen name="dp_69">138.0000dp</dimen>
-	<dimen name="dp_70">140.0000dp</dimen>
-	<dimen name="dp_71">142.0000dp</dimen>
-	<dimen name="dp_72">144.0000dp</dimen>
-	<dimen name="dp_73">146.0000dp</dimen>
-	<dimen name="dp_74">148.0000dp</dimen>
-	<dimen name="dp_75">150.0000dp</dimen>
-	<dimen name="dp_76">152.0000dp</dimen>
-	<dimen name="dp_77">154.0000dp</dimen>
-	<dimen name="dp_78">156.0000dp</dimen>
-	<dimen name="dp_79">158.0000dp</dimen>
-	<dimen name="dp_80">160.0000dp</dimen>
-	<dimen name="dp_81">162.0000dp</dimen>
-	<dimen name="dp_82">164.0000dp</dimen>
-	<dimen name="dp_83">166.0000dp</dimen>
-	<dimen name="dp_84">168.0000dp</dimen>
-	<dimen name="dp_85">170.0000dp</dimen>
-	<dimen name="dp_86">172.0000dp</dimen>
-	<dimen name="dp_87">174.0000dp</dimen>
-	<dimen name="dp_88">176.0000dp</dimen>
-	<dimen name="dp_89">178.0000dp</dimen>
-	<dimen name="dp_90">180.0000dp</dimen>
-	<dimen name="dp_91">182.0000dp</dimen>
-	<dimen name="dp_92">184.0000dp</dimen>
-	<dimen name="dp_93">186.0000dp</dimen>
-	<dimen name="dp_94">188.0000dp</dimen>
-	<dimen name="dp_95">190.0000dp</dimen>
-	<dimen name="dp_96">192.0000dp</dimen>
-	<dimen name="dp_97">194.0000dp</dimen>
-	<dimen name="dp_98">196.0000dp</dimen>
-	<dimen name="dp_99">198.0000dp</dimen>
-	<dimen name="dp_100">200.0000dp</dimen>
-	<dimen name="dp_101">202.0000dp</dimen>
-	<dimen name="dp_102">204.0000dp</dimen>
-	<dimen name="dp_103">206.0000dp</dimen>
-	<dimen name="dp_104">208.0000dp</dimen>
-	<dimen name="dp_105">210.0000dp</dimen>
-	<dimen name="dp_106">212.0000dp</dimen>
-	<dimen name="dp_107">214.0000dp</dimen>
-	<dimen name="dp_108">216.0000dp</dimen>
-	<dimen name="dp_109">218.0000dp</dimen>
-	<dimen name="dp_110">220.0000dp</dimen>
-	<dimen name="dp_111">222.0000dp</dimen>
-	<dimen name="dp_112">224.0000dp</dimen>
-	<dimen name="dp_113">226.0000dp</dimen>
-	<dimen name="dp_114">228.0000dp</dimen>
-	<dimen name="dp_115">230.0000dp</dimen>
-	<dimen name="dp_116">232.0000dp</dimen>
-	<dimen name="dp_117">234.0000dp</dimen>
-	<dimen name="dp_118">236.0000dp</dimen>
-	<dimen name="dp_119">238.0000dp</dimen>
-	<dimen name="dp_120">240.0000dp</dimen>
-	<dimen name="dp_121">242.0000dp</dimen>
-	<dimen name="dp_122">244.0000dp</dimen>
-	<dimen name="dp_123">246.0000dp</dimen>
-	<dimen name="dp_124">248.0000dp</dimen>
-	<dimen name="dp_125">250.0000dp</dimen>
-	<dimen name="dp_126">252.0000dp</dimen>
-	<dimen name="dp_127">254.0000dp</dimen>
-	<dimen name="dp_128">256.0000dp</dimen>
-	<dimen name="dp_129">258.0000dp</dimen>
-	<dimen name="dp_130">260.0000dp</dimen>
-	<dimen name="dp_131">262.0000dp</dimen>
-	<dimen name="dp_132">264.0000dp</dimen>
-	<dimen name="dp_133">266.0000dp</dimen>
-	<dimen name="dp_134">268.0000dp</dimen>
-	<dimen name="dp_135">270.0000dp</dimen>
-	<dimen name="dp_136">272.0000dp</dimen>
-	<dimen name="dp_137">274.0000dp</dimen>
-	<dimen name="dp_138">276.0000dp</dimen>
-	<dimen name="dp_139">278.0000dp</dimen>
-	<dimen name="dp_140">280.0000dp</dimen>
-	<dimen name="dp_141">282.0000dp</dimen>
-	<dimen name="dp_142">284.0000dp</dimen>
-	<dimen name="dp_143">286.0000dp</dimen>
-	<dimen name="dp_144">288.0000dp</dimen>
-	<dimen name="dp_145">290.0000dp</dimen>
-	<dimen name="dp_146">292.0000dp</dimen>
-	<dimen name="dp_147">294.0000dp</dimen>
-	<dimen name="dp_148">296.0000dp</dimen>
-	<dimen name="dp_149">298.0000dp</dimen>
-	<dimen name="dp_150">300.0000dp</dimen>
-	<dimen name="dp_151">302.0000dp</dimen>
-	<dimen name="dp_152">304.0000dp</dimen>
-	<dimen name="dp_153">306.0000dp</dimen>
-	<dimen name="dp_154">308.0000dp</dimen>
-	<dimen name="dp_155">310.0000dp</dimen>
-	<dimen name="dp_156">312.0000dp</dimen>
-	<dimen name="dp_157">314.0000dp</dimen>
-	<dimen name="dp_158">316.0000dp</dimen>
-	<dimen name="dp_159">318.0000dp</dimen>
-	<dimen name="dp_160">320.0000dp</dimen>
-	<dimen name="dp_161">322.0000dp</dimen>
-	<dimen name="dp_162">324.0000dp</dimen>
-	<dimen name="dp_163">326.0000dp</dimen>
-	<dimen name="dp_164">328.0000dp</dimen>
-	<dimen name="dp_165">330.0000dp</dimen>
-	<dimen name="dp_166">332.0000dp</dimen>
-	<dimen name="dp_167">334.0000dp</dimen>
-	<dimen name="dp_168">336.0000dp</dimen>
-	<dimen name="dp_169">338.0000dp</dimen>
-	<dimen name="dp_170">340.0000dp</dimen>
-	<dimen name="dp_171">342.0000dp</dimen>
-	<dimen name="dp_172">344.0000dp</dimen>
-	<dimen name="dp_173">346.0000dp</dimen>
-	<dimen name="dp_174">348.0000dp</dimen>
-	<dimen name="dp_175">350.0000dp</dimen>
-	<dimen name="dp_176">352.0000dp</dimen>
-	<dimen name="dp_177">354.0000dp</dimen>
-	<dimen name="dp_178">356.0000dp</dimen>
-	<dimen name="dp_179">358.0000dp</dimen>
-	<dimen name="dp_180">360.0000dp</dimen>
-	<dimen name="dp_181">362.0000dp</dimen>
-	<dimen name="dp_182">364.0000dp</dimen>
-	<dimen name="dp_183">366.0000dp</dimen>
-	<dimen name="dp_184">368.0000dp</dimen>
-	<dimen name="dp_185">370.0000dp</dimen>
-	<dimen name="dp_186">372.0000dp</dimen>
-	<dimen name="dp_187">374.0000dp</dimen>
-	<dimen name="dp_188">376.0000dp</dimen>
-	<dimen name="dp_189">378.0000dp</dimen>
-	<dimen name="dp_190">380.0000dp</dimen>
-	<dimen name="dp_191">382.0000dp</dimen>
-	<dimen name="dp_192">384.0000dp</dimen>
-	<dimen name="dp_193">386.0000dp</dimen>
-	<dimen name="dp_194">388.0000dp</dimen>
-	<dimen name="dp_195">390.0000dp</dimen>
-	<dimen name="dp_196">392.0000dp</dimen>
-	<dimen name="dp_197">394.0000dp</dimen>
-	<dimen name="dp_198">396.0000dp</dimen>
-	<dimen name="dp_199">398.0000dp</dimen>
-	<dimen name="dp_200">400.0000dp</dimen>
-	<dimen name="dp_201">402.0000dp</dimen>
-	<dimen name="dp_202">404.0000dp</dimen>
-	<dimen name="dp_203">406.0000dp</dimen>
-	<dimen name="dp_204">408.0000dp</dimen>
-	<dimen name="dp_205">410.0000dp</dimen>
-	<dimen name="dp_206">412.0000dp</dimen>
-	<dimen name="dp_207">414.0000dp</dimen>
-	<dimen name="dp_208">416.0000dp</dimen>
-	<dimen name="dp_209">418.0000dp</dimen>
-	<dimen name="dp_210">420.0000dp</dimen>
-	<dimen name="dp_211">422.0000dp</dimen>
-	<dimen name="dp_212">424.0000dp</dimen>
-	<dimen name="dp_213">426.0000dp</dimen>
-	<dimen name="dp_214">428.0000dp</dimen>
-	<dimen name="dp_215">430.0000dp</dimen>
-	<dimen name="dp_216">432.0000dp</dimen>
-	<dimen name="dp_217">434.0000dp</dimen>
-	<dimen name="dp_218">436.0000dp</dimen>
-	<dimen name="dp_219">438.0000dp</dimen>
-	<dimen name="dp_220">440.0000dp</dimen>
-	<dimen name="dp_221">442.0000dp</dimen>
-	<dimen name="dp_222">444.0000dp</dimen>
-	<dimen name="dp_223">446.0000dp</dimen>
-	<dimen name="dp_224">448.0000dp</dimen>
-	<dimen name="dp_225">450.0000dp</dimen>
-	<dimen name="dp_226">452.0000dp</dimen>
-	<dimen name="dp_227">454.0000dp</dimen>
-	<dimen name="dp_228">456.0000dp</dimen>
-	<dimen name="dp_229">458.0000dp</dimen>
-	<dimen name="dp_230">460.0000dp</dimen>
-	<dimen name="dp_231">462.0000dp</dimen>
-	<dimen name="dp_232">464.0000dp</dimen>
-	<dimen name="dp_233">466.0000dp</dimen>
-	<dimen name="dp_234">468.0000dp</dimen>
-	<dimen name="dp_235">470.0000dp</dimen>
-	<dimen name="dp_236">472.0000dp</dimen>
-	<dimen name="dp_237">474.0000dp</dimen>
-	<dimen name="dp_238">476.0000dp</dimen>
-	<dimen name="dp_239">478.0000dp</dimen>
-	<dimen name="dp_240">480.0000dp</dimen>
-	<dimen name="dp_241">482.0000dp</dimen>
-	<dimen name="dp_242">484.0000dp</dimen>
-	<dimen name="dp_243">486.0000dp</dimen>
-	<dimen name="dp_244">488.0000dp</dimen>
-	<dimen name="dp_245">490.0000dp</dimen>
-	<dimen name="dp_246">492.0000dp</dimen>
-	<dimen name="dp_247">494.0000dp</dimen>
-	<dimen name="dp_248">496.0000dp</dimen>
-	<dimen name="dp_249">498.0000dp</dimen>
-	<dimen name="dp_250">500.0000dp</dimen>
-	<dimen name="dp_251">502.0000dp</dimen>
-	<dimen name="dp_252">504.0000dp</dimen>
-	<dimen name="dp_253">506.0000dp</dimen>
-	<dimen name="dp_254">508.0000dp</dimen>
-	<dimen name="dp_255">510.0000dp</dimen>
-	<dimen name="dp_256">512.0000dp</dimen>
-	<dimen name="dp_257">514.0000dp</dimen>
-	<dimen name="dp_258">516.0000dp</dimen>
-	<dimen name="dp_259">518.0000dp</dimen>
-	<dimen name="dp_260">520.0000dp</dimen>
-	<dimen name="dp_261">522.0000dp</dimen>
-	<dimen name="dp_262">524.0000dp</dimen>
-	<dimen name="dp_263">526.0000dp</dimen>
-	<dimen name="dp_264">528.0000dp</dimen>
-	<dimen name="dp_265">530.0000dp</dimen>
-	<dimen name="dp_266">532.0000dp</dimen>
-	<dimen name="dp_267">534.0000dp</dimen>
-	<dimen name="dp_268">536.0000dp</dimen>
-	<dimen name="dp_269">538.0000dp</dimen>
-	<dimen name="dp_270">540.0000dp</dimen>
-	<dimen name="dp_271">542.0000dp</dimen>
-	<dimen name="dp_272">544.0000dp</dimen>
-	<dimen name="dp_273">546.0000dp</dimen>
-	<dimen name="dp_274">548.0000dp</dimen>
-	<dimen name="dp_275">550.0000dp</dimen>
-	<dimen name="dp_276">552.0000dp</dimen>
-	<dimen name="dp_277">554.0000dp</dimen>
-	<dimen name="dp_278">556.0000dp</dimen>
-	<dimen name="dp_279">558.0000dp</dimen>
-	<dimen name="dp_280">560.0000dp</dimen>
-	<dimen name="dp_281">562.0000dp</dimen>
-	<dimen name="dp_282">564.0000dp</dimen>
-	<dimen name="dp_283">566.0000dp</dimen>
-	<dimen name="dp_284">568.0000dp</dimen>
-	<dimen name="dp_285">570.0000dp</dimen>
-	<dimen name="dp_286">572.0000dp</dimen>
-	<dimen name="dp_287">574.0000dp</dimen>
-	<dimen name="dp_288">576.0000dp</dimen>
-	<dimen name="dp_289">578.0000dp</dimen>
-	<dimen name="dp_290">580.0000dp</dimen>
-	<dimen name="dp_291">582.0000dp</dimen>
-	<dimen name="dp_292">584.0000dp</dimen>
-	<dimen name="dp_293">586.0000dp</dimen>
-	<dimen name="dp_294">588.0000dp</dimen>
-	<dimen name="dp_295">590.0000dp</dimen>
-	<dimen name="dp_296">592.0000dp</dimen>
-	<dimen name="dp_297">594.0000dp</dimen>
-	<dimen name="dp_298">596.0000dp</dimen>
-	<dimen name="dp_299">598.0000dp</dimen>
-	<dimen name="dp_300">600.0000dp</dimen>
-	<dimen name="dp_301">602.0000dp</dimen>
-	<dimen name="dp_302">604.0000dp</dimen>
-	<dimen name="dp_303">606.0000dp</dimen>
-	<dimen name="dp_304">608.0000dp</dimen>
-	<dimen name="dp_305">610.0000dp</dimen>
-	<dimen name="dp_306">612.0000dp</dimen>
-	<dimen name="dp_307">614.0000dp</dimen>
-	<dimen name="dp_308">616.0000dp</dimen>
-	<dimen name="dp_309">618.0000dp</dimen>
-	<dimen name="dp_310">620.0000dp</dimen>
-	<dimen name="dp_311">622.0000dp</dimen>
-	<dimen name="dp_312">624.0000dp</dimen>
-	<dimen name="dp_313">626.0000dp</dimen>
-	<dimen name="dp_314">628.0000dp</dimen>
-	<dimen name="dp_315">630.0000dp</dimen>
-	<dimen name="dp_316">632.0000dp</dimen>
-	<dimen name="dp_317">634.0000dp</dimen>
-	<dimen name="dp_318">636.0000dp</dimen>
-	<dimen name="dp_319">638.0000dp</dimen>
-	<dimen name="dp_320">640.0000dp</dimen>
-	<dimen name="dp_321">642.0000dp</dimen>
-	<dimen name="dp_322">644.0000dp</dimen>
-	<dimen name="dp_323">646.0000dp</dimen>
-	<dimen name="dp_324">648.0000dp</dimen>
-	<dimen name="dp_325">650.0000dp</dimen>
-	<dimen name="dp_326">652.0000dp</dimen>
-	<dimen name="dp_327">654.0000dp</dimen>
-	<dimen name="dp_328">656.0000dp</dimen>
-	<dimen name="dp_329">658.0000dp</dimen>
-	<dimen name="dp_330">660.0000dp</dimen>
-	<dimen name="dp_331">662.0000dp</dimen>
-	<dimen name="dp_332">664.0000dp</dimen>
-	<dimen name="dp_333">666.0000dp</dimen>
-	<dimen name="dp_334">668.0000dp</dimen>
-	<dimen name="dp_335">670.0000dp</dimen>
-	<dimen name="dp_336">672.0000dp</dimen>
-	<dimen name="dp_337">674.0000dp</dimen>
-	<dimen name="dp_338">676.0000dp</dimen>
-	<dimen name="dp_339">678.0000dp</dimen>
-	<dimen name="dp_340">680.0000dp</dimen>
-	<dimen name="dp_341">682.0000dp</dimen>
-	<dimen name="dp_342">684.0000dp</dimen>
-	<dimen name="dp_343">686.0000dp</dimen>
-	<dimen name="dp_344">688.0000dp</dimen>
-	<dimen name="dp_345">690.0000dp</dimen>
-	<dimen name="dp_346">692.0000dp</dimen>
-	<dimen name="dp_347">694.0000dp</dimen>
-	<dimen name="dp_348">696.0000dp</dimen>
-	<dimen name="dp_349">698.0000dp</dimen>
-	<dimen name="dp_350">700.0000dp</dimen>
-	<dimen name="dp_351">702.0000dp</dimen>
-	<dimen name="dp_352">704.0000dp</dimen>
-	<dimen name="dp_353">706.0000dp</dimen>
-	<dimen name="dp_354">708.0000dp</dimen>
-	<dimen name="dp_355">710.0000dp</dimen>
-	<dimen name="dp_356">712.0000dp</dimen>
-	<dimen name="dp_357">714.0000dp</dimen>
-	<dimen name="dp_358">716.0000dp</dimen>
-	<dimen name="dp_359">718.0000dp</dimen>
-	<dimen name="dp_360">720.0000dp</dimen>
-	<dimen name="dp_365">730.0000dp</dimen>
-	<dimen name="dp_370">740.0000dp</dimen>
-	<dimen name="dp_400">800.0000dp</dimen>
-	<dimen name="dp_410">820.0000dp</dimen>
-	<dimen name="dp_422">844.0000dp</dimen>
-	<dimen name="dp_472">944.0000dp</dimen>
-	<dimen name="dp_500">1000.0000dp</dimen>
-	<dimen name="dp_600">1200.0000dp</dimen>
-	<dimen name="dp_640">1280.0000dp</dimen>
-	<dimen name="dp_720">1440.0000dp</dimen>
-	<dimen name="sp_6">12.0000sp</dimen>
-	<dimen name="sp_7">14.0000sp</dimen>
-	<dimen name="sp_8">16.0000sp</dimen>
-	<dimen name="sp_9">18.0000sp</dimen>
-	<dimen name="sp_10">20.0000sp</dimen>
-	<dimen name="sp_11">22.0000sp</dimen>
-	<dimen name="sp_12">24.0000sp</dimen>
-	<dimen name="sp_13">26.0000sp</dimen>
-	<dimen name="sp_14">28.0000sp</dimen>
-	<dimen name="sp_15">30.0000sp</dimen>
-	<dimen name="sp_16">32.0000sp</dimen>
-	<dimen name="sp_17">34.0000sp</dimen>
-	<dimen name="sp_18">36.0000sp</dimen>
-	<dimen name="sp_19">38.0000sp</dimen>
-	<dimen name="sp_20">40.0000sp</dimen>
-	<dimen name="sp_21">42.0000sp</dimen>
-	<dimen name="sp_22">44.0000sp</dimen>
-	<dimen name="sp_23">46.0000sp</dimen>
-	<dimen name="sp_24">48.0000sp</dimen>
-	<dimen name="sp_25">50.0000sp</dimen>
-	<dimen name="sp_28">56.0000sp</dimen>
-	<dimen name="sp_30">60.0000sp</dimen>
-	<dimen name="sp_32">64.0000sp</dimen>
-	<dimen name="sp_34">68.0000sp</dimen>
-	<dimen name="sp_36">72.0000sp</dimen>
-	<dimen name="sp_38">76.0000sp</dimen>
-	<dimen name="sp_40">80.0000sp</dimen>
-	<dimen name="sp_42">84.0000sp</dimen>
-	<dimen name="sp_48">96.0000sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw768dp/dimens.xml b/app/src/main/res/values-sw768dp/dimens.xml
deleted file mode 100644
index cf6fa3b..0000000
--- a/app/src/main/res/values-sw768dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-128.0000dp</dimen>
-	<dimen name="dp_m_30">-64.0000dp</dimen>
-	<dimen name="dp_m_20">-42.6667dp</dimen>
-	<dimen name="dp_m_12">-25.6000dp</dimen>
-	<dimen name="dp_m_10">-21.3333dp</dimen>
-	<dimen name="dp_m_8">-17.0667dp</dimen>
-	<dimen name="dp_m_5">-10.6667dp</dimen>
-	<dimen name="dp_m_2">-4.2667dp</dimen>
-	<dimen name="dp_m_1">-2.1333dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.2133dp</dimen>
-	<dimen name="dp_0_5">1.0667dp</dimen>
-	<dimen name="dp_1">2.1333dp</dimen>
-	<dimen name="dp_1_5">3.2000dp</dimen>
-	<dimen name="dp_2">4.2667dp</dimen>
-	<dimen name="dp_2_5">5.3333dp</dimen>
-	<dimen name="dp_3">6.4000dp</dimen>
-	<dimen name="dp_3_5">7.4667dp</dimen>
-	<dimen name="dp_4">8.5333dp</dimen>
-	<dimen name="dp_4_5">9.6000dp</dimen>
-	<dimen name="dp_5">10.6667dp</dimen>
-	<dimen name="dp_6">12.8000dp</dimen>
-	<dimen name="dp_7">14.9333dp</dimen>
-	<dimen name="dp_8">17.0667dp</dimen>
-	<dimen name="dp_9">19.2000dp</dimen>
-	<dimen name="dp_10">21.3333dp</dimen>
-	<dimen name="dp_11">23.4667dp</dimen>
-	<dimen name="dp_12">25.6000dp</dimen>
-	<dimen name="dp_13">27.7333dp</dimen>
-	<dimen name="dp_14">29.8667dp</dimen>
-	<dimen name="dp_15">32.0000dp</dimen>
-	<dimen name="dp_16">34.1333dp</dimen>
-	<dimen name="dp_17">36.2667dp</dimen>
-	<dimen name="dp_18">38.4000dp</dimen>
-	<dimen name="dp_19">40.5333dp</dimen>
-	<dimen name="dp_20">42.6667dp</dimen>
-	<dimen name="dp_21">44.8000dp</dimen>
-	<dimen name="dp_22">46.9333dp</dimen>
-	<dimen name="dp_23">49.0667dp</dimen>
-	<dimen name="dp_24">51.2000dp</dimen>
-	<dimen name="dp_25">53.3333dp</dimen>
-	<dimen name="dp_26">55.4667dp</dimen>
-	<dimen name="dp_27">57.6000dp</dimen>
-	<dimen name="dp_28">59.7333dp</dimen>
-	<dimen name="dp_29">61.8667dp</dimen>
-	<dimen name="dp_30">64.0000dp</dimen>
-	<dimen name="dp_31">66.1333dp</dimen>
-	<dimen name="dp_32">68.2667dp</dimen>
-	<dimen name="dp_33">70.4000dp</dimen>
-	<dimen name="dp_34">72.5333dp</dimen>
-	<dimen name="dp_35">74.6667dp</dimen>
-	<dimen name="dp_36">76.8000dp</dimen>
-	<dimen name="dp_37">78.9333dp</dimen>
-	<dimen name="dp_38">81.0667dp</dimen>
-	<dimen name="dp_39">83.2000dp</dimen>
-	<dimen name="dp_40">85.3333dp</dimen>
-	<dimen name="dp_41">87.4667dp</dimen>
-	<dimen name="dp_42">89.6000dp</dimen>
-	<dimen name="dp_43">91.7333dp</dimen>
-	<dimen name="dp_44">93.8667dp</dimen>
-	<dimen name="dp_45">96.0000dp</dimen>
-	<dimen name="dp_46">98.1333dp</dimen>
-	<dimen name="dp_47">100.2667dp</dimen>
-	<dimen name="dp_48">102.4000dp</dimen>
-	<dimen name="dp_49">104.5333dp</dimen>
-	<dimen name="dp_50">106.6667dp</dimen>
-	<dimen name="dp_51">108.8000dp</dimen>
-	<dimen name="dp_52">110.9333dp</dimen>
-	<dimen name="dp_53">113.0667dp</dimen>
-	<dimen name="dp_54">115.2000dp</dimen>
-	<dimen name="dp_55">117.3333dp</dimen>
-	<dimen name="dp_56">119.4667dp</dimen>
-	<dimen name="dp_57">121.6000dp</dimen>
-	<dimen name="dp_58">123.7333dp</dimen>
-	<dimen name="dp_59">125.8667dp</dimen>
-	<dimen name="dp_60">128.0000dp</dimen>
-	<dimen name="dp_61">130.1333dp</dimen>
-	<dimen name="dp_62">132.2667dp</dimen>
-	<dimen name="dp_63">134.4000dp</dimen>
-	<dimen name="dp_64">136.5333dp</dimen>
-	<dimen name="dp_65">138.6667dp</dimen>
-	<dimen name="dp_66">140.8000dp</dimen>
-	<dimen name="dp_67">142.9333dp</dimen>
-	<dimen name="dp_68">145.0667dp</dimen>
-	<dimen name="dp_69">147.2000dp</dimen>
-	<dimen name="dp_70">149.3333dp</dimen>
-	<dimen name="dp_71">151.4667dp</dimen>
-	<dimen name="dp_72">153.6000dp</dimen>
-	<dimen name="dp_73">155.7333dp</dimen>
-	<dimen name="dp_74">157.8667dp</dimen>
-	<dimen name="dp_75">160.0000dp</dimen>
-	<dimen name="dp_76">162.1333dp</dimen>
-	<dimen name="dp_77">164.2667dp</dimen>
-	<dimen name="dp_78">166.4000dp</dimen>
-	<dimen name="dp_79">168.5333dp</dimen>
-	<dimen name="dp_80">170.6667dp</dimen>
-	<dimen name="dp_81">172.8000dp</dimen>
-	<dimen name="dp_82">174.9333dp</dimen>
-	<dimen name="dp_83">177.0667dp</dimen>
-	<dimen name="dp_84">179.2000dp</dimen>
-	<dimen name="dp_85">181.3333dp</dimen>
-	<dimen name="dp_86">183.4667dp</dimen>
-	<dimen name="dp_87">185.6000dp</dimen>
-	<dimen name="dp_88">187.7333dp</dimen>
-	<dimen name="dp_89">189.8667dp</dimen>
-	<dimen name="dp_90">192.0000dp</dimen>
-	<dimen name="dp_91">194.1333dp</dimen>
-	<dimen name="dp_92">196.2667dp</dimen>
-	<dimen name="dp_93">198.4000dp</dimen>
-	<dimen name="dp_94">200.5333dp</dimen>
-	<dimen name="dp_95">202.6667dp</dimen>
-	<dimen name="dp_96">204.8000dp</dimen>
-	<dimen name="dp_97">206.9333dp</dimen>
-	<dimen name="dp_98">209.0667dp</dimen>
-	<dimen name="dp_99">211.2000dp</dimen>
-	<dimen name="dp_100">213.3333dp</dimen>
-	<dimen name="dp_101">215.4667dp</dimen>
-	<dimen name="dp_102">217.6000dp</dimen>
-	<dimen name="dp_103">219.7333dp</dimen>
-	<dimen name="dp_104">221.8667dp</dimen>
-	<dimen name="dp_105">224.0000dp</dimen>
-	<dimen name="dp_106">226.1333dp</dimen>
-	<dimen name="dp_107">228.2667dp</dimen>
-	<dimen name="dp_108">230.4000dp</dimen>
-	<dimen name="dp_109">232.5333dp</dimen>
-	<dimen name="dp_110">234.6667dp</dimen>
-	<dimen name="dp_111">236.8000dp</dimen>
-	<dimen name="dp_112">238.9333dp</dimen>
-	<dimen name="dp_113">241.0667dp</dimen>
-	<dimen name="dp_114">243.2000dp</dimen>
-	<dimen name="dp_115">245.3333dp</dimen>
-	<dimen name="dp_116">247.4667dp</dimen>
-	<dimen name="dp_117">249.6000dp</dimen>
-	<dimen name="dp_118">251.7333dp</dimen>
-	<dimen name="dp_119">253.8667dp</dimen>
-	<dimen name="dp_120">256.0000dp</dimen>
-	<dimen name="dp_121">258.1333dp</dimen>
-	<dimen name="dp_122">260.2667dp</dimen>
-	<dimen name="dp_123">262.4000dp</dimen>
-	<dimen name="dp_124">264.5333dp</dimen>
-	<dimen name="dp_125">266.6667dp</dimen>
-	<dimen name="dp_126">268.8000dp</dimen>
-	<dimen name="dp_127">270.9333dp</dimen>
-	<dimen name="dp_128">273.0667dp</dimen>
-	<dimen name="dp_129">275.2000dp</dimen>
-	<dimen name="dp_130">277.3333dp</dimen>
-	<dimen name="dp_131">279.4667dp</dimen>
-	<dimen name="dp_132">281.6000dp</dimen>
-	<dimen name="dp_133">283.7333dp</dimen>
-	<dimen name="dp_134">285.8667dp</dimen>
-	<dimen name="dp_135">288.0000dp</dimen>
-	<dimen name="dp_136">290.1333dp</dimen>
-	<dimen name="dp_137">292.2667dp</dimen>
-	<dimen name="dp_138">294.4000dp</dimen>
-	<dimen name="dp_139">296.5333dp</dimen>
-	<dimen name="dp_140">298.6667dp</dimen>
-	<dimen name="dp_141">300.8000dp</dimen>
-	<dimen name="dp_142">302.9333dp</dimen>
-	<dimen name="dp_143">305.0667dp</dimen>
-	<dimen name="dp_144">307.2000dp</dimen>
-	<dimen name="dp_145">309.3333dp</dimen>
-	<dimen name="dp_146">311.4667dp</dimen>
-	<dimen name="dp_147">313.6000dp</dimen>
-	<dimen name="dp_148">315.7333dp</dimen>
-	<dimen name="dp_149">317.8667dp</dimen>
-	<dimen name="dp_150">320.0000dp</dimen>
-	<dimen name="dp_151">322.1333dp</dimen>
-	<dimen name="dp_152">324.2667dp</dimen>
-	<dimen name="dp_153">326.4000dp</dimen>
-	<dimen name="dp_154">328.5333dp</dimen>
-	<dimen name="dp_155">330.6667dp</dimen>
-	<dimen name="dp_156">332.8000dp</dimen>
-	<dimen name="dp_157">334.9333dp</dimen>
-	<dimen name="dp_158">337.0667dp</dimen>
-	<dimen name="dp_159">339.2000dp</dimen>
-	<dimen name="dp_160">341.3333dp</dimen>
-	<dimen name="dp_161">343.4667dp</dimen>
-	<dimen name="dp_162">345.6000dp</dimen>
-	<dimen name="dp_163">347.7333dp</dimen>
-	<dimen name="dp_164">349.8667dp</dimen>
-	<dimen name="dp_165">352.0000dp</dimen>
-	<dimen name="dp_166">354.1333dp</dimen>
-	<dimen name="dp_167">356.2667dp</dimen>
-	<dimen name="dp_168">358.4000dp</dimen>
-	<dimen name="dp_169">360.5333dp</dimen>
-	<dimen name="dp_170">362.6667dp</dimen>
-	<dimen name="dp_171">364.8000dp</dimen>
-	<dimen name="dp_172">366.9333dp</dimen>
-	<dimen name="dp_173">369.0667dp</dimen>
-	<dimen name="dp_174">371.2000dp</dimen>
-	<dimen name="dp_175">373.3333dp</dimen>
-	<dimen name="dp_176">375.4667dp</dimen>
-	<dimen name="dp_177">377.6000dp</dimen>
-	<dimen name="dp_178">379.7333dp</dimen>
-	<dimen name="dp_179">381.8667dp</dimen>
-	<dimen name="dp_180">384.0000dp</dimen>
-	<dimen name="dp_181">386.1333dp</dimen>
-	<dimen name="dp_182">388.2667dp</dimen>
-	<dimen name="dp_183">390.4000dp</dimen>
-	<dimen name="dp_184">392.5333dp</dimen>
-	<dimen name="dp_185">394.6667dp</dimen>
-	<dimen name="dp_186">396.8000dp</dimen>
-	<dimen name="dp_187">398.9333dp</dimen>
-	<dimen name="dp_188">401.0667dp</dimen>
-	<dimen name="dp_189">403.2000dp</dimen>
-	<dimen name="dp_190">405.3333dp</dimen>
-	<dimen name="dp_191">407.4667dp</dimen>
-	<dimen name="dp_192">409.6000dp</dimen>
-	<dimen name="dp_193">411.7333dp</dimen>
-	<dimen name="dp_194">413.8667dp</dimen>
-	<dimen name="dp_195">416.0000dp</dimen>
-	<dimen name="dp_196">418.1333dp</dimen>
-	<dimen name="dp_197">420.2667dp</dimen>
-	<dimen name="dp_198">422.4000dp</dimen>
-	<dimen name="dp_199">424.5333dp</dimen>
-	<dimen name="dp_200">426.6667dp</dimen>
-	<dimen name="dp_201">428.8000dp</dimen>
-	<dimen name="dp_202">430.9333dp</dimen>
-	<dimen name="dp_203">433.0667dp</dimen>
-	<dimen name="dp_204">435.2000dp</dimen>
-	<dimen name="dp_205">437.3333dp</dimen>
-	<dimen name="dp_206">439.4667dp</dimen>
-	<dimen name="dp_207">441.6000dp</dimen>
-	<dimen name="dp_208">443.7333dp</dimen>
-	<dimen name="dp_209">445.8667dp</dimen>
-	<dimen name="dp_210">448.0000dp</dimen>
-	<dimen name="dp_211">450.1333dp</dimen>
-	<dimen name="dp_212">452.2667dp</dimen>
-	<dimen name="dp_213">454.4000dp</dimen>
-	<dimen name="dp_214">456.5333dp</dimen>
-	<dimen name="dp_215">458.6667dp</dimen>
-	<dimen name="dp_216">460.8000dp</dimen>
-	<dimen name="dp_217">462.9333dp</dimen>
-	<dimen name="dp_218">465.0667dp</dimen>
-	<dimen name="dp_219">467.2000dp</dimen>
-	<dimen name="dp_220">469.3333dp</dimen>
-	<dimen name="dp_221">471.4667dp</dimen>
-	<dimen name="dp_222">473.6000dp</dimen>
-	<dimen name="dp_223">475.7333dp</dimen>
-	<dimen name="dp_224">477.8667dp</dimen>
-	<dimen name="dp_225">480.0000dp</dimen>
-	<dimen name="dp_226">482.1333dp</dimen>
-	<dimen name="dp_227">484.2667dp</dimen>
-	<dimen name="dp_228">486.4000dp</dimen>
-	<dimen name="dp_229">488.5333dp</dimen>
-	<dimen name="dp_230">490.6667dp</dimen>
-	<dimen name="dp_231">492.8000dp</dimen>
-	<dimen name="dp_232">494.9333dp</dimen>
-	<dimen name="dp_233">497.0667dp</dimen>
-	<dimen name="dp_234">499.2000dp</dimen>
-	<dimen name="dp_235">501.3333dp</dimen>
-	<dimen name="dp_236">503.4667dp</dimen>
-	<dimen name="dp_237">505.6000dp</dimen>
-	<dimen name="dp_238">507.7333dp</dimen>
-	<dimen name="dp_239">509.8667dp</dimen>
-	<dimen name="dp_240">512.0000dp</dimen>
-	<dimen name="dp_241">514.1333dp</dimen>
-	<dimen name="dp_242">516.2667dp</dimen>
-	<dimen name="dp_243">518.4000dp</dimen>
-	<dimen name="dp_244">520.5333dp</dimen>
-	<dimen name="dp_245">522.6667dp</dimen>
-	<dimen name="dp_246">524.8000dp</dimen>
-	<dimen name="dp_247">526.9333dp</dimen>
-	<dimen name="dp_248">529.0667dp</dimen>
-	<dimen name="dp_249">531.2000dp</dimen>
-	<dimen name="dp_250">533.3333dp</dimen>
-	<dimen name="dp_251">535.4667dp</dimen>
-	<dimen name="dp_252">537.6000dp</dimen>
-	<dimen name="dp_253">539.7333dp</dimen>
-	<dimen name="dp_254">541.8667dp</dimen>
-	<dimen name="dp_255">544.0000dp</dimen>
-	<dimen name="dp_256">546.1333dp</dimen>
-	<dimen name="dp_257">548.2667dp</dimen>
-	<dimen name="dp_258">550.4000dp</dimen>
-	<dimen name="dp_259">552.5333dp</dimen>
-	<dimen name="dp_260">554.6667dp</dimen>
-	<dimen name="dp_261">556.8000dp</dimen>
-	<dimen name="dp_262">558.9333dp</dimen>
-	<dimen name="dp_263">561.0667dp</dimen>
-	<dimen name="dp_264">563.2000dp</dimen>
-	<dimen name="dp_265">565.3333dp</dimen>
-	<dimen name="dp_266">567.4667dp</dimen>
-	<dimen name="dp_267">569.6000dp</dimen>
-	<dimen name="dp_268">571.7333dp</dimen>
-	<dimen name="dp_269">573.8667dp</dimen>
-	<dimen name="dp_270">576.0000dp</dimen>
-	<dimen name="dp_271">578.1333dp</dimen>
-	<dimen name="dp_272">580.2667dp</dimen>
-	<dimen name="dp_273">582.4000dp</dimen>
-	<dimen name="dp_274">584.5333dp</dimen>
-	<dimen name="dp_275">586.6667dp</dimen>
-	<dimen name="dp_276">588.8000dp</dimen>
-	<dimen name="dp_277">590.9333dp</dimen>
-	<dimen name="dp_278">593.0667dp</dimen>
-	<dimen name="dp_279">595.2000dp</dimen>
-	<dimen name="dp_280">597.3333dp</dimen>
-	<dimen name="dp_281">599.4667dp</dimen>
-	<dimen name="dp_282">601.6000dp</dimen>
-	<dimen name="dp_283">603.7333dp</dimen>
-	<dimen name="dp_284">605.8667dp</dimen>
-	<dimen name="dp_285">608.0000dp</dimen>
-	<dimen name="dp_286">610.1333dp</dimen>
-	<dimen name="dp_287">612.2667dp</dimen>
-	<dimen name="dp_288">614.4000dp</dimen>
-	<dimen name="dp_289">616.5333dp</dimen>
-	<dimen name="dp_290">618.6667dp</dimen>
-	<dimen name="dp_291">620.8000dp</dimen>
-	<dimen name="dp_292">622.9333dp</dimen>
-	<dimen name="dp_293">625.0667dp</dimen>
-	<dimen name="dp_294">627.2000dp</dimen>
-	<dimen name="dp_295">629.3333dp</dimen>
-	<dimen name="dp_296">631.4667dp</dimen>
-	<dimen name="dp_297">633.6000dp</dimen>
-	<dimen name="dp_298">635.7333dp</dimen>
-	<dimen name="dp_299">637.8667dp</dimen>
-	<dimen name="dp_300">640.0000dp</dimen>
-	<dimen name="dp_301">642.1333dp</dimen>
-	<dimen name="dp_302">644.2667dp</dimen>
-	<dimen name="dp_303">646.4000dp</dimen>
-	<dimen name="dp_304">648.5333dp</dimen>
-	<dimen name="dp_305">650.6667dp</dimen>
-	<dimen name="dp_306">652.8000dp</dimen>
-	<dimen name="dp_307">654.9333dp</dimen>
-	<dimen name="dp_308">657.0667dp</dimen>
-	<dimen name="dp_309">659.2000dp</dimen>
-	<dimen name="dp_310">661.3333dp</dimen>
-	<dimen name="dp_311">663.4667dp</dimen>
-	<dimen name="dp_312">665.6000dp</dimen>
-	<dimen name="dp_313">667.7333dp</dimen>
-	<dimen name="dp_314">669.8667dp</dimen>
-	<dimen name="dp_315">672.0000dp</dimen>
-	<dimen name="dp_316">674.1333dp</dimen>
-	<dimen name="dp_317">676.2667dp</dimen>
-	<dimen name="dp_318">678.4000dp</dimen>
-	<dimen name="dp_319">680.5333dp</dimen>
-	<dimen name="dp_320">682.6667dp</dimen>
-	<dimen name="dp_321">684.8000dp</dimen>
-	<dimen name="dp_322">686.9333dp</dimen>
-	<dimen name="dp_323">689.0667dp</dimen>
-	<dimen name="dp_324">691.2000dp</dimen>
-	<dimen name="dp_325">693.3333dp</dimen>
-	<dimen name="dp_326">695.4667dp</dimen>
-	<dimen name="dp_327">697.6000dp</dimen>
-	<dimen name="dp_328">699.7333dp</dimen>
-	<dimen name="dp_329">701.8667dp</dimen>
-	<dimen name="dp_330">704.0000dp</dimen>
-	<dimen name="dp_331">706.1333dp</dimen>
-	<dimen name="dp_332">708.2667dp</dimen>
-	<dimen name="dp_333">710.4000dp</dimen>
-	<dimen name="dp_334">712.5333dp</dimen>
-	<dimen name="dp_335">714.6667dp</dimen>
-	<dimen name="dp_336">716.8000dp</dimen>
-	<dimen name="dp_337">718.9333dp</dimen>
-	<dimen name="dp_338">721.0667dp</dimen>
-	<dimen name="dp_339">723.2000dp</dimen>
-	<dimen name="dp_340">725.3333dp</dimen>
-	<dimen name="dp_341">727.4667dp</dimen>
-	<dimen name="dp_342">729.6000dp</dimen>
-	<dimen name="dp_343">731.7333dp</dimen>
-	<dimen name="dp_344">733.8667dp</dimen>
-	<dimen name="dp_345">736.0000dp</dimen>
-	<dimen name="dp_346">738.1333dp</dimen>
-	<dimen name="dp_347">740.2667dp</dimen>
-	<dimen name="dp_348">742.4000dp</dimen>
-	<dimen name="dp_349">744.5333dp</dimen>
-	<dimen name="dp_350">746.6667dp</dimen>
-	<dimen name="dp_351">748.8000dp</dimen>
-	<dimen name="dp_352">750.9333dp</dimen>
-	<dimen name="dp_353">753.0667dp</dimen>
-	<dimen name="dp_354">755.2000dp</dimen>
-	<dimen name="dp_355">757.3333dp</dimen>
-	<dimen name="dp_356">759.4667dp</dimen>
-	<dimen name="dp_357">761.6000dp</dimen>
-	<dimen name="dp_358">763.7333dp</dimen>
-	<dimen name="dp_359">765.8667dp</dimen>
-	<dimen name="dp_360">768.0000dp</dimen>
-	<dimen name="dp_365">778.6667dp</dimen>
-	<dimen name="dp_370">789.3333dp</dimen>
-	<dimen name="dp_400">853.3333dp</dimen>
-	<dimen name="dp_410">874.6667dp</dimen>
-	<dimen name="dp_422">900.2667dp</dimen>
-	<dimen name="dp_472">1006.9333dp</dimen>
-	<dimen name="dp_500">1066.6667dp</dimen>
-	<dimen name="dp_600">1280.0000dp</dimen>
-	<dimen name="dp_640">1365.3333dp</dimen>
-	<dimen name="dp_720">1536.0000dp</dimen>
-	<dimen name="sp_6">12.8000sp</dimen>
-	<dimen name="sp_7">14.9333sp</dimen>
-	<dimen name="sp_8">17.0667sp</dimen>
-	<dimen name="sp_9">19.2000sp</dimen>
-	<dimen name="sp_10">21.3333sp</dimen>
-	<dimen name="sp_11">23.4667sp</dimen>
-	<dimen name="sp_12">25.6000sp</dimen>
-	<dimen name="sp_13">27.7333sp</dimen>
-	<dimen name="sp_14">29.8667sp</dimen>
-	<dimen name="sp_15">32.0000sp</dimen>
-	<dimen name="sp_16">34.1333sp</dimen>
-	<dimen name="sp_17">36.2667sp</dimen>
-	<dimen name="sp_18">38.4000sp</dimen>
-	<dimen name="sp_19">40.5333sp</dimen>
-	<dimen name="sp_20">42.6667sp</dimen>
-	<dimen name="sp_21">44.8000sp</dimen>
-	<dimen name="sp_22">46.9333sp</dimen>
-	<dimen name="sp_23">49.0667sp</dimen>
-	<dimen name="sp_24">51.2000sp</dimen>
-	<dimen name="sp_25">53.3333sp</dimen>
-	<dimen name="sp_28">59.7333sp</dimen>
-	<dimen name="sp_30">64.0000sp</dimen>
-	<dimen name="sp_32">68.2667sp</dimen>
-	<dimen name="sp_34">72.5333sp</dimen>
-	<dimen name="sp_36">76.8000sp</dimen>
-	<dimen name="sp_38">81.0667sp</dimen>
-	<dimen name="sp_40">85.3333sp</dimen>
-	<dimen name="sp_42">89.6000sp</dimen>
-	<dimen name="sp_48">102.4000sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw800dp/dimens.xml b/app/src/main/res/values-sw800dp/dimens.xml
deleted file mode 100644
index 84c7673..0000000
--- a/app/src/main/res/values-sw800dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-133.3333dp</dimen>
-	<dimen name="dp_m_30">-66.6667dp</dimen>
-	<dimen name="dp_m_20">-44.4444dp</dimen>
-	<dimen name="dp_m_12">-26.6667dp</dimen>
-	<dimen name="dp_m_10">-22.2222dp</dimen>
-	<dimen name="dp_m_8">-17.7778dp</dimen>
-	<dimen name="dp_m_5">-11.1111dp</dimen>
-	<dimen name="dp_m_2">-4.4444dp</dimen>
-	<dimen name="dp_m_1">-2.2222dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.2222dp</dimen>
-	<dimen name="dp_0_5">1.1111dp</dimen>
-	<dimen name="dp_1">2.2222dp</dimen>
-	<dimen name="dp_1_5">3.3333dp</dimen>
-	<dimen name="dp_2">4.4444dp</dimen>
-	<dimen name="dp_2_5">5.5556dp</dimen>
-	<dimen name="dp_3">6.6667dp</dimen>
-	<dimen name="dp_3_5">7.7778dp</dimen>
-	<dimen name="dp_4">8.8889dp</dimen>
-	<dimen name="dp_4_5">10.0000dp</dimen>
-	<dimen name="dp_5">11.1111dp</dimen>
-	<dimen name="dp_6">13.3333dp</dimen>
-	<dimen name="dp_7">15.5556dp</dimen>
-	<dimen name="dp_8">17.7778dp</dimen>
-	<dimen name="dp_9">20.0000dp</dimen>
-	<dimen name="dp_10">22.2222dp</dimen>
-	<dimen name="dp_11">24.4444dp</dimen>
-	<dimen name="dp_12">26.6667dp</dimen>
-	<dimen name="dp_13">28.8889dp</dimen>
-	<dimen name="dp_14">31.1111dp</dimen>
-	<dimen name="dp_15">33.3333dp</dimen>
-	<dimen name="dp_16">35.5556dp</dimen>
-	<dimen name="dp_17">37.7778dp</dimen>
-	<dimen name="dp_18">40.0000dp</dimen>
-	<dimen name="dp_19">42.2222dp</dimen>
-	<dimen name="dp_20">44.4444dp</dimen>
-	<dimen name="dp_21">46.6667dp</dimen>
-	<dimen name="dp_22">48.8889dp</dimen>
-	<dimen name="dp_23">51.1111dp</dimen>
-	<dimen name="dp_24">53.3333dp</dimen>
-	<dimen name="dp_25">55.5556dp</dimen>
-	<dimen name="dp_26">57.7778dp</dimen>
-	<dimen name="dp_27">60.0000dp</dimen>
-	<dimen name="dp_28">62.2222dp</dimen>
-	<dimen name="dp_29">64.4444dp</dimen>
-	<dimen name="dp_30">66.6667dp</dimen>
-	<dimen name="dp_31">68.8889dp</dimen>
-	<dimen name="dp_32">71.1111dp</dimen>
-	<dimen name="dp_33">73.3333dp</dimen>
-	<dimen name="dp_34">75.5556dp</dimen>
-	<dimen name="dp_35">77.7778dp</dimen>
-	<dimen name="dp_36">80.0000dp</dimen>
-	<dimen name="dp_37">82.2222dp</dimen>
-	<dimen name="dp_38">84.4444dp</dimen>
-	<dimen name="dp_39">86.6667dp</dimen>
-	<dimen name="dp_40">88.8889dp</dimen>
-	<dimen name="dp_41">91.1111dp</dimen>
-	<dimen name="dp_42">93.3333dp</dimen>
-	<dimen name="dp_43">95.5556dp</dimen>
-	<dimen name="dp_44">97.7778dp</dimen>
-	<dimen name="dp_45">100.0000dp</dimen>
-	<dimen name="dp_46">102.2222dp</dimen>
-	<dimen name="dp_47">104.4444dp</dimen>
-	<dimen name="dp_48">106.6667dp</dimen>
-	<dimen name="dp_49">108.8889dp</dimen>
-	<dimen name="dp_50">111.1111dp</dimen>
-	<dimen name="dp_51">113.3333dp</dimen>
-	<dimen name="dp_52">115.5556dp</dimen>
-	<dimen name="dp_53">117.7778dp</dimen>
-	<dimen name="dp_54">120.0000dp</dimen>
-	<dimen name="dp_55">122.2222dp</dimen>
-	<dimen name="dp_56">124.4444dp</dimen>
-	<dimen name="dp_57">126.6667dp</dimen>
-	<dimen name="dp_58">128.8889dp</dimen>
-	<dimen name="dp_59">131.1111dp</dimen>
-	<dimen name="dp_60">133.3333dp</dimen>
-	<dimen name="dp_61">135.5556dp</dimen>
-	<dimen name="dp_62">137.7778dp</dimen>
-	<dimen name="dp_63">140.0000dp</dimen>
-	<dimen name="dp_64">142.2222dp</dimen>
-	<dimen name="dp_65">144.4444dp</dimen>
-	<dimen name="dp_66">146.6667dp</dimen>
-	<dimen name="dp_67">148.8889dp</dimen>
-	<dimen name="dp_68">151.1111dp</dimen>
-	<dimen name="dp_69">153.3333dp</dimen>
-	<dimen name="dp_70">155.5556dp</dimen>
-	<dimen name="dp_71">157.7778dp</dimen>
-	<dimen name="dp_72">160.0000dp</dimen>
-	<dimen name="dp_73">162.2222dp</dimen>
-	<dimen name="dp_74">164.4444dp</dimen>
-	<dimen name="dp_75">166.6667dp</dimen>
-	<dimen name="dp_76">168.8889dp</dimen>
-	<dimen name="dp_77">171.1111dp</dimen>
-	<dimen name="dp_78">173.3333dp</dimen>
-	<dimen name="dp_79">175.5556dp</dimen>
-	<dimen name="dp_80">177.7778dp</dimen>
-	<dimen name="dp_81">180.0000dp</dimen>
-	<dimen name="dp_82">182.2222dp</dimen>
-	<dimen name="dp_83">184.4444dp</dimen>
-	<dimen name="dp_84">186.6667dp</dimen>
-	<dimen name="dp_85">188.8889dp</dimen>
-	<dimen name="dp_86">191.1111dp</dimen>
-	<dimen name="dp_87">193.3333dp</dimen>
-	<dimen name="dp_88">195.5556dp</dimen>
-	<dimen name="dp_89">197.7778dp</dimen>
-	<dimen name="dp_90">200.0000dp</dimen>
-	<dimen name="dp_91">202.2222dp</dimen>
-	<dimen name="dp_92">204.4444dp</dimen>
-	<dimen name="dp_93">206.6667dp</dimen>
-	<dimen name="dp_94">208.8889dp</dimen>
-	<dimen name="dp_95">211.1111dp</dimen>
-	<dimen name="dp_96">213.3333dp</dimen>
-	<dimen name="dp_97">215.5556dp</dimen>
-	<dimen name="dp_98">217.7778dp</dimen>
-	<dimen name="dp_99">220.0000dp</dimen>
-	<dimen name="dp_100">222.2222dp</dimen>
-	<dimen name="dp_101">224.4444dp</dimen>
-	<dimen name="dp_102">226.6667dp</dimen>
-	<dimen name="dp_103">228.8889dp</dimen>
-	<dimen name="dp_104">231.1111dp</dimen>
-	<dimen name="dp_105">233.3333dp</dimen>
-	<dimen name="dp_106">235.5556dp</dimen>
-	<dimen name="dp_107">237.7778dp</dimen>
-	<dimen name="dp_108">240.0000dp</dimen>
-	<dimen name="dp_109">242.2222dp</dimen>
-	<dimen name="dp_110">244.4444dp</dimen>
-	<dimen name="dp_111">246.6667dp</dimen>
-	<dimen name="dp_112">248.8889dp</dimen>
-	<dimen name="dp_113">251.1111dp</dimen>
-	<dimen name="dp_114">253.3333dp</dimen>
-	<dimen name="dp_115">255.5556dp</dimen>
-	<dimen name="dp_116">257.7778dp</dimen>
-	<dimen name="dp_117">260.0000dp</dimen>
-	<dimen name="dp_118">262.2222dp</dimen>
-	<dimen name="dp_119">264.4444dp</dimen>
-	<dimen name="dp_120">266.6667dp</dimen>
-	<dimen name="dp_121">268.8889dp</dimen>
-	<dimen name="dp_122">271.1111dp</dimen>
-	<dimen name="dp_123">273.3333dp</dimen>
-	<dimen name="dp_124">275.5556dp</dimen>
-	<dimen name="dp_125">277.7778dp</dimen>
-	<dimen name="dp_126">280.0000dp</dimen>
-	<dimen name="dp_127">282.2222dp</dimen>
-	<dimen name="dp_128">284.4444dp</dimen>
-	<dimen name="dp_129">286.6667dp</dimen>
-	<dimen name="dp_130">288.8889dp</dimen>
-	<dimen name="dp_131">291.1111dp</dimen>
-	<dimen name="dp_132">293.3333dp</dimen>
-	<dimen name="dp_133">295.5556dp</dimen>
-	<dimen name="dp_134">297.7778dp</dimen>
-	<dimen name="dp_135">300.0000dp</dimen>
-	<dimen name="dp_136">302.2222dp</dimen>
-	<dimen name="dp_137">304.4444dp</dimen>
-	<dimen name="dp_138">306.6667dp</dimen>
-	<dimen name="dp_139">308.8889dp</dimen>
-	<dimen name="dp_140">311.1111dp</dimen>
-	<dimen name="dp_141">313.3333dp</dimen>
-	<dimen name="dp_142">315.5556dp</dimen>
-	<dimen name="dp_143">317.7778dp</dimen>
-	<dimen name="dp_144">320.0000dp</dimen>
-	<dimen name="dp_145">322.2222dp</dimen>
-	<dimen name="dp_146">324.4444dp</dimen>
-	<dimen name="dp_147">326.6667dp</dimen>
-	<dimen name="dp_148">328.8889dp</dimen>
-	<dimen name="dp_149">331.1111dp</dimen>
-	<dimen name="dp_150">333.3333dp</dimen>
-	<dimen name="dp_151">335.5556dp</dimen>
-	<dimen name="dp_152">337.7778dp</dimen>
-	<dimen name="dp_153">340.0000dp</dimen>
-	<dimen name="dp_154">342.2222dp</dimen>
-	<dimen name="dp_155">344.4444dp</dimen>
-	<dimen name="dp_156">346.6667dp</dimen>
-	<dimen name="dp_157">348.8889dp</dimen>
-	<dimen name="dp_158">351.1111dp</dimen>
-	<dimen name="dp_159">353.3333dp</dimen>
-	<dimen name="dp_160">355.5556dp</dimen>
-	<dimen name="dp_161">357.7778dp</dimen>
-	<dimen name="dp_162">360.0000dp</dimen>
-	<dimen name="dp_163">362.2222dp</dimen>
-	<dimen name="dp_164">364.4444dp</dimen>
-	<dimen name="dp_165">366.6667dp</dimen>
-	<dimen name="dp_166">368.8889dp</dimen>
-	<dimen name="dp_167">371.1111dp</dimen>
-	<dimen name="dp_168">373.3333dp</dimen>
-	<dimen name="dp_169">375.5556dp</dimen>
-	<dimen name="dp_170">377.7778dp</dimen>
-	<dimen name="dp_171">380.0000dp</dimen>
-	<dimen name="dp_172">382.2222dp</dimen>
-	<dimen name="dp_173">384.4444dp</dimen>
-	<dimen name="dp_174">386.6667dp</dimen>
-	<dimen name="dp_175">388.8889dp</dimen>
-	<dimen name="dp_176">391.1111dp</dimen>
-	<dimen name="dp_177">393.3333dp</dimen>
-	<dimen name="dp_178">395.5556dp</dimen>
-	<dimen name="dp_179">397.7778dp</dimen>
-	<dimen name="dp_180">400.0000dp</dimen>
-	<dimen name="dp_181">402.2222dp</dimen>
-	<dimen name="dp_182">404.4444dp</dimen>
-	<dimen name="dp_183">406.6667dp</dimen>
-	<dimen name="dp_184">408.8889dp</dimen>
-	<dimen name="dp_185">411.1111dp</dimen>
-	<dimen name="dp_186">413.3333dp</dimen>
-	<dimen name="dp_187">415.5556dp</dimen>
-	<dimen name="dp_188">417.7778dp</dimen>
-	<dimen name="dp_189">420.0000dp</dimen>
-	<dimen name="dp_190">422.2222dp</dimen>
-	<dimen name="dp_191">424.4444dp</dimen>
-	<dimen name="dp_192">426.6667dp</dimen>
-	<dimen name="dp_193">428.8889dp</dimen>
-	<dimen name="dp_194">431.1111dp</dimen>
-	<dimen name="dp_195">433.3333dp</dimen>
-	<dimen name="dp_196">435.5556dp</dimen>
-	<dimen name="dp_197">437.7778dp</dimen>
-	<dimen name="dp_198">440.0000dp</dimen>
-	<dimen name="dp_199">442.2222dp</dimen>
-	<dimen name="dp_200">444.4444dp</dimen>
-	<dimen name="dp_201">446.6667dp</dimen>
-	<dimen name="dp_202">448.8889dp</dimen>
-	<dimen name="dp_203">451.1111dp</dimen>
-	<dimen name="dp_204">453.3333dp</dimen>
-	<dimen name="dp_205">455.5556dp</dimen>
-	<dimen name="dp_206">457.7778dp</dimen>
-	<dimen name="dp_207">460.0000dp</dimen>
-	<dimen name="dp_208">462.2222dp</dimen>
-	<dimen name="dp_209">464.4444dp</dimen>
-	<dimen name="dp_210">466.6667dp</dimen>
-	<dimen name="dp_211">468.8889dp</dimen>
-	<dimen name="dp_212">471.1111dp</dimen>
-	<dimen name="dp_213">473.3333dp</dimen>
-	<dimen name="dp_214">475.5556dp</dimen>
-	<dimen name="dp_215">477.7778dp</dimen>
-	<dimen name="dp_216">480.0000dp</dimen>
-	<dimen name="dp_217">482.2222dp</dimen>
-	<dimen name="dp_218">484.4444dp</dimen>
-	<dimen name="dp_219">486.6667dp</dimen>
-	<dimen name="dp_220">488.8889dp</dimen>
-	<dimen name="dp_221">491.1111dp</dimen>
-	<dimen name="dp_222">493.3333dp</dimen>
-	<dimen name="dp_223">495.5556dp</dimen>
-	<dimen name="dp_224">497.7778dp</dimen>
-	<dimen name="dp_225">500.0000dp</dimen>
-	<dimen name="dp_226">502.2222dp</dimen>
-	<dimen name="dp_227">504.4444dp</dimen>
-	<dimen name="dp_228">506.6667dp</dimen>
-	<dimen name="dp_229">508.8889dp</dimen>
-	<dimen name="dp_230">511.1111dp</dimen>
-	<dimen name="dp_231">513.3333dp</dimen>
-	<dimen name="dp_232">515.5556dp</dimen>
-	<dimen name="dp_233">517.7778dp</dimen>
-	<dimen name="dp_234">520.0000dp</dimen>
-	<dimen name="dp_235">522.2222dp</dimen>
-	<dimen name="dp_236">524.4444dp</dimen>
-	<dimen name="dp_237">526.6667dp</dimen>
-	<dimen name="dp_238">528.8889dp</dimen>
-	<dimen name="dp_239">531.1111dp</dimen>
-	<dimen name="dp_240">533.3333dp</dimen>
-	<dimen name="dp_241">535.5556dp</dimen>
-	<dimen name="dp_242">537.7778dp</dimen>
-	<dimen name="dp_243">540.0000dp</dimen>
-	<dimen name="dp_244">542.2222dp</dimen>
-	<dimen name="dp_245">544.4444dp</dimen>
-	<dimen name="dp_246">546.6667dp</dimen>
-	<dimen name="dp_247">548.8889dp</dimen>
-	<dimen name="dp_248">551.1111dp</dimen>
-	<dimen name="dp_249">553.3333dp</dimen>
-	<dimen name="dp_250">555.5556dp</dimen>
-	<dimen name="dp_251">557.7778dp</dimen>
-	<dimen name="dp_252">560.0000dp</dimen>
-	<dimen name="dp_253">562.2222dp</dimen>
-	<dimen name="dp_254">564.4444dp</dimen>
-	<dimen name="dp_255">566.6667dp</dimen>
-	<dimen name="dp_256">568.8889dp</dimen>
-	<dimen name="dp_257">571.1111dp</dimen>
-	<dimen name="dp_258">573.3333dp</dimen>
-	<dimen name="dp_259">575.5556dp</dimen>
-	<dimen name="dp_260">577.7778dp</dimen>
-	<dimen name="dp_261">580.0000dp</dimen>
-	<dimen name="dp_262">582.2222dp</dimen>
-	<dimen name="dp_263">584.4444dp</dimen>
-	<dimen name="dp_264">586.6667dp</dimen>
-	<dimen name="dp_265">588.8889dp</dimen>
-	<dimen name="dp_266">591.1111dp</dimen>
-	<dimen name="dp_267">593.3333dp</dimen>
-	<dimen name="dp_268">595.5556dp</dimen>
-	<dimen name="dp_269">597.7778dp</dimen>
-	<dimen name="dp_270">600.0000dp</dimen>
-	<dimen name="dp_271">602.2222dp</dimen>
-	<dimen name="dp_272">604.4444dp</dimen>
-	<dimen name="dp_273">606.6667dp</dimen>
-	<dimen name="dp_274">608.8889dp</dimen>
-	<dimen name="dp_275">611.1111dp</dimen>
-	<dimen name="dp_276">613.3333dp</dimen>
-	<dimen name="dp_277">615.5556dp</dimen>
-	<dimen name="dp_278">617.7778dp</dimen>
-	<dimen name="dp_279">620.0000dp</dimen>
-	<dimen name="dp_280">622.2222dp</dimen>
-	<dimen name="dp_281">624.4444dp</dimen>
-	<dimen name="dp_282">626.6667dp</dimen>
-	<dimen name="dp_283">628.8889dp</dimen>
-	<dimen name="dp_284">631.1111dp</dimen>
-	<dimen name="dp_285">633.3333dp</dimen>
-	<dimen name="dp_286">635.5556dp</dimen>
-	<dimen name="dp_287">637.7778dp</dimen>
-	<dimen name="dp_288">640.0000dp</dimen>
-	<dimen name="dp_289">642.2222dp</dimen>
-	<dimen name="dp_290">644.4444dp</dimen>
-	<dimen name="dp_291">646.6667dp</dimen>
-	<dimen name="dp_292">648.8889dp</dimen>
-	<dimen name="dp_293">651.1111dp</dimen>
-	<dimen name="dp_294">653.3333dp</dimen>
-	<dimen name="dp_295">655.5556dp</dimen>
-	<dimen name="dp_296">657.7778dp</dimen>
-	<dimen name="dp_297">660.0000dp</dimen>
-	<dimen name="dp_298">662.2222dp</dimen>
-	<dimen name="dp_299">664.4444dp</dimen>
-	<dimen name="dp_300">666.6667dp</dimen>
-	<dimen name="dp_301">668.8889dp</dimen>
-	<dimen name="dp_302">671.1111dp</dimen>
-	<dimen name="dp_303">673.3333dp</dimen>
-	<dimen name="dp_304">675.5556dp</dimen>
-	<dimen name="dp_305">677.7778dp</dimen>
-	<dimen name="dp_306">680.0000dp</dimen>
-	<dimen name="dp_307">682.2222dp</dimen>
-	<dimen name="dp_308">684.4444dp</dimen>
-	<dimen name="dp_309">686.6667dp</dimen>
-	<dimen name="dp_310">688.8889dp</dimen>
-	<dimen name="dp_311">691.1111dp</dimen>
-	<dimen name="dp_312">693.3333dp</dimen>
-	<dimen name="dp_313">695.5556dp</dimen>
-	<dimen name="dp_314">697.7778dp</dimen>
-	<dimen name="dp_315">700.0000dp</dimen>
-	<dimen name="dp_316">702.2222dp</dimen>
-	<dimen name="dp_317">704.4444dp</dimen>
-	<dimen name="dp_318">706.6667dp</dimen>
-	<dimen name="dp_319">708.8889dp</dimen>
-	<dimen name="dp_320">711.1111dp</dimen>
-	<dimen name="dp_321">713.3333dp</dimen>
-	<dimen name="dp_322">715.5556dp</dimen>
-	<dimen name="dp_323">717.7778dp</dimen>
-	<dimen name="dp_324">720.0000dp</dimen>
-	<dimen name="dp_325">722.2222dp</dimen>
-	<dimen name="dp_326">724.4444dp</dimen>
-	<dimen name="dp_327">726.6667dp</dimen>
-	<dimen name="dp_328">728.8889dp</dimen>
-	<dimen name="dp_329">731.1111dp</dimen>
-	<dimen name="dp_330">733.3333dp</dimen>
-	<dimen name="dp_331">735.5556dp</dimen>
-	<dimen name="dp_332">737.7778dp</dimen>
-	<dimen name="dp_333">740.0000dp</dimen>
-	<dimen name="dp_334">742.2222dp</dimen>
-	<dimen name="dp_335">744.4444dp</dimen>
-	<dimen name="dp_336">746.6667dp</dimen>
-	<dimen name="dp_337">748.8889dp</dimen>
-	<dimen name="dp_338">751.1111dp</dimen>
-	<dimen name="dp_339">753.3333dp</dimen>
-	<dimen name="dp_340">755.5556dp</dimen>
-	<dimen name="dp_341">757.7778dp</dimen>
-	<dimen name="dp_342">760.0000dp</dimen>
-	<dimen name="dp_343">762.2222dp</dimen>
-	<dimen name="dp_344">764.4444dp</dimen>
-	<dimen name="dp_345">766.6667dp</dimen>
-	<dimen name="dp_346">768.8889dp</dimen>
-	<dimen name="dp_347">771.1111dp</dimen>
-	<dimen name="dp_348">773.3333dp</dimen>
-	<dimen name="dp_349">775.5556dp</dimen>
-	<dimen name="dp_350">777.7778dp</dimen>
-	<dimen name="dp_351">780.0000dp</dimen>
-	<dimen name="dp_352">782.2222dp</dimen>
-	<dimen name="dp_353">784.4444dp</dimen>
-	<dimen name="dp_354">786.6667dp</dimen>
-	<dimen name="dp_355">788.8889dp</dimen>
-	<dimen name="dp_356">791.1111dp</dimen>
-	<dimen name="dp_357">793.3333dp</dimen>
-	<dimen name="dp_358">795.5556dp</dimen>
-	<dimen name="dp_359">797.7778dp</dimen>
-	<dimen name="dp_360">800.0000dp</dimen>
-	<dimen name="dp_365">811.1111dp</dimen>
-	<dimen name="dp_370">822.2222dp</dimen>
-	<dimen name="dp_400">888.8889dp</dimen>
-	<dimen name="dp_410">911.1111dp</dimen>
-	<dimen name="dp_422">937.7778dp</dimen>
-	<dimen name="dp_472">1048.8889dp</dimen>
-	<dimen name="dp_500">1111.1111dp</dimen>
-	<dimen name="dp_600">1333.3333dp</dimen>
-	<dimen name="dp_640">1422.2222dp</dimen>
-	<dimen name="dp_720">1600.0000dp</dimen>
-	<dimen name="sp_6">13.3333sp</dimen>
-	<dimen name="sp_7">15.5556sp</dimen>
-	<dimen name="sp_8">17.7778sp</dimen>
-	<dimen name="sp_9">20.0000sp</dimen>
-	<dimen name="sp_10">22.2222sp</dimen>
-	<dimen name="sp_11">24.4444sp</dimen>
-	<dimen name="sp_12">26.6667sp</dimen>
-	<dimen name="sp_13">28.8889sp</dimen>
-	<dimen name="sp_14">31.1111sp</dimen>
-	<dimen name="sp_15">33.3333sp</dimen>
-	<dimen name="sp_16">35.5556sp</dimen>
-	<dimen name="sp_17">37.7778sp</dimen>
-	<dimen name="sp_18">40.0000sp</dimen>
-	<dimen name="sp_19">42.2222sp</dimen>
-	<dimen name="sp_20">44.4444sp</dimen>
-	<dimen name="sp_21">46.6667sp</dimen>
-	<dimen name="sp_22">48.8889sp</dimen>
-	<dimen name="sp_23">51.1111sp</dimen>
-	<dimen name="sp_24">53.3333sp</dimen>
-	<dimen name="sp_25">55.5556sp</dimen>
-	<dimen name="sp_28">62.2222sp</dimen>
-	<dimen name="sp_30">66.6667sp</dimen>
-	<dimen name="sp_32">71.1111sp</dimen>
-	<dimen name="sp_34">75.5556sp</dimen>
-	<dimen name="sp_36">80.0000sp</dimen>
-	<dimen name="sp_38">84.4444sp</dimen>
-	<dimen name="sp_40">88.8889sp</dimen>
-	<dimen name="sp_42">93.3333sp</dimen>
-	<dimen name="sp_48">106.6667sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw811dp/dimens.xml b/app/src/main/res/values-sw811dp/dimens.xml
deleted file mode 100644
index 2efc0dc..0000000
--- a/app/src/main/res/values-sw811dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-135.1667dp</dimen>
-	<dimen name="dp_m_30">-67.5833dp</dimen>
-	<dimen name="dp_m_20">-45.0556dp</dimen>
-	<dimen name="dp_m_12">-27.0333dp</dimen>
-	<dimen name="dp_m_10">-22.5278dp</dimen>
-	<dimen name="dp_m_8">-18.0222dp</dimen>
-	<dimen name="dp_m_5">-11.2639dp</dimen>
-	<dimen name="dp_m_2">-4.5056dp</dimen>
-	<dimen name="dp_m_1">-2.2528dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.2253dp</dimen>
-	<dimen name="dp_0_5">1.1264dp</dimen>
-	<dimen name="dp_1">2.2528dp</dimen>
-	<dimen name="dp_1_5">3.3792dp</dimen>
-	<dimen name="dp_2">4.5056dp</dimen>
-	<dimen name="dp_2_5">5.6319dp</dimen>
-	<dimen name="dp_3">6.7583dp</dimen>
-	<dimen name="dp_3_5">7.8847dp</dimen>
-	<dimen name="dp_4">9.0111dp</dimen>
-	<dimen name="dp_4_5">10.1375dp</dimen>
-	<dimen name="dp_5">11.2639dp</dimen>
-	<dimen name="dp_6">13.5167dp</dimen>
-	<dimen name="dp_7">15.7694dp</dimen>
-	<dimen name="dp_8">18.0222dp</dimen>
-	<dimen name="dp_9">20.2750dp</dimen>
-	<dimen name="dp_10">22.5278dp</dimen>
-	<dimen name="dp_11">24.7806dp</dimen>
-	<dimen name="dp_12">27.0333dp</dimen>
-	<dimen name="dp_13">29.2861dp</dimen>
-	<dimen name="dp_14">31.5389dp</dimen>
-	<dimen name="dp_15">33.7917dp</dimen>
-	<dimen name="dp_16">36.0444dp</dimen>
-	<dimen name="dp_17">38.2972dp</dimen>
-	<dimen name="dp_18">40.5500dp</dimen>
-	<dimen name="dp_19">42.8028dp</dimen>
-	<dimen name="dp_20">45.0556dp</dimen>
-	<dimen name="dp_21">47.3083dp</dimen>
-	<dimen name="dp_22">49.5611dp</dimen>
-	<dimen name="dp_23">51.8139dp</dimen>
-	<dimen name="dp_24">54.0667dp</dimen>
-	<dimen name="dp_25">56.3194dp</dimen>
-	<dimen name="dp_26">58.5722dp</dimen>
-	<dimen name="dp_27">60.8250dp</dimen>
-	<dimen name="dp_28">63.0778dp</dimen>
-	<dimen name="dp_29">65.3306dp</dimen>
-	<dimen name="dp_30">67.5833dp</dimen>
-	<dimen name="dp_31">69.8361dp</dimen>
-	<dimen name="dp_32">72.0889dp</dimen>
-	<dimen name="dp_33">74.3417dp</dimen>
-	<dimen name="dp_34">76.5944dp</dimen>
-	<dimen name="dp_35">78.8472dp</dimen>
-	<dimen name="dp_36">81.1000dp</dimen>
-	<dimen name="dp_37">83.3528dp</dimen>
-	<dimen name="dp_38">85.6056dp</dimen>
-	<dimen name="dp_39">87.8583dp</dimen>
-	<dimen name="dp_40">90.1111dp</dimen>
-	<dimen name="dp_41">92.3639dp</dimen>
-	<dimen name="dp_42">94.6167dp</dimen>
-	<dimen name="dp_43">96.8694dp</dimen>
-	<dimen name="dp_44">99.1222dp</dimen>
-	<dimen name="dp_45">101.3750dp</dimen>
-	<dimen name="dp_46">103.6278dp</dimen>
-	<dimen name="dp_47">105.8806dp</dimen>
-	<dimen name="dp_48">108.1333dp</dimen>
-	<dimen name="dp_49">110.3861dp</dimen>
-	<dimen name="dp_50">112.6389dp</dimen>
-	<dimen name="dp_51">114.8917dp</dimen>
-	<dimen name="dp_52">117.1444dp</dimen>
-	<dimen name="dp_53">119.3972dp</dimen>
-	<dimen name="dp_54">121.6500dp</dimen>
-	<dimen name="dp_55">123.9028dp</dimen>
-	<dimen name="dp_56">126.1556dp</dimen>
-	<dimen name="dp_57">128.4083dp</dimen>
-	<dimen name="dp_58">130.6611dp</dimen>
-	<dimen name="dp_59">132.9139dp</dimen>
-	<dimen name="dp_60">135.1667dp</dimen>
-	<dimen name="dp_61">137.4194dp</dimen>
-	<dimen name="dp_62">139.6722dp</dimen>
-	<dimen name="dp_63">141.9250dp</dimen>
-	<dimen name="dp_64">144.1778dp</dimen>
-	<dimen name="dp_65">146.4306dp</dimen>
-	<dimen name="dp_66">148.6833dp</dimen>
-	<dimen name="dp_67">150.9361dp</dimen>
-	<dimen name="dp_68">153.1889dp</dimen>
-	<dimen name="dp_69">155.4417dp</dimen>
-	<dimen name="dp_70">157.6944dp</dimen>
-	<dimen name="dp_71">159.9472dp</dimen>
-	<dimen name="dp_72">162.2000dp</dimen>
-	<dimen name="dp_73">164.4528dp</dimen>
-	<dimen name="dp_74">166.7056dp</dimen>
-	<dimen name="dp_75">168.9583dp</dimen>
-	<dimen name="dp_76">171.2111dp</dimen>
-	<dimen name="dp_77">173.4639dp</dimen>
-	<dimen name="dp_78">175.7167dp</dimen>
-	<dimen name="dp_79">177.9694dp</dimen>
-	<dimen name="dp_80">180.2222dp</dimen>
-	<dimen name="dp_81">182.4750dp</dimen>
-	<dimen name="dp_82">184.7278dp</dimen>
-	<dimen name="dp_83">186.9806dp</dimen>
-	<dimen name="dp_84">189.2333dp</dimen>
-	<dimen name="dp_85">191.4861dp</dimen>
-	<dimen name="dp_86">193.7389dp</dimen>
-	<dimen name="dp_87">195.9917dp</dimen>
-	<dimen name="dp_88">198.2444dp</dimen>
-	<dimen name="dp_89">200.4972dp</dimen>
-	<dimen name="dp_90">202.7500dp</dimen>
-	<dimen name="dp_91">205.0028dp</dimen>
-	<dimen name="dp_92">207.2556dp</dimen>
-	<dimen name="dp_93">209.5083dp</dimen>
-	<dimen name="dp_94">211.7611dp</dimen>
-	<dimen name="dp_95">214.0139dp</dimen>
-	<dimen name="dp_96">216.2667dp</dimen>
-	<dimen name="dp_97">218.5194dp</dimen>
-	<dimen name="dp_98">220.7722dp</dimen>
-	<dimen name="dp_99">223.0250dp</dimen>
-	<dimen name="dp_100">225.2778dp</dimen>
-	<dimen name="dp_101">227.5306dp</dimen>
-	<dimen name="dp_102">229.7833dp</dimen>
-	<dimen name="dp_103">232.0361dp</dimen>
-	<dimen name="dp_104">234.2889dp</dimen>
-	<dimen name="dp_105">236.5417dp</dimen>
-	<dimen name="dp_106">238.7944dp</dimen>
-	<dimen name="dp_107">241.0472dp</dimen>
-	<dimen name="dp_108">243.3000dp</dimen>
-	<dimen name="dp_109">245.5528dp</dimen>
-	<dimen name="dp_110">247.8056dp</dimen>
-	<dimen name="dp_111">250.0583dp</dimen>
-	<dimen name="dp_112">252.3111dp</dimen>
-	<dimen name="dp_113">254.5639dp</dimen>
-	<dimen name="dp_114">256.8167dp</dimen>
-	<dimen name="dp_115">259.0694dp</dimen>
-	<dimen name="dp_116">261.3222dp</dimen>
-	<dimen name="dp_117">263.5750dp</dimen>
-	<dimen name="dp_118">265.8278dp</dimen>
-	<dimen name="dp_119">268.0806dp</dimen>
-	<dimen name="dp_120">270.3333dp</dimen>
-	<dimen name="dp_121">272.5861dp</dimen>
-	<dimen name="dp_122">274.8389dp</dimen>
-	<dimen name="dp_123">277.0917dp</dimen>
-	<dimen name="dp_124">279.3444dp</dimen>
-	<dimen name="dp_125">281.5972dp</dimen>
-	<dimen name="dp_126">283.8500dp</dimen>
-	<dimen name="dp_127">286.1028dp</dimen>
-	<dimen name="dp_128">288.3556dp</dimen>
-	<dimen name="dp_129">290.6083dp</dimen>
-	<dimen name="dp_130">292.8611dp</dimen>
-	<dimen name="dp_131">295.1139dp</dimen>
-	<dimen name="dp_132">297.3667dp</dimen>
-	<dimen name="dp_133">299.6194dp</dimen>
-	<dimen name="dp_134">301.8722dp</dimen>
-	<dimen name="dp_135">304.1250dp</dimen>
-	<dimen name="dp_136">306.3778dp</dimen>
-	<dimen name="dp_137">308.6306dp</dimen>
-	<dimen name="dp_138">310.8833dp</dimen>
-	<dimen name="dp_139">313.1361dp</dimen>
-	<dimen name="dp_140">315.3889dp</dimen>
-	<dimen name="dp_141">317.6417dp</dimen>
-	<dimen name="dp_142">319.8944dp</dimen>
-	<dimen name="dp_143">322.1472dp</dimen>
-	<dimen name="dp_144">324.4000dp</dimen>
-	<dimen name="dp_145">326.6528dp</dimen>
-	<dimen name="dp_146">328.9056dp</dimen>
-	<dimen name="dp_147">331.1583dp</dimen>
-	<dimen name="dp_148">333.4111dp</dimen>
-	<dimen name="dp_149">335.6639dp</dimen>
-	<dimen name="dp_150">337.9167dp</dimen>
-	<dimen name="dp_151">340.1694dp</dimen>
-	<dimen name="dp_152">342.4222dp</dimen>
-	<dimen name="dp_153">344.6750dp</dimen>
-	<dimen name="dp_154">346.9278dp</dimen>
-	<dimen name="dp_155">349.1806dp</dimen>
-	<dimen name="dp_156">351.4333dp</dimen>
-	<dimen name="dp_157">353.6861dp</dimen>
-	<dimen name="dp_158">355.9389dp</dimen>
-	<dimen name="dp_159">358.1917dp</dimen>
-	<dimen name="dp_160">360.4444dp</dimen>
-	<dimen name="dp_161">362.6972dp</dimen>
-	<dimen name="dp_162">364.9500dp</dimen>
-	<dimen name="dp_163">367.2028dp</dimen>
-	<dimen name="dp_164">369.4556dp</dimen>
-	<dimen name="dp_165">371.7083dp</dimen>
-	<dimen name="dp_166">373.9611dp</dimen>
-	<dimen name="dp_167">376.2139dp</dimen>
-	<dimen name="dp_168">378.4667dp</dimen>
-	<dimen name="dp_169">380.7194dp</dimen>
-	<dimen name="dp_170">382.9722dp</dimen>
-	<dimen name="dp_171">385.2250dp</dimen>
-	<dimen name="dp_172">387.4778dp</dimen>
-	<dimen name="dp_173">389.7306dp</dimen>
-	<dimen name="dp_174">391.9833dp</dimen>
-	<dimen name="dp_175">394.2361dp</dimen>
-	<dimen name="dp_176">396.4889dp</dimen>
-	<dimen name="dp_177">398.7417dp</dimen>
-	<dimen name="dp_178">400.9944dp</dimen>
-	<dimen name="dp_179">403.2472dp</dimen>
-	<dimen name="dp_180">405.5000dp</dimen>
-	<dimen name="dp_181">407.7528dp</dimen>
-	<dimen name="dp_182">410.0056dp</dimen>
-	<dimen name="dp_183">412.2583dp</dimen>
-	<dimen name="dp_184">414.5111dp</dimen>
-	<dimen name="dp_185">416.7639dp</dimen>
-	<dimen name="dp_186">419.0167dp</dimen>
-	<dimen name="dp_187">421.2694dp</dimen>
-	<dimen name="dp_188">423.5222dp</dimen>
-	<dimen name="dp_189">425.7750dp</dimen>
-	<dimen name="dp_190">428.0278dp</dimen>
-	<dimen name="dp_191">430.2806dp</dimen>
-	<dimen name="dp_192">432.5333dp</dimen>
-	<dimen name="dp_193">434.7861dp</dimen>
-	<dimen name="dp_194">437.0389dp</dimen>
-	<dimen name="dp_195">439.2917dp</dimen>
-	<dimen name="dp_196">441.5444dp</dimen>
-	<dimen name="dp_197">443.7972dp</dimen>
-	<dimen name="dp_198">446.0500dp</dimen>
-	<dimen name="dp_199">448.3028dp</dimen>
-	<dimen name="dp_200">450.5556dp</dimen>
-	<dimen name="dp_201">452.8083dp</dimen>
-	<dimen name="dp_202">455.0611dp</dimen>
-	<dimen name="dp_203">457.3139dp</dimen>
-	<dimen name="dp_204">459.5667dp</dimen>
-	<dimen name="dp_205">461.8194dp</dimen>
-	<dimen name="dp_206">464.0722dp</dimen>
-	<dimen name="dp_207">466.3250dp</dimen>
-	<dimen name="dp_208">468.5778dp</dimen>
-	<dimen name="dp_209">470.8306dp</dimen>
-	<dimen name="dp_210">473.0833dp</dimen>
-	<dimen name="dp_211">475.3361dp</dimen>
-	<dimen name="dp_212">477.5889dp</dimen>
-	<dimen name="dp_213">479.8417dp</dimen>
-	<dimen name="dp_214">482.0944dp</dimen>
-	<dimen name="dp_215">484.3472dp</dimen>
-	<dimen name="dp_216">486.6000dp</dimen>
-	<dimen name="dp_217">488.8528dp</dimen>
-	<dimen name="dp_218">491.1056dp</dimen>
-	<dimen name="dp_219">493.3583dp</dimen>
-	<dimen name="dp_220">495.6111dp</dimen>
-	<dimen name="dp_221">497.8639dp</dimen>
-	<dimen name="dp_222">500.1167dp</dimen>
-	<dimen name="dp_223">502.3694dp</dimen>
-	<dimen name="dp_224">504.6222dp</dimen>
-	<dimen name="dp_225">506.8750dp</dimen>
-	<dimen name="dp_226">509.1278dp</dimen>
-	<dimen name="dp_227">511.3806dp</dimen>
-	<dimen name="dp_228">513.6333dp</dimen>
-	<dimen name="dp_229">515.8861dp</dimen>
-	<dimen name="dp_230">518.1389dp</dimen>
-	<dimen name="dp_231">520.3917dp</dimen>
-	<dimen name="dp_232">522.6444dp</dimen>
-	<dimen name="dp_233">524.8972dp</dimen>
-	<dimen name="dp_234">527.1500dp</dimen>
-	<dimen name="dp_235">529.4028dp</dimen>
-	<dimen name="dp_236">531.6556dp</dimen>
-	<dimen name="dp_237">533.9083dp</dimen>
-	<dimen name="dp_238">536.1611dp</dimen>
-	<dimen name="dp_239">538.4139dp</dimen>
-	<dimen name="dp_240">540.6667dp</dimen>
-	<dimen name="dp_241">542.9194dp</dimen>
-	<dimen name="dp_242">545.1722dp</dimen>
-	<dimen name="dp_243">547.4250dp</dimen>
-	<dimen name="dp_244">549.6778dp</dimen>
-	<dimen name="dp_245">551.9306dp</dimen>
-	<dimen name="dp_246">554.1833dp</dimen>
-	<dimen name="dp_247">556.4361dp</dimen>
-	<dimen name="dp_248">558.6889dp</dimen>
-	<dimen name="dp_249">560.9417dp</dimen>
-	<dimen name="dp_250">563.1944dp</dimen>
-	<dimen name="dp_251">565.4472dp</dimen>
-	<dimen name="dp_252">567.7000dp</dimen>
-	<dimen name="dp_253">569.9528dp</dimen>
-	<dimen name="dp_254">572.2056dp</dimen>
-	<dimen name="dp_255">574.4583dp</dimen>
-	<dimen name="dp_256">576.7111dp</dimen>
-	<dimen name="dp_257">578.9639dp</dimen>
-	<dimen name="dp_258">581.2167dp</dimen>
-	<dimen name="dp_259">583.4694dp</dimen>
-	<dimen name="dp_260">585.7222dp</dimen>
-	<dimen name="dp_261">587.9750dp</dimen>
-	<dimen name="dp_262">590.2278dp</dimen>
-	<dimen name="dp_263">592.4806dp</dimen>
-	<dimen name="dp_264">594.7333dp</dimen>
-	<dimen name="dp_265">596.9861dp</dimen>
-	<dimen name="dp_266">599.2389dp</dimen>
-	<dimen name="dp_267">601.4917dp</dimen>
-	<dimen name="dp_268">603.7444dp</dimen>
-	<dimen name="dp_269">605.9972dp</dimen>
-	<dimen name="dp_270">608.2500dp</dimen>
-	<dimen name="dp_271">610.5028dp</dimen>
-	<dimen name="dp_272">612.7556dp</dimen>
-	<dimen name="dp_273">615.0083dp</dimen>
-	<dimen name="dp_274">617.2611dp</dimen>
-	<dimen name="dp_275">619.5139dp</dimen>
-	<dimen name="dp_276">621.7667dp</dimen>
-	<dimen name="dp_277">624.0194dp</dimen>
-	<dimen name="dp_278">626.2722dp</dimen>
-	<dimen name="dp_279">628.5250dp</dimen>
-	<dimen name="dp_280">630.7778dp</dimen>
-	<dimen name="dp_281">633.0306dp</dimen>
-	<dimen name="dp_282">635.2833dp</dimen>
-	<dimen name="dp_283">637.5361dp</dimen>
-	<dimen name="dp_284">639.7889dp</dimen>
-	<dimen name="dp_285">642.0417dp</dimen>
-	<dimen name="dp_286">644.2944dp</dimen>
-	<dimen name="dp_287">646.5472dp</dimen>
-	<dimen name="dp_288">648.8000dp</dimen>
-	<dimen name="dp_289">651.0528dp</dimen>
-	<dimen name="dp_290">653.3056dp</dimen>
-	<dimen name="dp_291">655.5583dp</dimen>
-	<dimen name="dp_292">657.8111dp</dimen>
-	<dimen name="dp_293">660.0639dp</dimen>
-	<dimen name="dp_294">662.3167dp</dimen>
-	<dimen name="dp_295">664.5694dp</dimen>
-	<dimen name="dp_296">666.8222dp</dimen>
-	<dimen name="dp_297">669.0750dp</dimen>
-	<dimen name="dp_298">671.3278dp</dimen>
-	<dimen name="dp_299">673.5806dp</dimen>
-	<dimen name="dp_300">675.8333dp</dimen>
-	<dimen name="dp_301">678.0861dp</dimen>
-	<dimen name="dp_302">680.3389dp</dimen>
-	<dimen name="dp_303">682.5917dp</dimen>
-	<dimen name="dp_304">684.8444dp</dimen>
-	<dimen name="dp_305">687.0972dp</dimen>
-	<dimen name="dp_306">689.3500dp</dimen>
-	<dimen name="dp_307">691.6028dp</dimen>
-	<dimen name="dp_308">693.8556dp</dimen>
-	<dimen name="dp_309">696.1083dp</dimen>
-	<dimen name="dp_310">698.3611dp</dimen>
-	<dimen name="dp_311">700.6139dp</dimen>
-	<dimen name="dp_312">702.8667dp</dimen>
-	<dimen name="dp_313">705.1194dp</dimen>
-	<dimen name="dp_314">707.3722dp</dimen>
-	<dimen name="dp_315">709.6250dp</dimen>
-	<dimen name="dp_316">711.8778dp</dimen>
-	<dimen name="dp_317">714.1306dp</dimen>
-	<dimen name="dp_318">716.3833dp</dimen>
-	<dimen name="dp_319">718.6361dp</dimen>
-	<dimen name="dp_320">720.8889dp</dimen>
-	<dimen name="dp_321">723.1417dp</dimen>
-	<dimen name="dp_322">725.3944dp</dimen>
-	<dimen name="dp_323">727.6472dp</dimen>
-	<dimen name="dp_324">729.9000dp</dimen>
-	<dimen name="dp_325">732.1528dp</dimen>
-	<dimen name="dp_326">734.4056dp</dimen>
-	<dimen name="dp_327">736.6583dp</dimen>
-	<dimen name="dp_328">738.9111dp</dimen>
-	<dimen name="dp_329">741.1639dp</dimen>
-	<dimen name="dp_330">743.4167dp</dimen>
-	<dimen name="dp_331">745.6694dp</dimen>
-	<dimen name="dp_332">747.9222dp</dimen>
-	<dimen name="dp_333">750.1750dp</dimen>
-	<dimen name="dp_334">752.4278dp</dimen>
-	<dimen name="dp_335">754.6806dp</dimen>
-	<dimen name="dp_336">756.9333dp</dimen>
-	<dimen name="dp_337">759.1861dp</dimen>
-	<dimen name="dp_338">761.4389dp</dimen>
-	<dimen name="dp_339">763.6917dp</dimen>
-	<dimen name="dp_340">765.9444dp</dimen>
-	<dimen name="dp_341">768.1972dp</dimen>
-	<dimen name="dp_342">770.4500dp</dimen>
-	<dimen name="dp_343">772.7028dp</dimen>
-	<dimen name="dp_344">774.9556dp</dimen>
-	<dimen name="dp_345">777.2083dp</dimen>
-	<dimen name="dp_346">779.4611dp</dimen>
-	<dimen name="dp_347">781.7139dp</dimen>
-	<dimen name="dp_348">783.9667dp</dimen>
-	<dimen name="dp_349">786.2194dp</dimen>
-	<dimen name="dp_350">788.4722dp</dimen>
-	<dimen name="dp_351">790.7250dp</dimen>
-	<dimen name="dp_352">792.9778dp</dimen>
-	<dimen name="dp_353">795.2306dp</dimen>
-	<dimen name="dp_354">797.4833dp</dimen>
-	<dimen name="dp_355">799.7361dp</dimen>
-	<dimen name="dp_356">801.9889dp</dimen>
-	<dimen name="dp_357">804.2417dp</dimen>
-	<dimen name="dp_358">806.4944dp</dimen>
-	<dimen name="dp_359">808.7472dp</dimen>
-	<dimen name="dp_360">811.0000dp</dimen>
-	<dimen name="dp_365">822.2639dp</dimen>
-	<dimen name="dp_370">833.5278dp</dimen>
-	<dimen name="dp_400">901.1111dp</dimen>
-	<dimen name="dp_410">923.6389dp</dimen>
-	<dimen name="dp_422">950.6722dp</dimen>
-	<dimen name="dp_472">1063.3111dp</dimen>
-	<dimen name="dp_500">1126.3889dp</dimen>
-	<dimen name="dp_600">1351.6667dp</dimen>
-	<dimen name="dp_640">1441.7778dp</dimen>
-	<dimen name="dp_720">1622.0000dp</dimen>
-	<dimen name="sp_6">13.5167sp</dimen>
-	<dimen name="sp_7">15.7694sp</dimen>
-	<dimen name="sp_8">18.0222sp</dimen>
-	<dimen name="sp_9">20.2750sp</dimen>
-	<dimen name="sp_10">22.5278sp</dimen>
-	<dimen name="sp_11">24.7806sp</dimen>
-	<dimen name="sp_12">27.0333sp</dimen>
-	<dimen name="sp_13">29.2861sp</dimen>
-	<dimen name="sp_14">31.5389sp</dimen>
-	<dimen name="sp_15">33.7917sp</dimen>
-	<dimen name="sp_16">36.0444sp</dimen>
-	<dimen name="sp_17">38.2972sp</dimen>
-	<dimen name="sp_18">40.5500sp</dimen>
-	<dimen name="sp_19">42.8028sp</dimen>
-	<dimen name="sp_20">45.0556sp</dimen>
-	<dimen name="sp_21">47.3083sp</dimen>
-	<dimen name="sp_22">49.5611sp</dimen>
-	<dimen name="sp_23">51.8139sp</dimen>
-	<dimen name="sp_24">54.0667sp</dimen>
-	<dimen name="sp_25">56.3194sp</dimen>
-	<dimen name="sp_28">63.0778sp</dimen>
-	<dimen name="sp_30">67.5833sp</dimen>
-	<dimen name="sp_32">72.0889sp</dimen>
-	<dimen name="sp_34">76.5944sp</dimen>
-	<dimen name="sp_36">81.1000sp</dimen>
-	<dimen name="sp_38">85.6056sp</dimen>
-	<dimen name="sp_40">90.1111sp</dimen>
-	<dimen name="sp_42">94.6167sp</dimen>
-	<dimen name="sp_48">108.1333sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw820dp/dimens.xml b/app/src/main/res/values-sw820dp/dimens.xml
deleted file mode 100644
index e1e21b6..0000000
--- a/app/src/main/res/values-sw820dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-136.6667dp</dimen>
-	<dimen name="dp_m_30">-68.3333dp</dimen>
-	<dimen name="dp_m_20">-45.5556dp</dimen>
-	<dimen name="dp_m_12">-27.3333dp</dimen>
-	<dimen name="dp_m_10">-22.7778dp</dimen>
-	<dimen name="dp_m_8">-18.2222dp</dimen>
-	<dimen name="dp_m_5">-11.3889dp</dimen>
-	<dimen name="dp_m_2">-4.5556dp</dimen>
-	<dimen name="dp_m_1">-2.2778dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.2278dp</dimen>
-	<dimen name="dp_0_5">1.1389dp</dimen>
-	<dimen name="dp_1">2.2778dp</dimen>
-	<dimen name="dp_1_5">3.4167dp</dimen>
-	<dimen name="dp_2">4.5556dp</dimen>
-	<dimen name="dp_2_5">5.6944dp</dimen>
-	<dimen name="dp_3">6.8333dp</dimen>
-	<dimen name="dp_3_5">7.9722dp</dimen>
-	<dimen name="dp_4">9.1111dp</dimen>
-	<dimen name="dp_4_5">10.2500dp</dimen>
-	<dimen name="dp_5">11.3889dp</dimen>
-	<dimen name="dp_6">13.6667dp</dimen>
-	<dimen name="dp_7">15.9444dp</dimen>
-	<dimen name="dp_8">18.2222dp</dimen>
-	<dimen name="dp_9">20.5000dp</dimen>
-	<dimen name="dp_10">22.7778dp</dimen>
-	<dimen name="dp_11">25.0556dp</dimen>
-	<dimen name="dp_12">27.3333dp</dimen>
-	<dimen name="dp_13">29.6111dp</dimen>
-	<dimen name="dp_14">31.8889dp</dimen>
-	<dimen name="dp_15">34.1667dp</dimen>
-	<dimen name="dp_16">36.4444dp</dimen>
-	<dimen name="dp_17">38.7222dp</dimen>
-	<dimen name="dp_18">41.0000dp</dimen>
-	<dimen name="dp_19">43.2778dp</dimen>
-	<dimen name="dp_20">45.5556dp</dimen>
-	<dimen name="dp_21">47.8333dp</dimen>
-	<dimen name="dp_22">50.1111dp</dimen>
-	<dimen name="dp_23">52.3889dp</dimen>
-	<dimen name="dp_24">54.6667dp</dimen>
-	<dimen name="dp_25">56.9444dp</dimen>
-	<dimen name="dp_26">59.2222dp</dimen>
-	<dimen name="dp_27">61.5000dp</dimen>
-	<dimen name="dp_28">63.7778dp</dimen>
-	<dimen name="dp_29">66.0556dp</dimen>
-	<dimen name="dp_30">68.3333dp</dimen>
-	<dimen name="dp_31">70.6111dp</dimen>
-	<dimen name="dp_32">72.8889dp</dimen>
-	<dimen name="dp_33">75.1667dp</dimen>
-	<dimen name="dp_34">77.4444dp</dimen>
-	<dimen name="dp_35">79.7222dp</dimen>
-	<dimen name="dp_36">82.0000dp</dimen>
-	<dimen name="dp_37">84.2778dp</dimen>
-	<dimen name="dp_38">86.5556dp</dimen>
-	<dimen name="dp_39">88.8333dp</dimen>
-	<dimen name="dp_40">91.1111dp</dimen>
-	<dimen name="dp_41">93.3889dp</dimen>
-	<dimen name="dp_42">95.6667dp</dimen>
-	<dimen name="dp_43">97.9444dp</dimen>
-	<dimen name="dp_44">100.2222dp</dimen>
-	<dimen name="dp_45">102.5000dp</dimen>
-	<dimen name="dp_46">104.7778dp</dimen>
-	<dimen name="dp_47">107.0556dp</dimen>
-	<dimen name="dp_48">109.3333dp</dimen>
-	<dimen name="dp_49">111.6111dp</dimen>
-	<dimen name="dp_50">113.8889dp</dimen>
-	<dimen name="dp_51">116.1667dp</dimen>
-	<dimen name="dp_52">118.4444dp</dimen>
-	<dimen name="dp_53">120.7222dp</dimen>
-	<dimen name="dp_54">123.0000dp</dimen>
-	<dimen name="dp_55">125.2778dp</dimen>
-	<dimen name="dp_56">127.5556dp</dimen>
-	<dimen name="dp_57">129.8333dp</dimen>
-	<dimen name="dp_58">132.1111dp</dimen>
-	<dimen name="dp_59">134.3889dp</dimen>
-	<dimen name="dp_60">136.6667dp</dimen>
-	<dimen name="dp_61">138.9444dp</dimen>
-	<dimen name="dp_62">141.2222dp</dimen>
-	<dimen name="dp_63">143.5000dp</dimen>
-	<dimen name="dp_64">145.7778dp</dimen>
-	<dimen name="dp_65">148.0556dp</dimen>
-	<dimen name="dp_66">150.3333dp</dimen>
-	<dimen name="dp_67">152.6111dp</dimen>
-	<dimen name="dp_68">154.8889dp</dimen>
-	<dimen name="dp_69">157.1667dp</dimen>
-	<dimen name="dp_70">159.4444dp</dimen>
-	<dimen name="dp_71">161.7222dp</dimen>
-	<dimen name="dp_72">164.0000dp</dimen>
-	<dimen name="dp_73">166.2778dp</dimen>
-	<dimen name="dp_74">168.5556dp</dimen>
-	<dimen name="dp_75">170.8333dp</dimen>
-	<dimen name="dp_76">173.1111dp</dimen>
-	<dimen name="dp_77">175.3889dp</dimen>
-	<dimen name="dp_78">177.6667dp</dimen>
-	<dimen name="dp_79">179.9444dp</dimen>
-	<dimen name="dp_80">182.2222dp</dimen>
-	<dimen name="dp_81">184.5000dp</dimen>
-	<dimen name="dp_82">186.7778dp</dimen>
-	<dimen name="dp_83">189.0556dp</dimen>
-	<dimen name="dp_84">191.3333dp</dimen>
-	<dimen name="dp_85">193.6111dp</dimen>
-	<dimen name="dp_86">195.8889dp</dimen>
-	<dimen name="dp_87">198.1667dp</dimen>
-	<dimen name="dp_88">200.4444dp</dimen>
-	<dimen name="dp_89">202.7222dp</dimen>
-	<dimen name="dp_90">205.0000dp</dimen>
-	<dimen name="dp_91">207.2778dp</dimen>
-	<dimen name="dp_92">209.5556dp</dimen>
-	<dimen name="dp_93">211.8333dp</dimen>
-	<dimen name="dp_94">214.1111dp</dimen>
-	<dimen name="dp_95">216.3889dp</dimen>
-	<dimen name="dp_96">218.6667dp</dimen>
-	<dimen name="dp_97">220.9444dp</dimen>
-	<dimen name="dp_98">223.2222dp</dimen>
-	<dimen name="dp_99">225.5000dp</dimen>
-	<dimen name="dp_100">227.7778dp</dimen>
-	<dimen name="dp_101">230.0556dp</dimen>
-	<dimen name="dp_102">232.3333dp</dimen>
-	<dimen name="dp_103">234.6111dp</dimen>
-	<dimen name="dp_104">236.8889dp</dimen>
-	<dimen name="dp_105">239.1667dp</dimen>
-	<dimen name="dp_106">241.4444dp</dimen>
-	<dimen name="dp_107">243.7222dp</dimen>
-	<dimen name="dp_108">246.0000dp</dimen>
-	<dimen name="dp_109">248.2778dp</dimen>
-	<dimen name="dp_110">250.5556dp</dimen>
-	<dimen name="dp_111">252.8333dp</dimen>
-	<dimen name="dp_112">255.1111dp</dimen>
-	<dimen name="dp_113">257.3889dp</dimen>
-	<dimen name="dp_114">259.6667dp</dimen>
-	<dimen name="dp_115">261.9444dp</dimen>
-	<dimen name="dp_116">264.2222dp</dimen>
-	<dimen name="dp_117">266.5000dp</dimen>
-	<dimen name="dp_118">268.7778dp</dimen>
-	<dimen name="dp_119">271.0556dp</dimen>
-	<dimen name="dp_120">273.3333dp</dimen>
-	<dimen name="dp_121">275.6111dp</dimen>
-	<dimen name="dp_122">277.8889dp</dimen>
-	<dimen name="dp_123">280.1667dp</dimen>
-	<dimen name="dp_124">282.4444dp</dimen>
-	<dimen name="dp_125">284.7222dp</dimen>
-	<dimen name="dp_126">287.0000dp</dimen>
-	<dimen name="dp_127">289.2778dp</dimen>
-	<dimen name="dp_128">291.5556dp</dimen>
-	<dimen name="dp_129">293.8333dp</dimen>
-	<dimen name="dp_130">296.1111dp</dimen>
-	<dimen name="dp_131">298.3889dp</dimen>
-	<dimen name="dp_132">300.6667dp</dimen>
-	<dimen name="dp_133">302.9444dp</dimen>
-	<dimen name="dp_134">305.2222dp</dimen>
-	<dimen name="dp_135">307.5000dp</dimen>
-	<dimen name="dp_136">309.7778dp</dimen>
-	<dimen name="dp_137">312.0556dp</dimen>
-	<dimen name="dp_138">314.3333dp</dimen>
-	<dimen name="dp_139">316.6111dp</dimen>
-	<dimen name="dp_140">318.8889dp</dimen>
-	<dimen name="dp_141">321.1667dp</dimen>
-	<dimen name="dp_142">323.4444dp</dimen>
-	<dimen name="dp_143">325.7222dp</dimen>
-	<dimen name="dp_144">328.0000dp</dimen>
-	<dimen name="dp_145">330.2778dp</dimen>
-	<dimen name="dp_146">332.5556dp</dimen>
-	<dimen name="dp_147">334.8333dp</dimen>
-	<dimen name="dp_148">337.1111dp</dimen>
-	<dimen name="dp_149">339.3889dp</dimen>
-	<dimen name="dp_150">341.6667dp</dimen>
-	<dimen name="dp_151">343.9444dp</dimen>
-	<dimen name="dp_152">346.2222dp</dimen>
-	<dimen name="dp_153">348.5000dp</dimen>
-	<dimen name="dp_154">350.7778dp</dimen>
-	<dimen name="dp_155">353.0556dp</dimen>
-	<dimen name="dp_156">355.3333dp</dimen>
-	<dimen name="dp_157">357.6111dp</dimen>
-	<dimen name="dp_158">359.8889dp</dimen>
-	<dimen name="dp_159">362.1667dp</dimen>
-	<dimen name="dp_160">364.4444dp</dimen>
-	<dimen name="dp_161">366.7222dp</dimen>
-	<dimen name="dp_162">369.0000dp</dimen>
-	<dimen name="dp_163">371.2778dp</dimen>
-	<dimen name="dp_164">373.5556dp</dimen>
-	<dimen name="dp_165">375.8333dp</dimen>
-	<dimen name="dp_166">378.1111dp</dimen>
-	<dimen name="dp_167">380.3889dp</dimen>
-	<dimen name="dp_168">382.6667dp</dimen>
-	<dimen name="dp_169">384.9444dp</dimen>
-	<dimen name="dp_170">387.2222dp</dimen>
-	<dimen name="dp_171">389.5000dp</dimen>
-	<dimen name="dp_172">391.7778dp</dimen>
-	<dimen name="dp_173">394.0556dp</dimen>
-	<dimen name="dp_174">396.3333dp</dimen>
-	<dimen name="dp_175">398.6111dp</dimen>
-	<dimen name="dp_176">400.8889dp</dimen>
-	<dimen name="dp_177">403.1667dp</dimen>
-	<dimen name="dp_178">405.4444dp</dimen>
-	<dimen name="dp_179">407.7222dp</dimen>
-	<dimen name="dp_180">410.0000dp</dimen>
-	<dimen name="dp_181">412.2778dp</dimen>
-	<dimen name="dp_182">414.5556dp</dimen>
-	<dimen name="dp_183">416.8333dp</dimen>
-	<dimen name="dp_184">419.1111dp</dimen>
-	<dimen name="dp_185">421.3889dp</dimen>
-	<dimen name="dp_186">423.6667dp</dimen>
-	<dimen name="dp_187">425.9444dp</dimen>
-	<dimen name="dp_188">428.2222dp</dimen>
-	<dimen name="dp_189">430.5000dp</dimen>
-	<dimen name="dp_190">432.7778dp</dimen>
-	<dimen name="dp_191">435.0556dp</dimen>
-	<dimen name="dp_192">437.3333dp</dimen>
-	<dimen name="dp_193">439.6111dp</dimen>
-	<dimen name="dp_194">441.8889dp</dimen>
-	<dimen name="dp_195">444.1667dp</dimen>
-	<dimen name="dp_196">446.4444dp</dimen>
-	<dimen name="dp_197">448.7222dp</dimen>
-	<dimen name="dp_198">451.0000dp</dimen>
-	<dimen name="dp_199">453.2778dp</dimen>
-	<dimen name="dp_200">455.5556dp</dimen>
-	<dimen name="dp_201">457.8333dp</dimen>
-	<dimen name="dp_202">460.1111dp</dimen>
-	<dimen name="dp_203">462.3889dp</dimen>
-	<dimen name="dp_204">464.6667dp</dimen>
-	<dimen name="dp_205">466.9444dp</dimen>
-	<dimen name="dp_206">469.2222dp</dimen>
-	<dimen name="dp_207">471.5000dp</dimen>
-	<dimen name="dp_208">473.7778dp</dimen>
-	<dimen name="dp_209">476.0556dp</dimen>
-	<dimen name="dp_210">478.3333dp</dimen>
-	<dimen name="dp_211">480.6111dp</dimen>
-	<dimen name="dp_212">482.8889dp</dimen>
-	<dimen name="dp_213">485.1667dp</dimen>
-	<dimen name="dp_214">487.4444dp</dimen>
-	<dimen name="dp_215">489.7222dp</dimen>
-	<dimen name="dp_216">492.0000dp</dimen>
-	<dimen name="dp_217">494.2778dp</dimen>
-	<dimen name="dp_218">496.5556dp</dimen>
-	<dimen name="dp_219">498.8333dp</dimen>
-	<dimen name="dp_220">501.1111dp</dimen>
-	<dimen name="dp_221">503.3889dp</dimen>
-	<dimen name="dp_222">505.6667dp</dimen>
-	<dimen name="dp_223">507.9444dp</dimen>
-	<dimen name="dp_224">510.2222dp</dimen>
-	<dimen name="dp_225">512.5000dp</dimen>
-	<dimen name="dp_226">514.7778dp</dimen>
-	<dimen name="dp_227">517.0556dp</dimen>
-	<dimen name="dp_228">519.3333dp</dimen>
-	<dimen name="dp_229">521.6111dp</dimen>
-	<dimen name="dp_230">523.8889dp</dimen>
-	<dimen name="dp_231">526.1667dp</dimen>
-	<dimen name="dp_232">528.4444dp</dimen>
-	<dimen name="dp_233">530.7222dp</dimen>
-	<dimen name="dp_234">533.0000dp</dimen>
-	<dimen name="dp_235">535.2778dp</dimen>
-	<dimen name="dp_236">537.5556dp</dimen>
-	<dimen name="dp_237">539.8333dp</dimen>
-	<dimen name="dp_238">542.1111dp</dimen>
-	<dimen name="dp_239">544.3889dp</dimen>
-	<dimen name="dp_240">546.6667dp</dimen>
-	<dimen name="dp_241">548.9444dp</dimen>
-	<dimen name="dp_242">551.2222dp</dimen>
-	<dimen name="dp_243">553.5000dp</dimen>
-	<dimen name="dp_244">555.7778dp</dimen>
-	<dimen name="dp_245">558.0556dp</dimen>
-	<dimen name="dp_246">560.3333dp</dimen>
-	<dimen name="dp_247">562.6111dp</dimen>
-	<dimen name="dp_248">564.8889dp</dimen>
-	<dimen name="dp_249">567.1667dp</dimen>
-	<dimen name="dp_250">569.4444dp</dimen>
-	<dimen name="dp_251">571.7222dp</dimen>
-	<dimen name="dp_252">574.0000dp</dimen>
-	<dimen name="dp_253">576.2778dp</dimen>
-	<dimen name="dp_254">578.5556dp</dimen>
-	<dimen name="dp_255">580.8333dp</dimen>
-	<dimen name="dp_256">583.1111dp</dimen>
-	<dimen name="dp_257">585.3889dp</dimen>
-	<dimen name="dp_258">587.6667dp</dimen>
-	<dimen name="dp_259">589.9444dp</dimen>
-	<dimen name="dp_260">592.2222dp</dimen>
-	<dimen name="dp_261">594.5000dp</dimen>
-	<dimen name="dp_262">596.7778dp</dimen>
-	<dimen name="dp_263">599.0556dp</dimen>
-	<dimen name="dp_264">601.3333dp</dimen>
-	<dimen name="dp_265">603.6111dp</dimen>
-	<dimen name="dp_266">605.8889dp</dimen>
-	<dimen name="dp_267">608.1667dp</dimen>
-	<dimen name="dp_268">610.4444dp</dimen>
-	<dimen name="dp_269">612.7222dp</dimen>
-	<dimen name="dp_270">615.0000dp</dimen>
-	<dimen name="dp_271">617.2778dp</dimen>
-	<dimen name="dp_272">619.5556dp</dimen>
-	<dimen name="dp_273">621.8333dp</dimen>
-	<dimen name="dp_274">624.1111dp</dimen>
-	<dimen name="dp_275">626.3889dp</dimen>
-	<dimen name="dp_276">628.6667dp</dimen>
-	<dimen name="dp_277">630.9444dp</dimen>
-	<dimen name="dp_278">633.2222dp</dimen>
-	<dimen name="dp_279">635.5000dp</dimen>
-	<dimen name="dp_280">637.7778dp</dimen>
-	<dimen name="dp_281">640.0556dp</dimen>
-	<dimen name="dp_282">642.3333dp</dimen>
-	<dimen name="dp_283">644.6111dp</dimen>
-	<dimen name="dp_284">646.8889dp</dimen>
-	<dimen name="dp_285">649.1667dp</dimen>
-	<dimen name="dp_286">651.4444dp</dimen>
-	<dimen name="dp_287">653.7222dp</dimen>
-	<dimen name="dp_288">656.0000dp</dimen>
-	<dimen name="dp_289">658.2778dp</dimen>
-	<dimen name="dp_290">660.5556dp</dimen>
-	<dimen name="dp_291">662.8333dp</dimen>
-	<dimen name="dp_292">665.1111dp</dimen>
-	<dimen name="dp_293">667.3889dp</dimen>
-	<dimen name="dp_294">669.6667dp</dimen>
-	<dimen name="dp_295">671.9444dp</dimen>
-	<dimen name="dp_296">674.2222dp</dimen>
-	<dimen name="dp_297">676.5000dp</dimen>
-	<dimen name="dp_298">678.7778dp</dimen>
-	<dimen name="dp_299">681.0556dp</dimen>
-	<dimen name="dp_300">683.3333dp</dimen>
-	<dimen name="dp_301">685.6111dp</dimen>
-	<dimen name="dp_302">687.8889dp</dimen>
-	<dimen name="dp_303">690.1667dp</dimen>
-	<dimen name="dp_304">692.4444dp</dimen>
-	<dimen name="dp_305">694.7222dp</dimen>
-	<dimen name="dp_306">697.0000dp</dimen>
-	<dimen name="dp_307">699.2778dp</dimen>
-	<dimen name="dp_308">701.5556dp</dimen>
-	<dimen name="dp_309">703.8333dp</dimen>
-	<dimen name="dp_310">706.1111dp</dimen>
-	<dimen name="dp_311">708.3889dp</dimen>
-	<dimen name="dp_312">710.6667dp</dimen>
-	<dimen name="dp_313">712.9444dp</dimen>
-	<dimen name="dp_314">715.2222dp</dimen>
-	<dimen name="dp_315">717.5000dp</dimen>
-	<dimen name="dp_316">719.7778dp</dimen>
-	<dimen name="dp_317">722.0556dp</dimen>
-	<dimen name="dp_318">724.3333dp</dimen>
-	<dimen name="dp_319">726.6111dp</dimen>
-	<dimen name="dp_320">728.8889dp</dimen>
-	<dimen name="dp_321">731.1667dp</dimen>
-	<dimen name="dp_322">733.4444dp</dimen>
-	<dimen name="dp_323">735.7222dp</dimen>
-	<dimen name="dp_324">738.0000dp</dimen>
-	<dimen name="dp_325">740.2778dp</dimen>
-	<dimen name="dp_326">742.5556dp</dimen>
-	<dimen name="dp_327">744.8333dp</dimen>
-	<dimen name="dp_328">747.1111dp</dimen>
-	<dimen name="dp_329">749.3889dp</dimen>
-	<dimen name="dp_330">751.6667dp</dimen>
-	<dimen name="dp_331">753.9444dp</dimen>
-	<dimen name="dp_332">756.2222dp</dimen>
-	<dimen name="dp_333">758.5000dp</dimen>
-	<dimen name="dp_334">760.7778dp</dimen>
-	<dimen name="dp_335">763.0556dp</dimen>
-	<dimen name="dp_336">765.3333dp</dimen>
-	<dimen name="dp_337">767.6111dp</dimen>
-	<dimen name="dp_338">769.8889dp</dimen>
-	<dimen name="dp_339">772.1667dp</dimen>
-	<dimen name="dp_340">774.4444dp</dimen>
-	<dimen name="dp_341">776.7222dp</dimen>
-	<dimen name="dp_342">779.0000dp</dimen>
-	<dimen name="dp_343">781.2778dp</dimen>
-	<dimen name="dp_344">783.5556dp</dimen>
-	<dimen name="dp_345">785.8333dp</dimen>
-	<dimen name="dp_346">788.1111dp</dimen>
-	<dimen name="dp_347">790.3889dp</dimen>
-	<dimen name="dp_348">792.6667dp</dimen>
-	<dimen name="dp_349">794.9444dp</dimen>
-	<dimen name="dp_350">797.2222dp</dimen>
-	<dimen name="dp_351">799.5000dp</dimen>
-	<dimen name="dp_352">801.7778dp</dimen>
-	<dimen name="dp_353">804.0556dp</dimen>
-	<dimen name="dp_354">806.3333dp</dimen>
-	<dimen name="dp_355">808.6111dp</dimen>
-	<dimen name="dp_356">810.8889dp</dimen>
-	<dimen name="dp_357">813.1667dp</dimen>
-	<dimen name="dp_358">815.4444dp</dimen>
-	<dimen name="dp_359">817.7222dp</dimen>
-	<dimen name="dp_360">820.0000dp</dimen>
-	<dimen name="dp_365">831.3889dp</dimen>
-	<dimen name="dp_370">842.7778dp</dimen>
-	<dimen name="dp_400">911.1111dp</dimen>
-	<dimen name="dp_410">933.8889dp</dimen>
-	<dimen name="dp_422">961.2222dp</dimen>
-	<dimen name="dp_472">1075.1111dp</dimen>
-	<dimen name="dp_500">1138.8889dp</dimen>
-	<dimen name="dp_600">1366.6667dp</dimen>
-	<dimen name="dp_640">1457.7778dp</dimen>
-	<dimen name="dp_720">1640.0000dp</dimen>
-	<dimen name="sp_6">13.6667sp</dimen>
-	<dimen name="sp_7">15.9444sp</dimen>
-	<dimen name="sp_8">18.2222sp</dimen>
-	<dimen name="sp_9">20.5000sp</dimen>
-	<dimen name="sp_10">22.7778sp</dimen>
-	<dimen name="sp_11">25.0556sp</dimen>
-	<dimen name="sp_12">27.3333sp</dimen>
-	<dimen name="sp_13">29.6111sp</dimen>
-	<dimen name="sp_14">31.8889sp</dimen>
-	<dimen name="sp_15">34.1667sp</dimen>
-	<dimen name="sp_16">36.4444sp</dimen>
-	<dimen name="sp_17">38.7222sp</dimen>
-	<dimen name="sp_18">41.0000sp</dimen>
-	<dimen name="sp_19">43.2778sp</dimen>
-	<dimen name="sp_20">45.5556sp</dimen>
-	<dimen name="sp_21">47.8333sp</dimen>
-	<dimen name="sp_22">50.1111sp</dimen>
-	<dimen name="sp_23">52.3889sp</dimen>
-	<dimen name="sp_24">54.6667sp</dimen>
-	<dimen name="sp_25">56.9444sp</dimen>
-	<dimen name="sp_28">63.7778sp</dimen>
-	<dimen name="sp_30">68.3333sp</dimen>
-	<dimen name="sp_32">72.8889sp</dimen>
-	<dimen name="sp_34">77.4444sp</dimen>
-	<dimen name="sp_36">82.0000sp</dimen>
-	<dimen name="sp_38">86.5556sp</dimen>
-	<dimen name="sp_40">91.1111sp</dimen>
-	<dimen name="sp_42">95.6667sp</dimen>
-	<dimen name="sp_48">109.3333sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw960dp/dimens.xml b/app/src/main/res/values-sw960dp/dimens.xml
deleted file mode 100644
index 8cee169..0000000
--- a/app/src/main/res/values-sw960dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-160.0000dp</dimen>
-	<dimen name="dp_m_30">-80.0000dp</dimen>
-	<dimen name="dp_m_20">-53.3333dp</dimen>
-	<dimen name="dp_m_12">-32.0000dp</dimen>
-	<dimen name="dp_m_10">-26.6667dp</dimen>
-	<dimen name="dp_m_8">-21.3333dp</dimen>
-	<dimen name="dp_m_5">-13.3333dp</dimen>
-	<dimen name="dp_m_2">-5.3333dp</dimen>
-	<dimen name="dp_m_1">-2.6667dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.2667dp</dimen>
-	<dimen name="dp_0_5">1.3333dp</dimen>
-	<dimen name="dp_1">2.6667dp</dimen>
-	<dimen name="dp_1_5">4.0000dp</dimen>
-	<dimen name="dp_2">5.3333dp</dimen>
-	<dimen name="dp_2_5">6.6667dp</dimen>
-	<dimen name="dp_3">8.0000dp</dimen>
-	<dimen name="dp_3_5">9.3333dp</dimen>
-	<dimen name="dp_4">10.6667dp</dimen>
-	<dimen name="dp_4_5">12.0000dp</dimen>
-	<dimen name="dp_5">13.3333dp</dimen>
-	<dimen name="dp_6">16.0000dp</dimen>
-	<dimen name="dp_7">18.6667dp</dimen>
-	<dimen name="dp_8">21.3333dp</dimen>
-	<dimen name="dp_9">24.0000dp</dimen>
-	<dimen name="dp_10">26.6667dp</dimen>
-	<dimen name="dp_11">29.3333dp</dimen>
-	<dimen name="dp_12">32.0000dp</dimen>
-	<dimen name="dp_13">34.6667dp</dimen>
-	<dimen name="dp_14">37.3333dp</dimen>
-	<dimen name="dp_15">40.0000dp</dimen>
-	<dimen name="dp_16">42.6667dp</dimen>
-	<dimen name="dp_17">45.3333dp</dimen>
-	<dimen name="dp_18">48.0000dp</dimen>
-	<dimen name="dp_19">50.6667dp</dimen>
-	<dimen name="dp_20">53.3333dp</dimen>
-	<dimen name="dp_21">56.0000dp</dimen>
-	<dimen name="dp_22">58.6667dp</dimen>
-	<dimen name="dp_23">61.3333dp</dimen>
-	<dimen name="dp_24">64.0000dp</dimen>
-	<dimen name="dp_25">66.6667dp</dimen>
-	<dimen name="dp_26">69.3333dp</dimen>
-	<dimen name="dp_27">72.0000dp</dimen>
-	<dimen name="dp_28">74.6667dp</dimen>
-	<dimen name="dp_29">77.3333dp</dimen>
-	<dimen name="dp_30">80.0000dp</dimen>
-	<dimen name="dp_31">82.6667dp</dimen>
-	<dimen name="dp_32">85.3333dp</dimen>
-	<dimen name="dp_33">88.0000dp</dimen>
-	<dimen name="dp_34">90.6667dp</dimen>
-	<dimen name="dp_35">93.3333dp</dimen>
-	<dimen name="dp_36">96.0000dp</dimen>
-	<dimen name="dp_37">98.6667dp</dimen>
-	<dimen name="dp_38">101.3333dp</dimen>
-	<dimen name="dp_39">104.0000dp</dimen>
-	<dimen name="dp_40">106.6667dp</dimen>
-	<dimen name="dp_41">109.3333dp</dimen>
-	<dimen name="dp_42">112.0000dp</dimen>
-	<dimen name="dp_43">114.6667dp</dimen>
-	<dimen name="dp_44">117.3333dp</dimen>
-	<dimen name="dp_45">120.0000dp</dimen>
-	<dimen name="dp_46">122.6667dp</dimen>
-	<dimen name="dp_47">125.3333dp</dimen>
-	<dimen name="dp_48">128.0000dp</dimen>
-	<dimen name="dp_49">130.6667dp</dimen>
-	<dimen name="dp_50">133.3333dp</dimen>
-	<dimen name="dp_51">136.0000dp</dimen>
-	<dimen name="dp_52">138.6667dp</dimen>
-	<dimen name="dp_53">141.3333dp</dimen>
-	<dimen name="dp_54">144.0000dp</dimen>
-	<dimen name="dp_55">146.6667dp</dimen>
-	<dimen name="dp_56">149.3333dp</dimen>
-	<dimen name="dp_57">152.0000dp</dimen>
-	<dimen name="dp_58">154.6667dp</dimen>
-	<dimen name="dp_59">157.3333dp</dimen>
-	<dimen name="dp_60">160.0000dp</dimen>
-	<dimen name="dp_61">162.6667dp</dimen>
-	<dimen name="dp_62">165.3333dp</dimen>
-	<dimen name="dp_63">168.0000dp</dimen>
-	<dimen name="dp_64">170.6667dp</dimen>
-	<dimen name="dp_65">173.3333dp</dimen>
-	<dimen name="dp_66">176.0000dp</dimen>
-	<dimen name="dp_67">178.6667dp</dimen>
-	<dimen name="dp_68">181.3333dp</dimen>
-	<dimen name="dp_69">184.0000dp</dimen>
-	<dimen name="dp_70">186.6667dp</dimen>
-	<dimen name="dp_71">189.3333dp</dimen>
-	<dimen name="dp_72">192.0000dp</dimen>
-	<dimen name="dp_73">194.6667dp</dimen>
-	<dimen name="dp_74">197.3333dp</dimen>
-	<dimen name="dp_75">200.0000dp</dimen>
-	<dimen name="dp_76">202.6667dp</dimen>
-	<dimen name="dp_77">205.3333dp</dimen>
-	<dimen name="dp_78">208.0000dp</dimen>
-	<dimen name="dp_79">210.6667dp</dimen>
-	<dimen name="dp_80">213.3333dp</dimen>
-	<dimen name="dp_81">216.0000dp</dimen>
-	<dimen name="dp_82">218.6667dp</dimen>
-	<dimen name="dp_83">221.3333dp</dimen>
-	<dimen name="dp_84">224.0000dp</dimen>
-	<dimen name="dp_85">226.6667dp</dimen>
-	<dimen name="dp_86">229.3333dp</dimen>
-	<dimen name="dp_87">232.0000dp</dimen>
-	<dimen name="dp_88">234.6667dp</dimen>
-	<dimen name="dp_89">237.3333dp</dimen>
-	<dimen name="dp_90">240.0000dp</dimen>
-	<dimen name="dp_91">242.6667dp</dimen>
-	<dimen name="dp_92">245.3333dp</dimen>
-	<dimen name="dp_93">248.0000dp</dimen>
-	<dimen name="dp_94">250.6667dp</dimen>
-	<dimen name="dp_95">253.3333dp</dimen>
-	<dimen name="dp_96">256.0000dp</dimen>
-	<dimen name="dp_97">258.6667dp</dimen>
-	<dimen name="dp_98">261.3333dp</dimen>
-	<dimen name="dp_99">264.0000dp</dimen>
-	<dimen name="dp_100">266.6667dp</dimen>
-	<dimen name="dp_101">269.3333dp</dimen>
-	<dimen name="dp_102">272.0000dp</dimen>
-	<dimen name="dp_103">274.6667dp</dimen>
-	<dimen name="dp_104">277.3333dp</dimen>
-	<dimen name="dp_105">280.0000dp</dimen>
-	<dimen name="dp_106">282.6667dp</dimen>
-	<dimen name="dp_107">285.3333dp</dimen>
-	<dimen name="dp_108">288.0000dp</dimen>
-	<dimen name="dp_109">290.6667dp</dimen>
-	<dimen name="dp_110">293.3333dp</dimen>
-	<dimen name="dp_111">296.0000dp</dimen>
-	<dimen name="dp_112">298.6667dp</dimen>
-	<dimen name="dp_113">301.3333dp</dimen>
-	<dimen name="dp_114">304.0000dp</dimen>
-	<dimen name="dp_115">306.6667dp</dimen>
-	<dimen name="dp_116">309.3333dp</dimen>
-	<dimen name="dp_117">312.0000dp</dimen>
-	<dimen name="dp_118">314.6667dp</dimen>
-	<dimen name="dp_119">317.3333dp</dimen>
-	<dimen name="dp_120">320.0000dp</dimen>
-	<dimen name="dp_121">322.6667dp</dimen>
-	<dimen name="dp_122">325.3333dp</dimen>
-	<dimen name="dp_123">328.0000dp</dimen>
-	<dimen name="dp_124">330.6667dp</dimen>
-	<dimen name="dp_125">333.3333dp</dimen>
-	<dimen name="dp_126">336.0000dp</dimen>
-	<dimen name="dp_127">338.6667dp</dimen>
-	<dimen name="dp_128">341.3333dp</dimen>
-	<dimen name="dp_129">344.0000dp</dimen>
-	<dimen name="dp_130">346.6667dp</dimen>
-	<dimen name="dp_131">349.3333dp</dimen>
-	<dimen name="dp_132">352.0000dp</dimen>
-	<dimen name="dp_133">354.6667dp</dimen>
-	<dimen name="dp_134">357.3333dp</dimen>
-	<dimen name="dp_135">360.0000dp</dimen>
-	<dimen name="dp_136">362.6667dp</dimen>
-	<dimen name="dp_137">365.3333dp</dimen>
-	<dimen name="dp_138">368.0000dp</dimen>
-	<dimen name="dp_139">370.6667dp</dimen>
-	<dimen name="dp_140">373.3333dp</dimen>
-	<dimen name="dp_141">376.0000dp</dimen>
-	<dimen name="dp_142">378.6667dp</dimen>
-	<dimen name="dp_143">381.3333dp</dimen>
-	<dimen name="dp_144">384.0000dp</dimen>
-	<dimen name="dp_145">386.6667dp</dimen>
-	<dimen name="dp_146">389.3333dp</dimen>
-	<dimen name="dp_147">392.0000dp</dimen>
-	<dimen name="dp_148">394.6667dp</dimen>
-	<dimen name="dp_149">397.3333dp</dimen>
-	<dimen name="dp_150">400.0000dp</dimen>
-	<dimen name="dp_151">402.6667dp</dimen>
-	<dimen name="dp_152">405.3333dp</dimen>
-	<dimen name="dp_153">408.0000dp</dimen>
-	<dimen name="dp_154">410.6667dp</dimen>
-	<dimen name="dp_155">413.3333dp</dimen>
-	<dimen name="dp_156">416.0000dp</dimen>
-	<dimen name="dp_157">418.6667dp</dimen>
-	<dimen name="dp_158">421.3333dp</dimen>
-	<dimen name="dp_159">424.0000dp</dimen>
-	<dimen name="dp_160">426.6667dp</dimen>
-	<dimen name="dp_161">429.3333dp</dimen>
-	<dimen name="dp_162">432.0000dp</dimen>
-	<dimen name="dp_163">434.6667dp</dimen>
-	<dimen name="dp_164">437.3333dp</dimen>
-	<dimen name="dp_165">440.0000dp</dimen>
-	<dimen name="dp_166">442.6667dp</dimen>
-	<dimen name="dp_167">445.3333dp</dimen>
-	<dimen name="dp_168">448.0000dp</dimen>
-	<dimen name="dp_169">450.6667dp</dimen>
-	<dimen name="dp_170">453.3333dp</dimen>
-	<dimen name="dp_171">456.0000dp</dimen>
-	<dimen name="dp_172">458.6667dp</dimen>
-	<dimen name="dp_173">461.3333dp</dimen>
-	<dimen name="dp_174">464.0000dp</dimen>
-	<dimen name="dp_175">466.6667dp</dimen>
-	<dimen name="dp_176">469.3333dp</dimen>
-	<dimen name="dp_177">472.0000dp</dimen>
-	<dimen name="dp_178">474.6667dp</dimen>
-	<dimen name="dp_179">477.3333dp</dimen>
-	<dimen name="dp_180">480.0000dp</dimen>
-	<dimen name="dp_181">482.6667dp</dimen>
-	<dimen name="dp_182">485.3333dp</dimen>
-	<dimen name="dp_183">488.0000dp</dimen>
-	<dimen name="dp_184">490.6667dp</dimen>
-	<dimen name="dp_185">493.3333dp</dimen>
-	<dimen name="dp_186">496.0000dp</dimen>
-	<dimen name="dp_187">498.6667dp</dimen>
-	<dimen name="dp_188">501.3333dp</dimen>
-	<dimen name="dp_189">504.0000dp</dimen>
-	<dimen name="dp_190">506.6667dp</dimen>
-	<dimen name="dp_191">509.3333dp</dimen>
-	<dimen name="dp_192">512.0000dp</dimen>
-	<dimen name="dp_193">514.6667dp</dimen>
-	<dimen name="dp_194">517.3333dp</dimen>
-	<dimen name="dp_195">520.0000dp</dimen>
-	<dimen name="dp_196">522.6667dp</dimen>
-	<dimen name="dp_197">525.3333dp</dimen>
-	<dimen name="dp_198">528.0000dp</dimen>
-	<dimen name="dp_199">530.6667dp</dimen>
-	<dimen name="dp_200">533.3333dp</dimen>
-	<dimen name="dp_201">536.0000dp</dimen>
-	<dimen name="dp_202">538.6667dp</dimen>
-	<dimen name="dp_203">541.3333dp</dimen>
-	<dimen name="dp_204">544.0000dp</dimen>
-	<dimen name="dp_205">546.6667dp</dimen>
-	<dimen name="dp_206">549.3333dp</dimen>
-	<dimen name="dp_207">552.0000dp</dimen>
-	<dimen name="dp_208">554.6667dp</dimen>
-	<dimen name="dp_209">557.3333dp</dimen>
-	<dimen name="dp_210">560.0000dp</dimen>
-	<dimen name="dp_211">562.6667dp</dimen>
-	<dimen name="dp_212">565.3333dp</dimen>
-	<dimen name="dp_213">568.0000dp</dimen>
-	<dimen name="dp_214">570.6667dp</dimen>
-	<dimen name="dp_215">573.3333dp</dimen>
-	<dimen name="dp_216">576.0000dp</dimen>
-	<dimen name="dp_217">578.6667dp</dimen>
-	<dimen name="dp_218">581.3333dp</dimen>
-	<dimen name="dp_219">584.0000dp</dimen>
-	<dimen name="dp_220">586.6667dp</dimen>
-	<dimen name="dp_221">589.3333dp</dimen>
-	<dimen name="dp_222">592.0000dp</dimen>
-	<dimen name="dp_223">594.6667dp</dimen>
-	<dimen name="dp_224">597.3333dp</dimen>
-	<dimen name="dp_225">600.0000dp</dimen>
-	<dimen name="dp_226">602.6667dp</dimen>
-	<dimen name="dp_227">605.3333dp</dimen>
-	<dimen name="dp_228">608.0000dp</dimen>
-	<dimen name="dp_229">610.6667dp</dimen>
-	<dimen name="dp_230">613.3333dp</dimen>
-	<dimen name="dp_231">616.0000dp</dimen>
-	<dimen name="dp_232">618.6667dp</dimen>
-	<dimen name="dp_233">621.3333dp</dimen>
-	<dimen name="dp_234">624.0000dp</dimen>
-	<dimen name="dp_235">626.6667dp</dimen>
-	<dimen name="dp_236">629.3333dp</dimen>
-	<dimen name="dp_237">632.0000dp</dimen>
-	<dimen name="dp_238">634.6667dp</dimen>
-	<dimen name="dp_239">637.3333dp</dimen>
-	<dimen name="dp_240">640.0000dp</dimen>
-	<dimen name="dp_241">642.6667dp</dimen>
-	<dimen name="dp_242">645.3333dp</dimen>
-	<dimen name="dp_243">648.0000dp</dimen>
-	<dimen name="dp_244">650.6667dp</dimen>
-	<dimen name="dp_245">653.3333dp</dimen>
-	<dimen name="dp_246">656.0000dp</dimen>
-	<dimen name="dp_247">658.6667dp</dimen>
-	<dimen name="dp_248">661.3333dp</dimen>
-	<dimen name="dp_249">664.0000dp</dimen>
-	<dimen name="dp_250">666.6667dp</dimen>
-	<dimen name="dp_251">669.3333dp</dimen>
-	<dimen name="dp_252">672.0000dp</dimen>
-	<dimen name="dp_253">674.6667dp</dimen>
-	<dimen name="dp_254">677.3333dp</dimen>
-	<dimen name="dp_255">680.0000dp</dimen>
-	<dimen name="dp_256">682.6667dp</dimen>
-	<dimen name="dp_257">685.3333dp</dimen>
-	<dimen name="dp_258">688.0000dp</dimen>
-	<dimen name="dp_259">690.6667dp</dimen>
-	<dimen name="dp_260">693.3333dp</dimen>
-	<dimen name="dp_261">696.0000dp</dimen>
-	<dimen name="dp_262">698.6667dp</dimen>
-	<dimen name="dp_263">701.3333dp</dimen>
-	<dimen name="dp_264">704.0000dp</dimen>
-	<dimen name="dp_265">706.6667dp</dimen>
-	<dimen name="dp_266">709.3333dp</dimen>
-	<dimen name="dp_267">712.0000dp</dimen>
-	<dimen name="dp_268">714.6667dp</dimen>
-	<dimen name="dp_269">717.3333dp</dimen>
-	<dimen name="dp_270">720.0000dp</dimen>
-	<dimen name="dp_271">722.6667dp</dimen>
-	<dimen name="dp_272">725.3333dp</dimen>
-	<dimen name="dp_273">728.0000dp</dimen>
-	<dimen name="dp_274">730.6667dp</dimen>
-	<dimen name="dp_275">733.3333dp</dimen>
-	<dimen name="dp_276">736.0000dp</dimen>
-	<dimen name="dp_277">738.6667dp</dimen>
-	<dimen name="dp_278">741.3333dp</dimen>
-	<dimen name="dp_279">744.0000dp</dimen>
-	<dimen name="dp_280">746.6667dp</dimen>
-	<dimen name="dp_281">749.3333dp</dimen>
-	<dimen name="dp_282">752.0000dp</dimen>
-	<dimen name="dp_283">754.6667dp</dimen>
-	<dimen name="dp_284">757.3333dp</dimen>
-	<dimen name="dp_285">760.0000dp</dimen>
-	<dimen name="dp_286">762.6667dp</dimen>
-	<dimen name="dp_287">765.3333dp</dimen>
-	<dimen name="dp_288">768.0000dp</dimen>
-	<dimen name="dp_289">770.6667dp</dimen>
-	<dimen name="dp_290">773.3333dp</dimen>
-	<dimen name="dp_291">776.0000dp</dimen>
-	<dimen name="dp_292">778.6667dp</dimen>
-	<dimen name="dp_293">781.3333dp</dimen>
-	<dimen name="dp_294">784.0000dp</dimen>
-	<dimen name="dp_295">786.6667dp</dimen>
-	<dimen name="dp_296">789.3333dp</dimen>
-	<dimen name="dp_297">792.0000dp</dimen>
-	<dimen name="dp_298">794.6667dp</dimen>
-	<dimen name="dp_299">797.3333dp</dimen>
-	<dimen name="dp_300">800.0000dp</dimen>
-	<dimen name="dp_301">802.6667dp</dimen>
-	<dimen name="dp_302">805.3333dp</dimen>
-	<dimen name="dp_303">808.0000dp</dimen>
-	<dimen name="dp_304">810.6667dp</dimen>
-	<dimen name="dp_305">813.3333dp</dimen>
-	<dimen name="dp_306">816.0000dp</dimen>
-	<dimen name="dp_307">818.6667dp</dimen>
-	<dimen name="dp_308">821.3333dp</dimen>
-	<dimen name="dp_309">824.0000dp</dimen>
-	<dimen name="dp_310">826.6667dp</dimen>
-	<dimen name="dp_311">829.3333dp</dimen>
-	<dimen name="dp_312">832.0000dp</dimen>
-	<dimen name="dp_313">834.6667dp</dimen>
-	<dimen name="dp_314">837.3333dp</dimen>
-	<dimen name="dp_315">840.0000dp</dimen>
-	<dimen name="dp_316">842.6667dp</dimen>
-	<dimen name="dp_317">845.3333dp</dimen>
-	<dimen name="dp_318">848.0000dp</dimen>
-	<dimen name="dp_319">850.6667dp</dimen>
-	<dimen name="dp_320">853.3333dp</dimen>
-	<dimen name="dp_321">856.0000dp</dimen>
-	<dimen name="dp_322">858.6667dp</dimen>
-	<dimen name="dp_323">861.3333dp</dimen>
-	<dimen name="dp_324">864.0000dp</dimen>
-	<dimen name="dp_325">866.6667dp</dimen>
-	<dimen name="dp_326">869.3333dp</dimen>
-	<dimen name="dp_327">872.0000dp</dimen>
-	<dimen name="dp_328">874.6667dp</dimen>
-	<dimen name="dp_329">877.3333dp</dimen>
-	<dimen name="dp_330">880.0000dp</dimen>
-	<dimen name="dp_331">882.6667dp</dimen>
-	<dimen name="dp_332">885.3333dp</dimen>
-	<dimen name="dp_333">888.0000dp</dimen>
-	<dimen name="dp_334">890.6667dp</dimen>
-	<dimen name="dp_335">893.3333dp</dimen>
-	<dimen name="dp_336">896.0000dp</dimen>
-	<dimen name="dp_337">898.6667dp</dimen>
-	<dimen name="dp_338">901.3333dp</dimen>
-	<dimen name="dp_339">904.0000dp</dimen>
-	<dimen name="dp_340">906.6667dp</dimen>
-	<dimen name="dp_341">909.3333dp</dimen>
-	<dimen name="dp_342">912.0000dp</dimen>
-	<dimen name="dp_343">914.6667dp</dimen>
-	<dimen name="dp_344">917.3333dp</dimen>
-	<dimen name="dp_345">920.0000dp</dimen>
-	<dimen name="dp_346">922.6667dp</dimen>
-	<dimen name="dp_347">925.3333dp</dimen>
-	<dimen name="dp_348">928.0000dp</dimen>
-	<dimen name="dp_349">930.6667dp</dimen>
-	<dimen name="dp_350">933.3333dp</dimen>
-	<dimen name="dp_351">936.0000dp</dimen>
-	<dimen name="dp_352">938.6667dp</dimen>
-	<dimen name="dp_353">941.3333dp</dimen>
-	<dimen name="dp_354">944.0000dp</dimen>
-	<dimen name="dp_355">946.6667dp</dimen>
-	<dimen name="dp_356">949.3333dp</dimen>
-	<dimen name="dp_357">952.0000dp</dimen>
-	<dimen name="dp_358">954.6667dp</dimen>
-	<dimen name="dp_359">957.3333dp</dimen>
-	<dimen name="dp_360">960.0000dp</dimen>
-	<dimen name="dp_365">973.3333dp</dimen>
-	<dimen name="dp_370">986.6667dp</dimen>
-	<dimen name="dp_400">1066.6667dp</dimen>
-	<dimen name="dp_410">1093.3333dp</dimen>
-	<dimen name="dp_422">1125.3333dp</dimen>
-	<dimen name="dp_472">1258.6667dp</dimen>
-	<dimen name="dp_500">1333.3333dp</dimen>
-	<dimen name="dp_600">1600.0000dp</dimen>
-	<dimen name="dp_640">1706.6667dp</dimen>
-	<dimen name="dp_720">1920.0000dp</dimen>
-	<dimen name="sp_6">16.0000sp</dimen>
-	<dimen name="sp_7">18.6667sp</dimen>
-	<dimen name="sp_8">21.3333sp</dimen>
-	<dimen name="sp_9">24.0000sp</dimen>
-	<dimen name="sp_10">26.6667sp</dimen>
-	<dimen name="sp_11">29.3333sp</dimen>
-	<dimen name="sp_12">32.0000sp</dimen>
-	<dimen name="sp_13">34.6667sp</dimen>
-	<dimen name="sp_14">37.3333sp</dimen>
-	<dimen name="sp_15">40.0000sp</dimen>
-	<dimen name="sp_16">42.6667sp</dimen>
-	<dimen name="sp_17">45.3333sp</dimen>
-	<dimen name="sp_18">48.0000sp</dimen>
-	<dimen name="sp_19">50.6667sp</dimen>
-	<dimen name="sp_20">53.3333sp</dimen>
-	<dimen name="sp_21">56.0000sp</dimen>
-	<dimen name="sp_22">58.6667sp</dimen>
-	<dimen name="sp_23">61.3333sp</dimen>
-	<dimen name="sp_24">64.0000sp</dimen>
-	<dimen name="sp_25">66.6667sp</dimen>
-	<dimen name="sp_28">74.6667sp</dimen>
-	<dimen name="sp_30">80.0000sp</dimen>
-	<dimen name="sp_32">85.3333sp</dimen>
-	<dimen name="sp_34">90.6667sp</dimen>
-	<dimen name="sp_36">96.0000sp</dimen>
-	<dimen name="sp_38">101.3333sp</dimen>
-	<dimen name="sp_40">106.6667sp</dimen>
-	<dimen name="sp_42">112.0000sp</dimen>
-	<dimen name="sp_48">128.0000sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-sw961dp/dimens.xml b/app/src/main/res/values-sw961dp/dimens.xml
deleted file mode 100644
index bec6f70..0000000
--- a/app/src/main/res/values-sw961dp/dimens.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-160.1667dp</dimen>
-	<dimen name="dp_m_30">-80.0833dp</dimen>
-	<dimen name="dp_m_20">-53.3889dp</dimen>
-	<dimen name="dp_m_12">-32.0333dp</dimen>
-	<dimen name="dp_m_10">-26.6944dp</dimen>
-	<dimen name="dp_m_8">-21.3556dp</dimen>
-	<dimen name="dp_m_5">-13.3472dp</dimen>
-	<dimen name="dp_m_2">-5.3389dp</dimen>
-	<dimen name="dp_m_1">-2.6694dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.2669dp</dimen>
-	<dimen name="dp_0_5">1.3347dp</dimen>
-	<dimen name="dp_1">2.6694dp</dimen>
-	<dimen name="dp_1_5">4.0042dp</dimen>
-	<dimen name="dp_2">5.3389dp</dimen>
-	<dimen name="dp_2_5">6.6736dp</dimen>
-	<dimen name="dp_3">8.0083dp</dimen>
-	<dimen name="dp_3_5">9.3431dp</dimen>
-	<dimen name="dp_4">10.6778dp</dimen>
-	<dimen name="dp_4_5">12.0125dp</dimen>
-	<dimen name="dp_5">13.3472dp</dimen>
-	<dimen name="dp_6">16.0167dp</dimen>
-	<dimen name="dp_7">18.6861dp</dimen>
-	<dimen name="dp_8">21.3556dp</dimen>
-	<dimen name="dp_9">24.0250dp</dimen>
-	<dimen name="dp_10">26.6944dp</dimen>
-	<dimen name="dp_11">29.3639dp</dimen>
-	<dimen name="dp_12">32.0333dp</dimen>
-	<dimen name="dp_13">34.7028dp</dimen>
-	<dimen name="dp_14">37.3722dp</dimen>
-	<dimen name="dp_15">40.0417dp</dimen>
-	<dimen name="dp_16">42.7111dp</dimen>
-	<dimen name="dp_17">45.3806dp</dimen>
-	<dimen name="dp_18">48.0500dp</dimen>
-	<dimen name="dp_19">50.7194dp</dimen>
-	<dimen name="dp_20">53.3889dp</dimen>
-	<dimen name="dp_21">56.0583dp</dimen>
-	<dimen name="dp_22">58.7278dp</dimen>
-	<dimen name="dp_23">61.3972dp</dimen>
-	<dimen name="dp_24">64.0667dp</dimen>
-	<dimen name="dp_25">66.7361dp</dimen>
-	<dimen name="dp_26">69.4056dp</dimen>
-	<dimen name="dp_27">72.0750dp</dimen>
-	<dimen name="dp_28">74.7444dp</dimen>
-	<dimen name="dp_29">77.4139dp</dimen>
-	<dimen name="dp_30">80.0833dp</dimen>
-	<dimen name="dp_31">82.7528dp</dimen>
-	<dimen name="dp_32">85.4222dp</dimen>
-	<dimen name="dp_33">88.0917dp</dimen>
-	<dimen name="dp_34">90.7611dp</dimen>
-	<dimen name="dp_35">93.4306dp</dimen>
-	<dimen name="dp_36">96.1000dp</dimen>
-	<dimen name="dp_37">98.7694dp</dimen>
-	<dimen name="dp_38">101.4389dp</dimen>
-	<dimen name="dp_39">104.1083dp</dimen>
-	<dimen name="dp_40">106.7778dp</dimen>
-	<dimen name="dp_41">109.4472dp</dimen>
-	<dimen name="dp_42">112.1167dp</dimen>
-	<dimen name="dp_43">114.7861dp</dimen>
-	<dimen name="dp_44">117.4556dp</dimen>
-	<dimen name="dp_45">120.1250dp</dimen>
-	<dimen name="dp_46">122.7944dp</dimen>
-	<dimen name="dp_47">125.4639dp</dimen>
-	<dimen name="dp_48">128.1333dp</dimen>
-	<dimen name="dp_49">130.8028dp</dimen>
-	<dimen name="dp_50">133.4722dp</dimen>
-	<dimen name="dp_51">136.1417dp</dimen>
-	<dimen name="dp_52">138.8111dp</dimen>
-	<dimen name="dp_53">141.4806dp</dimen>
-	<dimen name="dp_54">144.1500dp</dimen>
-	<dimen name="dp_55">146.8194dp</dimen>
-	<dimen name="dp_56">149.4889dp</dimen>
-	<dimen name="dp_57">152.1583dp</dimen>
-	<dimen name="dp_58">154.8278dp</dimen>
-	<dimen name="dp_59">157.4972dp</dimen>
-	<dimen name="dp_60">160.1667dp</dimen>
-	<dimen name="dp_61">162.8361dp</dimen>
-	<dimen name="dp_62">165.5056dp</dimen>
-	<dimen name="dp_63">168.1750dp</dimen>
-	<dimen name="dp_64">170.8444dp</dimen>
-	<dimen name="dp_65">173.5139dp</dimen>
-	<dimen name="dp_66">176.1833dp</dimen>
-	<dimen name="dp_67">178.8528dp</dimen>
-	<dimen name="dp_68">181.5222dp</dimen>
-	<dimen name="dp_69">184.1917dp</dimen>
-	<dimen name="dp_70">186.8611dp</dimen>
-	<dimen name="dp_71">189.5306dp</dimen>
-	<dimen name="dp_72">192.2000dp</dimen>
-	<dimen name="dp_73">194.8694dp</dimen>
-	<dimen name="dp_74">197.5389dp</dimen>
-	<dimen name="dp_75">200.2083dp</dimen>
-	<dimen name="dp_76">202.8778dp</dimen>
-	<dimen name="dp_77">205.5472dp</dimen>
-	<dimen name="dp_78">208.2167dp</dimen>
-	<dimen name="dp_79">210.8861dp</dimen>
-	<dimen name="dp_80">213.5556dp</dimen>
-	<dimen name="dp_81">216.2250dp</dimen>
-	<dimen name="dp_82">218.8944dp</dimen>
-	<dimen name="dp_83">221.5639dp</dimen>
-	<dimen name="dp_84">224.2333dp</dimen>
-	<dimen name="dp_85">226.9028dp</dimen>
-	<dimen name="dp_86">229.5722dp</dimen>
-	<dimen name="dp_87">232.2417dp</dimen>
-	<dimen name="dp_88">234.9111dp</dimen>
-	<dimen name="dp_89">237.5806dp</dimen>
-	<dimen name="dp_90">240.2500dp</dimen>
-	<dimen name="dp_91">242.9194dp</dimen>
-	<dimen name="dp_92">245.5889dp</dimen>
-	<dimen name="dp_93">248.2583dp</dimen>
-	<dimen name="dp_94">250.9278dp</dimen>
-	<dimen name="dp_95">253.5972dp</dimen>
-	<dimen name="dp_96">256.2667dp</dimen>
-	<dimen name="dp_97">258.9361dp</dimen>
-	<dimen name="dp_98">261.6056dp</dimen>
-	<dimen name="dp_99">264.2750dp</dimen>
-	<dimen name="dp_100">266.9444dp</dimen>
-	<dimen name="dp_101">269.6139dp</dimen>
-	<dimen name="dp_102">272.2833dp</dimen>
-	<dimen name="dp_103">274.9528dp</dimen>
-	<dimen name="dp_104">277.6222dp</dimen>
-	<dimen name="dp_105">280.2917dp</dimen>
-	<dimen name="dp_106">282.9611dp</dimen>
-	<dimen name="dp_107">285.6306dp</dimen>
-	<dimen name="dp_108">288.3000dp</dimen>
-	<dimen name="dp_109">290.9694dp</dimen>
-	<dimen name="dp_110">293.6389dp</dimen>
-	<dimen name="dp_111">296.3083dp</dimen>
-	<dimen name="dp_112">298.9778dp</dimen>
-	<dimen name="dp_113">301.6472dp</dimen>
-	<dimen name="dp_114">304.3167dp</dimen>
-	<dimen name="dp_115">306.9861dp</dimen>
-	<dimen name="dp_116">309.6556dp</dimen>
-	<dimen name="dp_117">312.3250dp</dimen>
-	<dimen name="dp_118">314.9944dp</dimen>
-	<dimen name="dp_119">317.6639dp</dimen>
-	<dimen name="dp_120">320.3333dp</dimen>
-	<dimen name="dp_121">323.0028dp</dimen>
-	<dimen name="dp_122">325.6722dp</dimen>
-	<dimen name="dp_123">328.3417dp</dimen>
-	<dimen name="dp_124">331.0111dp</dimen>
-	<dimen name="dp_125">333.6806dp</dimen>
-	<dimen name="dp_126">336.3500dp</dimen>
-	<dimen name="dp_127">339.0194dp</dimen>
-	<dimen name="dp_128">341.6889dp</dimen>
-	<dimen name="dp_129">344.3583dp</dimen>
-	<dimen name="dp_130">347.0278dp</dimen>
-	<dimen name="dp_131">349.6972dp</dimen>
-	<dimen name="dp_132">352.3667dp</dimen>
-	<dimen name="dp_133">355.0361dp</dimen>
-	<dimen name="dp_134">357.7056dp</dimen>
-	<dimen name="dp_135">360.3750dp</dimen>
-	<dimen name="dp_136">363.0444dp</dimen>
-	<dimen name="dp_137">365.7139dp</dimen>
-	<dimen name="dp_138">368.3833dp</dimen>
-	<dimen name="dp_139">371.0528dp</dimen>
-	<dimen name="dp_140">373.7222dp</dimen>
-	<dimen name="dp_141">376.3917dp</dimen>
-	<dimen name="dp_142">379.0611dp</dimen>
-	<dimen name="dp_143">381.7306dp</dimen>
-	<dimen name="dp_144">384.4000dp</dimen>
-	<dimen name="dp_145">387.0694dp</dimen>
-	<dimen name="dp_146">389.7389dp</dimen>
-	<dimen name="dp_147">392.4083dp</dimen>
-	<dimen name="dp_148">395.0778dp</dimen>
-	<dimen name="dp_149">397.7472dp</dimen>
-	<dimen name="dp_150">400.4167dp</dimen>
-	<dimen name="dp_151">403.0861dp</dimen>
-	<dimen name="dp_152">405.7556dp</dimen>
-	<dimen name="dp_153">408.4250dp</dimen>
-	<dimen name="dp_154">411.0944dp</dimen>
-	<dimen name="dp_155">413.7639dp</dimen>
-	<dimen name="dp_156">416.4333dp</dimen>
-	<dimen name="dp_157">419.1028dp</dimen>
-	<dimen name="dp_158">421.7722dp</dimen>
-	<dimen name="dp_159">424.4417dp</dimen>
-	<dimen name="dp_160">427.1111dp</dimen>
-	<dimen name="dp_161">429.7806dp</dimen>
-	<dimen name="dp_162">432.4500dp</dimen>
-	<dimen name="dp_163">435.1194dp</dimen>
-	<dimen name="dp_164">437.7889dp</dimen>
-	<dimen name="dp_165">440.4583dp</dimen>
-	<dimen name="dp_166">443.1278dp</dimen>
-	<dimen name="dp_167">445.7972dp</dimen>
-	<dimen name="dp_168">448.4667dp</dimen>
-	<dimen name="dp_169">451.1361dp</dimen>
-	<dimen name="dp_170">453.8056dp</dimen>
-	<dimen name="dp_171">456.4750dp</dimen>
-	<dimen name="dp_172">459.1444dp</dimen>
-	<dimen name="dp_173">461.8139dp</dimen>
-	<dimen name="dp_174">464.4833dp</dimen>
-	<dimen name="dp_175">467.1528dp</dimen>
-	<dimen name="dp_176">469.8222dp</dimen>
-	<dimen name="dp_177">472.4917dp</dimen>
-	<dimen name="dp_178">475.1611dp</dimen>
-	<dimen name="dp_179">477.8306dp</dimen>
-	<dimen name="dp_180">480.5000dp</dimen>
-	<dimen name="dp_181">483.1694dp</dimen>
-	<dimen name="dp_182">485.8389dp</dimen>
-	<dimen name="dp_183">488.5083dp</dimen>
-	<dimen name="dp_184">491.1778dp</dimen>
-	<dimen name="dp_185">493.8472dp</dimen>
-	<dimen name="dp_186">496.5167dp</dimen>
-	<dimen name="dp_187">499.1861dp</dimen>
-	<dimen name="dp_188">501.8556dp</dimen>
-	<dimen name="dp_189">504.5250dp</dimen>
-	<dimen name="dp_190">507.1944dp</dimen>
-	<dimen name="dp_191">509.8639dp</dimen>
-	<dimen name="dp_192">512.5333dp</dimen>
-	<dimen name="dp_193">515.2028dp</dimen>
-	<dimen name="dp_194">517.8722dp</dimen>
-	<dimen name="dp_195">520.5417dp</dimen>
-	<dimen name="dp_196">523.2111dp</dimen>
-	<dimen name="dp_197">525.8806dp</dimen>
-	<dimen name="dp_198">528.5500dp</dimen>
-	<dimen name="dp_199">531.2194dp</dimen>
-	<dimen name="dp_200">533.8889dp</dimen>
-	<dimen name="dp_201">536.5583dp</dimen>
-	<dimen name="dp_202">539.2278dp</dimen>
-	<dimen name="dp_203">541.8972dp</dimen>
-	<dimen name="dp_204">544.5667dp</dimen>
-	<dimen name="dp_205">547.2361dp</dimen>
-	<dimen name="dp_206">549.9056dp</dimen>
-	<dimen name="dp_207">552.5750dp</dimen>
-	<dimen name="dp_208">555.2444dp</dimen>
-	<dimen name="dp_209">557.9139dp</dimen>
-	<dimen name="dp_210">560.5833dp</dimen>
-	<dimen name="dp_211">563.2528dp</dimen>
-	<dimen name="dp_212">565.9222dp</dimen>
-	<dimen name="dp_213">568.5917dp</dimen>
-	<dimen name="dp_214">571.2611dp</dimen>
-	<dimen name="dp_215">573.9306dp</dimen>
-	<dimen name="dp_216">576.6000dp</dimen>
-	<dimen name="dp_217">579.2694dp</dimen>
-	<dimen name="dp_218">581.9389dp</dimen>
-	<dimen name="dp_219">584.6083dp</dimen>
-	<dimen name="dp_220">587.2778dp</dimen>
-	<dimen name="dp_221">589.9472dp</dimen>
-	<dimen name="dp_222">592.6167dp</dimen>
-	<dimen name="dp_223">595.2861dp</dimen>
-	<dimen name="dp_224">597.9556dp</dimen>
-	<dimen name="dp_225">600.6250dp</dimen>
-	<dimen name="dp_226">603.2944dp</dimen>
-	<dimen name="dp_227">605.9639dp</dimen>
-	<dimen name="dp_228">608.6333dp</dimen>
-	<dimen name="dp_229">611.3028dp</dimen>
-	<dimen name="dp_230">613.9722dp</dimen>
-	<dimen name="dp_231">616.6417dp</dimen>
-	<dimen name="dp_232">619.3111dp</dimen>
-	<dimen name="dp_233">621.9806dp</dimen>
-	<dimen name="dp_234">624.6500dp</dimen>
-	<dimen name="dp_235">627.3194dp</dimen>
-	<dimen name="dp_236">629.9889dp</dimen>
-	<dimen name="dp_237">632.6583dp</dimen>
-	<dimen name="dp_238">635.3278dp</dimen>
-	<dimen name="dp_239">637.9972dp</dimen>
-	<dimen name="dp_240">640.6667dp</dimen>
-	<dimen name="dp_241">643.3361dp</dimen>
-	<dimen name="dp_242">646.0056dp</dimen>
-	<dimen name="dp_243">648.6750dp</dimen>
-	<dimen name="dp_244">651.3444dp</dimen>
-	<dimen name="dp_245">654.0139dp</dimen>
-	<dimen name="dp_246">656.6833dp</dimen>
-	<dimen name="dp_247">659.3528dp</dimen>
-	<dimen name="dp_248">662.0222dp</dimen>
-	<dimen name="dp_249">664.6917dp</dimen>
-	<dimen name="dp_250">667.3611dp</dimen>
-	<dimen name="dp_251">670.0306dp</dimen>
-	<dimen name="dp_252">672.7000dp</dimen>
-	<dimen name="dp_253">675.3694dp</dimen>
-	<dimen name="dp_254">678.0389dp</dimen>
-	<dimen name="dp_255">680.7083dp</dimen>
-	<dimen name="dp_256">683.3778dp</dimen>
-	<dimen name="dp_257">686.0472dp</dimen>
-	<dimen name="dp_258">688.7167dp</dimen>
-	<dimen name="dp_259">691.3861dp</dimen>
-	<dimen name="dp_260">694.0556dp</dimen>
-	<dimen name="dp_261">696.7250dp</dimen>
-	<dimen name="dp_262">699.3944dp</dimen>
-	<dimen name="dp_263">702.0639dp</dimen>
-	<dimen name="dp_264">704.7333dp</dimen>
-	<dimen name="dp_265">707.4028dp</dimen>
-	<dimen name="dp_266">710.0722dp</dimen>
-	<dimen name="dp_267">712.7417dp</dimen>
-	<dimen name="dp_268">715.4111dp</dimen>
-	<dimen name="dp_269">718.0806dp</dimen>
-	<dimen name="dp_270">720.7500dp</dimen>
-	<dimen name="dp_271">723.4194dp</dimen>
-	<dimen name="dp_272">726.0889dp</dimen>
-	<dimen name="dp_273">728.7583dp</dimen>
-	<dimen name="dp_274">731.4278dp</dimen>
-	<dimen name="dp_275">734.0972dp</dimen>
-	<dimen name="dp_276">736.7667dp</dimen>
-	<dimen name="dp_277">739.4361dp</dimen>
-	<dimen name="dp_278">742.1056dp</dimen>
-	<dimen name="dp_279">744.7750dp</dimen>
-	<dimen name="dp_280">747.4444dp</dimen>
-	<dimen name="dp_281">750.1139dp</dimen>
-	<dimen name="dp_282">752.7833dp</dimen>
-	<dimen name="dp_283">755.4528dp</dimen>
-	<dimen name="dp_284">758.1222dp</dimen>
-	<dimen name="dp_285">760.7917dp</dimen>
-	<dimen name="dp_286">763.4611dp</dimen>
-	<dimen name="dp_287">766.1306dp</dimen>
-	<dimen name="dp_288">768.8000dp</dimen>
-	<dimen name="dp_289">771.4694dp</dimen>
-	<dimen name="dp_290">774.1389dp</dimen>
-	<dimen name="dp_291">776.8083dp</dimen>
-	<dimen name="dp_292">779.4778dp</dimen>
-	<dimen name="dp_293">782.1472dp</dimen>
-	<dimen name="dp_294">784.8167dp</dimen>
-	<dimen name="dp_295">787.4861dp</dimen>
-	<dimen name="dp_296">790.1556dp</dimen>
-	<dimen name="dp_297">792.8250dp</dimen>
-	<dimen name="dp_298">795.4944dp</dimen>
-	<dimen name="dp_299">798.1639dp</dimen>
-	<dimen name="dp_300">800.8333dp</dimen>
-	<dimen name="dp_301">803.5028dp</dimen>
-	<dimen name="dp_302">806.1722dp</dimen>
-	<dimen name="dp_303">808.8417dp</dimen>
-	<dimen name="dp_304">811.5111dp</dimen>
-	<dimen name="dp_305">814.1806dp</dimen>
-	<dimen name="dp_306">816.8500dp</dimen>
-	<dimen name="dp_307">819.5194dp</dimen>
-	<dimen name="dp_308">822.1889dp</dimen>
-	<dimen name="dp_309">824.8583dp</dimen>
-	<dimen name="dp_310">827.5278dp</dimen>
-	<dimen name="dp_311">830.1972dp</dimen>
-	<dimen name="dp_312">832.8667dp</dimen>
-	<dimen name="dp_313">835.5361dp</dimen>
-	<dimen name="dp_314">838.2056dp</dimen>
-	<dimen name="dp_315">840.8750dp</dimen>
-	<dimen name="dp_316">843.5444dp</dimen>
-	<dimen name="dp_317">846.2139dp</dimen>
-	<dimen name="dp_318">848.8833dp</dimen>
-	<dimen name="dp_319">851.5528dp</dimen>
-	<dimen name="dp_320">854.2222dp</dimen>
-	<dimen name="dp_321">856.8917dp</dimen>
-	<dimen name="dp_322">859.5611dp</dimen>
-	<dimen name="dp_323">862.2306dp</dimen>
-	<dimen name="dp_324">864.9000dp</dimen>
-	<dimen name="dp_325">867.5694dp</dimen>
-	<dimen name="dp_326">870.2389dp</dimen>
-	<dimen name="dp_327">872.9083dp</dimen>
-	<dimen name="dp_328">875.5778dp</dimen>
-	<dimen name="dp_329">878.2472dp</dimen>
-	<dimen name="dp_330">880.9167dp</dimen>
-	<dimen name="dp_331">883.5861dp</dimen>
-	<dimen name="dp_332">886.2556dp</dimen>
-	<dimen name="dp_333">888.9250dp</dimen>
-	<dimen name="dp_334">891.5944dp</dimen>
-	<dimen name="dp_335">894.2639dp</dimen>
-	<dimen name="dp_336">896.9333dp</dimen>
-	<dimen name="dp_337">899.6028dp</dimen>
-	<dimen name="dp_338">902.2722dp</dimen>
-	<dimen name="dp_339">904.9417dp</dimen>
-	<dimen name="dp_340">907.6111dp</dimen>
-	<dimen name="dp_341">910.2806dp</dimen>
-	<dimen name="dp_342">912.9500dp</dimen>
-	<dimen name="dp_343">915.6194dp</dimen>
-	<dimen name="dp_344">918.2889dp</dimen>
-	<dimen name="dp_345">920.9583dp</dimen>
-	<dimen name="dp_346">923.6278dp</dimen>
-	<dimen name="dp_347">926.2972dp</dimen>
-	<dimen name="dp_348">928.9667dp</dimen>
-	<dimen name="dp_349">931.6361dp</dimen>
-	<dimen name="dp_350">934.3056dp</dimen>
-	<dimen name="dp_351">936.9750dp</dimen>
-	<dimen name="dp_352">939.6444dp</dimen>
-	<dimen name="dp_353">942.3139dp</dimen>
-	<dimen name="dp_354">944.9833dp</dimen>
-	<dimen name="dp_355">947.6528dp</dimen>
-	<dimen name="dp_356">950.3222dp</dimen>
-	<dimen name="dp_357">952.9917dp</dimen>
-	<dimen name="dp_358">955.6611dp</dimen>
-	<dimen name="dp_359">958.3306dp</dimen>
-	<dimen name="dp_360">961.0000dp</dimen>
-	<dimen name="dp_365">974.3472dp</dimen>
-	<dimen name="dp_370">987.6944dp</dimen>
-	<dimen name="dp_400">1067.7778dp</dimen>
-	<dimen name="dp_410">1094.4722dp</dimen>
-	<dimen name="dp_422">1126.5056dp</dimen>
-	<dimen name="dp_472">1259.9778dp</dimen>
-	<dimen name="dp_500">1334.7222dp</dimen>
-	<dimen name="dp_600">1601.6667dp</dimen>
-	<dimen name="dp_640">1708.4444dp</dimen>
-	<dimen name="dp_720">1922.0000dp</dimen>
-	<dimen name="sp_6">16.0167sp</dimen>
-	<dimen name="sp_7">18.6861sp</dimen>
-	<dimen name="sp_8">21.3556sp</dimen>
-	<dimen name="sp_9">24.0250sp</dimen>
-	<dimen name="sp_10">26.6944sp</dimen>
-	<dimen name="sp_11">29.3639sp</dimen>
-	<dimen name="sp_12">32.0333sp</dimen>
-	<dimen name="sp_13">34.7028sp</dimen>
-	<dimen name="sp_14">37.3722sp</dimen>
-	<dimen name="sp_15">40.0417sp</dimen>
-	<dimen name="sp_16">42.7111sp</dimen>
-	<dimen name="sp_17">45.3806sp</dimen>
-	<dimen name="sp_18">48.0500sp</dimen>
-	<dimen name="sp_19">50.7194sp</dimen>
-	<dimen name="sp_20">53.3889sp</dimen>
-	<dimen name="sp_21">56.0583sp</dimen>
-	<dimen name="sp_22">58.7278sp</dimen>
-	<dimen name="sp_23">61.3972sp</dimen>
-	<dimen name="sp_24">64.0667sp</dimen>
-	<dimen name="sp_25">66.7361sp</dimen>
-	<dimen name="sp_28">74.7444sp</dimen>
-	<dimen name="sp_30">80.0833sp</dimen>
-	<dimen name="sp_32">85.4222sp</dimen>
-	<dimen name="sp_34">90.7611sp</dimen>
-	<dimen name="sp_36">96.1000sp</dimen>
-	<dimen name="sp_38">101.4389sp</dimen>
-	<dimen name="sp_40">106.7778sp</dimen>
-	<dimen name="sp_42">112.1167sp</dimen>
-	<dimen name="sp_48">128.1333sp</dimen>
-</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f1d92ea..805fe8d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,7 +9,7 @@
     <color name="gray">#f5f4f4</color>
     <color name="install">#959393</color>
 
-    <color name="download">#d9d9d9</color>
-    <color name="backgroundcolor">#e5e2e2</color>
-    <color name="green">#55b68a</color>
+    <color name="download">#ffffff</color>
+    <color name="backgroundcolor">#ffffff</color>
+    <color name="red">#d64743</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f026464..7abeb1a 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -424,4 +424,8 @@
     <dimen name="sp_42">42sp</dimen>
     <dimen name="sp_48">48sp</dimen>
 
+<!--activity-->
+    <dimen name="activity_title_height">50dp</dimen>
+    <dimen name="activity_font_size">16sp</dimen>
+
 </resources>