diff --git a/.gradle/4.6/fileHashes/fileHashes.bin b/.gradle/4.6/fileHashes/fileHashes.bin
index 8220acc..66773a9 100644
Binary files a/.gradle/4.6/fileHashes/fileHashes.bin and b/.gradle/4.6/fileHashes/fileHashes.bin differ
diff --git a/.gradle/4.6/fileHashes/fileHashes.lock b/.gradle/4.6/fileHashes/fileHashes.lock
index df497f6..d35f44b 100644
Binary files a/.gradle/4.6/fileHashes/fileHashes.lock and b/.gradle/4.6/fileHashes/fileHashes.lock differ
diff --git a/.gradle/4.6/javaCompile/classAnalysis.bin b/.gradle/4.6/javaCompile/classAnalysis.bin
index bb53af3..b9f2158 100644
Binary files a/.gradle/4.6/javaCompile/classAnalysis.bin and b/.gradle/4.6/javaCompile/classAnalysis.bin differ
diff --git a/.gradle/4.6/javaCompile/javaCompile.lock b/.gradle/4.6/javaCompile/javaCompile.lock
index 4874503..a722ba2 100644
Binary files a/.gradle/4.6/javaCompile/javaCompile.lock and b/.gradle/4.6/javaCompile/javaCompile.lock differ
diff --git a/.gradle/4.6/javaCompile/taskHistory.bin b/.gradle/4.6/javaCompile/taskHistory.bin
index 908d689..383e3f1 100644
Binary files a/.gradle/4.6/javaCompile/taskHistory.bin and b/.gradle/4.6/javaCompile/taskHistory.bin differ
diff --git a/.gradle/4.6/taskHistory/taskHistory.bin b/.gradle/4.6/taskHistory/taskHistory.bin
index de7160e..d016de8 100644
Binary files a/.gradle/4.6/taskHistory/taskHistory.bin and b/.gradle/4.6/taskHistory/taskHistory.bin differ
diff --git a/.gradle/4.6/taskHistory/taskHistory.lock b/.gradle/4.6/taskHistory/taskHistory.lock
index cb0b34d..ca60d0a 100644
Binary files a/.gradle/4.6/taskHistory/taskHistory.lock and b/.gradle/4.6/taskHistory/taskHistory.lock differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 97748fe..ae3926b 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index c50a145..186eee8 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8361777..ddf16b8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,10 +3,10 @@
+
-
@@ -28,7 +28,6 @@
-
@@ -50,157 +49,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -227,21 +94,11 @@
+
-
-
-
-
-
-
-
-
-
-
-
@@ -254,114 +111,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -388,928 +143,15 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
@@ -1319,9 +161,7 @@
-
-
@@ -1337,19 +177,13 @@
+
+
+
-
-
-
-
-
-
-
-
-
@@ -1361,454 +195,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1817,11 +204,6 @@
-
-
-
-
-
@@ -1846,43 +228,20 @@
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
@@ -1907,54 +266,55 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
@@ -1962,36 +322,32 @@
-
-
+
+
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
@@ -1999,11 +355,11 @@
-
-
+
+
-
-
+
+
@@ -2011,11 +367,11 @@
-
-
+
+
-
-
+
+
@@ -2032,8 +388,6 @@
- start
- picpicaYou hafter
@@ -2062,6 +416,8 @@
statesshowge
+ fini
+ sho
@@ -4334,7 +2690,6 @@
-
@@ -4363,10 +2718,11 @@
-
+
+
@@ -4437,13 +2793,13 @@
-
+
-
+
@@ -4458,7 +2814,7 @@
-
+
@@ -4669,7 +3025,14 @@
1540681935384
-
+
+ 1540697789028
+
+
+
+ 1540697789028
+
+
@@ -4692,7 +3055,7 @@
-
+
@@ -4753,7 +3116,8 @@
-
+
+
@@ -4761,13 +3125,6 @@
-
-
-
-
-
-
-
@@ -4805,13 +3162,6 @@
-
-
-
-
-
-
-
@@ -4974,16 +3324,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -4994,16 +3334,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -5038,16 +3368,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -5109,27 +3429,55 @@
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
@@ -5139,27 +3487,44 @@
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/app/app.iml b/app/app.iml
index 5794952..1134013 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -99,6 +99,7 @@
+
diff --git a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/asynclayoutinflater/R.java b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/asynclayoutinflater/R.java
index 695a526..79c8155 100644
--- a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/asynclayoutinflater/R.java
+++ b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/asynclayoutinflater/R.java
@@ -85,20 +85,20 @@ private id() {}
public static final int actions = 0x7f08001d;
public static final int async = 0x7f080026;
public static final int blocking = 0x7f08002a;
- public static final int chronometer = 0x7f080035;
- public static final int forever = 0x7f080063;
- public static final int icon = 0x7f08006a;
- public static final int icon_group = 0x7f08006b;
- public static final int info = 0x7f080071;
- public static final int italic = 0x7f080075;
- public static final int line1 = 0x7f08007a;
- public static final int line3 = 0x7f08007b;
- public static final int normal = 0x7f080090;
- public static final int notification_background = 0x7f080091;
- public static final int notification_main_column = 0x7f080092;
- public static final int notification_main_column_container = 0x7f080093;
- public static final int right_icon = 0x7f0800a3;
- public static final int right_side = 0x7f0800a4;
+ public static final int chronometer = 0x7f080034;
+ public static final int forever = 0x7f080062;
+ public static final int icon = 0x7f080069;
+ public static final int icon_group = 0x7f08006a;
+ public static final int info = 0x7f080070;
+ public static final int italic = 0x7f080074;
+ public static final int line1 = 0x7f080079;
+ public static final int line3 = 0x7f08007a;
+ public static final int normal = 0x7f08008f;
+ public static final int notification_background = 0x7f080090;
+ public static final int notification_main_column = 0x7f080091;
+ public static final int notification_main_column_container = 0x7f080092;
+ public static final int right_icon = 0x7f0800a2;
+ public static final int right_side = 0x7f0800a3;
public static final int tag_transition_group = 0x7f0800d2;
public static final int tag_unhandled_key_event_manager = 0x7f0800d3;
public static final int tag_unhandled_key_listeners = 0x7f0800d4;
diff --git a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/compat/R.java b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/compat/R.java
index 671bc32..f2a4531 100644
--- a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/compat/R.java
+++ b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/compat/R.java
@@ -85,20 +85,20 @@ private id() {}
public static final int actions = 0x7f08001d;
public static final int async = 0x7f080026;
public static final int blocking = 0x7f08002a;
- public static final int chronometer = 0x7f080035;
- public static final int forever = 0x7f080063;
- public static final int icon = 0x7f08006a;
- public static final int icon_group = 0x7f08006b;
- public static final int info = 0x7f080071;
- public static final int italic = 0x7f080075;
- public static final int line1 = 0x7f08007a;
- public static final int line3 = 0x7f08007b;
- public static final int normal = 0x7f080090;
- public static final int notification_background = 0x7f080091;
- public static final int notification_main_column = 0x7f080092;
- public static final int notification_main_column_container = 0x7f080093;
- public static final int right_icon = 0x7f0800a3;
- public static final int right_side = 0x7f0800a4;
+ public static final int chronometer = 0x7f080034;
+ public static final int forever = 0x7f080062;
+ public static final int icon = 0x7f080069;
+ public static final int icon_group = 0x7f08006a;
+ public static final int info = 0x7f080070;
+ public static final int italic = 0x7f080074;
+ public static final int line1 = 0x7f080079;
+ public static final int line3 = 0x7f08007a;
+ public static final int normal = 0x7f08008f;
+ public static final int notification_background = 0x7f080090;
+ public static final int notification_main_column = 0x7f080091;
+ public static final int notification_main_column_container = 0x7f080092;
+ public static final int right_icon = 0x7f0800a2;
+ public static final int right_side = 0x7f0800a3;
public static final int tag_transition_group = 0x7f0800d2;
public static final int tag_unhandled_key_event_manager = 0x7f0800d3;
public static final int tag_unhandled_key_listeners = 0x7f0800d4;
diff --git a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/constraint/R.java b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/constraint/R.java
index d12f106..da2848a 100644
--- a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/constraint/R.java
+++ b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/constraint/R.java
@@ -74,17 +74,17 @@ public static final class id {
private id() {}
public static final int bottom = 0x7f08002b;
- public static final int end = 0x7f080055;
- public static final int gone = 0x7f080065;
- public static final int invisible = 0x7f080074;
- public static final int left = 0x7f080079;
- public static final int packed = 0x7f080095;
- public static final int parent = 0x7f080097;
- public static final int percent = 0x7f08009b;
- public static final int right = 0x7f0800a2;
- public static final int spread = 0x7f0800c6;
- public static final int spread_inside = 0x7f0800c7;
- public static final int start = 0x7f0800cc;
+ public static final int end = 0x7f080054;
+ public static final int gone = 0x7f080064;
+ public static final int invisible = 0x7f080073;
+ public static final int left = 0x7f080078;
+ public static final int packed = 0x7f080094;
+ public static final int parent = 0x7f080096;
+ public static final int percent = 0x7f08009a;
+ public static final int right = 0x7f0800a1;
+ public static final int spread = 0x7f0800c5;
+ public static final int spread_inside = 0x7f0800c6;
+ public static final int start = 0x7f0800cb;
public static final int top = 0x7f0800e6;
public static final int wrap = 0x7f0800f8;
}
diff --git a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/coordinatorlayout/R.java b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/coordinatorlayout/R.java
index 20b5942..d2f4bc8 100644
--- a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/coordinatorlayout/R.java
+++ b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/coordinatorlayout/R.java
@@ -95,25 +95,25 @@ private id() {}
public static final int async = 0x7f080026;
public static final int blocking = 0x7f08002a;
public static final int bottom = 0x7f08002b;
- public static final int chronometer = 0x7f080035;
- public static final int end = 0x7f080055;
- public static final int forever = 0x7f080063;
- public static final int icon = 0x7f08006a;
- public static final int icon_group = 0x7f08006b;
- public static final int info = 0x7f080071;
- public static final int italic = 0x7f080075;
- public static final int left = 0x7f080079;
- public static final int line1 = 0x7f08007a;
- public static final int line3 = 0x7f08007b;
- public static final int none = 0x7f08008f;
- public static final int normal = 0x7f080090;
- public static final int notification_background = 0x7f080091;
- public static final int notification_main_column = 0x7f080092;
- public static final int notification_main_column_container = 0x7f080093;
- public static final int right = 0x7f0800a2;
- public static final int right_icon = 0x7f0800a3;
- public static final int right_side = 0x7f0800a4;
- public static final int start = 0x7f0800cc;
+ public static final int chronometer = 0x7f080034;
+ public static final int end = 0x7f080054;
+ public static final int forever = 0x7f080062;
+ public static final int icon = 0x7f080069;
+ public static final int icon_group = 0x7f08006a;
+ public static final int info = 0x7f080070;
+ public static final int italic = 0x7f080074;
+ public static final int left = 0x7f080078;
+ public static final int line1 = 0x7f080079;
+ public static final int line3 = 0x7f08007a;
+ public static final int none = 0x7f08008e;
+ public static final int normal = 0x7f08008f;
+ public static final int notification_background = 0x7f080090;
+ public static final int notification_main_column = 0x7f080091;
+ public static final int notification_main_column_container = 0x7f080092;
+ public static final int right = 0x7f0800a1;
+ public static final int right_icon = 0x7f0800a2;
+ public static final int right_side = 0x7f0800a3;
+ public static final int start = 0x7f0800cb;
public static final int tag_transition_group = 0x7f0800d2;
public static final int tag_unhandled_key_event_manager = 0x7f0800d3;
public static final int tag_unhandled_key_listeners = 0x7f0800d4;
diff --git a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/coreui/R.java b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/coreui/R.java
index 8a4ece8..b7c672b 100644
--- a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/coreui/R.java
+++ b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/coreui/R.java
@@ -95,25 +95,25 @@ private id() {}
public static final int async = 0x7f080026;
public static final int blocking = 0x7f08002a;
public static final int bottom = 0x7f08002b;
- public static final int chronometer = 0x7f080035;
- public static final int end = 0x7f080055;
- public static final int forever = 0x7f080063;
- public static final int icon = 0x7f08006a;
- public static final int icon_group = 0x7f08006b;
- public static final int info = 0x7f080071;
- public static final int italic = 0x7f080075;
- public static final int left = 0x7f080079;
- public static final int line1 = 0x7f08007a;
- public static final int line3 = 0x7f08007b;
- public static final int none = 0x7f08008f;
- public static final int normal = 0x7f080090;
- public static final int notification_background = 0x7f080091;
- public static final int notification_main_column = 0x7f080092;
- public static final int notification_main_column_container = 0x7f080093;
- public static final int right = 0x7f0800a2;
- public static final int right_icon = 0x7f0800a3;
- public static final int right_side = 0x7f0800a4;
- public static final int start = 0x7f0800cc;
+ public static final int chronometer = 0x7f080034;
+ public static final int end = 0x7f080054;
+ public static final int forever = 0x7f080062;
+ public static final int icon = 0x7f080069;
+ public static final int icon_group = 0x7f08006a;
+ public static final int info = 0x7f080070;
+ public static final int italic = 0x7f080074;
+ public static final int left = 0x7f080078;
+ public static final int line1 = 0x7f080079;
+ public static final int line3 = 0x7f08007a;
+ public static final int none = 0x7f08008e;
+ public static final int normal = 0x7f08008f;
+ public static final int notification_background = 0x7f080090;
+ public static final int notification_main_column = 0x7f080091;
+ public static final int notification_main_column_container = 0x7f080092;
+ public static final int right = 0x7f0800a1;
+ public static final int right_icon = 0x7f0800a2;
+ public static final int right_side = 0x7f0800a3;
+ public static final int start = 0x7f0800cb;
public static final int tag_transition_group = 0x7f0800d2;
public static final int tag_unhandled_key_event_manager = 0x7f0800d3;
public static final int tag_unhandled_key_listeners = 0x7f0800d4;
diff --git a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/coreutils/R.java b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/coreutils/R.java
index 43cbdd1..5ba2cc1 100644
--- a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/coreutils/R.java
+++ b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/coreutils/R.java
@@ -85,20 +85,20 @@ private id() {}
public static final int actions = 0x7f08001d;
public static final int async = 0x7f080026;
public static final int blocking = 0x7f08002a;
- public static final int chronometer = 0x7f080035;
- public static final int forever = 0x7f080063;
- public static final int icon = 0x7f08006a;
- public static final int icon_group = 0x7f08006b;
- public static final int info = 0x7f080071;
- public static final int italic = 0x7f080075;
- public static final int line1 = 0x7f08007a;
- public static final int line3 = 0x7f08007b;
- public static final int normal = 0x7f080090;
- public static final int notification_background = 0x7f080091;
- public static final int notification_main_column = 0x7f080092;
- public static final int notification_main_column_container = 0x7f080093;
- public static final int right_icon = 0x7f0800a3;
- public static final int right_side = 0x7f0800a4;
+ public static final int chronometer = 0x7f080034;
+ public static final int forever = 0x7f080062;
+ public static final int icon = 0x7f080069;
+ public static final int icon_group = 0x7f08006a;
+ public static final int info = 0x7f080070;
+ public static final int italic = 0x7f080074;
+ public static final int line1 = 0x7f080079;
+ public static final int line3 = 0x7f08007a;
+ public static final int normal = 0x7f08008f;
+ public static final int notification_background = 0x7f080090;
+ public static final int notification_main_column = 0x7f080091;
+ public static final int notification_main_column_container = 0x7f080092;
+ public static final int right_icon = 0x7f0800a2;
+ public static final int right_side = 0x7f0800a3;
public static final int tag_transition_group = 0x7f0800d2;
public static final int tag_unhandled_key_event_manager = 0x7f0800d3;
public static final int tag_unhandled_key_listeners = 0x7f0800d4;
diff --git a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/customview/R.java b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/customview/R.java
index ab471cf..cbf9085 100644
--- a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/customview/R.java
+++ b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/customview/R.java
@@ -85,20 +85,20 @@ private id() {}
public static final int actions = 0x7f08001d;
public static final int async = 0x7f080026;
public static final int blocking = 0x7f08002a;
- public static final int chronometer = 0x7f080035;
- public static final int forever = 0x7f080063;
- public static final int icon = 0x7f08006a;
- public static final int icon_group = 0x7f08006b;
- public static final int info = 0x7f080071;
- public static final int italic = 0x7f080075;
- public static final int line1 = 0x7f08007a;
- public static final int line3 = 0x7f08007b;
- public static final int normal = 0x7f080090;
- public static final int notification_background = 0x7f080091;
- public static final int notification_main_column = 0x7f080092;
- public static final int notification_main_column_container = 0x7f080093;
- public static final int right_icon = 0x7f0800a3;
- public static final int right_side = 0x7f0800a4;
+ public static final int chronometer = 0x7f080034;
+ public static final int forever = 0x7f080062;
+ public static final int icon = 0x7f080069;
+ public static final int icon_group = 0x7f08006a;
+ public static final int info = 0x7f080070;
+ public static final int italic = 0x7f080074;
+ public static final int line1 = 0x7f080079;
+ public static final int line3 = 0x7f08007a;
+ public static final int normal = 0x7f08008f;
+ public static final int notification_background = 0x7f080090;
+ public static final int notification_main_column = 0x7f080091;
+ public static final int notification_main_column_container = 0x7f080092;
+ public static final int right_icon = 0x7f0800a2;
+ public static final int right_side = 0x7f0800a3;
public static final int tag_transition_group = 0x7f0800d2;
public static final int tag_unhandled_key_event_manager = 0x7f0800d3;
public static final int tag_unhandled_key_listeners = 0x7f0800d4;
diff --git a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/design/R.java b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/design/R.java
index 9221cf3..e0bf768 100644
--- a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/design/R.java
+++ b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/design/R.java
@@ -1026,101 +1026,101 @@ private id() {}
public static final int auto = 0x7f080027;
public static final int blocking = 0x7f08002a;
public static final int bottom = 0x7f08002b;
- public static final int buttonPanel = 0x7f08002d;
- public static final int center = 0x7f080030;
- public static final int checkbox = 0x7f080034;
- public static final int chronometer = 0x7f080035;
- public static final int container = 0x7f08003a;
- public static final int content = 0x7f08003b;
- public static final int contentPanel = 0x7f08003f;
- public static final int coordinator = 0x7f080040;
- public static final int custom = 0x7f080041;
- public static final int customPanel = 0x7f080042;
- public static final int decor_content_parent = 0x7f080043;
- public static final int default_activity_button = 0x7f080044;
- public static final int design_bottom_sheet = 0x7f080046;
- public static final int design_menu_item_action_area = 0x7f080047;
- public static final int design_menu_item_action_area_stub = 0x7f080048;
- public static final int design_menu_item_text = 0x7f080049;
- public static final int design_navigation_view = 0x7f08004a;
- public static final int edit_query = 0x7f080051;
- public static final int end = 0x7f080055;
- public static final int expand_activities_button = 0x7f08005a;
- public static final int expanded_menu = 0x7f08005b;
- public static final int fill = 0x7f08005d;
- public static final int filled = 0x7f080060;
- public static final int fixed = 0x7f080061;
- public static final int forever = 0x7f080063;
- public static final int ghost_view = 0x7f080064;
- public static final int group_divider = 0x7f080066;
- public static final int home = 0x7f080068;
- public static final int icon = 0x7f08006a;
- public static final int icon_group = 0x7f08006b;
- public static final int image = 0x7f08006d;
- public static final int info = 0x7f080071;
- public static final int italic = 0x7f080075;
- public static final int item_touch_helper_previous_elevation = 0x7f080076;
- public static final int labeled = 0x7f080077;
- public static final int largeLabel = 0x7f080078;
- public static final int left = 0x7f080079;
- public static final int line1 = 0x7f08007a;
- public static final int line3 = 0x7f08007b;
- public static final int listMode = 0x7f08007c;
- public static final int list_item = 0x7f08007d;
- public static final int masked = 0x7f080080;
- public static final int message = 0x7f080082;
- public static final int mini = 0x7f080084;
- public static final int mtrl_child_content_container = 0x7f080085;
- public static final int mtrl_internal_children_alpha_tag = 0x7f080086;
- public static final int multiply = 0x7f080087;
- public static final int navigation_header_container = 0x7f08008d;
- public static final int none = 0x7f08008f;
- public static final int normal = 0x7f080090;
- public static final int notification_background = 0x7f080091;
- public static final int notification_main_column = 0x7f080092;
- public static final int notification_main_column_container = 0x7f080093;
- public static final int outline = 0x7f080094;
- public static final int parallax = 0x7f080096;
- public static final int parentPanel = 0x7f080098;
- public static final int parent_matrix = 0x7f080099;
- public static final int pin = 0x7f08009c;
- public static final int progress_circular = 0x7f08009d;
- public static final int progress_horizontal = 0x7f08009e;
- public static final int radio = 0x7f0800a0;
- public static final int right = 0x7f0800a2;
- public static final int right_icon = 0x7f0800a3;
- public static final int right_side = 0x7f0800a4;
- public static final int save_image_matrix = 0x7f0800a5;
- public static final int save_non_transition_alpha = 0x7f0800a6;
- public static final int save_scale_type = 0x7f0800a7;
- public static final int screen = 0x7f0800a8;
- public static final int scrollIndicatorDown = 0x7f0800aa;
- public static final int scrollIndicatorUp = 0x7f0800ab;
- public static final int scrollView = 0x7f0800ac;
- public static final int scrollable = 0x7f0800ad;
- public static final int search_badge = 0x7f0800ae;
- public static final int search_bar = 0x7f0800af;
- public static final int search_button = 0x7f0800b0;
- public static final int search_close_btn = 0x7f0800b1;
- public static final int search_edit_frame = 0x7f0800b2;
- public static final int search_go_btn = 0x7f0800b3;
- public static final int search_mag_icon = 0x7f0800b4;
- public static final int search_plate = 0x7f0800b5;
- public static final int search_src_text = 0x7f0800b6;
- public static final int search_voice_btn = 0x7f0800b7;
- public static final int select_dialog_listview = 0x7f0800b9;
- public static final int selected = 0x7f0800ba;
- public static final int shortcut = 0x7f0800bb;
- public static final int smallLabel = 0x7f0800bf;
- public static final int snackbar_action = 0x7f0800c0;
- public static final int snackbar_text = 0x7f0800c1;
- public static final int spacer = 0x7f0800c4;
- public static final int split_action_bar = 0x7f0800c5;
- public static final int src_atop = 0x7f0800c8;
- public static final int src_in = 0x7f0800c9;
- public static final int src_over = 0x7f0800ca;
- public static final int start = 0x7f0800cc;
- public static final int stretch = 0x7f0800ce;
+ public static final int buttonPanel = 0x7f08002c;
+ public static final int center = 0x7f08002f;
+ public static final int checkbox = 0x7f080033;
+ public static final int chronometer = 0x7f080034;
+ public static final int container = 0x7f080039;
+ public static final int content = 0x7f08003a;
+ public static final int contentPanel = 0x7f08003e;
+ public static final int coordinator = 0x7f08003f;
+ public static final int custom = 0x7f080040;
+ public static final int customPanel = 0x7f080041;
+ public static final int decor_content_parent = 0x7f080042;
+ public static final int default_activity_button = 0x7f080043;
+ public static final int design_bottom_sheet = 0x7f080045;
+ public static final int design_menu_item_action_area = 0x7f080046;
+ public static final int design_menu_item_action_area_stub = 0x7f080047;
+ public static final int design_menu_item_text = 0x7f080048;
+ public static final int design_navigation_view = 0x7f080049;
+ public static final int edit_query = 0x7f080050;
+ public static final int end = 0x7f080054;
+ public static final int expand_activities_button = 0x7f080059;
+ public static final int expanded_menu = 0x7f08005a;
+ public static final int fill = 0x7f08005c;
+ public static final int filled = 0x7f08005f;
+ public static final int fixed = 0x7f080060;
+ public static final int forever = 0x7f080062;
+ public static final int ghost_view = 0x7f080063;
+ public static final int group_divider = 0x7f080065;
+ public static final int home = 0x7f080067;
+ public static final int icon = 0x7f080069;
+ public static final int icon_group = 0x7f08006a;
+ public static final int image = 0x7f08006c;
+ public static final int info = 0x7f080070;
+ public static final int italic = 0x7f080074;
+ public static final int item_touch_helper_previous_elevation = 0x7f080075;
+ public static final int labeled = 0x7f080076;
+ public static final int largeLabel = 0x7f080077;
+ public static final int left = 0x7f080078;
+ public static final int line1 = 0x7f080079;
+ public static final int line3 = 0x7f08007a;
+ public static final int listMode = 0x7f08007b;
+ public static final int list_item = 0x7f08007c;
+ public static final int masked = 0x7f08007f;
+ public static final int message = 0x7f080081;
+ public static final int mini = 0x7f080083;
+ public static final int mtrl_child_content_container = 0x7f080084;
+ public static final int mtrl_internal_children_alpha_tag = 0x7f080085;
+ public static final int multiply = 0x7f080086;
+ public static final int navigation_header_container = 0x7f08008c;
+ public static final int none = 0x7f08008e;
+ public static final int normal = 0x7f08008f;
+ public static final int notification_background = 0x7f080090;
+ public static final int notification_main_column = 0x7f080091;
+ public static final int notification_main_column_container = 0x7f080092;
+ public static final int outline = 0x7f080093;
+ public static final int parallax = 0x7f080095;
+ public static final int parentPanel = 0x7f080097;
+ public static final int parent_matrix = 0x7f080098;
+ public static final int pin = 0x7f08009b;
+ public static final int progress_circular = 0x7f08009c;
+ public static final int progress_horizontal = 0x7f08009d;
+ public static final int radio = 0x7f08009f;
+ public static final int right = 0x7f0800a1;
+ public static final int right_icon = 0x7f0800a2;
+ public static final int right_side = 0x7f0800a3;
+ public static final int save_image_matrix = 0x7f0800a4;
+ public static final int save_non_transition_alpha = 0x7f0800a5;
+ public static final int save_scale_type = 0x7f0800a6;
+ public static final int screen = 0x7f0800a7;
+ public static final int scrollIndicatorDown = 0x7f0800a9;
+ public static final int scrollIndicatorUp = 0x7f0800aa;
+ public static final int scrollView = 0x7f0800ab;
+ public static final int scrollable = 0x7f0800ac;
+ public static final int search_badge = 0x7f0800ad;
+ public static final int search_bar = 0x7f0800ae;
+ public static final int search_button = 0x7f0800af;
+ public static final int search_close_btn = 0x7f0800b0;
+ public static final int search_edit_frame = 0x7f0800b1;
+ public static final int search_go_btn = 0x7f0800b2;
+ public static final int search_mag_icon = 0x7f0800b3;
+ public static final int search_plate = 0x7f0800b4;
+ public static final int search_src_text = 0x7f0800b5;
+ public static final int search_voice_btn = 0x7f0800b6;
+ public static final int select_dialog_listview = 0x7f0800b8;
+ public static final int selected = 0x7f0800b9;
+ public static final int shortcut = 0x7f0800ba;
+ public static final int smallLabel = 0x7f0800be;
+ public static final int snackbar_action = 0x7f0800bf;
+ public static final int snackbar_text = 0x7f0800c0;
+ public static final int spacer = 0x7f0800c3;
+ public static final int split_action_bar = 0x7f0800c4;
+ public static final int src_atop = 0x7f0800c7;
+ public static final int src_in = 0x7f0800c8;
+ public static final int src_over = 0x7f0800c9;
+ public static final int start = 0x7f0800cb;
+ public static final int stretch = 0x7f0800cd;
public static final int submenuarrow = 0x7f0800cf;
public static final int submit_area = 0x7f0800d0;
public static final int tabMode = 0x7f0800d1;
diff --git a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/drawerlayout/R.java b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/drawerlayout/R.java
index d80ddbc..767f1de 100644
--- a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/drawerlayout/R.java
+++ b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/drawerlayout/R.java
@@ -85,20 +85,20 @@ private id() {}
public static final int actions = 0x7f08001d;
public static final int async = 0x7f080026;
public static final int blocking = 0x7f08002a;
- public static final int chronometer = 0x7f080035;
- public static final int forever = 0x7f080063;
- public static final int icon = 0x7f08006a;
- public static final int icon_group = 0x7f08006b;
- public static final int info = 0x7f080071;
- public static final int italic = 0x7f080075;
- public static final int line1 = 0x7f08007a;
- public static final int line3 = 0x7f08007b;
- public static final int normal = 0x7f080090;
- public static final int notification_background = 0x7f080091;
- public static final int notification_main_column = 0x7f080092;
- public static final int notification_main_column_container = 0x7f080093;
- public static final int right_icon = 0x7f0800a3;
- public static final int right_side = 0x7f0800a4;
+ public static final int chronometer = 0x7f080034;
+ public static final int forever = 0x7f080062;
+ public static final int icon = 0x7f080069;
+ public static final int icon_group = 0x7f08006a;
+ public static final int info = 0x7f080070;
+ public static final int italic = 0x7f080074;
+ public static final int line1 = 0x7f080079;
+ public static final int line3 = 0x7f08007a;
+ public static final int normal = 0x7f08008f;
+ public static final int notification_background = 0x7f080090;
+ public static final int notification_main_column = 0x7f080091;
+ public static final int notification_main_column_container = 0x7f080092;
+ public static final int right_icon = 0x7f0800a2;
+ public static final int right_side = 0x7f0800a3;
public static final int tag_transition_group = 0x7f0800d2;
public static final int tag_unhandled_key_event_manager = 0x7f0800d3;
public static final int tag_unhandled_key_listeners = 0x7f0800d4;
diff --git a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/fragment/R.java b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/fragment/R.java
index 775ba90..963a1cb 100644
--- a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/fragment/R.java
+++ b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/fragment/R.java
@@ -95,25 +95,25 @@ private id() {}
public static final int async = 0x7f080026;
public static final int blocking = 0x7f08002a;
public static final int bottom = 0x7f08002b;
- public static final int chronometer = 0x7f080035;
- public static final int end = 0x7f080055;
- public static final int forever = 0x7f080063;
- public static final int icon = 0x7f08006a;
- public static final int icon_group = 0x7f08006b;
- public static final int info = 0x7f080071;
- public static final int italic = 0x7f080075;
- public static final int left = 0x7f080079;
- public static final int line1 = 0x7f08007a;
- public static final int line3 = 0x7f08007b;
- public static final int none = 0x7f08008f;
- public static final int normal = 0x7f080090;
- public static final int notification_background = 0x7f080091;
- public static final int notification_main_column = 0x7f080092;
- public static final int notification_main_column_container = 0x7f080093;
- public static final int right = 0x7f0800a2;
- public static final int right_icon = 0x7f0800a3;
- public static final int right_side = 0x7f0800a4;
- public static final int start = 0x7f0800cc;
+ public static final int chronometer = 0x7f080034;
+ public static final int end = 0x7f080054;
+ public static final int forever = 0x7f080062;
+ public static final int icon = 0x7f080069;
+ public static final int icon_group = 0x7f08006a;
+ public static final int info = 0x7f080070;
+ public static final int italic = 0x7f080074;
+ public static final int left = 0x7f080078;
+ public static final int line1 = 0x7f080079;
+ public static final int line3 = 0x7f08007a;
+ public static final int none = 0x7f08008e;
+ public static final int normal = 0x7f08008f;
+ public static final int notification_background = 0x7f080090;
+ public static final int notification_main_column = 0x7f080091;
+ public static final int notification_main_column_container = 0x7f080092;
+ public static final int right = 0x7f0800a1;
+ public static final int right_icon = 0x7f0800a2;
+ public static final int right_side = 0x7f0800a3;
+ public static final int start = 0x7f0800cb;
public static final int tag_transition_group = 0x7f0800d2;
public static final int tag_unhandled_key_event_manager = 0x7f0800d3;
public static final int tag_unhandled_key_listeners = 0x7f0800d4;
diff --git a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/graphics/drawable/R.java b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/graphics/drawable/R.java
index 8263b68..c57331b 100644
--- a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/graphics/drawable/R.java
+++ b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/graphics/drawable/R.java
@@ -95,25 +95,25 @@ private id() {}
public static final int async = 0x7f080026;
public static final int blocking = 0x7f08002a;
public static final int bottom = 0x7f08002b;
- public static final int chronometer = 0x7f080035;
- public static final int end = 0x7f080055;
- public static final int forever = 0x7f080063;
- public static final int icon = 0x7f08006a;
- public static final int icon_group = 0x7f08006b;
- public static final int info = 0x7f080071;
- public static final int italic = 0x7f080075;
- public static final int left = 0x7f080079;
- public static final int line1 = 0x7f08007a;
- public static final int line3 = 0x7f08007b;
- public static final int none = 0x7f08008f;
- public static final int normal = 0x7f080090;
- public static final int notification_background = 0x7f080091;
- public static final int notification_main_column = 0x7f080092;
- public static final int notification_main_column_container = 0x7f080093;
- public static final int right = 0x7f0800a2;
- public static final int right_icon = 0x7f0800a3;
- public static final int right_side = 0x7f0800a4;
- public static final int start = 0x7f0800cc;
+ public static final int chronometer = 0x7f080034;
+ public static final int end = 0x7f080054;
+ public static final int forever = 0x7f080062;
+ public static final int icon = 0x7f080069;
+ public static final int icon_group = 0x7f08006a;
+ public static final int info = 0x7f080070;
+ public static final int italic = 0x7f080074;
+ public static final int left = 0x7f080078;
+ public static final int line1 = 0x7f080079;
+ public static final int line3 = 0x7f08007a;
+ public static final int none = 0x7f08008e;
+ public static final int normal = 0x7f08008f;
+ public static final int notification_background = 0x7f080090;
+ public static final int notification_main_column = 0x7f080091;
+ public static final int notification_main_column_container = 0x7f080092;
+ public static final int right = 0x7f0800a1;
+ public static final int right_icon = 0x7f0800a2;
+ public static final int right_side = 0x7f0800a3;
+ public static final int start = 0x7f0800cb;
public static final int tag_transition_group = 0x7f0800d2;
public static final int tag_unhandled_key_event_manager = 0x7f0800d3;
public static final int tag_unhandled_key_listeners = 0x7f0800d4;
diff --git a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/loader/R.java b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/loader/R.java
index 980190a..f592527 100644
--- a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/loader/R.java
+++ b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/loader/R.java
@@ -85,20 +85,20 @@ private id() {}
public static final int actions = 0x7f08001d;
public static final int async = 0x7f080026;
public static final int blocking = 0x7f08002a;
- public static final int chronometer = 0x7f080035;
- public static final int forever = 0x7f080063;
- public static final int icon = 0x7f08006a;
- public static final int icon_group = 0x7f08006b;
- public static final int info = 0x7f080071;
- public static final int italic = 0x7f080075;
- public static final int line1 = 0x7f08007a;
- public static final int line3 = 0x7f08007b;
- public static final int normal = 0x7f080090;
- public static final int notification_background = 0x7f080091;
- public static final int notification_main_column = 0x7f080092;
- public static final int notification_main_column_container = 0x7f080093;
- public static final int right_icon = 0x7f0800a3;
- public static final int right_side = 0x7f0800a4;
+ public static final int chronometer = 0x7f080034;
+ public static final int forever = 0x7f080062;
+ public static final int icon = 0x7f080069;
+ public static final int icon_group = 0x7f08006a;
+ public static final int info = 0x7f080070;
+ public static final int italic = 0x7f080074;
+ public static final int line1 = 0x7f080079;
+ public static final int line3 = 0x7f08007a;
+ public static final int normal = 0x7f08008f;
+ public static final int notification_background = 0x7f080090;
+ public static final int notification_main_column = 0x7f080091;
+ public static final int notification_main_column_container = 0x7f080092;
+ public static final int right_icon = 0x7f0800a2;
+ public static final int right_side = 0x7f0800a3;
public static final int tag_transition_group = 0x7f0800d2;
public static final int tag_unhandled_key_event_manager = 0x7f0800d3;
public static final int tag_unhandled_key_listeners = 0x7f0800d4;
diff --git a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/mediacompat/R.java b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/mediacompat/R.java
index 4259dac..9e9d8ac 100644
--- a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/mediacompat/R.java
+++ b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/mediacompat/R.java
@@ -93,24 +93,24 @@ private id() {}
public static final int actions = 0x7f08001d;
public static final int async = 0x7f080026;
public static final int blocking = 0x7f08002a;
- public static final int cancel_action = 0x7f08002e;
- public static final int chronometer = 0x7f080035;
- public static final int end_padder = 0x7f080056;
- public static final int forever = 0x7f080063;
- public static final int icon = 0x7f08006a;
- public static final int icon_group = 0x7f08006b;
- public static final int info = 0x7f080071;
- public static final int italic = 0x7f080075;
- public static final int line1 = 0x7f08007a;
- public static final int line3 = 0x7f08007b;
- public static final int media_actions = 0x7f080081;
- public static final int normal = 0x7f080090;
- public static final int notification_background = 0x7f080091;
- public static final int notification_main_column = 0x7f080092;
- public static final int notification_main_column_container = 0x7f080093;
- public static final int right_icon = 0x7f0800a3;
- public static final int right_side = 0x7f0800a4;
- public static final int status_bar_latest_event_content = 0x7f0800cd;
+ public static final int cancel_action = 0x7f08002d;
+ public static final int chronometer = 0x7f080034;
+ public static final int end_padder = 0x7f080055;
+ public static final int forever = 0x7f080062;
+ public static final int icon = 0x7f080069;
+ public static final int icon_group = 0x7f08006a;
+ public static final int info = 0x7f080070;
+ public static final int italic = 0x7f080074;
+ public static final int line1 = 0x7f080079;
+ public static final int line3 = 0x7f08007a;
+ public static final int media_actions = 0x7f080080;
+ public static final int normal = 0x7f08008f;
+ public static final int notification_background = 0x7f080090;
+ public static final int notification_main_column = 0x7f080091;
+ public static final int notification_main_column_container = 0x7f080092;
+ public static final int right_icon = 0x7f0800a2;
+ public static final int right_side = 0x7f0800a3;
+ public static final int status_bar_latest_event_content = 0x7f0800cc;
public static final int tag_transition_group = 0x7f0800d2;
public static final int tag_unhandled_key_event_manager = 0x7f0800d3;
public static final int tag_unhandled_key_listeners = 0x7f0800d4;
diff --git a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/slidingpanelayout/R.java b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/slidingpanelayout/R.java
index 031b2f2..3410bd7 100644
--- a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/slidingpanelayout/R.java
+++ b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/slidingpanelayout/R.java
@@ -85,20 +85,20 @@ private id() {}
public static final int actions = 0x7f08001d;
public static final int async = 0x7f080026;
public static final int blocking = 0x7f08002a;
- public static final int chronometer = 0x7f080035;
- public static final int forever = 0x7f080063;
- public static final int icon = 0x7f08006a;
- public static final int icon_group = 0x7f08006b;
- public static final int info = 0x7f080071;
- public static final int italic = 0x7f080075;
- public static final int line1 = 0x7f08007a;
- public static final int line3 = 0x7f08007b;
- public static final int normal = 0x7f080090;
- public static final int notification_background = 0x7f080091;
- public static final int notification_main_column = 0x7f080092;
- public static final int notification_main_column_container = 0x7f080093;
- public static final int right_icon = 0x7f0800a3;
- public static final int right_side = 0x7f0800a4;
+ public static final int chronometer = 0x7f080034;
+ public static final int forever = 0x7f080062;
+ public static final int icon = 0x7f080069;
+ public static final int icon_group = 0x7f08006a;
+ public static final int info = 0x7f080070;
+ public static final int italic = 0x7f080074;
+ public static final int line1 = 0x7f080079;
+ public static final int line3 = 0x7f08007a;
+ public static final int normal = 0x7f08008f;
+ public static final int notification_background = 0x7f080090;
+ public static final int notification_main_column = 0x7f080091;
+ public static final int notification_main_column_container = 0x7f080092;
+ public static final int right_icon = 0x7f0800a2;
+ public static final int right_side = 0x7f0800a3;
public static final int tag_transition_group = 0x7f0800d2;
public static final int tag_unhandled_key_event_manager = 0x7f0800d3;
public static final int tag_unhandled_key_listeners = 0x7f0800d4;
diff --git a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/swiperefreshlayout/R.java b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/swiperefreshlayout/R.java
index d0d82ac..e64c6fd 100644
--- a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/swiperefreshlayout/R.java
+++ b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/swiperefreshlayout/R.java
@@ -85,20 +85,20 @@ private id() {}
public static final int actions = 0x7f08001d;
public static final int async = 0x7f080026;
public static final int blocking = 0x7f08002a;
- public static final int chronometer = 0x7f080035;
- public static final int forever = 0x7f080063;
- public static final int icon = 0x7f08006a;
- public static final int icon_group = 0x7f08006b;
- public static final int info = 0x7f080071;
- public static final int italic = 0x7f080075;
- public static final int line1 = 0x7f08007a;
- public static final int line3 = 0x7f08007b;
- public static final int normal = 0x7f080090;
- public static final int notification_background = 0x7f080091;
- public static final int notification_main_column = 0x7f080092;
- public static final int notification_main_column_container = 0x7f080093;
- public static final int right_icon = 0x7f0800a3;
- public static final int right_side = 0x7f0800a4;
+ public static final int chronometer = 0x7f080034;
+ public static final int forever = 0x7f080062;
+ public static final int icon = 0x7f080069;
+ public static final int icon_group = 0x7f08006a;
+ public static final int info = 0x7f080070;
+ public static final int italic = 0x7f080074;
+ public static final int line1 = 0x7f080079;
+ public static final int line3 = 0x7f08007a;
+ public static final int normal = 0x7f08008f;
+ public static final int notification_background = 0x7f080090;
+ public static final int notification_main_column = 0x7f080091;
+ public static final int notification_main_column_container = 0x7f080092;
+ public static final int right_icon = 0x7f0800a2;
+ public static final int right_side = 0x7f0800a3;
public static final int tag_transition_group = 0x7f0800d2;
public static final int tag_unhandled_key_event_manager = 0x7f0800d3;
public static final int tag_unhandled_key_listeners = 0x7f0800d4;
diff --git a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/transition/R.java b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/transition/R.java
index 564057a..062fe5a 100644
--- a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/transition/R.java
+++ b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/transition/R.java
@@ -85,25 +85,25 @@ private id() {}
public static final int actions = 0x7f08001d;
public static final int async = 0x7f080026;
public static final int blocking = 0x7f08002a;
- public static final int chronometer = 0x7f080035;
- public static final int forever = 0x7f080063;
- public static final int ghost_view = 0x7f080064;
- public static final int icon = 0x7f08006a;
- public static final int icon_group = 0x7f08006b;
- public static final int info = 0x7f080071;
- public static final int italic = 0x7f080075;
- public static final int line1 = 0x7f08007a;
- public static final int line3 = 0x7f08007b;
- public static final int normal = 0x7f080090;
- public static final int notification_background = 0x7f080091;
- public static final int notification_main_column = 0x7f080092;
- public static final int notification_main_column_container = 0x7f080093;
- public static final int parent_matrix = 0x7f080099;
- public static final int right_icon = 0x7f0800a3;
- public static final int right_side = 0x7f0800a4;
- public static final int save_image_matrix = 0x7f0800a5;
- public static final int save_non_transition_alpha = 0x7f0800a6;
- public static final int save_scale_type = 0x7f0800a7;
+ public static final int chronometer = 0x7f080034;
+ public static final int forever = 0x7f080062;
+ public static final int ghost_view = 0x7f080063;
+ public static final int icon = 0x7f080069;
+ public static final int icon_group = 0x7f08006a;
+ public static final int info = 0x7f080070;
+ public static final int italic = 0x7f080074;
+ public static final int line1 = 0x7f080079;
+ public static final int line3 = 0x7f08007a;
+ public static final int normal = 0x7f08008f;
+ public static final int notification_background = 0x7f080090;
+ public static final int notification_main_column = 0x7f080091;
+ public static final int notification_main_column_container = 0x7f080092;
+ public static final int parent_matrix = 0x7f080098;
+ public static final int right_icon = 0x7f0800a2;
+ public static final int right_side = 0x7f0800a3;
+ public static final int save_image_matrix = 0x7f0800a4;
+ public static final int save_non_transition_alpha = 0x7f0800a5;
+ public static final int save_scale_type = 0x7f0800a6;
public static final int tag_transition_group = 0x7f0800d2;
public static final int tag_unhandled_key_event_manager = 0x7f0800d3;
public static final int tag_unhandled_key_listeners = 0x7f0800d4;
diff --git a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/v4/R.java b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/v4/R.java
index 3de2980..ca724f2 100644
--- a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/v4/R.java
+++ b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/v4/R.java
@@ -103,29 +103,29 @@ private id() {}
public static final int async = 0x7f080026;
public static final int blocking = 0x7f08002a;
public static final int bottom = 0x7f08002b;
- public static final int cancel_action = 0x7f08002e;
- public static final int chronometer = 0x7f080035;
- public static final int end = 0x7f080055;
- public static final int end_padder = 0x7f080056;
- public static final int forever = 0x7f080063;
- public static final int icon = 0x7f08006a;
- public static final int icon_group = 0x7f08006b;
- public static final int info = 0x7f080071;
- public static final int italic = 0x7f080075;
- public static final int left = 0x7f080079;
- public static final int line1 = 0x7f08007a;
- public static final int line3 = 0x7f08007b;
- public static final int media_actions = 0x7f080081;
- public static final int none = 0x7f08008f;
- public static final int normal = 0x7f080090;
- public static final int notification_background = 0x7f080091;
- public static final int notification_main_column = 0x7f080092;
- public static final int notification_main_column_container = 0x7f080093;
- public static final int right = 0x7f0800a2;
- public static final int right_icon = 0x7f0800a3;
- public static final int right_side = 0x7f0800a4;
- public static final int start = 0x7f0800cc;
- public static final int status_bar_latest_event_content = 0x7f0800cd;
+ public static final int cancel_action = 0x7f08002d;
+ public static final int chronometer = 0x7f080034;
+ public static final int end = 0x7f080054;
+ public static final int end_padder = 0x7f080055;
+ public static final int forever = 0x7f080062;
+ public static final int icon = 0x7f080069;
+ public static final int icon_group = 0x7f08006a;
+ public static final int info = 0x7f080070;
+ public static final int italic = 0x7f080074;
+ public static final int left = 0x7f080078;
+ public static final int line1 = 0x7f080079;
+ public static final int line3 = 0x7f08007a;
+ public static final int media_actions = 0x7f080080;
+ public static final int none = 0x7f08008e;
+ public static final int normal = 0x7f08008f;
+ public static final int notification_background = 0x7f080090;
+ public static final int notification_main_column = 0x7f080091;
+ public static final int notification_main_column_container = 0x7f080092;
+ public static final int right = 0x7f0800a1;
+ public static final int right_icon = 0x7f0800a2;
+ public static final int right_side = 0x7f0800a3;
+ public static final int start = 0x7f0800cb;
+ public static final int status_bar_latest_event_content = 0x7f0800cc;
public static final int tag_transition_group = 0x7f0800d2;
public static final int tag_unhandled_key_event_manager = 0x7f0800d3;
public static final int tag_unhandled_key_listeners = 0x7f0800d4;
diff --git a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/v7/appcompat/R.java b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/v7/appcompat/R.java
index 3dba2e7..c289d10 100644
--- a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/v7/appcompat/R.java
+++ b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/v7/appcompat/R.java
@@ -643,68 +643,68 @@ private id() {}
public static final int async = 0x7f080026;
public static final int blocking = 0x7f08002a;
public static final int bottom = 0x7f08002b;
- public static final int buttonPanel = 0x7f08002d;
- public static final int checkbox = 0x7f080034;
- public static final int chronometer = 0x7f080035;
- public static final int content = 0x7f08003b;
- public static final int contentPanel = 0x7f08003f;
- public static final int custom = 0x7f080041;
- public static final int customPanel = 0x7f080042;
- public static final int decor_content_parent = 0x7f080043;
- public static final int default_activity_button = 0x7f080044;
- public static final int edit_query = 0x7f080051;
- public static final int end = 0x7f080055;
- public static final int expand_activities_button = 0x7f08005a;
- public static final int expanded_menu = 0x7f08005b;
- public static final int forever = 0x7f080063;
- public static final int group_divider = 0x7f080066;
- public static final int home = 0x7f080068;
- public static final int icon = 0x7f08006a;
- public static final int icon_group = 0x7f08006b;
- public static final int image = 0x7f08006d;
- public static final int info = 0x7f080071;
- public static final int italic = 0x7f080075;
- public static final int left = 0x7f080079;
- public static final int line1 = 0x7f08007a;
- public static final int line3 = 0x7f08007b;
- public static final int listMode = 0x7f08007c;
- public static final int list_item = 0x7f08007d;
- public static final int message = 0x7f080082;
- public static final int multiply = 0x7f080087;
- public static final int none = 0x7f08008f;
- public static final int normal = 0x7f080090;
- public static final int notification_background = 0x7f080091;
- public static final int notification_main_column = 0x7f080092;
- public static final int notification_main_column_container = 0x7f080093;
- public static final int parentPanel = 0x7f080098;
- public static final int progress_circular = 0x7f08009d;
- public static final int progress_horizontal = 0x7f08009e;
- public static final int radio = 0x7f0800a0;
- public static final int right = 0x7f0800a2;
- public static final int right_icon = 0x7f0800a3;
- public static final int right_side = 0x7f0800a4;
- public static final int screen = 0x7f0800a8;
- public static final int scrollIndicatorDown = 0x7f0800aa;
- public static final int scrollIndicatorUp = 0x7f0800ab;
- public static final int scrollView = 0x7f0800ac;
- public static final int search_badge = 0x7f0800ae;
- public static final int search_bar = 0x7f0800af;
- public static final int search_button = 0x7f0800b0;
- public static final int search_close_btn = 0x7f0800b1;
- public static final int search_edit_frame = 0x7f0800b2;
- public static final int search_go_btn = 0x7f0800b3;
- public static final int search_mag_icon = 0x7f0800b4;
- public static final int search_plate = 0x7f0800b5;
- public static final int search_src_text = 0x7f0800b6;
- public static final int search_voice_btn = 0x7f0800b7;
- public static final int select_dialog_listview = 0x7f0800b9;
- public static final int shortcut = 0x7f0800bb;
- public static final int spacer = 0x7f0800c4;
- public static final int split_action_bar = 0x7f0800c5;
- public static final int src_atop = 0x7f0800c8;
- public static final int src_in = 0x7f0800c9;
- public static final int src_over = 0x7f0800ca;
- public static final int start = 0x7f0800cc;
+ public static final int buttonPanel = 0x7f08002c;
+ public static final int checkbox = 0x7f080033;
+ public static final int chronometer = 0x7f080034;
+ public static final int content = 0x7f08003a;
+ public static final int contentPanel = 0x7f08003e;
+ public static final int custom = 0x7f080040;
+ public static final int customPanel = 0x7f080041;
+ public static final int decor_content_parent = 0x7f080042;
+ public static final int default_activity_button = 0x7f080043;
+ public static final int edit_query = 0x7f080050;
+ public static final int end = 0x7f080054;
+ public static final int expand_activities_button = 0x7f080059;
+ public static final int expanded_menu = 0x7f08005a;
+ public static final int forever = 0x7f080062;
+ public static final int group_divider = 0x7f080065;
+ public static final int home = 0x7f080067;
+ public static final int icon = 0x7f080069;
+ public static final int icon_group = 0x7f08006a;
+ public static final int image = 0x7f08006c;
+ public static final int info = 0x7f080070;
+ public static final int italic = 0x7f080074;
+ public static final int left = 0x7f080078;
+ public static final int line1 = 0x7f080079;
+ public static final int line3 = 0x7f08007a;
+ public static final int listMode = 0x7f08007b;
+ public static final int list_item = 0x7f08007c;
+ public static final int message = 0x7f080081;
+ public static final int multiply = 0x7f080086;
+ public static final int none = 0x7f08008e;
+ public static final int normal = 0x7f08008f;
+ public static final int notification_background = 0x7f080090;
+ public static final int notification_main_column = 0x7f080091;
+ public static final int notification_main_column_container = 0x7f080092;
+ public static final int parentPanel = 0x7f080097;
+ public static final int progress_circular = 0x7f08009c;
+ public static final int progress_horizontal = 0x7f08009d;
+ public static final int radio = 0x7f08009f;
+ public static final int right = 0x7f0800a1;
+ public static final int right_icon = 0x7f0800a2;
+ public static final int right_side = 0x7f0800a3;
+ public static final int screen = 0x7f0800a7;
+ public static final int scrollIndicatorDown = 0x7f0800a9;
+ public static final int scrollIndicatorUp = 0x7f0800aa;
+ public static final int scrollView = 0x7f0800ab;
+ public static final int search_badge = 0x7f0800ad;
+ public static final int search_bar = 0x7f0800ae;
+ public static final int search_button = 0x7f0800af;
+ public static final int search_close_btn = 0x7f0800b0;
+ public static final int search_edit_frame = 0x7f0800b1;
+ public static final int search_go_btn = 0x7f0800b2;
+ public static final int search_mag_icon = 0x7f0800b3;
+ public static final int search_plate = 0x7f0800b4;
+ public static final int search_src_text = 0x7f0800b5;
+ public static final int search_voice_btn = 0x7f0800b6;
+ public static final int select_dialog_listview = 0x7f0800b8;
+ public static final int shortcut = 0x7f0800ba;
+ public static final int spacer = 0x7f0800c3;
+ public static final int split_action_bar = 0x7f0800c4;
+ public static final int src_atop = 0x7f0800c7;
+ public static final int src_in = 0x7f0800c8;
+ public static final int src_over = 0x7f0800c9;
+ public static final int start = 0x7f0800cb;
public static final int submenuarrow = 0x7f0800cf;
public static final int submit_area = 0x7f0800d0;
public static final int tabMode = 0x7f0800d1;
diff --git a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/v7/recyclerview/R.java b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/v7/recyclerview/R.java
index 79c4041..9ae43a1 100644
--- a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/v7/recyclerview/R.java
+++ b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/v7/recyclerview/R.java
@@ -110,26 +110,26 @@ private id() {}
public static final int async = 0x7f080026;
public static final int blocking = 0x7f08002a;
public static final int bottom = 0x7f08002b;
- public static final int chronometer = 0x7f080035;
- public static final int end = 0x7f080055;
- public static final int forever = 0x7f080063;
- public static final int icon = 0x7f08006a;
- public static final int icon_group = 0x7f08006b;
- public static final int info = 0x7f080071;
- public static final int italic = 0x7f080075;
- public static final int item_touch_helper_previous_elevation = 0x7f080076;
- public static final int left = 0x7f080079;
- public static final int line1 = 0x7f08007a;
- public static final int line3 = 0x7f08007b;
- public static final int none = 0x7f08008f;
- public static final int normal = 0x7f080090;
- public static final int notification_background = 0x7f080091;
- public static final int notification_main_column = 0x7f080092;
- public static final int notification_main_column_container = 0x7f080093;
- public static final int right = 0x7f0800a2;
- public static final int right_icon = 0x7f0800a3;
- public static final int right_side = 0x7f0800a4;
- public static final int start = 0x7f0800cc;
+ public static final int chronometer = 0x7f080034;
+ public static final int end = 0x7f080054;
+ public static final int forever = 0x7f080062;
+ public static final int icon = 0x7f080069;
+ public static final int icon_group = 0x7f08006a;
+ public static final int info = 0x7f080070;
+ public static final int italic = 0x7f080074;
+ public static final int item_touch_helper_previous_elevation = 0x7f080075;
+ public static final int left = 0x7f080078;
+ public static final int line1 = 0x7f080079;
+ public static final int line3 = 0x7f08007a;
+ public static final int none = 0x7f08008e;
+ public static final int normal = 0x7f08008f;
+ public static final int notification_background = 0x7f080090;
+ public static final int notification_main_column = 0x7f080091;
+ public static final int notification_main_column_container = 0x7f080092;
+ public static final int right = 0x7f0800a1;
+ public static final int right_icon = 0x7f0800a2;
+ public static final int right_side = 0x7f0800a3;
+ public static final int start = 0x7f0800cb;
public static final int tag_transition_group = 0x7f0800d2;
public static final int tag_unhandled_key_event_manager = 0x7f0800d3;
public static final int tag_unhandled_key_listeners = 0x7f0800d4;
diff --git a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/v7/viewpager/R.java b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/v7/viewpager/R.java
index 42d7a09..4f3def2 100644
--- a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/v7/viewpager/R.java
+++ b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/android/support/v7/viewpager/R.java
@@ -85,20 +85,20 @@ private id() {}
public static final int actions = 0x7f08001d;
public static final int async = 0x7f080026;
public static final int blocking = 0x7f08002a;
- public static final int chronometer = 0x7f080035;
- public static final int forever = 0x7f080063;
- public static final int icon = 0x7f08006a;
- public static final int icon_group = 0x7f08006b;
- public static final int info = 0x7f080071;
- public static final int italic = 0x7f080075;
- public static final int line1 = 0x7f08007a;
- public static final int line3 = 0x7f08007b;
- public static final int normal = 0x7f080090;
- public static final int notification_background = 0x7f080091;
- public static final int notification_main_column = 0x7f080092;
- public static final int notification_main_column_container = 0x7f080093;
- public static final int right_icon = 0x7f0800a3;
- public static final int right_side = 0x7f0800a4;
+ public static final int chronometer = 0x7f080034;
+ public static final int forever = 0x7f080062;
+ public static final int icon = 0x7f080069;
+ public static final int icon_group = 0x7f08006a;
+ public static final int info = 0x7f080070;
+ public static final int italic = 0x7f080074;
+ public static final int line1 = 0x7f080079;
+ public static final int line3 = 0x7f08007a;
+ public static final int normal = 0x7f08008f;
+ public static final int notification_background = 0x7f080090;
+ public static final int notification_main_column = 0x7f080091;
+ public static final int notification_main_column_container = 0x7f080092;
+ public static final int right_icon = 0x7f0800a2;
+ public static final int right_side = 0x7f0800a3;
public static final int tag_transition_group = 0x7f0800d2;
public static final int tag_unhandled_key_event_manager = 0x7f0800d3;
public static final int tag_unhandled_key_listeners = 0x7f0800d4;
diff --git a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/com/ivanf/healthadviser/R.java b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/com/ivanf/healthadviser/R.java
index 8022708..73db504 100644
--- a/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/com/ivanf/healthadviser/R.java
+++ b/app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/com/ivanf/healthadviser/R.java
@@ -5172,169 +5172,169 @@ public static final class id {
public static final int beginning=0x7f080029;
public static final int blocking=0x7f08002a;
public static final int bottom=0x7f08002b;
- public static final int button2=0x7f08002c;
- public static final int buttonPanel=0x7f08002d;
- public static final int cancel_action=0x7f08002e;
- public static final int capital=0x7f08002f;
- public static final int center=0x7f080030;
- public static final int center_horizontal=0x7f080031;
- public static final int center_vertical=0x7f080032;
- public static final int chains=0x7f080033;
- public static final int checkbox=0x7f080034;
- public static final int chronometer=0x7f080035;
- public static final int clip_horizontal=0x7f080036;
- public static final int clip_vertical=0x7f080037;
- public static final int collapseActionView=0x7f080038;
- public static final int company=0x7f080039;
- public static final int container=0x7f08003a;
- public static final int content=0x7f08003b;
- public static final int contentChat=0x7f08003c;
- public static final int contentFragment=0x7f08003d;
- public static final int contentFragmentChat=0x7f08003e;
- public static final int contentPanel=0x7f08003f;
- public static final int coordinator=0x7f080040;
- public static final int custom=0x7f080041;
- public static final int customPanel=0x7f080042;
- public static final int decor_content_parent=0x7f080043;
- public static final int default_activity_button=0x7f080044;
- public static final int description_info=0x7f080045;
- public static final int design_bottom_sheet=0x7f080046;
- public static final int design_menu_item_action_area=0x7f080047;
- public static final int design_menu_item_action_area_stub=0x7f080048;
- public static final int design_menu_item_text=0x7f080049;
- public static final int design_navigation_view=0x7f08004a;
- public static final int dimensions=0x7f08004b;
- public static final int direct=0x7f08004c;
- public static final int disableHome=0x7f08004d;
- public static final int downloadBtn=0x7f08004e;
- public static final int dragsList=0x7f08004f;
- public static final int drawer_layout=0x7f080050;
- public static final int edit_query=0x7f080051;
- public static final int email=0x7f080052;
- public static final int email_login_form=0x7f080053;
- public static final int email_sign_in_button=0x7f080054;
- public static final int end=0x7f080055;
- public static final int end_padder=0x7f080056;
- public static final int enterAlways=0x7f080057;
- public static final int enterAlwaysCollapsed=0x7f080058;
- public static final int exitUntilCollapsed=0x7f080059;
- public static final int expand_activities_button=0x7f08005a;
- public static final int expanded_menu=0x7f08005b;
- public static final int fab=0x7f08005c;
- public static final int fill=0x7f08005d;
- public static final int fill_horizontal=0x7f08005e;
- public static final int fill_vertical=0x7f08005f;
- public static final int filled=0x7f080060;
- public static final int fixed=0x7f080061;
- public static final int flag=0x7f080062;
- public static final int forever=0x7f080063;
- public static final int ghost_view=0x7f080064;
- public static final int gone=0x7f080065;
- public static final int group_divider=0x7f080066;
- public static final int groups=0x7f080067;
- public static final int home=0x7f080068;
- public static final int homeAsUp=0x7f080069;
- public static final int icon=0x7f08006a;
- public static final int icon_group=0x7f08006b;
- public static final int ifRoom=0x7f08006c;
- public static final int image=0x7f08006d;
- public static final int imageAdds=0x7f08006e;
- public static final int imageView=0x7f08006f;
- public static final int img=0x7f080070;
- public static final int info=0x7f080071;
- public static final int infoRecipe=0x7f080072;
- public static final int infoText=0x7f080073;
- public static final int invisible=0x7f080074;
- public static final int italic=0x7f080075;
- public static final int item_touch_helper_previous_elevation=0x7f080076;
- public static final int labeled=0x7f080077;
- public static final int largeLabel=0x7f080078;
- public static final int left=0x7f080079;
- public static final int line1=0x7f08007a;
- public static final int line3=0x7f08007b;
- public static final int listMode=0x7f08007c;
- public static final int list_item=0x7f08007d;
- public static final int login_form=0x7f08007e;
- public static final int login_progress=0x7f08007f;
- public static final int masked=0x7f080080;
- public static final int media_actions=0x7f080081;
- public static final int message=0x7f080082;
- public static final int middle=0x7f080083;
- public static final int mini=0x7f080084;
- public static final int mtrl_child_content_container=0x7f080085;
- public static final int mtrl_internal_children_alpha_tag=0x7f080086;
- public static final int multiply=0x7f080087;
- public static final int name=0x7f080088;
- public static final int nav_chat=0x7f080089;
- public static final int nav_exit=0x7f08008a;
- public static final int nav_settings=0x7f08008b;
- public static final int nav_view=0x7f08008c;
- public static final int navigation_header_container=0x7f08008d;
- public static final int never=0x7f08008e;
- public static final int none=0x7f08008f;
- public static final int normal=0x7f080090;
- public static final int notification_background=0x7f080091;
- public static final int notification_main_column=0x7f080092;
- public static final int notification_main_column_container=0x7f080093;
- public static final int outline=0x7f080094;
- public static final int packed=0x7f080095;
- public static final int parallax=0x7f080096;
- public static final int parent=0x7f080097;
- public static final int parentPanel=0x7f080098;
- public static final int parent_matrix=0x7f080099;
- public static final int password=0x7f08009a;
- public static final int percent=0x7f08009b;
- public static final int pin=0x7f08009c;
- public static final int progress_circular=0x7f08009d;
- public static final int progress_horizontal=0x7f08009e;
- public static final int questionText=0x7f08009f;
- public static final int radio=0x7f0800a0;
- public static final int recipeList=0x7f0800a1;
- public static final int right=0x7f0800a2;
- public static final int right_icon=0x7f0800a3;
- public static final int right_side=0x7f0800a4;
- public static final int save_image_matrix=0x7f0800a5;
- public static final int save_non_transition_alpha=0x7f0800a6;
- public static final int save_scale_type=0x7f0800a7;
- public static final int screen=0x7f0800a8;
- public static final int scroll=0x7f0800a9;
- public static final int scrollIndicatorDown=0x7f0800aa;
- public static final int scrollIndicatorUp=0x7f0800ab;
- public static final int scrollView=0x7f0800ac;
- public static final int scrollable=0x7f0800ad;
- public static final int search_badge=0x7f0800ae;
- public static final int search_bar=0x7f0800af;
- public static final int search_button=0x7f0800b0;
- public static final int search_close_btn=0x7f0800b1;
- public static final int search_edit_frame=0x7f0800b2;
- public static final int search_go_btn=0x7f0800b3;
- public static final int search_mag_icon=0x7f0800b4;
- public static final int search_plate=0x7f0800b5;
- public static final int search_src_text=0x7f0800b6;
- public static final int search_voice_btn=0x7f0800b7;
- public static final int seekBar=0x7f0800b8;
- public static final int select_dialog_listview=0x7f0800b9;
- public static final int selected=0x7f0800ba;
- public static final int shortcut=0x7f0800bb;
- public static final int showCustom=0x7f0800bc;
- public static final int showHome=0x7f0800bd;
- public static final int showTitle=0x7f0800be;
- public static final int smallLabel=0x7f0800bf;
- public static final int snackbar_action=0x7f0800c0;
- public static final int snackbar_text=0x7f0800c1;
- public static final int snap=0x7f0800c2;
- public static final int snapMargins=0x7f0800c3;
- public static final int spacer=0x7f0800c4;
- public static final int split_action_bar=0x7f0800c5;
- public static final int spread=0x7f0800c6;
- public static final int spread_inside=0x7f0800c7;
- public static final int src_atop=0x7f0800c8;
- public static final int src_in=0x7f0800c9;
- public static final int src_over=0x7f0800ca;
- public static final int standard=0x7f0800cb;
- public static final int start=0x7f0800cc;
- public static final int status_bar_latest_event_content=0x7f0800cd;
- public static final int stretch=0x7f0800ce;
+ public static final int buttonPanel=0x7f08002c;
+ public static final int cancel_action=0x7f08002d;
+ public static final int capital=0x7f08002e;
+ public static final int center=0x7f08002f;
+ public static final int center_horizontal=0x7f080030;
+ public static final int center_vertical=0x7f080031;
+ public static final int chains=0x7f080032;
+ public static final int checkbox=0x7f080033;
+ public static final int chronometer=0x7f080034;
+ public static final int clip_horizontal=0x7f080035;
+ public static final int clip_vertical=0x7f080036;
+ public static final int collapseActionView=0x7f080037;
+ public static final int company=0x7f080038;
+ public static final int container=0x7f080039;
+ public static final int content=0x7f08003a;
+ public static final int contentChat=0x7f08003b;
+ public static final int contentFragment=0x7f08003c;
+ public static final int contentFragmentChat=0x7f08003d;
+ public static final int contentPanel=0x7f08003e;
+ public static final int coordinator=0x7f08003f;
+ public static final int custom=0x7f080040;
+ public static final int customPanel=0x7f080041;
+ public static final int decor_content_parent=0x7f080042;
+ public static final int default_activity_button=0x7f080043;
+ public static final int description_info=0x7f080044;
+ public static final int design_bottom_sheet=0x7f080045;
+ public static final int design_menu_item_action_area=0x7f080046;
+ public static final int design_menu_item_action_area_stub=0x7f080047;
+ public static final int design_menu_item_text=0x7f080048;
+ public static final int design_navigation_view=0x7f080049;
+ public static final int dimensions=0x7f08004a;
+ public static final int direct=0x7f08004b;
+ public static final int disableHome=0x7f08004c;
+ public static final int downloadBtn=0x7f08004d;
+ public static final int dragsList=0x7f08004e;
+ public static final int drawer_layout=0x7f08004f;
+ public static final int edit_query=0x7f080050;
+ public static final int email=0x7f080051;
+ public static final int email_login_form=0x7f080052;
+ public static final int email_sign_in_button=0x7f080053;
+ public static final int end=0x7f080054;
+ public static final int end_padder=0x7f080055;
+ public static final int enterAlways=0x7f080056;
+ public static final int enterAlwaysCollapsed=0x7f080057;
+ public static final int exitUntilCollapsed=0x7f080058;
+ public static final int expand_activities_button=0x7f080059;
+ public static final int expanded_menu=0x7f08005a;
+ public static final int fab=0x7f08005b;
+ public static final int fill=0x7f08005c;
+ public static final int fill_horizontal=0x7f08005d;
+ public static final int fill_vertical=0x7f08005e;
+ public static final int filled=0x7f08005f;
+ public static final int fixed=0x7f080060;
+ public static final int flag=0x7f080061;
+ public static final int forever=0x7f080062;
+ public static final int ghost_view=0x7f080063;
+ public static final int gone=0x7f080064;
+ public static final int group_divider=0x7f080065;
+ public static final int groups=0x7f080066;
+ public static final int home=0x7f080067;
+ public static final int homeAsUp=0x7f080068;
+ public static final int icon=0x7f080069;
+ public static final int icon_group=0x7f08006a;
+ public static final int ifRoom=0x7f08006b;
+ public static final int image=0x7f08006c;
+ public static final int imageAdds=0x7f08006d;
+ public static final int imageView=0x7f08006e;
+ public static final int img=0x7f08006f;
+ public static final int info=0x7f080070;
+ public static final int infoRecipe=0x7f080071;
+ public static final int infoText=0x7f080072;
+ public static final int invisible=0x7f080073;
+ public static final int italic=0x7f080074;
+ public static final int item_touch_helper_previous_elevation=0x7f080075;
+ public static final int labeled=0x7f080076;
+ public static final int largeLabel=0x7f080077;
+ public static final int left=0x7f080078;
+ public static final int line1=0x7f080079;
+ public static final int line3=0x7f08007a;
+ public static final int listMode=0x7f08007b;
+ public static final int list_item=0x7f08007c;
+ public static final int login_form=0x7f08007d;
+ public static final int login_progress=0x7f08007e;
+ public static final int masked=0x7f08007f;
+ public static final int media_actions=0x7f080080;
+ public static final int message=0x7f080081;
+ public static final int middle=0x7f080082;
+ public static final int mini=0x7f080083;
+ public static final int mtrl_child_content_container=0x7f080084;
+ public static final int mtrl_internal_children_alpha_tag=0x7f080085;
+ public static final int multiply=0x7f080086;
+ public static final int name=0x7f080087;
+ public static final int nav_chat=0x7f080088;
+ public static final int nav_exit=0x7f080089;
+ public static final int nav_settings=0x7f08008a;
+ public static final int nav_view=0x7f08008b;
+ public static final int navigation_header_container=0x7f08008c;
+ public static final int never=0x7f08008d;
+ public static final int none=0x7f08008e;
+ public static final int normal=0x7f08008f;
+ public static final int notification_background=0x7f080090;
+ public static final int notification_main_column=0x7f080091;
+ public static final int notification_main_column_container=0x7f080092;
+ public static final int outline=0x7f080093;
+ public static final int packed=0x7f080094;
+ public static final int parallax=0x7f080095;
+ public static final int parent=0x7f080096;
+ public static final int parentPanel=0x7f080097;
+ public static final int parent_matrix=0x7f080098;
+ public static final int password=0x7f080099;
+ public static final int percent=0x7f08009a;
+ public static final int pin=0x7f08009b;
+ public static final int progress_circular=0x7f08009c;
+ public static final int progress_horizontal=0x7f08009d;
+ public static final int questionText=0x7f08009e;
+ public static final int radio=0x7f08009f;
+ public static final int recipeList=0x7f0800a0;
+ public static final int right=0x7f0800a1;
+ public static final int right_icon=0x7f0800a2;
+ public static final int right_side=0x7f0800a3;
+ public static final int save_image_matrix=0x7f0800a4;
+ public static final int save_non_transition_alpha=0x7f0800a5;
+ public static final int save_scale_type=0x7f0800a6;
+ public static final int screen=0x7f0800a7;
+ public static final int scroll=0x7f0800a8;
+ public static final int scrollIndicatorDown=0x7f0800a9;
+ public static final int scrollIndicatorUp=0x7f0800aa;
+ public static final int scrollView=0x7f0800ab;
+ public static final int scrollable=0x7f0800ac;
+ public static final int search_badge=0x7f0800ad;
+ public static final int search_bar=0x7f0800ae;
+ public static final int search_button=0x7f0800af;
+ public static final int search_close_btn=0x7f0800b0;
+ public static final int search_edit_frame=0x7f0800b1;
+ public static final int search_go_btn=0x7f0800b2;
+ public static final int search_mag_icon=0x7f0800b3;
+ public static final int search_plate=0x7f0800b4;
+ public static final int search_src_text=0x7f0800b5;
+ public static final int search_voice_btn=0x7f0800b6;
+ public static final int seekBar=0x7f0800b7;
+ public static final int select_dialog_listview=0x7f0800b8;
+ public static final int selected=0x7f0800b9;
+ public static final int shortcut=0x7f0800ba;
+ public static final int showCustom=0x7f0800bb;
+ public static final int showHome=0x7f0800bc;
+ public static final int showTitle=0x7f0800bd;
+ public static final int smallLabel=0x7f0800be;
+ public static final int snackbar_action=0x7f0800bf;
+ public static final int snackbar_text=0x7f0800c0;
+ public static final int snap=0x7f0800c1;
+ public static final int snapMargins=0x7f0800c2;
+ public static final int spacer=0x7f0800c3;
+ public static final int split_action_bar=0x7f0800c4;
+ public static final int spread=0x7f0800c5;
+ public static final int spread_inside=0x7f0800c6;
+ public static final int src_atop=0x7f0800c7;
+ public static final int src_in=0x7f0800c8;
+ public static final int src_over=0x7f0800c9;
+ public static final int standard=0x7f0800ca;
+ public static final int start=0x7f0800cb;
+ public static final int status_bar_latest_event_content=0x7f0800cc;
+ public static final int stretch=0x7f0800cd;
+ public static final int subButton=0x7f0800ce;
public static final int submenuarrow=0x7f0800cf;
public static final int submit_area=0x7f0800d0;
public static final int tabMode=0x7f0800d1;
diff --git a/app/build/intermediates/blame/res/debug/multi-v2/debug.json b/app/build/intermediates/blame/res/debug/multi-v2/debug.json
index c2f7280..9df9d33 100644
--- a/app/build/intermediates/blame/res/debug/multi-v2/debug.json
+++ b/app/build/intermediates/blame/res/debug/multi-v2/debug.json
@@ -448,20 +448,20 @@
]
},
{
- "outputFile": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\values-es_values-es.arsc.flat",
+ "outputFile": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\values-it_values-it.arsc.flat",
"map": [
{
- "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\values-es\\values-es.xml",
+ "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\values-it\\values-it.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "105,222,335,443,528,629,757,842,924,1016,1110,1208,1302,1403,1497,1593,1689,1781,1873,1955,2062,2162,2261,2369,2476,2583,2742,2842",
- "endColumns": "116,112,107,84,100,127,84,81,91,93,97,93,100,93,95,95,91,91,81,106,99,98,107,106,106,158,99,81",
- "endOffsets": "217,330,438,523,624,752,837,919,1011,1105,1203,1297,1398,1492,1588,1684,1776,1868,1950,2057,2157,2256,2364,2471,2578,2737,2837,2919"
+ "startOffsets": "105,214,314,423,507,616,741,818,894,986,1080,1174,1268,1370,1464,1561,1667,1759,1851,1932,2038,2146,2244,2348,2453,2560,2723,2823",
+ "endColumns": "108,99,108,83,108,124,76,75,91,93,93,93,101,93,96,105,91,91,80,105,107,97,103,104,106,162,99,82",
+ "endOffsets": "209,309,418,502,611,736,813,889,981,1075,1169,1263,1365,1459,1556,1662,1754,1846,1927,2033,2141,2239,2343,2448,2555,2718,2818,2901"
}
},
{
- "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\values-es\\values-es.xml",
+ "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\values-it\\values-it.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -472,28 +472,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2924",
+ "startOffsets": "2906",
"endColumns": "100",
- "endOffsets": "3020"
+ "endOffsets": "3002"
}
}
]
},
{
- "outputFile": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\values-it_values-it.arsc.flat",
+ "outputFile": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\values-es_values-es.arsc.flat",
"map": [
{
- "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\values-it\\values-it.xml",
+ "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\values-es\\values-es.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "105,214,314,423,507,616,741,818,894,986,1080,1174,1268,1370,1464,1561,1667,1759,1851,1932,2038,2146,2244,2348,2453,2560,2723,2823",
- "endColumns": "108,99,108,83,108,124,76,75,91,93,93,93,101,93,96,105,91,91,80,105,107,97,103,104,106,162,99,82",
- "endOffsets": "209,309,418,502,611,736,813,889,981,1075,1169,1263,1365,1459,1556,1662,1754,1846,1927,2033,2141,2239,2343,2448,2555,2718,2818,2901"
+ "startOffsets": "105,222,335,443,528,629,757,842,924,1016,1110,1208,1302,1403,1497,1593,1689,1781,1873,1955,2062,2162,2261,2369,2476,2583,2742,2842",
+ "endColumns": "116,112,107,84,100,127,84,81,91,93,97,93,100,93,95,95,91,91,81,106,99,98,107,106,106,158,99,81",
+ "endOffsets": "217,330,438,523,624,752,837,919,1011,1105,1203,1297,1398,1492,1588,1684,1776,1868,1950,2057,2157,2256,2364,2471,2578,2737,2837,2919"
}
},
{
- "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\values-it\\values-it.xml",
+ "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\values-es\\values-es.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -504,9 +504,9 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2906",
+ "startOffsets": "2924",
"endColumns": "100",
- "endOffsets": "3002"
+ "endOffsets": "3020"
}
}
]
@@ -670,21 +670,6 @@
}
]
},
- {
- "outputFile": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\values-night-v8_values-night-v8.arsc.flat",
- "map": [
- {
- "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\values-night-v8\\values-night-v8.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8",
- "startColumns": "4,4,4,4,4,4,4",
- "startOffsets": "55,125,209,293,389,491,593",
- "endColumns": "69,83,83,95,101,101,93",
- "endOffsets": "120,204,288,384,486,588,682"
- }
- }
- ]
- },
{
"outputFile": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\values-v16_values-v16.arsc.flat",
"map": [
@@ -719,6 +704,21 @@
}
]
},
+ {
+ "outputFile": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\values-night-v8_values-night-v8.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\values-night-v8\\values-night-v8.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8",
+ "startColumns": "4,4,4,4,4,4,4",
+ "startOffsets": "55,125,209,293,389,491,593",
+ "endColumns": "69,83,83,95,101,101,93",
+ "endOffsets": "120,204,288,384,486,588,682"
+ }
+ }
+ ]
+ },
{
"outputFile": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\values-is_values-is.arsc.flat",
"map": [
diff --git a/app/build/intermediates/blame/res/debug/single/debug.json b/app/build/intermediates/blame/res/debug/single/debug.json
index fe4b98a..757068c 100644
--- a/app/build/intermediates/blame/res/debug/single/debug.json
+++ b/app/build/intermediates/blame/res/debug/single/debug.json
@@ -8,16 +8,16 @@
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\layout-sw600dp-v13\\mtrl_layout_snackbar.xml"
},
{
- "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\anim_design_snackbar_in.xml.flat",
- "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\anim\\design_snackbar_in.xml"
+ "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_text_select_handle_left_mtrl_light.png.flat",
+ "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_text_select_handle_left_mtrl_light.png"
},
{
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_btn_check_to_on_mtrl_015.png.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_btn_check_to_on_mtrl_015.png"
},
{
- "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_text_select_handle_left_mtrl_light.png.flat",
- "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_text_select_handle_left_mtrl_light.png"
+ "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\anim_design_snackbar_in.xml.flat",
+ "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\anim\\design_snackbar_in.xml"
},
{
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_spinner_mtrl_am_alpha.9.png.flat",
@@ -103,14 +103,14 @@
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_text_select_handle_left_mtrl_dark.png.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_text_select_handle_left_mtrl_dark.png"
},
- {
- "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\color_abc_btn_colored_text_material.xml.flat",
- "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\color\\abc_btn_colored_text_material.xml"
- },
{
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_cascading_menu_item_layout.xml.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout\\abc_cascading_menu_item_layout.xml"
},
+ {
+ "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\color_abc_btn_colored_text_material.xml.flat",
+ "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\color\\abc_btn_colored_text_material.xml"
+ },
{
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_ic_menu_overflow_material.xml.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable\\abc_ic_menu_overflow_material.xml"
@@ -171,26 +171,26 @@
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-ldrtl-xxxhdpi-v17_abc_ic_menu_cut_mtrl_alpha.png.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-ldrtl-xxxhdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png"
},
- {
- "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_design_ic_visibility_off.png.flat",
- "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\drawable-xxxhdpi-v4\\design_ic_visibility_off.png"
- },
{
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_text_select_handle_left_mtrl_dark.png.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxxhdpi-v4\\abc_text_select_handle_left_mtrl_dark.png"
},
{
- "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_app_bar_main.xml.flat",
- "source": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\layout\\app_bar_main.xml"
+ "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_design_ic_visibility_off.png.flat",
+ "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\drawable-xxxhdpi-v4\\design_ic_visibility_off.png"
},
{
- "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_design_text_input_password_icon.xml.flat",
- "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\layout\\design_text_input_password_icon.xml"
+ "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_app_bar_main.xml.flat",
+ "source": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\layout\\app_bar_main.xml"
},
{
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_fragment_progress_fragmebt.xml.flat",
"source": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\layout\\fragment_progress_fragmebt.xml"
},
+ {
+ "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_design_text_input_password_icon.xml.flat",
+ "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\layout\\design_text_input_password_icon.xml"
+ },
{
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout-v21_notification_template_icon_group.xml.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\layout-v21\\notification_template_icon_group.xml"
@@ -263,14 +263,14 @@
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_list_divider_mtrl_alpha.9.png.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_list_divider_mtrl_alpha.9.png"
},
- {
- "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_ic_menu_cut_mtrl_alpha.png.flat",
- "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png"
- },
{
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_btn_switch_to_on_mtrl_00001.9.png.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png"
},
+ {
+ "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_ic_menu_cut_mtrl_alpha.png.flat",
+ "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png"
+ },
{
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_list_selector_disabled_holo_light.9.png.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_list_selector_disabled_holo_light.9.png"
@@ -311,14 +311,14 @@
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_list_pressed_holo_light.9.png.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_list_pressed_holo_light.9.png"
},
- {
- "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\anim_abc_shrink_fade_out_from_bottom.xml.flat",
- "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\anim\\abc_shrink_fade_out_from_bottom.xml"
- },
{
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_popup_menu_header_item_layout.xml.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout\\abc_popup_menu_header_item_layout.xml"
},
+ {
+ "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\anim_abc_shrink_fade_out_from_bottom.xml.flat",
+ "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\anim\\abc_shrink_fade_out_from_bottom.xml"
+ },
{
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xhdpi_ic_launcher_foreground.png.flat",
"source": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\mipmap-xhdpi\\ic_launcher_foreground.png"
@@ -391,14 +391,14 @@
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_scrubber_primary_mtrl_alpha.9.png.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png"
},
- {
- "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_list_menu_item_checkbox.xml.flat",
- "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout\\abc_list_menu_item_checkbox.xml"
- },
{
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\color_mtrl_text_btn_text_color_selector.xml.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\color\\mtrl_text_btn_text_color_selector.xml"
},
+ {
+ "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_list_menu_item_checkbox.xml.flat",
+ "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout\\abc_list_menu_item_checkbox.xml"
+ },
{
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_part_chronometer.xml.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\layout\\notification_template_part_chronometer.xml"
@@ -435,14 +435,14 @@
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_scrubber_control_off_mtrl_alpha.png.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_scrubber_control_off_mtrl_alpha.png"
},
- {
- "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_ic_menu_share.xml.flat",
- "source": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\drawable\\ic_menu_share.xml"
- },
{
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_ic_commit_search_api_mtrl_alpha.png.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_ic_commit_search_api_mtrl_alpha.png"
},
+ {
+ "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_ic_menu_share.xml.flat",
+ "source": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\drawable\\ic_menu_share.xml"
+ },
{
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_list_pressed_holo_dark.9.png.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_list_pressed_holo_dark.9.png"
@@ -455,14 +455,14 @@
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_btn_check_to_on_mtrl_015.png.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_btn_check_to_on_mtrl_015.png"
},
- {
- "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\animator_mtrl_fab_show_motion_spec.xml.flat",
- "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\animator\\mtrl_fab_show_motion_spec.xml"
- },
{
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\animator_mtrl_fab_transformation_sheet_expand_spec.xml.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\animator\\mtrl_fab_transformation_sheet_expand_spec.xml"
},
+ {
+ "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\animator_mtrl_fab_show_motion_spec.xml.flat",
+ "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\animator\\mtrl_fab_show_motion_spec.xml"
+ },
{
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_btn_check_to_on_mtrl_000.png.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_btn_check_to_on_mtrl_000.png"
@@ -483,14 +483,14 @@
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_notification_icon_background.xml.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\drawable\\notification_icon_background.xml"
},
- {
- "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_btn_check_to_on_mtrl_000.png.flat",
- "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_btn_check_to_on_mtrl_000.png"
- },
{
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-ldrtl-xhdpi-v17_abc_ic_menu_copy_mtrl_am_alpha.png.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-ldrtl-xhdpi-v17\\abc_ic_menu_copy_mtrl_am_alpha.png"
},
+ {
+ "merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_btn_check_to_on_mtrl_000.png.flat",
+ "source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_btn_check_to_on_mtrl_000.png"
+ },
{
"merged": "C:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\color_switch_thumb_material_dark.xml.flat",
"source": "C:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\color\\switch_thumb_material_dark.xml"
diff --git a/app/build/intermediates/build-info/debug/build-info.xml b/app/build/intermediates/build-info/debug/build-info.xml
index 81a50f2..e6de961 100644
--- a/app/build/intermediates/build-info/debug/build-info.xml
+++ b/app/build/intermediates/build-info/debug/build-info.xml
@@ -1,105 +1,111 @@
+ duration="0" />
+ duration="1421" />
+ duration="0" />
-
+
+
-
+
+
diff --git a/app/build/intermediates/builds/debug/1540589021713/classes.dex b/app/build/intermediates/builds/debug/1540589021713/classes.dex
deleted file mode 100644
index 38b293d..0000000
Binary files a/app/build/intermediates/builds/debug/1540589021713/classes.dex and /dev/null differ
diff --git a/app/build/intermediates/builds/debug/1540592903984/classes.dex b/app/build/intermediates/builds/debug/1540592903984/classes.dex
deleted file mode 100644
index 8649859..0000000
Binary files a/app/build/intermediates/builds/debug/1540592903984/classes.dex and /dev/null differ
diff --git a/app/build/intermediates/builds/debug/1540598970678/classes.dex b/app/build/intermediates/builds/debug/1540598970678/classes.dex
deleted file mode 100644
index cbca4d5..0000000
Binary files a/app/build/intermediates/builds/debug/1540598970678/classes.dex and /dev/null differ
diff --git a/app/build/intermediates/builds/debug/1540598999027/classes.dex b/app/build/intermediates/builds/debug/1540598999027/classes.dex
deleted file mode 100644
index 5e0dad2..0000000
Binary files a/app/build/intermediates/builds/debug/1540598999027/classes.dex and /dev/null differ
diff --git a/app/build/intermediates/builds/debug/1540599040344/classes.dex b/app/build/intermediates/builds/debug/1540599040344/classes.dex
deleted file mode 100644
index 8b36fca..0000000
Binary files a/app/build/intermediates/builds/debug/1540599040344/classes.dex and /dev/null differ
diff --git a/app/build/intermediates/builds/debug/1540599321485/classes.dex b/app/build/intermediates/builds/debug/1540599321485/classes.dex
deleted file mode 100644
index 3c76bdc..0000000
Binary files a/app/build/intermediates/builds/debug/1540599321485/classes.dex and /dev/null differ
diff --git a/app/build/intermediates/builds/debug/1540599911435/classes.dex b/app/build/intermediates/builds/debug/1540599911435/classes.dex
deleted file mode 100644
index 3c76bdc..0000000
Binary files a/app/build/intermediates/builds/debug/1540599911435/classes.dex and /dev/null differ
diff --git a/app/build/intermediates/builds/debug/1540613423058/classes.dex b/app/build/intermediates/builds/debug/1540613423058/classes.dex
deleted file mode 100644
index cf00550..0000000
Binary files a/app/build/intermediates/builds/debug/1540613423058/classes.dex and /dev/null differ
diff --git a/app/build/intermediates/builds/debug/1540613652203/classes.dex b/app/build/intermediates/builds/debug/1540613652203/classes.dex
deleted file mode 100644
index 79be25f..0000000
Binary files a/app/build/intermediates/builds/debug/1540613652203/classes.dex and /dev/null differ
diff --git a/app/build/intermediates/builds/debug/1540614217562/classes.dex b/app/build/intermediates/builds/debug/1540614217562/classes.dex
deleted file mode 100644
index 20eab57..0000000
Binary files a/app/build/intermediates/builds/debug/1540614217562/classes.dex and /dev/null differ
diff --git a/app/build/intermediates/builds/debug/1540614868245/classes.dex b/app/build/intermediates/builds/debug/1540614868245/classes.dex
deleted file mode 100644
index cb4e0f2..0000000
Binary files a/app/build/intermediates/builds/debug/1540614868245/classes.dex and /dev/null differ
diff --git a/app/build/intermediates/builds/debug/1540615302276/classes.dex b/app/build/intermediates/builds/debug/1540615302276/classes.dex
deleted file mode 100644
index 49500f8..0000000
Binary files a/app/build/intermediates/builds/debug/1540615302276/classes.dex and /dev/null differ
diff --git a/app/build/intermediates/builds/debug/1540621157706/classes.dex b/app/build/intermediates/builds/debug/1540621157706/classes.dex
deleted file mode 100644
index 638e8bc..0000000
Binary files a/app/build/intermediates/builds/debug/1540621157706/classes.dex and /dev/null differ
diff --git a/app/build/intermediates/builds/debug/1540621177332/classes.dex b/app/build/intermediates/builds/debug/1540621177332/classes.dex
deleted file mode 100644
index 0dd7368..0000000
Binary files a/app/build/intermediates/builds/debug/1540621177332/classes.dex and /dev/null differ
diff --git a/app/build/intermediates/builds/debug/1540630724124/classes.dex b/app/build/intermediates/builds/debug/1540630724124/classes.dex
deleted file mode 100644
index d17addd..0000000
Binary files a/app/build/intermediates/builds/debug/1540630724124/classes.dex and /dev/null differ
diff --git a/app/build/intermediates/builds/debug/1540640898692/classes.dex b/app/build/intermediates/builds/debug/1540640898692/classes.dex
deleted file mode 100644
index c2f2636..0000000
Binary files a/app/build/intermediates/builds/debug/1540640898692/classes.dex and /dev/null differ
diff --git a/app/build/intermediates/incremental-verifier/debug/android/support/asynclayoutinflater/R$id.class b/app/build/intermediates/incremental-verifier/debug/android/support/asynclayoutinflater/R$id.class
index f505103..a25850a 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/android/support/asynclayoutinflater/R$id.class and b/app/build/intermediates/incremental-verifier/debug/android/support/asynclayoutinflater/R$id.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/android/support/compat/R$id.class b/app/build/intermediates/incremental-verifier/debug/android/support/compat/R$id.class
index c912039..aa9eeea 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/android/support/compat/R$id.class and b/app/build/intermediates/incremental-verifier/debug/android/support/compat/R$id.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/android/support/constraint/R$id.class b/app/build/intermediates/incremental-verifier/debug/android/support/constraint/R$id.class
index 5887695..fe4ed4d 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/android/support/constraint/R$id.class and b/app/build/intermediates/incremental-verifier/debug/android/support/constraint/R$id.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/android/support/coordinatorlayout/R$id.class b/app/build/intermediates/incremental-verifier/debug/android/support/coordinatorlayout/R$id.class
index edba03a..51c10ab 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/android/support/coordinatorlayout/R$id.class and b/app/build/intermediates/incremental-verifier/debug/android/support/coordinatorlayout/R$id.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/android/support/coreui/R$id.class b/app/build/intermediates/incremental-verifier/debug/android/support/coreui/R$id.class
index a5b0be7..c95b4d2 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/android/support/coreui/R$id.class and b/app/build/intermediates/incremental-verifier/debug/android/support/coreui/R$id.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/android/support/coreutils/R$id.class b/app/build/intermediates/incremental-verifier/debug/android/support/coreutils/R$id.class
index f95fb27..acbdeb1 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/android/support/coreutils/R$id.class and b/app/build/intermediates/incremental-verifier/debug/android/support/coreutils/R$id.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/android/support/customview/R$id.class b/app/build/intermediates/incremental-verifier/debug/android/support/customview/R$id.class
index cc916de..7cd8a60 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/android/support/customview/R$id.class and b/app/build/intermediates/incremental-verifier/debug/android/support/customview/R$id.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/android/support/design/R$id.class b/app/build/intermediates/incremental-verifier/debug/android/support/design/R$id.class
index 931109f..5fb0dae 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/android/support/design/R$id.class and b/app/build/intermediates/incremental-verifier/debug/android/support/design/R$id.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/android/support/drawerlayout/R$id.class b/app/build/intermediates/incremental-verifier/debug/android/support/drawerlayout/R$id.class
index 3538cb2..5674570 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/android/support/drawerlayout/R$id.class and b/app/build/intermediates/incremental-verifier/debug/android/support/drawerlayout/R$id.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/android/support/fragment/R$id.class b/app/build/intermediates/incremental-verifier/debug/android/support/fragment/R$id.class
index 908b4a1..45ef276 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/android/support/fragment/R$id.class and b/app/build/intermediates/incremental-verifier/debug/android/support/fragment/R$id.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/android/support/graphics/drawable/R$id.class b/app/build/intermediates/incremental-verifier/debug/android/support/graphics/drawable/R$id.class
index 4c8e385..2a2a62a 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/android/support/graphics/drawable/R$id.class and b/app/build/intermediates/incremental-verifier/debug/android/support/graphics/drawable/R$id.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/android/support/loader/R$id.class b/app/build/intermediates/incremental-verifier/debug/android/support/loader/R$id.class
index 92f2cc3..99c6266 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/android/support/loader/R$id.class and b/app/build/intermediates/incremental-verifier/debug/android/support/loader/R$id.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/android/support/mediacompat/R$id.class b/app/build/intermediates/incremental-verifier/debug/android/support/mediacompat/R$id.class
index 6860d27..e83c7ac 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/android/support/mediacompat/R$id.class and b/app/build/intermediates/incremental-verifier/debug/android/support/mediacompat/R$id.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/android/support/slidingpanelayout/R$id.class b/app/build/intermediates/incremental-verifier/debug/android/support/slidingpanelayout/R$id.class
index 59d0d56..86f4ad7 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/android/support/slidingpanelayout/R$id.class and b/app/build/intermediates/incremental-verifier/debug/android/support/slidingpanelayout/R$id.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/android/support/swiperefreshlayout/R$id.class b/app/build/intermediates/incremental-verifier/debug/android/support/swiperefreshlayout/R$id.class
index a0980f9..fa10ed9 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/android/support/swiperefreshlayout/R$id.class and b/app/build/intermediates/incremental-verifier/debug/android/support/swiperefreshlayout/R$id.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/android/support/transition/R$id.class b/app/build/intermediates/incremental-verifier/debug/android/support/transition/R$id.class
index 59ea20b..ec9364d 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/android/support/transition/R$id.class and b/app/build/intermediates/incremental-verifier/debug/android/support/transition/R$id.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/android/support/v4/R$id.class b/app/build/intermediates/incremental-verifier/debug/android/support/v4/R$id.class
index 10f24c0..3863c6b 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/android/support/v4/R$id.class and b/app/build/intermediates/incremental-verifier/debug/android/support/v4/R$id.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/android/support/v7/appcompat/R$id.class b/app/build/intermediates/incremental-verifier/debug/android/support/v7/appcompat/R$id.class
index 7133168..2cf15b6 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/android/support/v7/appcompat/R$id.class and b/app/build/intermediates/incremental-verifier/debug/android/support/v7/appcompat/R$id.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/android/support/v7/recyclerview/R$id.class b/app/build/intermediates/incremental-verifier/debug/android/support/v7/recyclerview/R$id.class
index 336c7ce..c129b49 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/android/support/v7/recyclerview/R$id.class and b/app/build/intermediates/incremental-verifier/debug/android/support/v7/recyclerview/R$id.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/android/support/v7/viewpager/R$id.class b/app/build/intermediates/incremental-verifier/debug/android/support/v7/viewpager/R$id.class
index d580231..667ecb1 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/android/support/v7/viewpager/R$id.class and b/app/build/intermediates/incremental-verifier/debug/android/support/v7/viewpager/R$id.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/Chat.class b/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/Chat.class
index d0f6899..87260a6 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/Chat.class and b/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/Chat.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/DragAdapter.class b/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/DragAdapter.class
index 3ae54c1..16054ca 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/DragAdapter.class and b/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/DragAdapter.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/DrugInfo.class b/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/DrugInfo.class
index 48380e6..8e52b88 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/DrugInfo.class and b/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/DrugInfo.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/Drugs.class b/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/Drugs.class
index 312ce75..1673102 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/Drugs.class and b/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/Drugs.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/LoginActivity.class b/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/LoginActivity.class
index 5ecdf08..4d52662 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/LoginActivity.class and b/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/LoginActivity.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/MainActivity.class b/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/MainActivity.class
index f166c10..10f7730 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/MainActivity.class and b/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/MainActivity.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/ProgressFragmebt$ProgressTask.class b/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/ProgressFragmebt$ProgressTask.class
index f6c3889..5bfbb1d 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/ProgressFragmebt$ProgressTask.class and b/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/ProgressFragmebt$ProgressTask.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/ProgressFragmebt.class b/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/ProgressFragmebt.class
index 2c2a425..6a05fc0 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/ProgressFragmebt.class and b/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/ProgressFragmebt.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/R$id.class b/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/R$id.class
index af106bf..fe87f1c 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/R$id.class and b/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/R$id.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/RecipeAdapter.class b/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/RecipeAdapter.class
index 4a24a83..0428cd2 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/RecipeAdapter.class and b/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/RecipeAdapter.class differ
diff --git a/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/RecipeInfo.class b/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/RecipeInfo.class
index fa135ef..418e491 100644
Binary files a/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/RecipeInfo.class and b/app/build/intermediates/incremental-verifier/debug/com/ivanf/healthadviser/RecipeInfo.class differ
diff --git a/app/build/intermediates/incremental/ir_dep/debug/package_dependencies/dex-renamer-state.txt b/app/build/intermediates/incremental/ir_dep/debug/package_dependencies/dex-renamer-state.txt
index 7d08c33..fce9604 100644
--- a/app/build/intermediates/incremental/ir_dep/debug/package_dependencies/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/ir_dep/debug/package_dependencies/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Sun Oct 28 06:27:14 MSK 2018
+#Sun Oct 28 07:33:55 MSK 2018
base.0=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\10
path.0=classes.dex
renamed.0=classes.dex
diff --git a/app/build/intermediates/incremental/ir_slices/debug/package_slice_0/dex-renamer-state.txt b/app/build/intermediates/incremental/ir_slices/debug/package_slice_0/dex-renamer-state.txt
index 078649a..963e0eb 100644
--- a/app/build/intermediates/incremental/ir_slices/debug/package_slice_0/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/ir_slices/debug/package_slice_0/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Sun Oct 28 06:27:17 MSK 2018
+#Sun Oct 28 07:33:56 MSK 2018
base.0=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\0
path.0=classes.dex
renamed.0=classes.dex
diff --git a/app/build/intermediates/incremental/ir_slices/debug/package_slice_1/dex-renamer-state.txt b/app/build/intermediates/incremental/ir_slices/debug/package_slice_1/dex-renamer-state.txt
index bf9defb..e13cbbc 100644
--- a/app/build/intermediates/incremental/ir_slices/debug/package_slice_1/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/ir_slices/debug/package_slice_1/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Sun Oct 28 06:27:17 MSK 2018
+#Sun Oct 28 07:33:56 MSK 2018
base.0=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\1
path.0=classes.dex
renamed.0=classes.dex
diff --git a/app/build/intermediates/incremental/ir_slices/debug/package_slice_2/dex-renamer-state.txt b/app/build/intermediates/incremental/ir_slices/debug/package_slice_2/dex-renamer-state.txt
index 49a2be5..4bdabdb 100644
--- a/app/build/intermediates/incremental/ir_slices/debug/package_slice_2/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/ir_slices/debug/package_slice_2/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Sun Oct 28 06:27:17 MSK 2018
+#Sun Oct 28 07:33:56 MSK 2018
base.0=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\2
path.0=classes.dex
renamed.0=classes.dex
diff --git a/app/build/intermediates/incremental/ir_slices/debug/package_slice_3/dex-renamer-state.txt b/app/build/intermediates/incremental/ir_slices/debug/package_slice_3/dex-renamer-state.txt
index 96eb6e3..817451e 100644
--- a/app/build/intermediates/incremental/ir_slices/debug/package_slice_3/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/ir_slices/debug/package_slice_3/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Sun Oct 28 06:27:17 MSK 2018
+#Sun Oct 28 07:33:56 MSK 2018
base.0=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\3
path.0=classes.dex
renamed.0=classes.dex
diff --git a/app/build/intermediates/incremental/ir_slices/debug/package_slice_4/dex-renamer-state.txt b/app/build/intermediates/incremental/ir_slices/debug/package_slice_4/dex-renamer-state.txt
index 517387c..37dbdd7 100644
--- a/app/build/intermediates/incremental/ir_slices/debug/package_slice_4/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/ir_slices/debug/package_slice_4/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Sun Oct 28 06:27:17 MSK 2018
+#Sun Oct 28 07:33:56 MSK 2018
base.0=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\4
path.0=classes.dex
renamed.0=classes.dex
diff --git a/app/build/intermediates/incremental/ir_slices/debug/package_slice_5/dex-renamer-state.txt b/app/build/intermediates/incremental/ir_slices/debug/package_slice_5/dex-renamer-state.txt
index 2f320af..2ee2815 100644
--- a/app/build/intermediates/incremental/ir_slices/debug/package_slice_5/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/ir_slices/debug/package_slice_5/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Sun Oct 28 06:27:17 MSK 2018
+#Sun Oct 28 07:33:56 MSK 2018
base.0=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\5
path.0=classes.dex
renamed.0=classes.dex
diff --git a/app/build/intermediates/incremental/ir_slices/debug/package_slice_6/dex-renamer-state.txt b/app/build/intermediates/incremental/ir_slices/debug/package_slice_6/dex-renamer-state.txt
index 421c3e8..5fee498 100644
--- a/app/build/intermediates/incremental/ir_slices/debug/package_slice_6/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/ir_slices/debug/package_slice_6/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Sun Oct 28 06:27:17 MSK 2018
+#Sun Oct 28 07:33:56 MSK 2018
base.0=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\6
path.0=classes.dex
renamed.0=classes.dex
diff --git a/app/build/intermediates/incremental/ir_slices/debug/package_slice_7/dex-renamer-state.txt b/app/build/intermediates/incremental/ir_slices/debug/package_slice_7/dex-renamer-state.txt
index 74f8c69..74d039e 100644
--- a/app/build/intermediates/incremental/ir_slices/debug/package_slice_7/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/ir_slices/debug/package_slice_7/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Sun Oct 28 06:27:17 MSK 2018
+#Sun Oct 28 07:33:56 MSK 2018
base.0=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\7
path.0=classes.dex
renamed.0=classes.dex
diff --git a/app/build/intermediates/incremental/ir_slices/debug/package_slice_8/dex-renamer-state.txt b/app/build/intermediates/incremental/ir_slices/debug/package_slice_8/dex-renamer-state.txt
index d0678ed..2d7137d 100644
--- a/app/build/intermediates/incremental/ir_slices/debug/package_slice_8/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/ir_slices/debug/package_slice_8/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Sun Oct 28 06:27:17 MSK 2018
+#Sun Oct 28 07:33:56 MSK 2018
base.0=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\8
path.0=classes.dex
renamed.0=classes.dex
diff --git a/app/build/intermediates/incremental/ir_slices/debug/package_slice_9/dex-renamer-state.txt b/app/build/intermediates/incremental/ir_slices/debug/package_slice_9/dex-renamer-state.txt
index 3464364..435b802 100644
--- a/app/build/intermediates/incremental/ir_slices/debug/package_slice_9/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/ir_slices/debug/package_slice_9/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Sun Oct 28 06:27:17 MSK 2018
+#Sun Oct 28 07:33:56 MSK 2018
base.0=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\9
path.0=classes.dex
renamed.0=classes.dex
diff --git a/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
index 02a410c..00441ec 100644
--- a/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+++ b/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Sun Oct 28 06:26:21 MSK 2018
+#Sun Oct 28 07:03:09 MSK 2018
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable\\abc_ic_arrow_drop_right_black_24dp.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_ic_arrow_drop_right_black_24dp.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout\\abc_screen_simple_overlay_action_mode.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_screen_simple_overlay_action_mode.xml.flat
C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\drawable\\ic_menu_camera.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_ic_menu_camera.xml.flat
@@ -285,45 +285,45 @@ C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0
C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\drawable\\ic_menu_slideshow.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_ic_menu_slideshow.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\layout\\notification_template_part_time.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_part_time.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\anim\\abc_popup_enter.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\anim_abc_popup_enter.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxxhdpi-v4\\abc_ic_star_black_48dp.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_ic_star_black_48dp.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-media-compat-28.0.0.aar\\717962eedfd692e412dda653eb108ce1\\res\\layout\\notification_template_media.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_media.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\layout\\design_navigation_item_subheader.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_design_navigation_item_subheader.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxxhdpi-v4\\abc_ic_star_black_48dp.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_ic_star_black_48dp.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout-watch-v20\\abc_alert_dialog_title_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout-watch-v20_abc_alert_dialog_title_material.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\layout\\design_navigation_item_subheader.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_design_navigation_item_subheader.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_tab_indicator_mtrl_alpha.9.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_list_focused_holo.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_list_focused_holo.9.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_btn_check_to_on_mtrl_000.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_btn_check_to_on_mtrl_000.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\layout\\design_navigation_item_header.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_design_navigation_item_header.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-media-compat-28.0.0.aar\\717962eedfd692e412dda653eb108ce1\\res\\layout\\notification_template_big_media.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_big_media.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_btn_check_to_on_mtrl_000.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_btn_check_to_on_mtrl_000.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_list_focused_holo.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_list_focused_holo.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\color\\design_error.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\color_design_error.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-media-compat-28.0.0.aar\\717962eedfd692e412dda653eb108ce1\\res\\layout\\notification_template_big_media.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_big_media.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-media-compat-28.0.0.aar\\717962eedfd692e412dda653eb108ce1\\res\\layout\\notification_template_big_media_narrow.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_big_media_narrow.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout\\support_simple_spinner_dropdown_item.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_support_simple_spinner_dropdown_item.xml.flat
C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\layout\\content_drug_info.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_content_drug_info.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-media-compat-28.0.0.aar\\717962eedfd692e412dda653eb108ce1\\res\\layout\\notification_template_lines_media.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_lines_media.xml.flat
C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\menu\\menu_drug_info.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\menu_menu_drug_info.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-media-compat-28.0.0.aar\\717962eedfd692e412dda653eb108ce1\\res\\layout\\notification_template_lines_media.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_lines_media.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_ic_star_half_black_48dp.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_ic_star_half_black_48dp.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_textfield_search_default_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_textfield_search_default_mtrl_alpha.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-media-compat-28.0.0.aar\\717962eedfd692e412dda653eb108ce1\\res\\layout\\notification_template_media_custom.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_media_custom.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable\\tooltip_frame_dark.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_tooltip_frame_dark.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_textfield_search_default_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_textfield_search_default_mtrl_alpha.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_ic_menu_paste_mtrl_am_alpha.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_list_divider_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_list_divider_mtrl_alpha.9.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable\\tooltip_frame_dark.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_tooltip_frame_dark.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout\\abc_search_dropdown_item_icons_2line.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_search_dropdown_item_icons_2line.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\drawable-hdpi-v4\\notify_panel_notification_icon_bg.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_notify_panel_notification_icon_bg.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_list_divider_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_list_divider_mtrl_alpha.9.png.flat
C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\layout\\content_recipe_info.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_content_recipe_info.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\drawable-hdpi-v4\\notify_panel_notification_icon_bg.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_notify_panel_notification_icon_bg.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_btn_switch_to_on_mtrl_00012.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_list_longpressed_holo.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_list_longpressed_holo.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-media-compat-28.0.0.aar\\717962eedfd692e412dda653eb108ce1\\res\\layout\\notification_template_big_media_narrow_custom.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_big_media_narrow_custom.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\color\\mtrl_bottom_nav_item_tint.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\color_mtrl_bottom_nav_item_tint.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_scrubber_primary_mtrl_alpha.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_ic_star_black_16dp.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_ic_star_black_16dp.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable\\abc_cab_background_top_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_cab_background_top_material.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout\\abc_popup_menu_header_item_layout.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_popup_menu_header_item_layout.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable\\abc_cab_background_top_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_cab_background_top_material.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout\\abc_search_view.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_search_view.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable\\abc_ic_clear_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_ic_clear_material.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\color\\abc_primary_text_material_light.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\color_abc_primary_text_material_light.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_text_select_handle_right_mtrl_dark.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_text_select_handle_right_mtrl_dark.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\drawable-hdpi-v4\\design_ic_visibility.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_design_ic_visibility.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\drawable\\design_snackbar_background.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_design_snackbar_background.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_btn_check_to_on_mtrl_000.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_btn_check_to_on_mtrl_000.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\drawable\\design_snackbar_background.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_design_snackbar_background.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable\\abc_ic_ab_back_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_ic_ab_back_material.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable\\abc_seekbar_thumb_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_seekbar_thumb_material.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_list_pressed_holo_light.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_list_pressed_holo_light.9.png.flat
@@ -332,84 +332,84 @@ C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\layout\\design_menu_item_action_area.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_design_menu_item_action_area.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_text_select_handle_left_mtrl_dark.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_text_select_handle_left_mtrl_dark.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\animator\\mtrl_fab_hide_motion_spec.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\animator_mtrl_fab_hide_motion_spec.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout\\abc_activity_chooser_view.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_activity_chooser_view.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\drawable-xhdpi-v4\\notify_panel_notification_icon_bg.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_notify_panel_notification_icon_bg.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxxhdpi-v4\\abc_ic_star_half_black_36dp.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_ic_star_half_black_36dp.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout\\abc_activity_chooser_view.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_activity_chooser_view.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_scrubber_control_to_pressed_mtrl_000.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxxhdpi-v4\\abc_btn_radio_to_on_mtrl_000.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_btn_radio_to_on_mtrl_000.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxxhdpi-v4\\abc_ic_star_half_black_36dp.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_ic_star_half_black_36dp.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_text_select_handle_right_mtrl_light.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_text_select_handle_right_mtrl_light.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxxhdpi-v4\\abc_btn_radio_to_on_mtrl_000.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_btn_radio_to_on_mtrl_000.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\drawable-xxxhdpi-v4\\design_ic_visibility_off.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_design_ic_visibility_off.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_btn_switch_to_on_mtrl_00012.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\layout\\design_bottom_sheet_dialog.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_design_bottom_sheet_dialog.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_btn_switch_to_on_mtrl_00012.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\color\\mtrl_tabs_icon_color_selector.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\color_mtrl_tabs_icon_color_selector.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable\\abc_spinner_textfield_background_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_spinner_textfield_background_material.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_text_select_handle_middle_mtrl_light.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_text_select_handle_middle_mtrl_light.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable\\abc_spinner_textfield_background_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_spinner_textfield_background_material.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\anim\\abc_slide_out_bottom.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\anim_abc_slide_out_bottom.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_scrubber_control_to_pressed_mtrl_000.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-v23\\abc_control_background_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v23_abc_control_background_material.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable\\abc_cab_background_internal_bg.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_cab_background_internal_bg.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-v23\\abc_control_background_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v23_abc_control_background_material.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_ic_commit_search_api_mtrl_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_ic_commit_search_api_mtrl_alpha.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_scrubber_track_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_scrubber_track_mtrl_alpha.9.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-v21\\abc_list_divider_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21_abc_list_divider_material.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\drawable-mdpi-v4\\notification_bg_normal.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_notification_bg_normal.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout\\abc_alert_dialog_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_alert_dialog_material.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\drawable-mdpi-v4\\notification_bg_normal.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_notification_bg_normal.9.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-v21\\abc_list_divider_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21_abc_list_divider_material.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_switch_track_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_switch_track_mtrl_alpha.9.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\drawable-v21\\avd_show_password.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21_avd_show_password.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable\\abc_vector_test.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_vector_test.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\drawable-v21\\avd_show_password.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21_avd_show_password.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\drawable-mdpi-v4\\notify_panel_notification_icon_bg.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_notify_panel_notification_icon_bg.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_btn_switch_to_on_mtrl_00001.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\color\\abc_tint_spinner.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\color_abc_tint_spinner.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_btn_switch_to_on_mtrl_00001.9.png.flat
C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\mipmap-xhdpi\\ic_launcher_round.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xhdpi_ic_launcher_round.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_btn_radio_to_on_mtrl_015.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_btn_radio_to_on_mtrl_015.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_ic_menu_copy_mtrl_am_alpha.png.flat
-C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\layout\\activity_chat.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_chat.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_btn_radio_to_on_mtrl_015.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_btn_radio_to_on_mtrl_015.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-ldrtl-xxxhdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-ldrtl-xxxhdpi-v17_abc_ic_menu_cut_mtrl_alpha.png.flat
+C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\layout\\activity_chat.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_chat.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\color\\mtrl_btn_ripple_color.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\color_mtrl_btn_ripple_color.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-ldrtl-mdpi-v17\\abc_ic_menu_copy_mtrl_am_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-ldrtl-mdpi-v17_abc_ic_menu_copy_mtrl_am_alpha.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxxhdpi-v4\\abc_ic_star_black_36dp.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_ic_star_black_36dp.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_switch_track_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_switch_track_mtrl_alpha.9.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxxhdpi-v4\\abc_ic_star_black_36dp.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_ic_star_black_36dp.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_ic_star_black_48dp.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\drawable-xhdpi-v4\\design_ic_visibility_off.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_design_ic_visibility_off.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_popup_background_mtrl_mult.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_popup_background_mtrl_mult.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_text_select_handle_middle_mtrl_dark.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_text_select_handle_middle_mtrl_dark.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_popup_background_mtrl_mult.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_popup_background_mtrl_mult.9.png.flat
C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\layout\\content_main.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_content_main.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\color\\mtrl_btn_stroke_color_selector.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\color_mtrl_btn_stroke_color_selector.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_ic_star_half_black_48dp.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_ic_star_half_black_48dp.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout\\abc_dialog_title_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_dialog_title_material.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\anim\\abc_popup_exit.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\anim_abc_popup_exit.xml.flat
C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\layout\\activity_drug_info.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_drug_info.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\anim\\abc_popup_exit.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\anim_abc_popup_exit.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_ic_star_half_black_48dp.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_ic_star_half_black_48dp.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_ic_menu_paste_mtrl_am_alpha.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_ic_star_half_black_36dp.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_ic_star_half_black_36dp.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout\\abc_alert_dialog_title_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_alert_dialog_title_material.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_list_selector_disabled_holo_dark.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_list_selector_disabled_holo_dark.9.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_ic_star_half_black_36dp.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_ic_star_half_black_36dp.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_ic_menu_paste_mtrl_am_alpha.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\drawable-xxhdpi-v4\\design_ic_visibility_off.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_design_ic_visibility_off.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_scrubber_primary_mtrl_alpha.9.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_list_selector_disabled_holo_dark.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_list_selector_disabled_holo_dark.9.png.flat
C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\mipmap-xxxhdpi\\ic_launcher.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxxhdpi_ic_launcher.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_scrubber_primary_mtrl_alpha.9.png.flat
C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\layout\\activity_login.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_login.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout\\abc_list_menu_item_radio.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_list_menu_item_radio.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\layout\\design_layout_snackbar.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_design_layout_snackbar.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxxhdpi-v4\\abc_text_select_handle_left_mtrl_dark.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_text_select_handle_left_mtrl_dark.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\layout\\design_layout_snackbar.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_design_layout_snackbar.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_scrubber_control_off_mtrl_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_scrubber_control_off_mtrl_alpha.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_textfield_search_default_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_textfield_search_default_mtrl_alpha.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\layout\\design_text_input_password_icon.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_design_text_input_password_icon.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-v21\\abc_action_bar_item_background_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21_abc_action_bar_item_background_material.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_list_selector_disabled_holo_light.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_list_selector_disabled_holo_light.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxxhdpi-v4\\abc_text_select_handle_left_mtrl_light.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_text_select_handle_left_mtrl_light.png.flat
-C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\menu\\menu_recipe_info.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\menu_menu_recipe_info.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\layout-v21\\notification_template_icon_group.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout-v21_notification_template_icon_group.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\anim\\abc_slide_out_top.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\anim_abc_slide_out_top.xml.flat
+C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\menu\\menu_recipe_info.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\menu_menu_recipe_info.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_text_select_handle_right_mtrl_dark.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_text_select_handle_right_mtrl_dark.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\anim\\abc_slide_out_top.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\anim_abc_slide_out_top.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\drawable-mdpi-v4\\notification_bg_low_normal.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_notification_bg_low_normal.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_ic_menu_selectall_mtrl_alpha.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\drawable-v21\\notification_action_background.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21_notification_action_background.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxxhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_ic_menu_share_mtrl_alpha.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_ab_share_pack_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_ab_share_pack_mtrl_alpha.9.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_cab_background_top_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_cab_background_top_mtrl_alpha.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout\\abc_screen_content_include.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_screen_content_include.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_cab_background_top_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_cab_background_top_mtrl_alpha.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\drawable-v21\\design_password_eye.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21_design_password_eye.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_textfield_default_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_textfield_default_mtrl_alpha.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxxhdpi-v4\\abc_btn_check_to_on_mtrl_000.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_btn_check_to_on_mtrl_000.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_textfield_default_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_textfield_default_mtrl_alpha.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\layout-v21\\notification_action.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout-v21_notification_action.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_btn_switch_to_on_mtrl_00012.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\color\\mtrl_chip_background_color.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\color_mtrl_chip_background_color.xml.flat
@@ -419,28 +419,28 @@ C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_textfield_activated_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_textfield_activated_mtrl_alpha.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\color-v23\\abc_color_highlight_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\color-v23_abc_color_highlight_material.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\drawable-v21\\avd_hide_password.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21_avd_hide_password.xml.flat
-C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher_round.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher_round.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\drawable\\mtrl_snackbar_background.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_mtrl_snackbar_background.xml.flat
+C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher_round.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher_round.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable\\abc_ratingbar_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_ratingbar_material.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout\\abc_action_bar_title_item.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_action_bar_title_item.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\layout\\design_layout_tab_icon.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_design_layout_tab_icon.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_textfield_search_activated_mtrl_alpha.9.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_list_pressed_holo_light.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_list_pressed_holo_light.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_scrubber_track_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_scrubber_track_mtrl_alpha.9.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_tab_indicator_mtrl_alpha.9.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_list_selector_disabled_holo_dark.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_list_selector_disabled_holo_dark.9.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_list_pressed_holo_light.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_list_pressed_holo_light.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable\\abc_btn_radio_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_btn_radio_material.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_list_selector_disabled_holo_dark.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_list_selector_disabled_holo_dark.9.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_tab_indicator_mtrl_alpha.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_btn_switch_to_on_mtrl_00001.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout\\abc_cascading_menu_item_layout.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_cascading_menu_item_layout.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_ic_menu_share_mtrl_alpha.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\anim\\abc_tooltip_exit.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\anim_abc_tooltip_exit.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout\\abc_action_menu_item_layout.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_action_menu_item_layout.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_ic_menu_share_mtrl_alpha.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxxhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_ic_menu_selectall_mtrl_alpha.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_scrubber_primary_mtrl_alpha.9.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout\\abc_action_menu_item_layout.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_action_menu_item_layout.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable\\abc_ratingbar_indicator_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_ratingbar_indicator_material.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_scrubber_control_to_pressed_mtrl_005.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_scrubber_control_to_pressed_mtrl_005.png.flat
-C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_scrubber_primary_mtrl_alpha.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\color\\mtrl_tabs_colored_ripple_color.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\color_mtrl_tabs_colored_ripple_color.xml.flat
+C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_scrubber_control_to_pressed_mtrl_005.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_scrubber_control_to_pressed_mtrl_005.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\color\\abc_secondary_text_material_dark.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\color_abc_secondary_text_material_dark.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_ic_menu_cut_mtrl_alpha.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_btn_check_to_on_mtrl_000.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_btn_check_to_on_mtrl_000.png.flat
@@ -449,36 +449,36 @@ C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\layout\\design_navigation_item.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_design_navigation_item.xml.flat
C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher_foreground.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher_foreground.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_list_pressed_holo_light.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_list_pressed_holo_light.9.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\anim\\abc_fade_out.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\anim_abc_fade_out.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_menu_hardkey_panel_mtrl_mult.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_menu_hardkey_panel_mtrl_mult.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_text_select_handle_middle_mtrl_dark.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_text_select_handle_middle_mtrl_dark.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_menu_hardkey_panel_mtrl_mult.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_menu_hardkey_panel_mtrl_mult.9.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\anim\\abc_fade_out.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\anim_abc_fade_out.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_ic_commit_search_api_mtrl_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_ic_commit_search_api_mtrl_alpha.png.flat
C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\drawable-v24\\ic_launcher_foreground.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v24_ic_launcher_foreground.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\drawable\\navigation_empty_icon.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_navigation_empty_icon.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_ic_menu_share_mtrl_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_ic_menu_share_mtrl_alpha.png.flat
C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\layout\\app_bar_drugs.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_app_bar_drugs.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_ic_menu_share_mtrl_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_ic_menu_share_mtrl_alpha.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_ic_menu_cut_mtrl_alpha.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_ic_star_half_black_36dp.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_ic_star_half_black_36dp.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-ldrtl-mdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-ldrtl-mdpi-v17_abc_ic_menu_cut_mtrl_alpha.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_ic_star_half_black_36dp.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_ic_star_half_black_36dp.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_btn_check_to_on_mtrl_000.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_btn_check_to_on_mtrl_000.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_ic_star_black_48dp.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_ic_star_black_48dp.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_text_select_handle_left_mtrl_dark.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_text_select_handle_left_mtrl_dark.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_ic_star_black_48dp.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_ic_star_black_48dp.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_ic_star_black_48dp.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_ic_star_black_48dp.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable\\abc_list_selector_background_transition_holo_dark.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_list_selector_background_transition_holo_dark.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_scrubber_control_to_pressed_mtrl_000.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\layout\\notification_template_part_chronometer.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_part_chronometer.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout\\abc_screen_simple.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_screen_simple.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_btn_switch_to_on_mtrl_00012.9.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\layout\\notification_template_part_chronometer.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_part_chronometer.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\layout\\abc_action_menu_layout.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_action_menu_layout.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_btn_switch_to_on_mtrl_00012.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\color-v23\\abc_tint_seek_thumb.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\color-v23_abc_tint_seek_thumb.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_textfield_activated_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_textfield_activated_mtrl_alpha.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_list_selector_disabled_holo_dark.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_list_selector_disabled_holo_dark.9.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\drawable-hdpi-v4\\notification_bg_normal_pressed.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_notification_bg_normal_pressed.9.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_textfield_activated_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_textfield_activated_mtrl_alpha.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_ic_star_half_black_36dp.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_ic_star_half_black_36dp.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\drawable-hdpi-v4\\notification_bg_normal_pressed.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_notification_bg_normal_pressed.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_text_select_handle_right_mtrl_light.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_text_select_handle_right_mtrl_light.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\drawable-hdpi-v4\\notification_bg_normal.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_notification_bg_normal.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\drawable\\notification_tile_bg.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_notification_tile_bg.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\drawable-hdpi-v4\\notification_bg_normal.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_notification_bg_normal.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\color\\abc_primary_text_disable_only_material_light.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\color_abc_primary_text_disable_only_material_light.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_ab_share_pack_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_ab_share_pack_mtrl_alpha.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_menu_hardkey_panel_mtrl_mult.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_menu_hardkey_panel_mtrl_mult.9.png.flat
@@ -486,13 +486,13 @@ C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\drawable\\notification_icon_background.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_notification_icon_background.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxxhdpi-v4\\abc_ic_star_half_black_16dp.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_ic_star_half_black_16dp.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_popup_background_mtrl_mult.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_popup_background_mtrl_mult.9.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_scrubber_control_off_mtrl_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_scrubber_control_off_mtrl_alpha.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-v21\\abc_edit_text_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21_abc_edit_text_material.xml.flat
C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\layout\\activity_drugs.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_drugs.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-v21\\abc_edit_text_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21_abc_edit_text_material.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_scrubber_control_off_mtrl_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_scrubber_control_off_mtrl_alpha.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_btn_radio_to_on_mtrl_015.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_btn_radio_to_on_mtrl_015.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-watch-v20\\abc_dialog_material_background.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-watch-v20_abc_dialog_material_background.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_btn_switch_to_on_mtrl_00001.9.png.flat
C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\layout\\activity_main.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_main.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_btn_switch_to_on_mtrl_00001.9.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\drawable-anydpi-v21\\design_ic_visibility.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-anydpi-v21_design_ic_visibility.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-ldrtl-xhdpi-v17\\abc_ic_menu_copy_mtrl_am_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-ldrtl-xhdpi-v17_abc_ic_menu_copy_mtrl_am_alpha.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\drawable-xxxhdpi-v4\\design_ic_visibility.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_design_ic_visibility.png.flat
@@ -501,15 +501,15 @@ C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable\\abc_ic_menu_overflow_material.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_ic_menu_overflow_material.xml.flat
C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\menu\\main.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\menu_main.xml.flat
C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\layout\\nav_header_main.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_nav_header_main.xml.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\layout-v21\\notification_action_tombstone.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout-v21_notification_action_tombstone.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_switch_track_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_switch_track_mtrl_alpha.9.png.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\support-compat-28.0.0.aar\\6e8626cf88f993abf9bb2d5c1decf9de\\res\\layout-v21\\notification_action_tombstone.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout-v21_notification_action_tombstone.xml.flat
C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\mipmap-hdpi\\ic_launcher_foreground.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi_ic_launcher_foreground.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_cab_background_top_mtrl_alpha.9.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_cab_background_top_mtrl_alpha.9.png.flat
C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\mipmap-anydpi-v26\\ic_launcher_round.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-anydpi-v26_ic_launcher_round.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-hdpi-v4\\abc_btn_radio_to_on_mtrl_015.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_btn_radio_to_on_mtrl_015.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-mdpi-v4\\abc_btn_radio_to_on_mtrl_015.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_btn_radio_to_on_mtrl_015.png.flat
-C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_ic_menu_copy_mtrl_am_alpha.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\color\\mtrl_btn_bg_color_selector.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\color_mtrl_btn_bg_color_selector.xml.flat
-C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\layout\\activity_recipe_info.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_recipe_info.xml.flat
+C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_ic_menu_copy_mtrl_am_alpha.png.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\design-28.0.0.aar\\5e9425e85b4f77a422cf4fbd6ed13d13\\res\\interpolator-v21\\mtrl_fast_out_slow_in.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\interpolator-v21_mtrl_fast_out_slow_in.xml.flat
+C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\src\\main\\res\\layout\\activity_recipe_info.xml=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_recipe_info.xml.flat
C\:\\Users\\ivanf\\.gradle\\caches\\transforms-1\\files-1.1\\appcompat-v7-28.0.0.aar\\f6461184d79d294311fadbaf570e25f4\\res\\drawable-xhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png=C\:\\Users\\ivanf\\Desktop\\HackMoscow\\health_client\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_ic_menu_selectall_mtrl_alpha.png.flat
diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index ac163be..0a53df1 100644
--- a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Sun Oct 28 06:27:17 MSK 2018
+#Sun Oct 28 07:33:56 MSK 2018
path.1=classes.dex
path.0=classes.dex
renamed.10=classes11.dex
diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/file-input-save-data.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/file-input-save-data.txt
index cd9c3c6..8022d4b 100644
--- a/app/build/intermediates/incremental/packageDebug/tmp/debug/file-input-save-data.txt
+++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/file-input-save-data.txt
@@ -1,5 +1,5 @@
#Internal package file, do not edit.
-#Sun Oct 28 06:27:17 MSK 2018
+#Sun Oct 28 07:33:56 MSK 2018
4.path=classes.dex
8.set=DEX
6.path=classes.dex
diff --git a/app/build/intermediates/incremental/packageInstantRunResourcesDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageInstantRunResourcesDebug/tmp/debug/dex-renamer-state.txt
index 67fdd81..2296693 100644
--- a/app/build/intermediates/incremental/packageInstantRunResourcesDebug/tmp/debug/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/packageInstantRunResourcesDebug/tmp/debug/dex-renamer-state.txt
@@ -1 +1 @@
-#Sun Oct 28 06:27:05 MSK 2018
+#Sun Oct 28 07:03:11 MSK 2018
diff --git a/app/build/intermediates/incremental/packageInstantRunResourcesDebug/tmp/debug/zip-cache/BpPESGPdcBXJcJnA0g+SZHX31kQ= b/app/build/intermediates/incremental/packageInstantRunResourcesDebug/tmp/debug/zip-cache/BpPESGPdcBXJcJnA0g+SZHX31kQ=
index 1828237..b93f15c 100644
Binary files a/app/build/intermediates/incremental/packageInstantRunResourcesDebug/tmp/debug/zip-cache/BpPESGPdcBXJcJnA0g+SZHX31kQ= and b/app/build/intermediates/incremental/packageInstantRunResourcesDebug/tmp/debug/zip-cache/BpPESGPdcBXJcJnA0g+SZHX31kQ= differ
diff --git a/app/build/intermediates/instant-run-apk/debug/app-debug.apk b/app/build/intermediates/instant-run-apk/debug/app-debug.apk
index e8f1e6d..3e20b4a 100644
Binary files a/app/build/intermediates/instant-run-apk/debug/app-debug.apk and b/app/build/intermediates/instant-run-apk/debug/app-debug.apk differ
diff --git a/app/build/intermediates/instant-run-resources/resources-debug.ir.ap_ b/app/build/intermediates/instant-run-resources/resources-debug.ir.ap_
index 714eebf..1f9f6df 100644
Binary files a/app/build/intermediates/instant-run-resources/resources-debug.ir.ap_ and b/app/build/intermediates/instant-run-resources/resources-debug.ir.ap_ differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/asynclayoutinflater/R$id.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/asynclayoutinflater/R$id.class
index f505103..a25850a 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/asynclayoutinflater/R$id.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/asynclayoutinflater/R$id.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/compat/R$id.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/compat/R$id.class
index c912039..aa9eeea 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/compat/R$id.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/compat/R$id.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/constraint/R$id.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/constraint/R$id.class
index 5887695..fe4ed4d 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/constraint/R$id.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/constraint/R$id.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/coordinatorlayout/R$id.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/coordinatorlayout/R$id.class
index edba03a..51c10ab 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/coordinatorlayout/R$id.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/coordinatorlayout/R$id.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/coreui/R$id.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/coreui/R$id.class
index a5b0be7..c95b4d2 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/coreui/R$id.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/coreui/R$id.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/coreutils/R$id.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/coreutils/R$id.class
index f95fb27..acbdeb1 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/coreutils/R$id.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/coreutils/R$id.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/customview/R$id.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/customview/R$id.class
index cc916de..7cd8a60 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/customview/R$id.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/customview/R$id.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/design/R$id.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/design/R$id.class
index 931109f..5fb0dae 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/design/R$id.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/design/R$id.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/drawerlayout/R$id.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/drawerlayout/R$id.class
index 3538cb2..5674570 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/drawerlayout/R$id.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/drawerlayout/R$id.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/fragment/R$id.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/fragment/R$id.class
index 908b4a1..45ef276 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/fragment/R$id.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/fragment/R$id.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/graphics/drawable/R$id.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/graphics/drawable/R$id.class
index 4c8e385..2a2a62a 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/graphics/drawable/R$id.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/graphics/drawable/R$id.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/loader/R$id.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/loader/R$id.class
index 92f2cc3..99c6266 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/loader/R$id.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/loader/R$id.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/mediacompat/R$id.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/mediacompat/R$id.class
index 6860d27..e83c7ac 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/mediacompat/R$id.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/mediacompat/R$id.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/slidingpanelayout/R$id.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/slidingpanelayout/R$id.class
index 59d0d56..86f4ad7 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/slidingpanelayout/R$id.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/slidingpanelayout/R$id.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/swiperefreshlayout/R$id.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/swiperefreshlayout/R$id.class
index a0980f9..fa10ed9 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/swiperefreshlayout/R$id.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/swiperefreshlayout/R$id.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/transition/R$id.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/transition/R$id.class
index 59ea20b..ec9364d 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/transition/R$id.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/transition/R$id.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/v4/R$id.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/v4/R$id.class
index 10f24c0..3863c6b 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/v4/R$id.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/v4/R$id.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/v7/appcompat/R$id.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/v7/appcompat/R$id.class
index 7133168..2cf15b6 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/v7/appcompat/R$id.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/v7/appcompat/R$id.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/v7/recyclerview/R$id.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/v7/recyclerview/R$id.class
index 336c7ce..c129b49 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/v7/recyclerview/R$id.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/v7/recyclerview/R$id.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/v7/viewpager/R$id.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/v7/viewpager/R$id.class
index d580231..667ecb1 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/v7/viewpager/R$id.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/android/support/v7/viewpager/R$id.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/Chat.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/Chat.class
index d0f6899..87260a6 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/Chat.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/Chat.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/DragAdapter.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/DragAdapter.class
index 3ae54c1..16054ca 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/DragAdapter.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/DragAdapter.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/DrugInfo.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/DrugInfo.class
index 48380e6..8e52b88 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/DrugInfo.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/DrugInfo.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/Drugs.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/Drugs.class
index 312ce75..1673102 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/Drugs.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/Drugs.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/LoginActivity.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/LoginActivity.class
index 5ecdf08..4d52662 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/LoginActivity.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/LoginActivity.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/MainActivity.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/MainActivity.class
index f166c10..10f7730 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/MainActivity.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/MainActivity.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/ProgressFragmebt$ProgressTask.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/ProgressFragmebt$ProgressTask.class
index f6c3889..5bfbb1d 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/ProgressFragmebt$ProgressTask.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/ProgressFragmebt$ProgressTask.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/ProgressFragmebt.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/ProgressFragmebt.class
index 2c2a425..6a05fc0 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/ProgressFragmebt.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/ProgressFragmebt.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/R$id.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/R$id.class
index af106bf..fe87f1c 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/R$id.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/R$id.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/RecipeAdapter.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/RecipeAdapter.class
index 4a24a83..0428cd2 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/RecipeAdapter.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/RecipeAdapter.class differ
diff --git a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/RecipeInfo.class b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/RecipeInfo.class
index fa135ef..418e491 100644
Binary files a/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/RecipeInfo.class and b/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/ivanf/healthadviser/RecipeInfo.class differ
diff --git a/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_ b/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_
index 1828237..c7b02a0 100644
Binary files a/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_ and b/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_ differ
diff --git a/app/build/intermediates/res/merged/debug/layout_activity_chat.xml.flat b/app/build/intermediates/res/merged/debug/layout_activity_chat.xml.flat
index 14a946b..64cf905 100644
Binary files a/app/build/intermediates/res/merged/debug/layout_activity_chat.xml.flat and b/app/build/intermediates/res/merged/debug/layout_activity_chat.xml.flat differ
diff --git a/app/build/intermediates/res/merged/debug/layout_activity_login.xml.flat b/app/build/intermediates/res/merged/debug/layout_activity_login.xml.flat
index d7ea02b..6a48114 100644
Binary files a/app/build/intermediates/res/merged/debug/layout_activity_login.xml.flat and b/app/build/intermediates/res/merged/debug/layout_activity_login.xml.flat differ
diff --git a/app/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt b/app/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
index 5ca86dd..9671907 100644
--- a/app/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
+++ b/app/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
@@ -1085,7 +1085,6 @@ id barrier
id beginning
id blocking
id bottom
-id button2
id buttonPanel
id cancel_action
id capital
@@ -1248,6 +1247,7 @@ id standard
id start
id status_bar_latest_event_content
id stretch
+id subButton
id submenuarrow
id submit_area
id tabMode
diff --git a/app/build/intermediates/split-apk/debug/slices/slice_0.apk b/app/build/intermediates/split-apk/debug/slices/slice_0.apk
index 94e7ca6..7e19709 100644
Binary files a/app/build/intermediates/split-apk/debug/slices/slice_0.apk and b/app/build/intermediates/split-apk/debug/slices/slice_0.apk differ
diff --git a/app/build/intermediates/split-apk/debug/slices/slice_1.apk b/app/build/intermediates/split-apk/debug/slices/slice_1.apk
index 47b1613..6d5c869 100644
Binary files a/app/build/intermediates/split-apk/debug/slices/slice_1.apk and b/app/build/intermediates/split-apk/debug/slices/slice_1.apk differ
diff --git a/app/build/intermediates/split-apk/debug/slices/slice_3.apk b/app/build/intermediates/split-apk/debug/slices/slice_3.apk
index 8f27fc9..9489085 100644
Binary files a/app/build/intermediates/split-apk/debug/slices/slice_3.apk and b/app/build/intermediates/split-apk/debug/slices/slice_3.apk differ
diff --git a/app/build/intermediates/split-apk/debug/slices/slice_4.apk b/app/build/intermediates/split-apk/debug/slices/slice_4.apk
index 207b116..e6f7bf6 100644
Binary files a/app/build/intermediates/split-apk/debug/slices/slice_4.apk and b/app/build/intermediates/split-apk/debug/slices/slice_4.apk differ
diff --git a/app/build/intermediates/split-apk/debug/slices/slice_5.apk b/app/build/intermediates/split-apk/debug/slices/slice_5.apk
index d9a985e..347f0fb 100644
Binary files a/app/build/intermediates/split-apk/debug/slices/slice_5.apk and b/app/build/intermediates/split-apk/debug/slices/slice_5.apk differ
diff --git a/app/build/intermediates/split-apk/debug/slices/slice_6.apk b/app/build/intermediates/split-apk/debug/slices/slice_6.apk
index 2a3c4f4..6f44efc 100644
Binary files a/app/build/intermediates/split-apk/debug/slices/slice_6.apk and b/app/build/intermediates/split-apk/debug/slices/slice_6.apk differ
diff --git a/app/build/intermediates/split-apk/debug/slices/slice_7.apk b/app/build/intermediates/split-apk/debug/slices/slice_7.apk
index a9bf51f..bbfa184 100644
Binary files a/app/build/intermediates/split-apk/debug/slices/slice_7.apk and b/app/build/intermediates/split-apk/debug/slices/slice_7.apk differ
diff --git a/app/build/intermediates/split-apk/debug/slices/slice_8.apk b/app/build/intermediates/split-apk/debug/slices/slice_8.apk
index 1f66655..c5acdd8 100644
Binary files a/app/build/intermediates/split-apk/debug/slices/slice_8.apk and b/app/build/intermediates/split-apk/debug/slices/slice_8.apk differ
diff --git a/app/build/intermediates/split-apk/debug/slices/slice_9.apk b/app/build/intermediates/split-apk/debug/slices/slice_9.apk
index aabfb01..72bec1e 100644
Binary files a/app/build/intermediates/split-apk/debug/slices/slice_9.apk and b/app/build/intermediates/split-apk/debug/slices/slice_9.apk differ
diff --git a/app/build/intermediates/symbols/debug/R.txt b/app/build/intermediates/symbols/debug/R.txt
index 470ce1b..cdcfaeb 100644
--- a/app/build/intermediates/symbols/debug/R.txt
+++ b/app/build/intermediates/symbols/debug/R.txt
@@ -1084,169 +1084,169 @@ int id barrier 0x7f080028
int id beginning 0x7f080029
int id blocking 0x7f08002a
int id bottom 0x7f08002b
-int id button2 0x7f08002c
-int id buttonPanel 0x7f08002d
-int id cancel_action 0x7f08002e
-int id capital 0x7f08002f
-int id center 0x7f080030
-int id center_horizontal 0x7f080031
-int id center_vertical 0x7f080032
-int id chains 0x7f080033
-int id checkbox 0x7f080034
-int id chronometer 0x7f080035
-int id clip_horizontal 0x7f080036
-int id clip_vertical 0x7f080037
-int id collapseActionView 0x7f080038
-int id company 0x7f080039
-int id container 0x7f08003a
-int id content 0x7f08003b
-int id contentChat 0x7f08003c
-int id contentFragment 0x7f08003d
-int id contentFragmentChat 0x7f08003e
-int id contentPanel 0x7f08003f
-int id coordinator 0x7f080040
-int id custom 0x7f080041
-int id customPanel 0x7f080042
-int id decor_content_parent 0x7f080043
-int id default_activity_button 0x7f080044
-int id description_info 0x7f080045
-int id design_bottom_sheet 0x7f080046
-int id design_menu_item_action_area 0x7f080047
-int id design_menu_item_action_area_stub 0x7f080048
-int id design_menu_item_text 0x7f080049
-int id design_navigation_view 0x7f08004a
-int id dimensions 0x7f08004b
-int id direct 0x7f08004c
-int id disableHome 0x7f08004d
-int id downloadBtn 0x7f08004e
-int id dragsList 0x7f08004f
-int id drawer_layout 0x7f080050
-int id edit_query 0x7f080051
-int id email 0x7f080052
-int id email_login_form 0x7f080053
-int id email_sign_in_button 0x7f080054
-int id end 0x7f080055
-int id end_padder 0x7f080056
-int id enterAlways 0x7f080057
-int id enterAlwaysCollapsed 0x7f080058
-int id exitUntilCollapsed 0x7f080059
-int id expand_activities_button 0x7f08005a
-int id expanded_menu 0x7f08005b
-int id fab 0x7f08005c
-int id fill 0x7f08005d
-int id fill_horizontal 0x7f08005e
-int id fill_vertical 0x7f08005f
-int id filled 0x7f080060
-int id fixed 0x7f080061
-int id flag 0x7f080062
-int id forever 0x7f080063
-int id ghost_view 0x7f080064
-int id gone 0x7f080065
-int id group_divider 0x7f080066
-int id groups 0x7f080067
-int id home 0x7f080068
-int id homeAsUp 0x7f080069
-int id icon 0x7f08006a
-int id icon_group 0x7f08006b
-int id ifRoom 0x7f08006c
-int id image 0x7f08006d
-int id imageAdds 0x7f08006e
-int id imageView 0x7f08006f
-int id img 0x7f080070
-int id info 0x7f080071
-int id infoRecipe 0x7f080072
-int id infoText 0x7f080073
-int id invisible 0x7f080074
-int id italic 0x7f080075
-int id item_touch_helper_previous_elevation 0x7f080076
-int id labeled 0x7f080077
-int id largeLabel 0x7f080078
-int id left 0x7f080079
-int id line1 0x7f08007a
-int id line3 0x7f08007b
-int id listMode 0x7f08007c
-int id list_item 0x7f08007d
-int id login_form 0x7f08007e
-int id login_progress 0x7f08007f
-int id masked 0x7f080080
-int id media_actions 0x7f080081
-int id message 0x7f080082
-int id middle 0x7f080083
-int id mini 0x7f080084
-int id mtrl_child_content_container 0x7f080085
-int id mtrl_internal_children_alpha_tag 0x7f080086
-int id multiply 0x7f080087
-int id name 0x7f080088
-int id nav_chat 0x7f080089
-int id nav_exit 0x7f08008a
-int id nav_settings 0x7f08008b
-int id nav_view 0x7f08008c
-int id navigation_header_container 0x7f08008d
-int id never 0x7f08008e
-int id none 0x7f08008f
-int id normal 0x7f080090
-int id notification_background 0x7f080091
-int id notification_main_column 0x7f080092
-int id notification_main_column_container 0x7f080093
-int id outline 0x7f080094
-int id packed 0x7f080095
-int id parallax 0x7f080096
-int id parent 0x7f080097
-int id parentPanel 0x7f080098
-int id parent_matrix 0x7f080099
-int id password 0x7f08009a
-int id percent 0x7f08009b
-int id pin 0x7f08009c
-int id progress_circular 0x7f08009d
-int id progress_horizontal 0x7f08009e
-int id questionText 0x7f08009f
-int id radio 0x7f0800a0
-int id recipeList 0x7f0800a1
-int id right 0x7f0800a2
-int id right_icon 0x7f0800a3
-int id right_side 0x7f0800a4
-int id save_image_matrix 0x7f0800a5
-int id save_non_transition_alpha 0x7f0800a6
-int id save_scale_type 0x7f0800a7
-int id screen 0x7f0800a8
-int id scroll 0x7f0800a9
-int id scrollIndicatorDown 0x7f0800aa
-int id scrollIndicatorUp 0x7f0800ab
-int id scrollView 0x7f0800ac
-int id scrollable 0x7f0800ad
-int id search_badge 0x7f0800ae
-int id search_bar 0x7f0800af
-int id search_button 0x7f0800b0
-int id search_close_btn 0x7f0800b1
-int id search_edit_frame 0x7f0800b2
-int id search_go_btn 0x7f0800b3
-int id search_mag_icon 0x7f0800b4
-int id search_plate 0x7f0800b5
-int id search_src_text 0x7f0800b6
-int id search_voice_btn 0x7f0800b7
-int id seekBar 0x7f0800b8
-int id select_dialog_listview 0x7f0800b9
-int id selected 0x7f0800ba
-int id shortcut 0x7f0800bb
-int id showCustom 0x7f0800bc
-int id showHome 0x7f0800bd
-int id showTitle 0x7f0800be
-int id smallLabel 0x7f0800bf
-int id snackbar_action 0x7f0800c0
-int id snackbar_text 0x7f0800c1
-int id snap 0x7f0800c2
-int id snapMargins 0x7f0800c3
-int id spacer 0x7f0800c4
-int id split_action_bar 0x7f0800c5
-int id spread 0x7f0800c6
-int id spread_inside 0x7f0800c7
-int id src_atop 0x7f0800c8
-int id src_in 0x7f0800c9
-int id src_over 0x7f0800ca
-int id standard 0x7f0800cb
-int id start 0x7f0800cc
-int id status_bar_latest_event_content 0x7f0800cd
-int id stretch 0x7f0800ce
+int id buttonPanel 0x7f08002c
+int id cancel_action 0x7f08002d
+int id capital 0x7f08002e
+int id center 0x7f08002f
+int id center_horizontal 0x7f080030
+int id center_vertical 0x7f080031
+int id chains 0x7f080032
+int id checkbox 0x7f080033
+int id chronometer 0x7f080034
+int id clip_horizontal 0x7f080035
+int id clip_vertical 0x7f080036
+int id collapseActionView 0x7f080037
+int id company 0x7f080038
+int id container 0x7f080039
+int id content 0x7f08003a
+int id contentChat 0x7f08003b
+int id contentFragment 0x7f08003c
+int id contentFragmentChat 0x7f08003d
+int id contentPanel 0x7f08003e
+int id coordinator 0x7f08003f
+int id custom 0x7f080040
+int id customPanel 0x7f080041
+int id decor_content_parent 0x7f080042
+int id default_activity_button 0x7f080043
+int id description_info 0x7f080044
+int id design_bottom_sheet 0x7f080045
+int id design_menu_item_action_area 0x7f080046
+int id design_menu_item_action_area_stub 0x7f080047
+int id design_menu_item_text 0x7f080048
+int id design_navigation_view 0x7f080049
+int id dimensions 0x7f08004a
+int id direct 0x7f08004b
+int id disableHome 0x7f08004c
+int id downloadBtn 0x7f08004d
+int id dragsList 0x7f08004e
+int id drawer_layout 0x7f08004f
+int id edit_query 0x7f080050
+int id email 0x7f080051
+int id email_login_form 0x7f080052
+int id email_sign_in_button 0x7f080053
+int id end 0x7f080054
+int id end_padder 0x7f080055
+int id enterAlways 0x7f080056
+int id enterAlwaysCollapsed 0x7f080057
+int id exitUntilCollapsed 0x7f080058
+int id expand_activities_button 0x7f080059
+int id expanded_menu 0x7f08005a
+int id fab 0x7f08005b
+int id fill 0x7f08005c
+int id fill_horizontal 0x7f08005d
+int id fill_vertical 0x7f08005e
+int id filled 0x7f08005f
+int id fixed 0x7f080060
+int id flag 0x7f080061
+int id forever 0x7f080062
+int id ghost_view 0x7f080063
+int id gone 0x7f080064
+int id group_divider 0x7f080065
+int id groups 0x7f080066
+int id home 0x7f080067
+int id homeAsUp 0x7f080068
+int id icon 0x7f080069
+int id icon_group 0x7f08006a
+int id ifRoom 0x7f08006b
+int id image 0x7f08006c
+int id imageAdds 0x7f08006d
+int id imageView 0x7f08006e
+int id img 0x7f08006f
+int id info 0x7f080070
+int id infoRecipe 0x7f080071
+int id infoText 0x7f080072
+int id invisible 0x7f080073
+int id italic 0x7f080074
+int id item_touch_helper_previous_elevation 0x7f080075
+int id labeled 0x7f080076
+int id largeLabel 0x7f080077
+int id left 0x7f080078
+int id line1 0x7f080079
+int id line3 0x7f08007a
+int id listMode 0x7f08007b
+int id list_item 0x7f08007c
+int id login_form 0x7f08007d
+int id login_progress 0x7f08007e
+int id masked 0x7f08007f
+int id media_actions 0x7f080080
+int id message 0x7f080081
+int id middle 0x7f080082
+int id mini 0x7f080083
+int id mtrl_child_content_container 0x7f080084
+int id mtrl_internal_children_alpha_tag 0x7f080085
+int id multiply 0x7f080086
+int id name 0x7f080087
+int id nav_chat 0x7f080088
+int id nav_exit 0x7f080089
+int id nav_settings 0x7f08008a
+int id nav_view 0x7f08008b
+int id navigation_header_container 0x7f08008c
+int id never 0x7f08008d
+int id none 0x7f08008e
+int id normal 0x7f08008f
+int id notification_background 0x7f080090
+int id notification_main_column 0x7f080091
+int id notification_main_column_container 0x7f080092
+int id outline 0x7f080093
+int id packed 0x7f080094
+int id parallax 0x7f080095
+int id parent 0x7f080096
+int id parentPanel 0x7f080097
+int id parent_matrix 0x7f080098
+int id password 0x7f080099
+int id percent 0x7f08009a
+int id pin 0x7f08009b
+int id progress_circular 0x7f08009c
+int id progress_horizontal 0x7f08009d
+int id questionText 0x7f08009e
+int id radio 0x7f08009f
+int id recipeList 0x7f0800a0
+int id right 0x7f0800a1
+int id right_icon 0x7f0800a2
+int id right_side 0x7f0800a3
+int id save_image_matrix 0x7f0800a4
+int id save_non_transition_alpha 0x7f0800a5
+int id save_scale_type 0x7f0800a6
+int id screen 0x7f0800a7
+int id scroll 0x7f0800a8
+int id scrollIndicatorDown 0x7f0800a9
+int id scrollIndicatorUp 0x7f0800aa
+int id scrollView 0x7f0800ab
+int id scrollable 0x7f0800ac
+int id search_badge 0x7f0800ad
+int id search_bar 0x7f0800ae
+int id search_button 0x7f0800af
+int id search_close_btn 0x7f0800b0
+int id search_edit_frame 0x7f0800b1
+int id search_go_btn 0x7f0800b2
+int id search_mag_icon 0x7f0800b3
+int id search_plate 0x7f0800b4
+int id search_src_text 0x7f0800b5
+int id search_voice_btn 0x7f0800b6
+int id seekBar 0x7f0800b7
+int id select_dialog_listview 0x7f0800b8
+int id selected 0x7f0800b9
+int id shortcut 0x7f0800ba
+int id showCustom 0x7f0800bb
+int id showHome 0x7f0800bc
+int id showTitle 0x7f0800bd
+int id smallLabel 0x7f0800be
+int id snackbar_action 0x7f0800bf
+int id snackbar_text 0x7f0800c0
+int id snap 0x7f0800c1
+int id snapMargins 0x7f0800c2
+int id spacer 0x7f0800c3
+int id split_action_bar 0x7f0800c4
+int id spread 0x7f0800c5
+int id spread_inside 0x7f0800c6
+int id src_atop 0x7f0800c7
+int id src_in 0x7f0800c8
+int id src_over 0x7f0800c9
+int id standard 0x7f0800ca
+int id start 0x7f0800cb
+int id status_bar_latest_event_content 0x7f0800cc
+int id stretch 0x7f0800cd
+int id subButton 0x7f0800ce
int id submenuarrow 0x7f0800cf
int id submit_area 0x7f0800d0
int id tabMode 0x7f0800d1
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/42/android/support/drawerlayout/R$id.dex b/app/build/intermediates/transforms/dexBuilder/debug/42/android/support/drawerlayout/R$id.dex
index aaf658a..dcdaa01 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/42/android/support/drawerlayout/R$id.dex and b/app/build/intermediates/transforms/dexBuilder/debug/42/android/support/drawerlayout/R$id.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/42/android/support/loader/R$id.dex b/app/build/intermediates/transforms/dexBuilder/debug/42/android/support/loader/R$id.dex
index 15ee328..a8b74ea 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/42/android/support/loader/R$id.dex and b/app/build/intermediates/transforms/dexBuilder/debug/42/android/support/loader/R$id.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/42/android/support/swiperefreshlayout/R$id.dex b/app/build/intermediates/transforms/dexBuilder/debug/42/android/support/swiperefreshlayout/R$id.dex
index af82ddb..3e8511b 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/42/android/support/swiperefreshlayout/R$id.dex and b/app/build/intermediates/transforms/dexBuilder/debug/42/android/support/swiperefreshlayout/R$id.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/43/android/support/customview/R$id.dex b/app/build/intermediates/transforms/dexBuilder/debug/43/android/support/customview/R$id.dex
index beb84b4..f9e052e 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/43/android/support/customview/R$id.dex and b/app/build/intermediates/transforms/dexBuilder/debug/43/android/support/customview/R$id.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/45/android/support/compat/R$id.dex b/app/build/intermediates/transforms/dexBuilder/debug/45/android/support/compat/R$id.dex
index 3433313..5adb38a 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/45/android/support/compat/R$id.dex and b/app/build/intermediates/transforms/dexBuilder/debug/45/android/support/compat/R$id.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/45/android/support/design/R$id.dex b/app/build/intermediates/transforms/dexBuilder/debug/45/android/support/design/R$id.dex
index 09b0e2b..1d16c9d 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/45/android/support/design/R$id.dex and b/app/build/intermediates/transforms/dexBuilder/debug/45/android/support/design/R$id.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/45/android/support/fragment/R$id.dex b/app/build/intermediates/transforms/dexBuilder/debug/45/android/support/fragment/R$id.dex
index a3d56d4..a0d1e67 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/45/android/support/fragment/R$id.dex and b/app/build/intermediates/transforms/dexBuilder/debug/45/android/support/fragment/R$id.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/45/android/support/slidingpanelayout/R$id.dex b/app/build/intermediates/transforms/dexBuilder/debug/45/android/support/slidingpanelayout/R$id.dex
index 5835d1e..4eb8ca8 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/45/android/support/slidingpanelayout/R$id.dex and b/app/build/intermediates/transforms/dexBuilder/debug/45/android/support/slidingpanelayout/R$id.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/45/android/support/v7/appcompat/R$id.dex b/app/build/intermediates/transforms/dexBuilder/debug/45/android/support/v7/appcompat/R$id.dex
index 3075938..4d4add9 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/45/android/support/v7/appcompat/R$id.dex and b/app/build/intermediates/transforms/dexBuilder/debug/45/android/support/v7/appcompat/R$id.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/46/android/support/asynclayoutinflater/R$id.dex b/app/build/intermediates/transforms/dexBuilder/debug/46/android/support/asynclayoutinflater/R$id.dex
index 9107ea0..4ebed61 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/46/android/support/asynclayoutinflater/R$id.dex and b/app/build/intermediates/transforms/dexBuilder/debug/46/android/support/asynclayoutinflater/R$id.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/46/android/support/v7/recyclerview/R$id.dex b/app/build/intermediates/transforms/dexBuilder/debug/46/android/support/v7/recyclerview/R$id.dex
index bfd8d52..23ecac4 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/46/android/support/v7/recyclerview/R$id.dex and b/app/build/intermediates/transforms/dexBuilder/debug/46/android/support/v7/recyclerview/R$id.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/Chat.dex b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/Chat.dex
index 5281e7e..3f87e69 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/Chat.dex and b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/Chat.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/DragAdapter.dex b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/DragAdapter.dex
index b78d08b..3ca94c5 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/DragAdapter.dex and b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/DragAdapter.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/DrugInfo.dex b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/DrugInfo.dex
index 4eeeaa0..7106ffd 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/DrugInfo.dex and b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/DrugInfo.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/Drugs.dex b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/Drugs.dex
index 85cd5c4..c56c162 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/Drugs.dex and b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/Drugs.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/LoginActivity$4.dex b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/LoginActivity$4.dex
index 12c9712..7411602 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/LoginActivity$4.dex and b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/LoginActivity$4.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/LoginActivity$5.dex b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/LoginActivity$5.dex
index d5b65e8..14820e5 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/LoginActivity$5.dex and b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/LoginActivity$5.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/LoginActivity.dex b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/LoginActivity.dex
index 715834e..d80c19d 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/LoginActivity.dex and b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/LoginActivity.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/MainActivity.dex b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/MainActivity.dex
index 6049f52..458d4ea 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/MainActivity.dex and b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/MainActivity.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/ProgressFragmebt$ProgressTask.dex b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/ProgressFragmebt$ProgressTask.dex
index eb0274f..0d202ee 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/ProgressFragmebt$ProgressTask.dex and b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/ProgressFragmebt$ProgressTask.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/ProgressFragmebt.dex b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/ProgressFragmebt.dex
index 69e4cfa..6429eb2 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/ProgressFragmebt.dex and b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/ProgressFragmebt.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/R$id.dex b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/R$id.dex
index d1aee22..2d73d28 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/R$id.dex and b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/R$id.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/RecipeAdapter.dex b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/RecipeAdapter.dex
index 91cc4e1..427f398 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/RecipeAdapter.dex and b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/RecipeAdapter.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/RecipeInfo.dex b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/RecipeInfo.dex
index 17132a1..29b5010 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/RecipeInfo.dex and b/app/build/intermediates/transforms/dexBuilder/debug/46/com/ivanf/healthadviser/RecipeInfo.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/48/android/support/constraint/R$id.dex b/app/build/intermediates/transforms/dexBuilder/debug/48/android/support/constraint/R$id.dex
index 0bb1ed3..48a7c7c 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/48/android/support/constraint/R$id.dex and b/app/build/intermediates/transforms/dexBuilder/debug/48/android/support/constraint/R$id.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/48/android/support/coreui/R$id.dex b/app/build/intermediates/transforms/dexBuilder/debug/48/android/support/coreui/R$id.dex
index 70a7372..ae4b79a 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/48/android/support/coreui/R$id.dex and b/app/build/intermediates/transforms/dexBuilder/debug/48/android/support/coreui/R$id.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/48/android/support/transition/R$id.dex b/app/build/intermediates/transforms/dexBuilder/debug/48/android/support/transition/R$id.dex
index c2c8af7..4fdda22 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/48/android/support/transition/R$id.dex and b/app/build/intermediates/transforms/dexBuilder/debug/48/android/support/transition/R$id.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/48/android/support/v7/viewpager/R$id.dex b/app/build/intermediates/transforms/dexBuilder/debug/48/android/support/v7/viewpager/R$id.dex
index de97576..971febf 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/48/android/support/v7/viewpager/R$id.dex and b/app/build/intermediates/transforms/dexBuilder/debug/48/android/support/v7/viewpager/R$id.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/49/android/support/coordinatorlayout/R$id.dex b/app/build/intermediates/transforms/dexBuilder/debug/49/android/support/coordinatorlayout/R$id.dex
index 41a1b80..7a3ab40 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/49/android/support/coordinatorlayout/R$id.dex and b/app/build/intermediates/transforms/dexBuilder/debug/49/android/support/coordinatorlayout/R$id.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/49/android/support/coreutils/R$id.dex b/app/build/intermediates/transforms/dexBuilder/debug/49/android/support/coreutils/R$id.dex
index 18101f6..1af5ac9 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/49/android/support/coreutils/R$id.dex and b/app/build/intermediates/transforms/dexBuilder/debug/49/android/support/coreutils/R$id.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/50/android/support/graphics/drawable/R$id.dex b/app/build/intermediates/transforms/dexBuilder/debug/50/android/support/graphics/drawable/R$id.dex
index bb43e4e..1b9f876 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/50/android/support/graphics/drawable/R$id.dex and b/app/build/intermediates/transforms/dexBuilder/debug/50/android/support/graphics/drawable/R$id.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/51/android/support/mediacompat/R$id.dex b/app/build/intermediates/transforms/dexBuilder/debug/51/android/support/mediacompat/R$id.dex
index a16fd93..111ce06 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/51/android/support/mediacompat/R$id.dex and b/app/build/intermediates/transforms/dexBuilder/debug/51/android/support/mediacompat/R$id.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/51/android/support/v4/R$id.dex b/app/build/intermediates/transforms/dexBuilder/debug/51/android/support/v4/R$id.dex
index 6112ac3..78145aa 100644
Binary files a/app/build/intermediates/transforms/dexBuilder/debug/51/android/support/v4/R$id.dex and b/app/build/intermediates/transforms/dexBuilder/debug/51/android/support/v4/R$id.dex differ
diff --git a/app/build/intermediates/transforms/dexBuilder/debug/__content__.json b/app/build/intermediates/transforms/dexBuilder/debug/__content__.json
index cc976d9..2b170fd 100644
--- a/app/build/intermediates/transforms/dexBuilder/debug/__content__.json
+++ b/app/build/intermediates/transforms/dexBuilder/debug/__content__.json
@@ -1 +1 @@
-[{"name":"com.android.support:design:28.0.0","index":0,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:appcompat-v7:28.0.0","index":1,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-v4:28.0.0","index":2,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support.constraint:constraint-layout:1.1.3","index":3,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.squareup.picasso:picasso:2.71828","index":4,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-fragment:28.0.0","index":5,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:animated-vector-drawable:28.0.0","index":6,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:recyclerview-v7:28.0.0","index":7,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-core-ui:28.0.0","index":8,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-core-utils:28.0.0","index":9,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-vector-drawable:28.0.0","index":10,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:transition:28.0.0","index":11,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-media-compat:28.0.0","index":12,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:loader:28.0.0","index":13,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:viewpager:28.0.0","index":14,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:coordinatorlayout:28.0.0","index":15,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:drawerlayout:28.0.0","index":16,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:slidingpanelayout:28.0.0","index":17,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:customview:28.0.0","index":18,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:swiperefreshlayout:28.0.0","index":19,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:asynclayoutinflater:28.0.0","index":20,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-compat:28.0.0","index":21,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:versionedparcelable:28.0.0","index":22,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:collections:28.0.0","index":23,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:cursoradapter:28.0.0","index":24,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:cardview-v7:28.0.0","index":25,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:exifinterface:27.1.0","index":26,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"android.arch.lifecycle:runtime:1.1.1","index":27,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:documentfile:28.0.0","index":28,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:localbroadcastmanager:28.0.0","index":29,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:print:28.0.0","index":30,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"android.arch.lifecycle:viewmodel:1.1.1","index":31,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:interpolator:28.0.0","index":32,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"android.arch.lifecycle:livedata:1.1.1","index":33,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"android.arch.lifecycle:livedata-core:1.1.1","index":34,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"android.arch.lifecycle:common:1.1.1","index":35,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"android.arch.core:runtime:1.1.1","index":36,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"android.arch.core:common:1.1.1","index":37,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-annotations:28.0.0","index":38,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support.constraint:constraint-layout-solver:1.1.3","index":39,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.squareup.okhttp3:okhttp:3.10.0","index":40,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.squareup.okio:okio:1.14.0","index":41,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"slice_0","index":42,"scopes":["PROJECT","SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_1","index":43,"scopes":["PROJECT","SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_2","index":44,"scopes":["PROJECT","SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_3","index":45,"scopes":["PROJECT","SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_4","index":46,"scopes":["PROJECT","SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_5","index":47,"scopes":["PROJECT","SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_6","index":48,"scopes":["PROJECT","SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_7","index":49,"scopes":["PROJECT","SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_8","index":50,"scopes":["PROJECT","SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_9","index":51,"scopes":["PROJECT","SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"1c90c759532e0cc7c268fca0ab01e5751ccb34e0-0","index":52,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"1c90c759532e0cc7c268fca0ab01e5751ccb34e0-1","index":53,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"1c90c759532e0cc7c268fca0ab01e5751ccb34e0-2","index":54,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"1c90c759532e0cc7c268fca0ab01e5751ccb34e0-3","index":55,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"1c90c759532e0cc7c268fca0ab01e5751ccb34e0-4","index":56,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"1c90c759532e0cc7c268fca0ab01e5751ccb34e0-5","index":57,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"1c90c759532e0cc7c268fca0ab01e5751ccb34e0-6","index":58,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"1c90c759532e0cc7c268fca0ab01e5751ccb34e0-7","index":59,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"1c90c759532e0cc7c268fca0ab01e5751ccb34e0-8","index":60,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"1c90c759532e0cc7c268fca0ab01e5751ccb34e0-9","index":61,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"8759637ba4e1ab9003c9cc48385a6542d5905b42-0","index":62,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":false},{"name":"8759637ba4e1ab9003c9cc48385a6542d5905b42-1","index":63,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"8759637ba4e1ab9003c9cc48385a6542d5905b42-2","index":64,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":false},{"name":"8759637ba4e1ab9003c9cc48385a6542d5905b42-3","index":65,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":false},{"name":"8759637ba4e1ab9003c9cc48385a6542d5905b42-4","index":66,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":false},{"name":"8759637ba4e1ab9003c9cc48385a6542d5905b42-5","index":67,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":false},{"name":"8759637ba4e1ab9003c9cc48385a6542d5905b42-6","index":68,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":false},{"name":"8759637ba4e1ab9003c9cc48385a6542d5905b42-7","index":69,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":false},{"name":"8759637ba4e1ab9003c9cc48385a6542d5905b42-8","index":70,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":false},{"name":"8759637ba4e1ab9003c9cc48385a6542d5905b42-9","index":71,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":false}]
\ No newline at end of file
+[{"name":"com.android.support:design:28.0.0","index":0,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:appcompat-v7:28.0.0","index":1,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-v4:28.0.0","index":2,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support.constraint:constraint-layout:1.1.3","index":3,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.squareup.picasso:picasso:2.71828","index":4,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-fragment:28.0.0","index":5,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:animated-vector-drawable:28.0.0","index":6,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:recyclerview-v7:28.0.0","index":7,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-core-ui:28.0.0","index":8,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-core-utils:28.0.0","index":9,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-vector-drawable:28.0.0","index":10,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:transition:28.0.0","index":11,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-media-compat:28.0.0","index":12,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:loader:28.0.0","index":13,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:viewpager:28.0.0","index":14,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:coordinatorlayout:28.0.0","index":15,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:drawerlayout:28.0.0","index":16,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:slidingpanelayout:28.0.0","index":17,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:customview:28.0.0","index":18,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:swiperefreshlayout:28.0.0","index":19,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:asynclayoutinflater:28.0.0","index":20,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-compat:28.0.0","index":21,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:versionedparcelable:28.0.0","index":22,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:collections:28.0.0","index":23,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:cursoradapter:28.0.0","index":24,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:cardview-v7:28.0.0","index":25,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:exifinterface:27.1.0","index":26,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"android.arch.lifecycle:runtime:1.1.1","index":27,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:documentfile:28.0.0","index":28,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:localbroadcastmanager:28.0.0","index":29,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:print:28.0.0","index":30,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"android.arch.lifecycle:viewmodel:1.1.1","index":31,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:interpolator:28.0.0","index":32,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"android.arch.lifecycle:livedata:1.1.1","index":33,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"android.arch.lifecycle:livedata-core:1.1.1","index":34,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"android.arch.lifecycle:common:1.1.1","index":35,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"android.arch.core:runtime:1.1.1","index":36,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"android.arch.core:common:1.1.1","index":37,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-annotations:28.0.0","index":38,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support.constraint:constraint-layout-solver:1.1.3","index":39,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.squareup.okhttp3:okhttp:3.10.0","index":40,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.squareup.okio:okio:1.14.0","index":41,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"slice_0","index":42,"scopes":["PROJECT","SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_1","index":43,"scopes":["PROJECT","SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_2","index":44,"scopes":["PROJECT","SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_3","index":45,"scopes":["PROJECT","SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_4","index":46,"scopes":["PROJECT","SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_5","index":47,"scopes":["PROJECT","SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_6","index":48,"scopes":["PROJECT","SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_7","index":49,"scopes":["PROJECT","SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_8","index":50,"scopes":["PROJECT","SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_9","index":51,"scopes":["PROJECT","SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"1c90c759532e0cc7c268fca0ab01e5751ccb34e0-0","index":52,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"1c90c759532e0cc7c268fca0ab01e5751ccb34e0-1","index":53,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"1c90c759532e0cc7c268fca0ab01e5751ccb34e0-2","index":54,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"1c90c759532e0cc7c268fca0ab01e5751ccb34e0-3","index":55,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"1c90c759532e0cc7c268fca0ab01e5751ccb34e0-4","index":56,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"1c90c759532e0cc7c268fca0ab01e5751ccb34e0-5","index":57,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"1c90c759532e0cc7c268fca0ab01e5751ccb34e0-6","index":58,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"1c90c759532e0cc7c268fca0ab01e5751ccb34e0-7","index":59,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"1c90c759532e0cc7c268fca0ab01e5751ccb34e0-8","index":60,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"1c90c759532e0cc7c268fca0ab01e5751ccb34e0-9","index":61,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"8759637ba4e1ab9003c9cc48385a6542d5905b42-1","index":63,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true}]
\ No newline at end of file
diff --git a/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex b/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex
index 65ff909..5a45071 100644
Binary files a/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex and b/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex differ
diff --git a/app/build/intermediates/transforms/dexMerger/debug/1/classes.dex b/app/build/intermediates/transforms/dexMerger/debug/1/classes.dex
index 31aa20f..b521f60 100644
Binary files a/app/build/intermediates/transforms/dexMerger/debug/1/classes.dex and b/app/build/intermediates/transforms/dexMerger/debug/1/classes.dex differ
diff --git a/app/build/intermediates/transforms/dexMerger/debug/3/classes.dex b/app/build/intermediates/transforms/dexMerger/debug/3/classes.dex
index 8e471dc..f09db1a 100644
Binary files a/app/build/intermediates/transforms/dexMerger/debug/3/classes.dex and b/app/build/intermediates/transforms/dexMerger/debug/3/classes.dex differ
diff --git a/app/build/intermediates/transforms/dexMerger/debug/4/classes.dex b/app/build/intermediates/transforms/dexMerger/debug/4/classes.dex
index 431cb2e..cd0b255 100644
Binary files a/app/build/intermediates/transforms/dexMerger/debug/4/classes.dex and b/app/build/intermediates/transforms/dexMerger/debug/4/classes.dex differ
diff --git a/app/build/intermediates/transforms/dexMerger/debug/6/classes.dex b/app/build/intermediates/transforms/dexMerger/debug/6/classes.dex
index da29a10..d3e5491 100644
Binary files a/app/build/intermediates/transforms/dexMerger/debug/6/classes.dex and b/app/build/intermediates/transforms/dexMerger/debug/6/classes.dex differ
diff --git a/app/build/intermediates/transforms/dexMerger/debug/7/classes.dex b/app/build/intermediates/transforms/dexMerger/debug/7/classes.dex
index 02b61ef..a5cb128 100644
Binary files a/app/build/intermediates/transforms/dexMerger/debug/7/classes.dex and b/app/build/intermediates/transforms/dexMerger/debug/7/classes.dex differ
diff --git a/app/build/intermediates/transforms/dexMerger/debug/8/classes.dex b/app/build/intermediates/transforms/dexMerger/debug/8/classes.dex
index 2bb7cf4..6023d62 100644
Binary files a/app/build/intermediates/transforms/dexMerger/debug/8/classes.dex and b/app/build/intermediates/transforms/dexMerger/debug/8/classes.dex differ
diff --git a/app/build/intermediates/transforms/dexMerger/debug/9/classes.dex b/app/build/intermediates/transforms/dexMerger/debug/9/classes.dex
index 08738f4..f8a9dac 100644
Binary files a/app/build/intermediates/transforms/dexMerger/debug/9/classes.dex and b/app/build/intermediates/transforms/dexMerger/debug/9/classes.dex differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/android/support/asynclayoutinflater/R$id.class b/app/build/intermediates/transforms/instantRun/debug/0/android/support/asynclayoutinflater/R$id.class
index f505103..a25850a 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/android/support/asynclayoutinflater/R$id.class and b/app/build/intermediates/transforms/instantRun/debug/0/android/support/asynclayoutinflater/R$id.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/android/support/compat/R$id.class b/app/build/intermediates/transforms/instantRun/debug/0/android/support/compat/R$id.class
index c912039..aa9eeea 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/android/support/compat/R$id.class and b/app/build/intermediates/transforms/instantRun/debug/0/android/support/compat/R$id.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/android/support/constraint/R$id.class b/app/build/intermediates/transforms/instantRun/debug/0/android/support/constraint/R$id.class
index 5887695..fe4ed4d 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/android/support/constraint/R$id.class and b/app/build/intermediates/transforms/instantRun/debug/0/android/support/constraint/R$id.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/android/support/coordinatorlayout/R$id.class b/app/build/intermediates/transforms/instantRun/debug/0/android/support/coordinatorlayout/R$id.class
index edba03a..51c10ab 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/android/support/coordinatorlayout/R$id.class and b/app/build/intermediates/transforms/instantRun/debug/0/android/support/coordinatorlayout/R$id.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/android/support/coreui/R$id.class b/app/build/intermediates/transforms/instantRun/debug/0/android/support/coreui/R$id.class
index a5b0be7..c95b4d2 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/android/support/coreui/R$id.class and b/app/build/intermediates/transforms/instantRun/debug/0/android/support/coreui/R$id.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/android/support/coreutils/R$id.class b/app/build/intermediates/transforms/instantRun/debug/0/android/support/coreutils/R$id.class
index f95fb27..acbdeb1 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/android/support/coreutils/R$id.class and b/app/build/intermediates/transforms/instantRun/debug/0/android/support/coreutils/R$id.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/android/support/customview/R$id.class b/app/build/intermediates/transforms/instantRun/debug/0/android/support/customview/R$id.class
index cc916de..7cd8a60 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/android/support/customview/R$id.class and b/app/build/intermediates/transforms/instantRun/debug/0/android/support/customview/R$id.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/android/support/design/R$id.class b/app/build/intermediates/transforms/instantRun/debug/0/android/support/design/R$id.class
index 931109f..5fb0dae 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/android/support/design/R$id.class and b/app/build/intermediates/transforms/instantRun/debug/0/android/support/design/R$id.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/android/support/drawerlayout/R$id.class b/app/build/intermediates/transforms/instantRun/debug/0/android/support/drawerlayout/R$id.class
index 3538cb2..5674570 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/android/support/drawerlayout/R$id.class and b/app/build/intermediates/transforms/instantRun/debug/0/android/support/drawerlayout/R$id.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/android/support/fragment/R$id.class b/app/build/intermediates/transforms/instantRun/debug/0/android/support/fragment/R$id.class
index 908b4a1..45ef276 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/android/support/fragment/R$id.class and b/app/build/intermediates/transforms/instantRun/debug/0/android/support/fragment/R$id.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/android/support/graphics/drawable/R$id.class b/app/build/intermediates/transforms/instantRun/debug/0/android/support/graphics/drawable/R$id.class
index 4c8e385..2a2a62a 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/android/support/graphics/drawable/R$id.class and b/app/build/intermediates/transforms/instantRun/debug/0/android/support/graphics/drawable/R$id.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/android/support/loader/R$id.class b/app/build/intermediates/transforms/instantRun/debug/0/android/support/loader/R$id.class
index 92f2cc3..99c6266 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/android/support/loader/R$id.class and b/app/build/intermediates/transforms/instantRun/debug/0/android/support/loader/R$id.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/android/support/mediacompat/R$id.class b/app/build/intermediates/transforms/instantRun/debug/0/android/support/mediacompat/R$id.class
index 6860d27..e83c7ac 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/android/support/mediacompat/R$id.class and b/app/build/intermediates/transforms/instantRun/debug/0/android/support/mediacompat/R$id.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/android/support/slidingpanelayout/R$id.class b/app/build/intermediates/transforms/instantRun/debug/0/android/support/slidingpanelayout/R$id.class
index 59d0d56..86f4ad7 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/android/support/slidingpanelayout/R$id.class and b/app/build/intermediates/transforms/instantRun/debug/0/android/support/slidingpanelayout/R$id.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/android/support/swiperefreshlayout/R$id.class b/app/build/intermediates/transforms/instantRun/debug/0/android/support/swiperefreshlayout/R$id.class
index a0980f9..fa10ed9 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/android/support/swiperefreshlayout/R$id.class and b/app/build/intermediates/transforms/instantRun/debug/0/android/support/swiperefreshlayout/R$id.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/android/support/transition/R$id.class b/app/build/intermediates/transforms/instantRun/debug/0/android/support/transition/R$id.class
index 59ea20b..ec9364d 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/android/support/transition/R$id.class and b/app/build/intermediates/transforms/instantRun/debug/0/android/support/transition/R$id.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/android/support/v4/R$id.class b/app/build/intermediates/transforms/instantRun/debug/0/android/support/v4/R$id.class
index 10f24c0..3863c6b 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/android/support/v4/R$id.class and b/app/build/intermediates/transforms/instantRun/debug/0/android/support/v4/R$id.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/android/support/v7/appcompat/R$id.class b/app/build/intermediates/transforms/instantRun/debug/0/android/support/v7/appcompat/R$id.class
index 7133168..2cf15b6 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/android/support/v7/appcompat/R$id.class and b/app/build/intermediates/transforms/instantRun/debug/0/android/support/v7/appcompat/R$id.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/android/support/v7/recyclerview/R$id.class b/app/build/intermediates/transforms/instantRun/debug/0/android/support/v7/recyclerview/R$id.class
index 336c7ce..c129b49 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/android/support/v7/recyclerview/R$id.class and b/app/build/intermediates/transforms/instantRun/debug/0/android/support/v7/recyclerview/R$id.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/android/support/v7/viewpager/R$id.class b/app/build/intermediates/transforms/instantRun/debug/0/android/support/v7/viewpager/R$id.class
index d580231..667ecb1 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/android/support/v7/viewpager/R$id.class and b/app/build/intermediates/transforms/instantRun/debug/0/android/support/v7/viewpager/R$id.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/Chat.class b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/Chat.class
index 1e8b780..76cf60c 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/Chat.class and b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/Chat.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/DragAdapter.class b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/DragAdapter.class
index b8cb749..403d5e8 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/DragAdapter.class and b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/DragAdapter.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/DrugInfo.class b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/DrugInfo.class
index 61f6d8b..4ab1728 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/DrugInfo.class and b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/DrugInfo.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/Drugs.class b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/Drugs.class
index c24aaf2..af3f9ba 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/Drugs.class and b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/Drugs.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/LoginActivity$4.class b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/LoginActivity$4.class
index 1760e7d..ec5ef97 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/LoginActivity$4.class and b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/LoginActivity$4.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/LoginActivity$5.class b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/LoginActivity$5.class
index 88c4655..98b67f8 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/LoginActivity$5.class and b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/LoginActivity$5.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/LoginActivity.class b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/LoginActivity.class
index 802bfd4..20f27fd 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/LoginActivity.class and b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/LoginActivity.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/MainActivity.class b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/MainActivity.class
index 219424d..c3753aa 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/MainActivity.class and b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/MainActivity.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/ProgressFragmebt$ProgressTask.class b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/ProgressFragmebt$ProgressTask.class
index aed9f68..007ab9c 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/ProgressFragmebt$ProgressTask.class and b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/ProgressFragmebt$ProgressTask.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/ProgressFragmebt.class b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/ProgressFragmebt.class
index 49936bf..657fb4f 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/ProgressFragmebt.class and b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/ProgressFragmebt.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/R$id.class b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/R$id.class
index af106bf..fe87f1c 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/R$id.class and b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/R$id.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/RecipeAdapter.class b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/RecipeAdapter.class
index 5a7e6e4..80fe868 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/RecipeAdapter.class and b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/RecipeAdapter.class differ
diff --git a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/RecipeInfo.class b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/RecipeInfo.class
index 457dbf3..9fc54ce 100644
Binary files a/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/RecipeInfo.class and b/app/build/intermediates/transforms/instantRun/debug/0/com/ivanf/healthadviser/RecipeInfo.class differ
diff --git a/app/src/main/java/com/ivanf/healthadviser/Chat.java b/app/src/main/java/com/ivanf/healthadviser/Chat.java
index e39f7ed..1482a4e 100644
--- a/app/src/main/java/com/ivanf/healthadviser/Chat.java
+++ b/app/src/main/java/com/ivanf/healthadviser/Chat.java
@@ -4,6 +4,7 @@
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
+import android.widget.Button;
import android.widget.ImageView;
import android.widget.SeekBar;
import android.widget.TextView;
@@ -18,6 +19,8 @@ public class Chat extends AppCompatActivity {
public static String key, quest, result;
public static int number;
public static TextView textQ;
+ public static Button sub;
+ public static SeekBar line;
boolean first = true;
static public ImageView addsImg;
@@ -34,6 +37,8 @@ protected void onCreate(Bundle savedInstanceState) {
addsImg = (ImageView) findViewById(R.id.imageAdds);
nameAdds = (TextView) findViewById(R.id.addsName);
companyAdds = (TextView) findViewById(R.id.addsComp);
+ sub = (Button) findViewById(R.id.subButton);
+ line = (SeekBar) findViewById(R.id.seekBar);
String ping = "http://68.183.104.168:8888/start_health_test/%7B%22username%22:%20%22ivan.fil@gmail.com%22,%20%22session_id%22:%20%22" + key + "%22%7D";
@@ -57,6 +62,15 @@ public void onMyButtonClick(View view)
first = false;
}
}
+ else if (Chat.sub.getText() == "Are you sure?"){
+ Intent main;
+ main = new Intent(Chat.this, MainActivity.class);
+
+ startActivity(main);
+ finish();
+ } else {
+ Chat.sub.setText("Are you sure?");
+ }
}
static int POWER = -1;
int getPower(){
diff --git a/app/src/main/java/com/ivanf/healthadviser/ChatFragment.java b/app/src/main/java/com/ivanf/healthadviser/ChatFragment.java
index eeae10c..8c29032 100644
--- a/app/src/main/java/com/ivanf/healthadviser/ChatFragment.java
+++ b/app/src/main/java/com/ivanf/healthadviser/ChatFragment.java
@@ -1,6 +1,8 @@
package com.ivanf.healthadviser;
+import android.annotation.SuppressLint;
import android.content.Context;
+import android.graphics.Color;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
@@ -79,6 +81,7 @@ protected String doInBackground(String... path) {
return content;
}
+ @SuppressLint("ResourceAsColor")
@Override
protected void onPostExecute(String content) {
@@ -126,6 +129,12 @@ else if (input.contains("diagnosis") && !input.contains("NaN") && !input.contain
Chat.result = "Sorry, but you have " + input.substring(30, input.length() - 8);
Chat.textQ.setText( Chat.result);
+ Chat.line.setVisibility(View.INVISIBLE);
+
+ Chat.sub.setText("Exit");
+ Chat.sub.setBackgroundColor(Color.rgb(216,27,96));
+ Chat.sub.setHeight(350);
+
Chat.nameAdds.setVisibility(View.VISIBLE);
Chat.companyAdds.setVisibility(View.VISIBLE);
Chat.addsImg.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/com/ivanf/healthadviser/ProgressFragmebt.java b/app/src/main/java/com/ivanf/healthadviser/ProgressFragmebt.java
index ab3e2fa..54cc225 100644
--- a/app/src/main/java/com/ivanf/healthadviser/ProgressFragmebt.java
+++ b/app/src/main/java/com/ivanf/healthadviser/ProgressFragmebt.java
@@ -75,8 +75,8 @@ protected void onPostExecute(String content) {
String kek = content.substring(31, content.length()-8);
Chat.key = kek;
- Toast.makeText(getActivity(), content, Toast.LENGTH_SHORT)
- .show();
+// Toast.makeText(getActivity(), content, Toast.LENGTH_SHORT)
+// .show();
}
private String getContent(String path) throws IOException {
diff --git a/app/src/main/res/layout/activity_chat.xml b/app/src/main/res/layout/activity_chat.xml
index a721c37..6194607 100644
--- a/app/src/main/res/layout/activity_chat.xml
+++ b/app/src/main/res/layout/activity_chat.xml
@@ -91,7 +91,7 @@
android:max="5" />