.gitignore

@@ -1,53 +0,0 @@
-# ---> Eagle
-# Ignore list for Eagle, a PCB layout tool
-
-# Backup files
-*.s#?
-*.b#?
-*.l#?
-*.b$?
-*.s$?
-*.l$?
-
-# Eagle project file
-# It contains a serial number and references to the file structure
-# on your computer.
-# comment the following line if you want to have your project file included.
-eagle.epf
-
-# Autorouter files
-*.pro
-*.job
-
-# CAM files
-*.$$$
-*.cmp
-*.ly2
-*.l15
-*.sol
-*.plc
-*.stc
-*.sts
-*.crc
-*.crs
-
-*.dri
-*.drl
-*.gpi
-*.pls
-*.ger
-*.xln
-
-*.drd
-*.drd.*
-
-*.s#*
-*.b#*
-
-*.info
-
-*.eps
-
-# file locks introduced since 7.x
-*.lck
-

LICENSE

@@ -1,19 +0,0 @@
-MIT License Copyright (c) <year> <copyright holders>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
-OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,2 +0,0 @@
-# xiaomi_maintain
-

app/build.gradle

@@ -12,13 +12,22 @@ android {
 
     }
 
-
+    sourceSets{
+        main{
+            jniLibs.srcDirs = ['libs']
+        }
+    }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs']
+        }
+    }
 
     useLibrary 'org.apache.http.legacy'
 }
@@ -42,10 +51,11 @@ repositories {
 }
 
 dependencies {
-    compile(name: 'YoumiSdk_v8.3.0_2018-10-11', ext: 'aar')
-    compile 'com.android.support:support-v4:25.0.0'
 
-    implementation 'com.android.support:appcompat-v7:26.+'
+
+
+    implementation 'com.android.support:support-v4:28.0.0'
+    //implementation 'com.android.support:appcompat-v7:26.+'
     implementation 'com.android.support.constraint:constraint-layout:2.0.4'
     implementation 'com.android.support:support-vector-drawable:26.+'
     implementation 'android.arch.lifecycle:livedata:1.1.1'
@@ -53,6 +63,8 @@ dependencies {
     implementation 'android.arch.navigation:navigation-fragment:1.0.0'
     implementation 'android.arch.navigation:navigation-ui:1.0.0'
     implementation 'com.android.support:design:26.+'
+    implementation files('libs\\Msc.jar')
+    implementation files('libs\\Msc.jar')
 
 
 }

app/build/generated/not_namespaced_r_class_sources/debug/r/android/support/asynclayoutinflater/R.java

@@ -62,18 +62,18 @@ public final class R {
     public static final class drawable {
         private drawable() {}
 
-        public static final int notification_action_background = 0x7f0800a0;
-        public static final int notification_bg = 0x7f0800a1;
-        public static final int notification_bg_low = 0x7f0800a2;
-        public static final int notification_bg_low_normal = 0x7f0800a3;
-        public static final int notification_bg_low_pressed = 0x7f0800a4;
-        public static final int notification_bg_normal = 0x7f0800a5;
-        public static final int notification_bg_normal_pressed = 0x7f0800a6;
-        public static final int notification_icon_background = 0x7f0800a7;
-        public static final int notification_template_icon_bg = 0x7f0800a8;
-        public static final int notification_template_icon_low_bg = 0x7f0800a9;
-        public static final int notification_tile_bg = 0x7f0800aa;
-        public static final int notify_panel_notification_icon_bg = 0x7f0800ab;
+        public static final int notification_action_background = 0x7f0800a1;
+        public static final int notification_bg = 0x7f0800a2;
+        public static final int notification_bg_low = 0x7f0800a3;
+        public static final int notification_bg_low_normal = 0x7f0800a4;
+        public static final int notification_bg_low_pressed = 0x7f0800a5;
+        public static final int notification_bg_normal = 0x7f0800a6;
+        public static final int notification_bg_normal_pressed = 0x7f0800a7;
+        public static final int notification_icon_background = 0x7f0800a8;
+        public static final int notification_template_icon_bg = 0x7f0800a9;
+        public static final int notification_template_icon_low_bg = 0x7f0800aa;
+        public static final int notification_tile_bg = 0x7f0800ab;
+        public static final int notify_panel_notification_icon_bg = 0x7f0800ac;
     }
     public static final class id {
         private id() {}
@@ -85,27 +85,27 @@ public final class R {
         public static final int actions = 0x7f090020;
         public static final int async = 0x7f09002b;
         public static final int blocking = 0x7f090034;
-        public static final int chronometer = 0x7f090043;
-        public static final int forever = 0x7f09007b;
-        public static final int icon = 0x7f090089;
-        public static final int icon_group = 0x7f09008a;
-        public static final int info = 0x7f090090;
-        public static final int italic = 0x7f090092;
-        public static final int line1 = 0x7f0900aa;
-        public static final int line3 = 0x7f0900ab;
-        public static final int normal = 0x7f0900d9;
-        public static final int notification_background = 0x7f0900e0;
-        public static final int notification_main_column = 0x7f0900e1;
-        public static final int notification_main_column_container = 0x7f0900e2;
-        public static final int right_icon = 0x7f0900fb;
-        public static final int right_side = 0x7f0900fc;
-        public static final int tag_transition_group = 0x7f090137;
-        public static final int tag_unhandled_key_event_manager = 0x7f090138;
-        public static final int tag_unhandled_key_listeners = 0x7f090139;
-        public static final int text = 0x7f09013a;
-        public static final int text2 = 0x7f09013b;
-        public static final int time = 0x7f090147;
-        public static final int title = 0x7f090148;
+        public static final int chronometer = 0x7f090044;
+        public static final int forever = 0x7f09007c;
+        public static final int icon = 0x7f09008a;
+        public static final int icon_group = 0x7f09008b;
+        public static final int info = 0x7f090091;
+        public static final int italic = 0x7f090093;
+        public static final int line1 = 0x7f0900ab;
+        public static final int line3 = 0x7f0900ac;
+        public static final int normal = 0x7f0900dd;
+        public static final int notification_background = 0x7f0900e4;
+        public static final int notification_main_column = 0x7f0900e5;
+        public static final int notification_main_column_container = 0x7f0900e6;
+        public static final int right_icon = 0x7f0900ff;
+        public static final int right_side = 0x7f090100;
+        public static final int tag_transition_group = 0x7f09013b;
+        public static final int tag_unhandled_key_event_manager = 0x7f09013c;
+        public static final int tag_unhandled_key_listeners = 0x7f09013d;
+        public static final int text = 0x7f09013e;
+        public static final int text2 = 0x7f09013f;
+        public static final int time = 0x7f09014b;
+        public static final int title = 0x7f09014c;
     }
     public static final class integer {
         private integer() {}
@@ -125,18 +125,18 @@ public final class R {
     public static final class string {
         private string() {}
 
-        public static final int status_bar_notification_info_overflow = 0x7f11009b;
+        public static final int status_bar_notification_info_overflow = 0x7f12009e;
     }
     public static final class style {
         private style() {}
 
-        public static final int TextAppearance_Compat_Notification = 0x7f120118;
-        public static final int TextAppearance_Compat_Notification_Info = 0x7f120119;
-        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f12011b;
-        public static final int TextAppearance_Compat_Notification_Time = 0x7f12011e;
-        public static final int TextAppearance_Compat_Notification_Title = 0x7f120120;
-        public static final int Widget_Compat_NotificationActionContainer = 0x7f1201d1;
-        public static final int Widget_Compat_NotificationActionText = 0x7f1201d2;
+        public static final int TextAppearance_Compat_Notification = 0x7f130118;
+        public static final int TextAppearance_Compat_Notification_Info = 0x7f130119;
+        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f13011b;
+        public static final int TextAppearance_Compat_Notification_Time = 0x7f13011e;
+        public static final int TextAppearance_Compat_Notification_Title = 0x7f130120;
+        public static final int Widget_Compat_NotificationActionContainer = 0x7f1301d1;
+        public static final int Widget_Compat_NotificationActionText = 0x7f1301d2;
     }
     public static final class styleable {
         private styleable() {}

app/build/generated/not_namespaced_r_class_sources/debug/r/android/support/compat/R.java

@@ -62,18 +62,18 @@ public final class R {
     public static final class drawable {
         private drawable() {}
 
-        public static final int notification_action_background = 0x7f0800a0;
-        public static final int notification_bg = 0x7f0800a1;
-        public static final int notification_bg_low = 0x7f0800a2;
-        public static final int notification_bg_low_normal = 0x7f0800a3;
-        public static final int notification_bg_low_pressed = 0x7f0800a4;
-        public static final int notification_bg_normal = 0x7f0800a5;
-        public static final int notification_bg_normal_pressed = 0x7f0800a6;
-        public static final int notification_icon_background = 0x7f0800a7;
-        public static final int notification_template_icon_bg = 0x7f0800a8;
-        public static final int notification_template_icon_low_bg = 0x7f0800a9;
-        public static final int notification_tile_bg = 0x7f0800aa;
-        public static final int notify_panel_notification_icon_bg = 0x7f0800ab;
+        public static final int notification_action_background = 0x7f0800a1;
+        public static final int notification_bg = 0x7f0800a2;
+        public static final int notification_bg_low = 0x7f0800a3;
+        public static final int notification_bg_low_normal = 0x7f0800a4;
+        public static final int notification_bg_low_pressed = 0x7f0800a5;
+        public static final int notification_bg_normal = 0x7f0800a6;
+        public static final int notification_bg_normal_pressed = 0x7f0800a7;
+        public static final int notification_icon_background = 0x7f0800a8;
+        public static final int notification_template_icon_bg = 0x7f0800a9;
+        public static final int notification_template_icon_low_bg = 0x7f0800aa;
+        public static final int notification_tile_bg = 0x7f0800ab;
+        public static final int notify_panel_notification_icon_bg = 0x7f0800ac;
     }
     public static final class id {
         private id() {}
@@ -85,27 +85,27 @@ public final class R {
         public static final int actions = 0x7f090020;
         public static final int async = 0x7f09002b;
         public static final int blocking = 0x7f090034;
-        public static final int chronometer = 0x7f090043;
-        public static final int forever = 0x7f09007b;
-        public static final int icon = 0x7f090089;
-        public static final int icon_group = 0x7f09008a;
-        public static final int info = 0x7f090090;
-        public static final int italic = 0x7f090092;
-        public static final int line1 = 0x7f0900aa;
-        public static final int line3 = 0x7f0900ab;
-        public static final int normal = 0x7f0900d9;
-        public static final int notification_background = 0x7f0900e0;
-        public static final int notification_main_column = 0x7f0900e1;
-        public static final int notification_main_column_container = 0x7f0900e2;
-        public static final int right_icon = 0x7f0900fb;
-        public static final int right_side = 0x7f0900fc;
-        public static final int tag_transition_group = 0x7f090137;
-        public static final int tag_unhandled_key_event_manager = 0x7f090138;
-        public static final int tag_unhandled_key_listeners = 0x7f090139;
-        public static final int text = 0x7f09013a;
-        public static final int text2 = 0x7f09013b;
-        public static final int time = 0x7f090147;
-        public static final int title = 0x7f090148;
+        public static final int chronometer = 0x7f090044;
+        public static final int forever = 0x7f09007c;
+        public static final int icon = 0x7f09008a;
+        public static final int icon_group = 0x7f09008b;
+        public static final int info = 0x7f090091;
+        public static final int italic = 0x7f090093;
+        public static final int line1 = 0x7f0900ab;
+        public static final int line3 = 0x7f0900ac;
+        public static final int normal = 0x7f0900dd;
+        public static final int notification_background = 0x7f0900e4;
+        public static final int notification_main_column = 0x7f0900e5;
+        public static final int notification_main_column_container = 0x7f0900e6;
+        public static final int right_icon = 0x7f0900ff;
+        public static final int right_side = 0x7f090100;
+        public static final int tag_transition_group = 0x7f09013b;
+        public static final int tag_unhandled_key_event_manager = 0x7f09013c;
+        public static final int tag_unhandled_key_listeners = 0x7f09013d;
+        public static final int text = 0x7f09013e;
+        public static final int text2 = 0x7f09013f;
+        public static final int time = 0x7f09014b;
+        public static final int title = 0x7f09014c;
     }
     public static final class integer {
         private integer() {}
@@ -125,18 +125,18 @@ public final class R {
     public static final class string {
         private string() {}
 
-        public static final int status_bar_notification_info_overflow = 0x7f11009b;
+        public static final int status_bar_notification_info_overflow = 0x7f12009e;
     }
     public static final class style {
         private style() {}
 
-        public static final int TextAppearance_Compat_Notification = 0x7f120118;
-        public static final int TextAppearance_Compat_Notification_Info = 0x7f120119;
-        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f12011b;
-        public static final int TextAppearance_Compat_Notification_Time = 0x7f12011e;
-        public static final int TextAppearance_Compat_Notification_Title = 0x7f120120;
-        public static final int Widget_Compat_NotificationActionContainer = 0x7f1201d1;
-        public static final int Widget_Compat_NotificationActionText = 0x7f1201d2;
+        public static final int TextAppearance_Compat_Notification = 0x7f130118;
+        public static final int TextAppearance_Compat_Notification_Info = 0x7f130119;
+        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f13011b;
+        public static final int TextAppearance_Compat_Notification_Time = 0x7f13011e;
+        public static final int TextAppearance_Compat_Notification_Title = 0x7f130120;
+        public static final int Widget_Compat_NotificationActionContainer = 0x7f1301d1;
+        public static final int Widget_Compat_NotificationActionText = 0x7f1301d2;
     }
     public static final class styleable {
         private styleable() {}

app/build/generated/not_namespaced_r_class_sources/debug/r/android/support/coordinatorlayout/R.java

@@ -71,18 +71,18 @@ public final class R {
     public static final class drawable {
         private drawable() {}
 
-        public static final int notification_action_background = 0x7f0800a0;
-        public static final int notification_bg = 0x7f0800a1;
-        public static final int notification_bg_low = 0x7f0800a2;
-        public static final int notification_bg_low_normal = 0x7f0800a3;
-        public static final int notification_bg_low_pressed = 0x7f0800a4;
-        public static final int notification_bg_normal = 0x7f0800a5;
-        public static final int notification_bg_normal_pressed = 0x7f0800a6;
-        public static final int notification_icon_background = 0x7f0800a7;
-        public static final int notification_template_icon_bg = 0x7f0800a8;
-        public static final int notification_template_icon_low_bg = 0x7f0800a9;
-        public static final int notification_tile_bg = 0x7f0800aa;
-        public static final int notify_panel_notification_icon_bg = 0x7f0800ab;
+        public static final int notification_action_background = 0x7f0800a1;
+        public static final int notification_bg = 0x7f0800a2;
+        public static final int notification_bg_low = 0x7f0800a3;
+        public static final int notification_bg_low_normal = 0x7f0800a4;
+        public static final int notification_bg_low_pressed = 0x7f0800a5;
+        public static final int notification_bg_normal = 0x7f0800a6;
+        public static final int notification_bg_normal_pressed = 0x7f0800a7;
+        public static final int notification_icon_background = 0x7f0800a8;
+        public static final int notification_template_icon_bg = 0x7f0800a9;
+        public static final int notification_template_icon_low_bg = 0x7f0800aa;
+        public static final int notification_tile_bg = 0x7f0800ab;
+        public static final int notify_panel_notification_icon_bg = 0x7f0800ac;
     }
     public static final class id {
         private id() {}
@@ -95,33 +95,33 @@ public final class R {
         public static final int async = 0x7f09002b;
         public static final int blocking = 0x7f090034;
         public static final int bottom = 0x7f090035;
-        public static final int chronometer = 0x7f090043;
-        public static final int end = 0x7f09006b;
-        public static final int forever = 0x7f09007b;
-        public static final int icon = 0x7f090089;
-        public static final int icon_group = 0x7f09008a;
-        public static final int info = 0x7f090090;
-        public static final int italic = 0x7f090092;
-        public static final int left = 0x7f0900a9;
-        public static final int line1 = 0x7f0900aa;
-        public static final int line3 = 0x7f0900ab;
-        public static final int none = 0x7f0900d8;
-        public static final int normal = 0x7f0900d9;
-        public static final int notification_background = 0x7f0900e0;
-        public static final int notification_main_column = 0x7f0900e1;
-        public static final int notification_main_column_container = 0x7f0900e2;
-        public static final int right = 0x7f0900fa;
-        public static final int right_icon = 0x7f0900fb;
-        public static final int right_side = 0x7f0900fc;
-        public static final int start = 0x7f090128;
-        public static final int tag_transition_group = 0x7f090137;
-        public static final int tag_unhandled_key_event_manager = 0x7f090138;
-        public static final int tag_unhandled_key_listeners = 0x7f090139;
-        public static final int text = 0x7f09013a;
-        public static final int text2 = 0x7f09013b;
-        public static final int time = 0x7f090147;
-        public static final int title = 0x7f090148;
-        public static final int top = 0x7f09014c;
+        public static final int chronometer = 0x7f090044;
+        public static final int end = 0x7f09006c;
+        public static final int forever = 0x7f09007c;
+        public static final int icon = 0x7f09008a;
+        public static final int icon_group = 0x7f09008b;
+        public static final int info = 0x7f090091;
+        public static final int italic = 0x7f090093;
+        public static final int left = 0x7f0900aa;
+        public static final int line1 = 0x7f0900ab;
+        public static final int line3 = 0x7f0900ac;
+        public static final int none = 0x7f0900dc;
+        public static final int normal = 0x7f0900dd;
+        public static final int notification_background = 0x7f0900e4;
+        public static final int notification_main_column = 0x7f0900e5;
+        public static final int notification_main_column_container = 0x7f0900e6;
+        public static final int right = 0x7f0900fe;
+        public static final int right_icon = 0x7f0900ff;
+        public static final int right_side = 0x7f090100;
+        public static final int start = 0x7f09012c;
+        public static final int tag_transition_group = 0x7f09013b;
+        public static final int tag_unhandled_key_event_manager = 0x7f09013c;
+        public static final int tag_unhandled_key_listeners = 0x7f09013d;
+        public static final int text = 0x7f09013e;
+        public static final int text2 = 0x7f09013f;
+        public static final int time = 0x7f09014b;
+        public static final int title = 0x7f09014c;
+        public static final int top = 0x7f090150;
     }
     public static final class integer {
         private integer() {}
@@ -141,19 +141,19 @@ public final class R {
     public static final class string {
         private string() {}
 
-        public static final int status_bar_notification_info_overflow = 0x7f11009b;
+        public static final int status_bar_notification_info_overflow = 0x7f12009e;
     }
     public static final class style {
         private style() {}
 
-        public static final int TextAppearance_Compat_Notification = 0x7f120118;
-        public static final int TextAppearance_Compat_Notification_Info = 0x7f120119;
-        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f12011b;
-        public static final int TextAppearance_Compat_Notification_Time = 0x7f12011e;
-        public static final int TextAppearance_Compat_Notification_Title = 0x7f120120;
-        public static final int Widget_Compat_NotificationActionContainer = 0x7f1201d1;
-        public static final int Widget_Compat_NotificationActionText = 0x7f1201d2;
-        public static final int Widget_Support_CoordinatorLayout = 0x7f120201;
+        public static final int TextAppearance_Compat_Notification = 0x7f130118;
+        public static final int TextAppearance_Compat_Notification_Info = 0x7f130119;
+        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f13011b;
+        public static final int TextAppearance_Compat_Notification_Time = 0x7f13011e;
+        public static final int TextAppearance_Compat_Notification_Title = 0x7f130120;
+        public static final int Widget_Compat_NotificationActionContainer = 0x7f1301d1;
+        public static final int Widget_Compat_NotificationActionText = 0x7f1301d2;
+        public static final int Widget_Support_CoordinatorLayout = 0x7f130201;
     }
     public static final class styleable {
         private styleable() {}

app/build/generated/not_namespaced_r_class_sources/debug/r/android/support/coreui/R.java

@@ -71,18 +71,18 @@ public final class R {
     public static final class drawable {
         private drawable() {}
 
-        public static final int notification_action_background = 0x7f0800a0;
-        public static final int notification_bg = 0x7f0800a1;
-        public static final int notification_bg_low = 0x7f0800a2;
-        public static final int notification_bg_low_normal = 0x7f0800a3;
-        public static final int notification_bg_low_pressed = 0x7f0800a4;
-        public static final int notification_bg_normal = 0x7f0800a5;
-        public static final int notification_bg_normal_pressed = 0x7f0800a6;
-        public static final int notification_icon_background = 0x7f0800a7;
-        public static final int notification_template_icon_bg = 0x7f0800a8;
-        public static final int notification_template_icon_low_bg = 0x7f0800a9;
-        public static final int notification_tile_bg = 0x7f0800aa;
-        public static final int notify_panel_notification_icon_bg = 0x7f0800ab;
+        public static final int notification_action_background = 0x7f0800a1;
+        public static final int notification_bg = 0x7f0800a2;
+        public static final int notification_bg_low = 0x7f0800a3;
+        public static final int notification_bg_low_normal = 0x7f0800a4;
+        public static final int notification_bg_low_pressed = 0x7f0800a5;
+        public static final int notification_bg_normal = 0x7f0800a6;
+        public static final int notification_bg_normal_pressed = 0x7f0800a7;
+        public static final int notification_icon_background = 0x7f0800a8;
+        public static final int notification_template_icon_bg = 0x7f0800a9;
+        public static final int notification_template_icon_low_bg = 0x7f0800aa;
+        public static final int notification_tile_bg = 0x7f0800ab;
+        public static final int notify_panel_notification_icon_bg = 0x7f0800ac;
     }
     public static final class id {
         private id() {}
@@ -95,33 +95,33 @@ public final class R {
         public static final int async = 0x7f09002b;
         public static final int blocking = 0x7f090034;
         public static final int bottom = 0x7f090035;
-        public static final int chronometer = 0x7f090043;
-        public static final int end = 0x7f09006b;
-        public static final int forever = 0x7f09007b;
-        public static final int icon = 0x7f090089;
-        public static final int icon_group = 0x7f09008a;
-        public static final int info = 0x7f090090;
-        public static final int italic = 0x7f090092;
-        public static final int left = 0x7f0900a9;
-        public static final int line1 = 0x7f0900aa;
-        public static final int line3 = 0x7f0900ab;
-        public static final int none = 0x7f0900d8;
-        public static final int normal = 0x7f0900d9;
-        public static final int notification_background = 0x7f0900e0;
-        public static final int notification_main_column = 0x7f0900e1;
-        public static final int notification_main_column_container = 0x7f0900e2;
-        public static final int right = 0x7f0900fa;
-        public static final int right_icon = 0x7f0900fb;
-        public static final int right_side = 0x7f0900fc;
-        public static final int start = 0x7f090128;
-        public static final int tag_transition_group = 0x7f090137;
-        public static final int tag_unhandled_key_event_manager = 0x7f090138;
-        public static final int tag_unhandled_key_listeners = 0x7f090139;
-        public static final int text = 0x7f09013a;
-        public static final int text2 = 0x7f09013b;
-        public static final int time = 0x7f090147;
-        public static final int title = 0x7f090148;
-        public static final int top = 0x7f09014c;
+        public static final int chronometer = 0x7f090044;
+        public static final int end = 0x7f09006c;
+        public static final int forever = 0x7f09007c;
+        public static final int icon = 0x7f09008a;
+        public static final int icon_group = 0x7f09008b;
+        public static final int info = 0x7f090091;
+        public static final int italic = 0x7f090093;
+        public static final int left = 0x7f0900aa;
+        public static final int line1 = 0x7f0900ab;
+        public static final int line3 = 0x7f0900ac;
+        public static final int none = 0x7f0900dc;
+        public static final int normal = 0x7f0900dd;
+        public static final int notification_background = 0x7f0900e4;
+        public static final int notification_main_column = 0x7f0900e5;
+        public static final int notification_main_column_container = 0x7f0900e6;
+        public static final int right = 0x7f0900fe;
+        public static final int right_icon = 0x7f0900ff;
+        public static final int right_side = 0x7f090100;
+        public static final int start = 0x7f09012c;
+        public static final int tag_transition_group = 0x7f09013b;
+        public static final int tag_unhandled_key_event_manager = 0x7f09013c;
+        public static final int tag_unhandled_key_listeners = 0x7f09013d;
+        public static final int text = 0x7f09013e;
+        public static final int text2 = 0x7f09013f;
+        public static final int time = 0x7f09014b;
+        public static final int title = 0x7f09014c;
+        public static final int top = 0x7f090150;
     }
     public static final class integer {
         private integer() {}
@@ -141,19 +141,19 @@ public final class R {
     public static final class string {
         private string() {}
 
-        public static final int status_bar_notification_info_overflow = 0x7f11009b;
+        public static final int status_bar_notification_info_overflow = 0x7f12009e;
     }
     public static final class style {
         private style() {}
 
-        public static final int TextAppearance_Compat_Notification = 0x7f120118;
-        public static final int TextAppearance_Compat_Notification_Info = 0x7f120119;
-        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f12011b;
-        public static final int TextAppearance_Compat_Notification_Time = 0x7f12011e;
-        public static final int TextAppearance_Compat_Notification_Title = 0x7f120120;
-        public static final int Widget_Compat_NotificationActionContainer = 0x7f1201d1;
-        public static final int Widget_Compat_NotificationActionText = 0x7f1201d2;
-        public static final int Widget_Support_CoordinatorLayout = 0x7f120201;
+        public static final int TextAppearance_Compat_Notification = 0x7f130118;
+        public static final int TextAppearance_Compat_Notification_Info = 0x7f130119;
+        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f13011b;
+        public static final int TextAppearance_Compat_Notification_Time = 0x7f13011e;
+        public static final int TextAppearance_Compat_Notification_Title = 0x7f130120;
+        public static final int Widget_Compat_NotificationActionContainer = 0x7f1301d1;
+        public static final int Widget_Compat_NotificationActionText = 0x7f1301d2;
+        public static final int Widget_Support_CoordinatorLayout = 0x7f130201;
     }
     public static final class styleable {
         private styleable() {}

app/build/generated/not_namespaced_r_class_sources/debug/r/android/support/coreutils/R.java

@@ -62,18 +62,18 @@ public final class R {
     public static final class drawable {
         private drawable() {}
 
-        public static final int notification_action_background = 0x7f0800a0;
-        public static final int notification_bg = 0x7f0800a1;
-        public static final int notification_bg_low = 0x7f0800a2;
-        public static final int notification_bg_low_normal = 0x7f0800a3;
-        public static final int notification_bg_low_pressed = 0x7f0800a4;
-        public static final int notification_bg_normal = 0x7f0800a5;
-        public static final int notification_bg_normal_pressed = 0x7f0800a6;
-        public static final int notification_icon_background = 0x7f0800a7;
-        public static final int notification_template_icon_bg = 0x7f0800a8;
-        public static final int notification_template_icon_low_bg = 0x7f0800a9;
-        public static final int notification_tile_bg = 0x7f0800aa;
-        public static final int notify_panel_notification_icon_bg = 0x7f0800ab;
+        public static final int notification_action_background = 0x7f0800a1;
+        public static final int notification_bg = 0x7f0800a2;
+        public static final int notification_bg_low = 0x7f0800a3;
+        public static final int notification_bg_low_normal = 0x7f0800a4;
+        public static final int notification_bg_low_pressed = 0x7f0800a5;
+        public static final int notification_bg_normal = 0x7f0800a6;
+        public static final int notification_bg_normal_pressed = 0x7f0800a7;
+        public static final int notification_icon_background = 0x7f0800a8;
+        public static final int notification_template_icon_bg = 0x7f0800a9;
+        public static final int notification_template_icon_low_bg = 0x7f0800aa;
+        public static final int notification_tile_bg = 0x7f0800ab;
+        public static final int notify_panel_notification_icon_bg = 0x7f0800ac;
     }
     public static final class id {
         private id() {}
@@ -85,27 +85,27 @@ public final class R {
         public static final int actions = 0x7f090020;
         public static final int async = 0x7f09002b;
         public static final int blocking = 0x7f090034;
-        public static final int chronometer = 0x7f090043;
-        public static final int forever = 0x7f09007b;
-        public static final int icon = 0x7f090089;
-        public static final int icon_group = 0x7f09008a;
-        public static final int info = 0x7f090090;
-        public static final int italic = 0x7f090092;
-        public static final int line1 = 0x7f0900aa;
-        public static final int line3 = 0x7f0900ab;
-        public static final int normal = 0x7f0900d9;
-        public static final int notification_background = 0x7f0900e0;
-        public static final int notification_main_column = 0x7f0900e1;
-        public static final int notification_main_column_container = 0x7f0900e2;
-        public static final int right_icon = 0x7f0900fb;
-        public static final int right_side = 0x7f0900fc;
-        public static final int tag_transition_group = 0x7f090137;
-        public static final int tag_unhandled_key_event_manager = 0x7f090138;
-        public static final int tag_unhandled_key_listeners = 0x7f090139;
-        public static final int text = 0x7f09013a;
-        public static final int text2 = 0x7f09013b;
-        public static final int time = 0x7f090147;
-        public static final int title = 0x7f090148;
+        public static final int chronometer = 0x7f090044;
+        public static final int forever = 0x7f09007c;
+        public static final int icon = 0x7f09008a;
+        public static final int icon_group = 0x7f09008b;
+        public static final int info = 0x7f090091;
+        public static final int italic = 0x7f090093;
+        public static final int line1 = 0x7f0900ab;
+        public static final int line3 = 0x7f0900ac;
+        public static final int normal = 0x7f0900dd;
+        public static final int notification_background = 0x7f0900e4;
+        public static final int notification_main_column = 0x7f0900e5;
+        public static final int notification_main_column_container = 0x7f0900e6;
+        public static final int right_icon = 0x7f0900ff;
+        public static final int right_side = 0x7f090100;
+        public static final int tag_transition_group = 0x7f09013b;
+        public static final int tag_unhandled_key_event_manager = 0x7f09013c;
+        public static final int tag_unhandled_key_listeners = 0x7f09013d;
+        public static final int text = 0x7f09013e;
+        public static final int text2 = 0x7f09013f;
+        public static final int time = 0x7f09014b;
+        public static final int title = 0x7f09014c;
     }
     public static final class integer {
         private integer() {}
@@ -125,18 +125,18 @@ public final class R {
     public static final class string {
         private string() {}
 
-        public static final int status_bar_notification_info_overflow = 0x7f11009b;
+        public static final int status_bar_notification_info_overflow = 0x7f12009e;
     }
     public static final class style {
         private style() {}
 
-        public static final int TextAppearance_Compat_Notification = 0x7f120118;
-        public static final int TextAppearance_Compat_Notification_Info = 0x7f120119;
-        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f12011b;
-        public static final int TextAppearance_Compat_Notification_Time = 0x7f12011e;
-        public static final int TextAppearance_Compat_Notification_Title = 0x7f120120;
-        public static final int Widget_Compat_NotificationActionContainer = 0x7f1201d1;
-        public static final int Widget_Compat_NotificationActionText = 0x7f1201d2;
+        public static final int TextAppearance_Compat_Notification = 0x7f130118;
+        public static final int TextAppearance_Compat_Notification_Info = 0x7f130119;
+        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f13011b;
+        public static final int TextAppearance_Compat_Notification_Time = 0x7f13011e;
+        public static final int TextAppearance_Compat_Notification_Title = 0x7f130120;
+        public static final int Widget_Compat_NotificationActionContainer = 0x7f1301d1;
+        public static final int Widget_Compat_NotificationActionText = 0x7f1301d2;
     }
     public static final class styleable {
         private styleable() {}

app/build/generated/not_namespaced_r_class_sources/debug/r/android/support/customview/R.java

@@ -62,18 +62,18 @@ public final class R {
     public static final class drawable {
         private drawable() {}
 
-        public static final int notification_action_background = 0x7f0800a0;
-        public static final int notification_bg = 0x7f0800a1;
-        public static final int notification_bg_low = 0x7f0800a2;
-        public static final int notification_bg_low_normal = 0x7f0800a3;
-        public static final int notification_bg_low_pressed = 0x7f0800a4;
-        public static final int notification_bg_normal = 0x7f0800a5;
-        public static final int notification_bg_normal_pressed = 0x7f0800a6;
-        public static final int notification_icon_background = 0x7f0800a7;
-        public static final int notification_template_icon_bg = 0x7f0800a8;
-        public static final int notification_template_icon_low_bg = 0x7f0800a9;
-        public static final int notification_tile_bg = 0x7f0800aa;
-        public static final int notify_panel_notification_icon_bg = 0x7f0800ab;
+        public static final int notification_action_background = 0x7f0800a1;
+        public static final int notification_bg = 0x7f0800a2;
+        public static final int notification_bg_low = 0x7f0800a3;
+        public static final int notification_bg_low_normal = 0x7f0800a4;
+        public static final int notification_bg_low_pressed = 0x7f0800a5;
+        public static final int notification_bg_normal = 0x7f0800a6;
+        public static final int notification_bg_normal_pressed = 0x7f0800a7;
+        public static final int notification_icon_background = 0x7f0800a8;
+        public static final int notification_template_icon_bg = 0x7f0800a9;
+        public static final int notification_template_icon_low_bg = 0x7f0800aa;
+        public static final int notification_tile_bg = 0x7f0800ab;
+        public static final int notify_panel_notification_icon_bg = 0x7f0800ac;
     }
     public static final class id {
         private id() {}
@@ -85,27 +85,27 @@ public final class R {
         public static final int actions = 0x7f090020;
         public static final int async = 0x7f09002b;
         public static final int blocking = 0x7f090034;
-        public static final int chronometer = 0x7f090043;
-        public static final int forever = 0x7f09007b;
-        public static final int icon = 0x7f090089;
-        public static final int icon_group = 0x7f09008a;
-        public static final int info = 0x7f090090;
-        public static final int italic = 0x7f090092;
-        public static final int line1 = 0x7f0900aa;
-        public static final int line3 = 0x7f0900ab;
-        public static final int normal = 0x7f0900d9;
-        public static final int notification_background = 0x7f0900e0;
-        public static final int notification_main_column = 0x7f0900e1;
-        public static final int notification_main_column_container = 0x7f0900e2;
-        public static final int right_icon = 0x7f0900fb;
-        public static final int right_side = 0x7f0900fc;
-        public static final int tag_transition_group = 0x7f090137;
-        public static final int tag_unhandled_key_event_manager = 0x7f090138;
-        public static final int tag_unhandled_key_listeners = 0x7f090139;
-        public static final int text = 0x7f09013a;
-        public static final int text2 = 0x7f09013b;
-        public static final int time = 0x7f090147;
-        public static final int title = 0x7f090148;
+        public static final int chronometer = 0x7f090044;
+        public static final int forever = 0x7f09007c;
+        public static final int icon = 0x7f09008a;
+        public static final int icon_group = 0x7f09008b;
+        public static final int info = 0x7f090091;
+        public static final int italic = 0x7f090093;
+        public static final int line1 = 0x7f0900ab;
+        public static final int line3 = 0x7f0900ac;
+        public static final int normal = 0x7f0900dd;
+        public static final int notification_background = 0x7f0900e4;
+        public static final int notification_main_column = 0x7f0900e5;
+        public static final int notification_main_column_container = 0x7f0900e6;
+        public static final int right_icon = 0x7f0900ff;
+        public static final int right_side = 0x7f090100;
+        public static final int tag_transition_group = 0x7f09013b;
+        public static final int tag_unhandled_key_event_manager = 0x7f09013c;
+        public static final int tag_unhandled_key_listeners = 0x7f09013d;
+        public static final int text = 0x7f09013e;
+        public static final int text2 = 0x7f09013f;
+        public static final int time = 0x7f09014b;
+        public static final int title = 0x7f09014c;
     }
     public static final class integer {
         private integer() {}
@@ -125,18 +125,18 @@ public final class R {
     public static final class string {
         private string() {}
 
-        public static final int status_bar_notification_info_overflow = 0x7f11009b;
+        public static final int status_bar_notification_info_overflow = 0x7f12009e;
     }
     public static final class style {
         private style() {}
 
-        public static final int TextAppearance_Compat_Notification = 0x7f120118;
-        public static final int TextAppearance_Compat_Notification_Info = 0x7f120119;
-        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f12011b;
-        public static final int TextAppearance_Compat_Notification_Time = 0x7f12011e;
-        public static final int TextAppearance_Compat_Notification_Title = 0x7f120120;
-        public static final int Widget_Compat_NotificationActionContainer = 0x7f1201d1;
-        public static final int Widget_Compat_NotificationActionText = 0x7f1201d2;
+        public static final int TextAppearance_Compat_Notification = 0x7f130118;
+        public static final int TextAppearance_Compat_Notification_Info = 0x7f130119;
+        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f13011b;
+        public static final int TextAppearance_Compat_Notification_Time = 0x7f13011e;
+        public static final int TextAppearance_Compat_Notification_Title = 0x7f130120;
+        public static final int Widget_Compat_NotificationActionContainer = 0x7f1301d1;
+        public static final int Widget_Compat_NotificationActionText = 0x7f1301d2;
     }
     public static final class styleable {
         private styleable() {}

app/build/generated/not_namespaced_r_class_sources/debug/r/android/support/drawerlayout/R.java

@@ -62,18 +62,18 @@ public final class R {
     public static final class drawable {
         private drawable() {}
 
-        public static final int notification_action_background = 0x7f0800a0;
-        public static final int notification_bg = 0x7f0800a1;
-        public static final int notification_bg_low = 0x7f0800a2;
-        public static final int notification_bg_low_normal = 0x7f0800a3;
-        public static final int notification_bg_low_pressed = 0x7f0800a4;
-        public static final int notification_bg_normal = 0x7f0800a5;
-        public static final int notification_bg_normal_pressed = 0x7f0800a6;
-        public static final int notification_icon_background = 0x7f0800a7;
-        public static final int notification_template_icon_bg = 0x7f0800a8;
-        public static final int notification_template_icon_low_bg = 0x7f0800a9;
-        public static final int notification_tile_bg = 0x7f0800aa;
-        public static final int notify_panel_notification_icon_bg = 0x7f0800ab;
+        public static final int notification_action_background = 0x7f0800a1;
+        public static final int notification_bg = 0x7f0800a2;
+        public static final int notification_bg_low = 0x7f0800a3;
+        public static final int notification_bg_low_normal = 0x7f0800a4;
+        public static final int notification_bg_low_pressed = 0x7f0800a5;
+        public static final int notification_bg_normal = 0x7f0800a6;
+        public static final int notification_bg_normal_pressed = 0x7f0800a7;
+        public static final int notification_icon_background = 0x7f0800a8;
+        public static final int notification_template_icon_bg = 0x7f0800a9;
+        public static final int notification_template_icon_low_bg = 0x7f0800aa;
+        public static final int notification_tile_bg = 0x7f0800ab;
+        public static final int notify_panel_notification_icon_bg = 0x7f0800ac;
     }
     public static final class id {
         private id() {}
@@ -85,27 +85,27 @@ public final class R {
         public static final int actions = 0x7f090020;
         public static final int async = 0x7f09002b;
         public static final int blocking = 0x7f090034;
-        public static final int chronometer = 0x7f090043;
-        public static final int forever = 0x7f09007b;
-        public static final int icon = 0x7f090089;
-        public static final int icon_group = 0x7f09008a;
-        public static final int info = 0x7f090090;
-        public static final int italic = 0x7f090092;
-        public static final int line1 = 0x7f0900aa;
-        public static final int line3 = 0x7f0900ab;
-        public static final int normal = 0x7f0900d9;
-        public static final int notification_background = 0x7f0900e0;
-        public static final int notification_main_column = 0x7f0900e1;
-        public static final int notification_main_column_container = 0x7f0900e2;
-        public static final int right_icon = 0x7f0900fb;
-        public static final int right_side = 0x7f0900fc;
-        public static final int tag_transition_group = 0x7f090137;
-        public static final int tag_unhandled_key_event_manager = 0x7f090138;
-        public static final int tag_unhandled_key_listeners = 0x7f090139;
-        public static final int text = 0x7f09013a;
-        public static final int text2 = 0x7f09013b;
-        public static final int time = 0x7f090147;
-        public static final int title = 0x7f090148;
+        public static final int chronometer = 0x7f090044;
+        public static final int forever = 0x7f09007c;
+        public static final int icon = 0x7f09008a;
+        public static final int icon_group = 0x7f09008b;
+        public static final int info = 0x7f090091;
+        public static final int italic = 0x7f090093;
+        public static final int line1 = 0x7f0900ab;
+        public static final int line3 = 0x7f0900ac;
+        public static final int normal = 0x7f0900dd;
+        public static final int notification_background = 0x7f0900e4;
+        public static final int notification_main_column = 0x7f0900e5;
+        public static final int notification_main_column_container = 0x7f0900e6;
+        public static final int right_icon = 0x7f0900ff;
+        public static final int right_side = 0x7f090100;
+        public static final int tag_transition_group = 0x7f09013b;
+        public static final int tag_unhandled_key_event_manager = 0x7f09013c;
+        public static final int tag_unhandled_key_listeners = 0x7f09013d;
+        public static final int text = 0x7f09013e;
+        public static final int text2 = 0x7f09013f;
+        public static final int time = 0x7f09014b;
+        public static final int title = 0x7f09014c;
     }
     public static final class integer {
         private integer() {}
@@ -125,18 +125,18 @@ public final class R {
     public static final class string {
         private string() {}
 
-        public static final int status_bar_notification_info_overflow = 0x7f11009b;
+        public static final int status_bar_notification_info_overflow = 0x7f12009e;
     }
     public static final class style {
         private style() {}
 
-        public static final int TextAppearance_Compat_Notification = 0x7f120118;
-        public static final int TextAppearance_Compat_Notification_Info = 0x7f120119;
-        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f12011b;
-        public static final int TextAppearance_Compat_Notification_Time = 0x7f12011e;
-        public static final int TextAppearance_Compat_Notification_Title = 0x7f120120;
-        public static final int Widget_Compat_NotificationActionContainer = 0x7f1201d1;
-        public static final int Widget_Compat_NotificationActionText = 0x7f1201d2;
+        public static final int TextAppearance_Compat_Notification = 0x7f130118;
+        public static final int TextAppearance_Compat_Notification_Info = 0x7f130119;
+        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f13011b;
+        public static final int TextAppearance_Compat_Notification_Time = 0x7f13011e;
+        public static final int TextAppearance_Compat_Notification_Title = 0x7f130120;
+        public static final int Widget_Compat_NotificationActionContainer = 0x7f1301d1;
+        public static final int Widget_Compat_NotificationActionText = 0x7f1301d2;
     }
     public static final class styleable {
         private styleable() {}

app/build/generated/not_namespaced_r_class_sources/debug/r/android/support/fragment/R.java

@@ -71,18 +71,18 @@ public final class R {
     public static final class drawable {
         private drawable() {}
 
-        public static final int notification_action_background = 0x7f0800a0;
-        public static final int notification_bg = 0x7f0800a1;
-        public static final int notification_bg_low = 0x7f0800a2;
-        public static final int notification_bg_low_normal = 0x7f0800a3;
-        public static final int notification_bg_low_pressed = 0x7f0800a4;
-        public static final int notification_bg_normal = 0x7f0800a5;
-        public static final int notification_bg_normal_pressed = 0x7f0800a6;
-        public static final int notification_icon_background = 0x7f0800a7;
-        public static final int notification_template_icon_bg = 0x7f0800a8;
-        public static final int notification_template_icon_low_bg = 0x7f0800a9;
-        public static final int notification_tile_bg = 0x7f0800aa;
-        public static final int notify_panel_notification_icon_bg = 0x7f0800ab;
+        public static final int notification_action_background = 0x7f0800a1;
+        public static final int notification_bg = 0x7f0800a2;
+        public static final int notification_bg_low = 0x7f0800a3;
+        public static final int notification_bg_low_normal = 0x7f0800a4;
+        public static final int notification_bg_low_pressed = 0x7f0800a5;
+        public static final int notification_bg_normal = 0x7f0800a6;
+        public static final int notification_bg_normal_pressed = 0x7f0800a7;
+        public static final int notification_icon_background = 0x7f0800a8;
+        public static final int notification_template_icon_bg = 0x7f0800a9;
+        public static final int notification_template_icon_low_bg = 0x7f0800aa;
+        public static final int notification_tile_bg = 0x7f0800ab;
+        public static final int notify_panel_notification_icon_bg = 0x7f0800ac;
     }
     public static final class id {
         private id() {}
@@ -95,33 +95,33 @@ public final class R {
         public static final int async = 0x7f09002b;
         public static final int blocking = 0x7f090034;
         public static final int bottom = 0x7f090035;
-        public static final int chronometer = 0x7f090043;
-        public static final int end = 0x7f09006b;
-        public static final int forever = 0x7f09007b;
-        public static final int icon = 0x7f090089;
-        public static final int icon_group = 0x7f09008a;
-        public static final int info = 0x7f090090;
-        public static final int italic = 0x7f090092;
-        public static final int left = 0x7f0900a9;
-        public static final int line1 = 0x7f0900aa;
-        public static final int line3 = 0x7f0900ab;
-        public static final int none = 0x7f0900d8;
-        public static final int normal = 0x7f0900d9;
-        public static final int notification_background = 0x7f0900e0;
-        public static final int notification_main_column = 0x7f0900e1;
-        public static final int notification_main_column_container = 0x7f0900e2;
-        public static final int right = 0x7f0900fa;
-        public static final int right_icon = 0x7f0900fb;
-        public static final int right_side = 0x7f0900fc;
-        public static final int start = 0x7f090128;
-        public static final int tag_transition_group = 0x7f090137;
-        public static final int tag_unhandled_key_event_manager = 0x7f090138;
-        public static final int tag_unhandled_key_listeners = 0x7f090139;
-        public static final int text = 0x7f09013a;
-        public static final int text2 = 0x7f09013b;
-        public static final int time = 0x7f090147;
-        public static final int title = 0x7f090148;
-        public static final int top = 0x7f09014c;
+        public static final int chronometer = 0x7f090044;
+        public static final int end = 0x7f09006c;
+        public static final int forever = 0x7f09007c;
+        public static final int icon = 0x7f09008a;
+        public static final int icon_group = 0x7f09008b;
+        public static final int info = 0x7f090091;
+        public static final int italic = 0x7f090093;
+        public static final int left = 0x7f0900aa;
+        public static final int line1 = 0x7f0900ab;
+        public static final int line3 = 0x7f0900ac;
+        public static final int none = 0x7f0900dc;
+        public static final int normal = 0x7f0900dd;
+        public static final int notification_background = 0x7f0900e4;
+        public static final int notification_main_column = 0x7f0900e5;
+        public static final int notification_main_column_container = 0x7f0900e6;
+        public static final int right = 0x7f0900fe;
+        public static final int right_icon = 0x7f0900ff;
+        public static final int right_side = 0x7f090100;
+        public static final int start = 0x7f09012c;
+        public static final int tag_transition_group = 0x7f09013b;
+        public static final int tag_unhandled_key_event_manager = 0x7f09013c;
+        public static final int tag_unhandled_key_listeners = 0x7f09013d;
+        public static final int text = 0x7f09013e;
+        public static final int text2 = 0x7f09013f;
+        public static final int time = 0x7f09014b;
+        public static final int title = 0x7f09014c;
+        public static final int top = 0x7f090150;
     }
     public static final class integer {
         private integer() {}
@@ -141,19 +141,19 @@ public final class R {
     public static final class string {
         private string() {}
 
-        public static final int status_bar_notification_info_overflow = 0x7f11009b;
+        public static final int status_bar_notification_info_overflow = 0x7f12009e;
     }
     public static final class style {
         private style() {}
 
-        public static final int TextAppearance_Compat_Notification = 0x7f120118;
-        public static final int TextAppearance_Compat_Notification_Info = 0x7f120119;
-        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f12011b;
-        public static final int TextAppearance_Compat_Notification_Time = 0x7f12011e;
-        public static final int TextAppearance_Compat_Notification_Title = 0x7f120120;
-        public static final int Widget_Compat_NotificationActionContainer = 0x7f1201d1;
-        public static final int Widget_Compat_NotificationActionText = 0x7f1201d2;
-        public static final int Widget_Support_CoordinatorLayout = 0x7f120201;
+        public static final int TextAppearance_Compat_Notification = 0x7f130118;
+        public static final int TextAppearance_Compat_Notification_Info = 0x7f130119;
+        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f13011b;
+        public static final int TextAppearance_Compat_Notification_Time = 0x7f13011e;
+        public static final int TextAppearance_Compat_Notification_Title = 0x7f130120;
+        public static final int Widget_Compat_NotificationActionContainer = 0x7f1301d1;
+        public static final int Widget_Compat_NotificationActionText = 0x7f1301d2;
+        public static final int Widget_Support_CoordinatorLayout = 0x7f130201;
     }
     public static final class styleable {
         private styleable() {}

app/build/generated/not_namespaced_r_class_sources/debug/r/android/support/graphics/drawable/R.java

@@ -71,18 +71,18 @@ public final class R {
     public static final class drawable {
         private drawable() {}
 
-        public static final int notification_action_background = 0x7f0800a0;
-        public static final int notification_bg = 0x7f0800a1;
-        public static final int notification_bg_low = 0x7f0800a2;
-        public static final int notification_bg_low_normal = 0x7f0800a3;
-        public static final int notification_bg_low_pressed = 0x7f0800a4;
-        public static final int notification_bg_normal = 0x7f0800a5;
-        public static final int notification_bg_normal_pressed = 0x7f0800a6;
-        public static final int notification_icon_background = 0x7f0800a7;
-        public static final int notification_template_icon_bg = 0x7f0800a8;
-        public static final int notification_template_icon_low_bg = 0x7f0800a9;
-        public static final int notification_tile_bg = 0x7f0800aa;
-        public static final int notify_panel_notification_icon_bg = 0x7f0800ab;
+        public static final int notification_action_background = 0x7f0800a1;
+        public static final int notification_bg = 0x7f0800a2;
+        public static final int notification_bg_low = 0x7f0800a3;
+        public static final int notification_bg_low_normal = 0x7f0800a4;
+        public static final int notification_bg_low_pressed = 0x7f0800a5;
+        public static final int notification_bg_normal = 0x7f0800a6;
+        public static final int notification_bg_normal_pressed = 0x7f0800a7;
+        public static final int notification_icon_background = 0x7f0800a8;
+        public static final int notification_template_icon_bg = 0x7f0800a9;
+        public static final int notification_template_icon_low_bg = 0x7f0800aa;
+        public static final int notification_tile_bg = 0x7f0800ab;
+        public static final int notify_panel_notification_icon_bg = 0x7f0800ac;
     }
     public static final class id {
         private id() {}
@@ -95,33 +95,33 @@ public final class R {
         public static final int async = 0x7f09002b;
         public static final int blocking = 0x7f090034;
         public static final int bottom = 0x7f090035;
-        public static final int chronometer = 0x7f090043;
-        public static final int end = 0x7f09006b;
-        public static final int forever = 0x7f09007b;
-        public static final int icon = 0x7f090089;
-        public static final int icon_group = 0x7f09008a;
-        public static final int info = 0x7f090090;
-        public static final int italic = 0x7f090092;
-        public static final int left = 0x7f0900a9;
-        public static final int line1 = 0x7f0900aa;
-        public static final int line3 = 0x7f0900ab;
-        public static final int none = 0x7f0900d8;
-        public static final int normal = 0x7f0900d9;
-        public static final int notification_background = 0x7f0900e0;
-        public static final int notification_main_column = 0x7f0900e1;
-        public static final int notification_main_column_container = 0x7f0900e2;
-        public static final int right = 0x7f0900fa;
-        public static final int right_icon = 0x7f0900fb;
-        public static final int right_side = 0x7f0900fc;
-        public static final int start = 0x7f090128;
-        public static final int tag_transition_group = 0x7f090137;
-        public static final int tag_unhandled_key_event_manager = 0x7f090138;
-        public static final int tag_unhandled_key_listeners = 0x7f090139;
-        public static final int text = 0x7f09013a;
-        public static final int text2 = 0x7f09013b;
-        public static final int time = 0x7f090147;
-        public static final int title = 0x7f090148;
-        public static final int top = 0x7f09014c;
+        public static final int chronometer = 0x7f090044;
+        public static final int end = 0x7f09006c;
+        public static final int forever = 0x7f09007c;
+        public static final int icon = 0x7f09008a;
+        public static final int icon_group = 0x7f09008b;
+        public static final int info = 0x7f090091;
+        public static final int italic = 0x7f090093;
+        public static final int left = 0x7f0900aa;
+        public static final int line1 = 0x7f0900ab;
+        public static final int line3 = 0x7f0900ac;
+        public static final int none = 0x7f0900dc;
+        public static final int normal = 0x7f0900dd;
+        public static final int notification_background = 0x7f0900e4;
+        public static final int notification_main_column = 0x7f0900e5;
+        public static final int notification_main_column_container = 0x7f0900e6;
+        public static final int right = 0x7f0900fe;
+        public static final int right_icon = 0x7f0900ff;
+        public static final int right_side = 0x7f090100;
+        public static final int start = 0x7f09012c;
+        public static final int tag_transition_group = 0x7f09013b;
+        public static final int tag_unhandled_key_event_manager = 0x7f09013c;
+        public static final int tag_unhandled_key_listeners = 0x7f09013d;
+        public static final int text = 0x7f09013e;
+        public static final int text2 = 0x7f09013f;
+        public static final int time = 0x7f09014b;
+        public static final int title = 0x7f09014c;
+        public static final int top = 0x7f090150;
     }
     public static final class integer {
         private integer() {}
@@ -141,19 +141,19 @@ public final class R {
     public static final class string {
         private string() {}
 
-        public static final int status_bar_notification_info_overflow = 0x7f11009b;
+        public static final int status_bar_notification_info_overflow = 0x7f12009e;
     }
     public static final class style {
         private style() {}
 
-        public static final int TextAppearance_Compat_Notification = 0x7f120118;
-        public static final int TextAppearance_Compat_Notification_Info = 0x7f120119;
-        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f12011b;
-        public static final int TextAppearance_Compat_Notification_Time = 0x7f12011e;
-        public static final int TextAppearance_Compat_Notification_Title = 0x7f120120;
-        public static final int Widget_Compat_NotificationActionContainer = 0x7f1201d1;
-        public static final int Widget_Compat_NotificationActionText = 0x7f1201d2;
-        public static final int Widget_Support_CoordinatorLayout = 0x7f120201;
+        public static final int TextAppearance_Compat_Notification = 0x7f130118;
+        public static final int TextAppearance_Compat_Notification_Info = 0x7f130119;
+        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f13011b;
+        public static final int TextAppearance_Compat_Notification_Time = 0x7f13011e;
+        public static final int TextAppearance_Compat_Notification_Title = 0x7f130120;
+        public static final int Widget_Compat_NotificationActionContainer = 0x7f1301d1;
+        public static final int Widget_Compat_NotificationActionText = 0x7f1301d2;
+        public static final int Widget_Support_CoordinatorLayout = 0x7f130201;
     }
     public static final class styleable {
         private styleable() {}

app/build/generated/not_namespaced_r_class_sources/debug/r/android/support/loader/R.java

@@ -62,18 +62,18 @@ public final class R {
     public static final class drawable {
         private drawable() {}
 
-        public static final int notification_action_background = 0x7f0800a0;
-        public static final int notification_bg = 0x7f0800a1;
-        public static final int notification_bg_low = 0x7f0800a2;
-        public static final int notification_bg_low_normal = 0x7f0800a3;
-        public static final int notification_bg_low_pressed = 0x7f0800a4;
-        public static final int notification_bg_normal = 0x7f0800a5;
-        public static final int notification_bg_normal_pressed = 0x7f0800a6;
-        public static final int notification_icon_background = 0x7f0800a7;
-        public static final int notification_template_icon_bg = 0x7f0800a8;
-        public static final int notification_template_icon_low_bg = 0x7f0800a9;
-        public static final int notification_tile_bg = 0x7f0800aa;
-        public static final int notify_panel_notification_icon_bg = 0x7f0800ab;
+        public static final int notification_action_background = 0x7f0800a1;
+        public static final int notification_bg = 0x7f0800a2;
+        public static final int notification_bg_low = 0x7f0800a3;
+        public static final int notification_bg_low_normal = 0x7f0800a4;
+        public static final int notification_bg_low_pressed = 0x7f0800a5;
+        public static final int notification_bg_normal = 0x7f0800a6;
+        public static final int notification_bg_normal_pressed = 0x7f0800a7;
+        public static final int notification_icon_background = 0x7f0800a8;
+        public static final int notification_template_icon_bg = 0x7f0800a9;
+        public static final int notification_template_icon_low_bg = 0x7f0800aa;
+        public static final int notification_tile_bg = 0x7f0800ab;
+        public static final int notify_panel_notification_icon_bg = 0x7f0800ac;
     }
     public static final class id {
         private id() {}
@@ -85,27 +85,27 @@ public final class R {
         public static final int actions = 0x7f090020;
         public static final int async = 0x7f09002b;
         public static final int blocking = 0x7f090034;
-        public static final int chronometer = 0x7f090043;
-        public static final int forever = 0x7f09007b;
-        public static final int icon = 0x7f090089;
-        public static final int icon_group = 0x7f09008a;
-        public static final int info = 0x7f090090;
-        public static final int italic = 0x7f090092;
-        public static final int line1 = 0x7f0900aa;
-        public static final int line3 = 0x7f0900ab;
-        public static final int normal = 0x7f0900d9;
-        public static final int notification_background = 0x7f0900e0;
-        public static final int notification_main_column = 0x7f0900e1;
-        public static final int notification_main_column_container = 0x7f0900e2;
-        public static final int right_icon = 0x7f0900fb;
-        public static final int right_side = 0x7f0900fc;
-        public static final int tag_transition_group = 0x7f090137;
-        public static final int tag_unhandled_key_event_manager = 0x7f090138;
-        public static final int tag_unhandled_key_listeners = 0x7f090139;
-        public static final int text = 0x7f09013a;
-        public static final int text2 = 0x7f09013b;
-        public static final int time = 0x7f090147;
-        public static final int title = 0x7f090148;
+        public static final int chronometer = 0x7f090044;
+        public static final int forever = 0x7f09007c;
+        public static final int icon = 0x7f09008a;
+        public static final int icon_group = 0x7f09008b;
+        public static final int info = 0x7f090091;
+        public static final int italic = 0x7f090093;
+        public static final int line1 = 0x7f0900ab;
+        public static final int line3 = 0x7f0900ac;
+        public static final int normal = 0x7f0900dd;
+        public static final int notification_background = 0x7f0900e4;
+        public static final int notification_main_column = 0x7f0900e5;
+        public static final int notification_main_column_container = 0x7f0900e6;
+        public static final int right_icon = 0x7f0900ff;
+        public static final int right_side = 0x7f090100;
+        public static final int tag_transition_group = 0x7f09013b;
+        public static final int tag_unhandled_key_event_manager = 0x7f09013c;
+        public static final int tag_unhandled_key_listeners = 0x7f09013d;
+        public static final int text = 0x7f09013e;
+        public static final int text2 = 0x7f09013f;
+        public static final int time = 0x7f09014b;
+        public static final int title = 0x7f09014c;
     }
     public static final class integer {
         private integer() {}
@@ -125,18 +125,18 @@ public final class R {
     public static final class string {
         private string() {}
 
-        public static final int status_bar_notification_info_overflow = 0x7f11009b;
+        public static final int status_bar_notification_info_overflow = 0x7f12009e;
     }
     public static final class style {
         private style() {}
 
-        public static final int TextAppearance_Compat_Notification = 0x7f120118;
-        public static final int TextAppearance_Compat_Notification_Info = 0x7f120119;
-        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f12011b;
-        public static final int TextAppearance_Compat_Notification_Time = 0x7f12011e;
-        public static final int TextAppearance_Compat_Notification_Title = 0x7f120120;
-        public static final int Widget_Compat_NotificationActionContainer = 0x7f1201d1;
-        public static final int Widget_Compat_NotificationActionText = 0x7f1201d2;
+        public static final int TextAppearance_Compat_Notification = 0x7f130118;
+        public static final int TextAppearance_Compat_Notification_Info = 0x7f130119;
+        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f13011b;
+        public static final int TextAppearance_Compat_Notification_Time = 0x7f13011e;
+        public static final int TextAppearance_Compat_Notification_Title = 0x7f130120;
+        public static final int Widget_Compat_NotificationActionContainer = 0x7f1301d1;
+        public static final int Widget_Compat_NotificationActionText = 0x7f1301d2;
     }
     public static final class styleable {
         private styleable() {}

app/build/generated/not_namespaced_r_class_sources/debug/r/android/support/mediacompat/R.java

@@ -0,0 +1,210 @@
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * gradle plugin from the resource data it found. It
+ * should not be modified by hand.
+ */
+package android.support.mediacompat;
+
+public final class R {
+    private R() {}
+
+    public static final class attr {
+        private attr() {}
+
+        public static final int alpha = 0x7f040028;
+        public static final int font = 0x7f040115;
+        public static final int fontProviderAuthority = 0x7f040117;
+        public static final int fontProviderCerts = 0x7f040118;
+        public static final int fontProviderFetchStrategy = 0x7f040119;
+        public static final int fontProviderFetchTimeout = 0x7f04011a;
+        public static final int fontProviderPackage = 0x7f04011b;
+        public static final int fontProviderQuery = 0x7f04011c;
+        public static final int fontStyle = 0x7f04011d;
+        public static final int fontVariationSettings = 0x7f04011e;
+        public static final int fontWeight = 0x7f04011f;
+        public static final int ttcIndex = 0x7f040295;
+    }
+    public static final class color {
+        private color() {}
+
+        public static final int notification_action_color_filter = 0x7f06006c;
+        public static final int notification_icon_bg_color = 0x7f06006d;
+        public static final int notification_material_background_media_default_color = 0x7f06006e;
+        public static final int primary_text_default_material_dark = 0x7f060074;
+        public static final int ripple_material_light = 0x7f060079;
+        public static final int secondary_text_default_material_dark = 0x7f06007b;
+        public static final int secondary_text_default_material_light = 0x7f06007c;
+    }
+    public static final class dimen {
+        private dimen() {}
+
+        public static final int compat_button_inset_horizontal_material = 0x7f070050;
+        public static final int compat_button_inset_vertical_material = 0x7f070051;
+        public static final int compat_button_padding_horizontal_material = 0x7f070052;
+        public static final int compat_button_padding_vertical_material = 0x7f070053;
+        public static final int compat_control_corner_material = 0x7f070054;
+        public static final int compat_notification_large_icon_max_height = 0x7f070055;
+        public static final int compat_notification_large_icon_max_width = 0x7f070056;
+        public static final int notification_action_icon_size = 0x7f0700c2;
+        public static final int notification_action_text_size = 0x7f0700c3;
+        public static final int notification_big_circle_margin = 0x7f0700c4;
+        public static final int notification_content_margin_start = 0x7f0700c5;
+        public static final int notification_large_icon_height = 0x7f0700c6;
+        public static final int notification_large_icon_width = 0x7f0700c7;
+        public static final int notification_main_column_padding_top = 0x7f0700c8;
+        public static final int notification_media_narrow_margin = 0x7f0700c9;
+        public static final int notification_right_icon_size = 0x7f0700ca;
+        public static final int notification_right_side_padding_top = 0x7f0700cb;
+        public static final int notification_small_icon_background_padding = 0x7f0700cc;
+        public static final int notification_small_icon_size_as_large = 0x7f0700cd;
+        public static final int notification_subtext_size = 0x7f0700ce;
+        public static final int notification_top_pad = 0x7f0700cf;
+        public static final int notification_top_pad_large_text = 0x7f0700d0;
+        public static final int subtitle_corner_radius = 0x7f0700d1;
+        public static final int subtitle_outline_width = 0x7f0700d2;
+        public static final int subtitle_shadow_offset = 0x7f0700d3;
+        public static final int subtitle_shadow_radius = 0x7f0700d4;
+    }
+    public static final class drawable {
+        private drawable() {}
+
+        public static final int notification_action_background = 0x7f0800a1;
+        public static final int notification_bg = 0x7f0800a2;
+        public static final int notification_bg_low = 0x7f0800a3;
+        public static final int notification_bg_low_normal = 0x7f0800a4;
+        public static final int notification_bg_low_pressed = 0x7f0800a5;
+        public static final int notification_bg_normal = 0x7f0800a6;
+        public static final int notification_bg_normal_pressed = 0x7f0800a7;
+        public static final int notification_icon_background = 0x7f0800a8;
+        public static final int notification_template_icon_bg = 0x7f0800a9;
+        public static final int notification_template_icon_low_bg = 0x7f0800aa;
+        public static final int notification_tile_bg = 0x7f0800ab;
+        public static final int notify_panel_notification_icon_bg = 0x7f0800ac;
+    }
+    public static final class id {
+        private id() {}
+
+        public static final int action0 = 0x7f09000d;
+        public static final int action_container = 0x7f090015;
+        public static final int action_divider = 0x7f090017;
+        public static final int action_image = 0x7f090018;
+        public static final int action_text = 0x7f09001f;
+        public static final int actions = 0x7f090020;
+        public static final int async = 0x7f09002b;
+        public static final int blocking = 0x7f090034;
+        public static final int cancel_action = 0x7f09003c;
+        public static final int chronometer = 0x7f090044;
+        public static final int end_padder = 0x7f09006d;
+        public static final int forever = 0x7f09007c;
+        public static final int icon = 0x7f09008a;
+        public static final int icon_group = 0x7f09008b;
+        public static final int info = 0x7f090091;
+        public static final int italic = 0x7f090093;
+        public static final int line1 = 0x7f0900ab;
+        public static final int line3 = 0x7f0900ac;
+        public static final int media_actions = 0x7f0900b5;
+        public static final int normal = 0x7f0900dd;
+        public static final int notification_background = 0x7f0900e4;
+        public static final int notification_main_column = 0x7f0900e5;
+        public static final int notification_main_column_container = 0x7f0900e6;
+        public static final int right_icon = 0x7f0900ff;
+        public static final int right_side = 0x7f090100;
+        public static final int status_bar_latest_event_content = 0x7f090132;
+        public static final int tag_transition_group = 0x7f09013b;
+        public static final int tag_unhandled_key_event_manager = 0x7f09013c;
+        public static final int tag_unhandled_key_listeners = 0x7f09013d;
+        public static final int text = 0x7f09013e;
+        public static final int text2 = 0x7f09013f;
+        public static final int time = 0x7f09014b;
+        public static final int title = 0x7f09014c;
+    }
+    public static final class integer {
+        private integer() {}
+
+        public static final int cancel_button_image_alpha = 0x7f0a0004;
+        public static final int status_bar_notification_info_maxnum = 0x7f0a000e;
+    }
+    public static final class layout {
+        private layout() {}
+
+        public static final int notification_action = 0x7f0c003b;
+        public static final int notification_action_tombstone = 0x7f0c003c;
+        public static final int notification_media_action = 0x7f0c003d;
+        public static final int notification_media_cancel_action = 0x7f0c003e;
+        public static final int notification_template_big_media = 0x7f0c003f;
+        public static final int notification_template_big_media_custom = 0x7f0c0040;
+        public static final int notification_template_big_media_narrow = 0x7f0c0041;
+        public static final int notification_template_big_media_narrow_custom = 0x7f0c0042;
+        public static final int notification_template_custom_big = 0x7f0c0043;
+        public static final int notification_template_icon_group = 0x7f0c0044;
+        public static final int notification_template_lines_media = 0x7f0c0045;
+        public static final int notification_template_media = 0x7f0c0046;
+        public static final int notification_template_media_custom = 0x7f0c0047;
+        public static final int notification_template_part_chronometer = 0x7f0c0048;
+        public static final int notification_template_part_time = 0x7f0c0049;
+    }
+    public static final class string {
+        private string() {}
+
+        public static final int status_bar_notification_info_overflow = 0x7f12009e;
+    }
+    public static final class style {
+        private style() {}
+
+        public static final int TextAppearance_Compat_Notification = 0x7f130118;
+        public static final int TextAppearance_Compat_Notification_Info = 0x7f130119;
+        public static final int TextAppearance_Compat_Notification_Info_Media = 0x7f13011a;
+        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f13011b;
+        public static final int TextAppearance_Compat_Notification_Line2_Media = 0x7f13011c;
+        public static final int TextAppearance_Compat_Notification_Media = 0x7f13011d;
+        public static final int TextAppearance_Compat_Notification_Time = 0x7f13011e;
+        public static final int TextAppearance_Compat_Notification_Time_Media = 0x7f13011f;
+        public static final int TextAppearance_Compat_Notification_Title = 0x7f130120;
+        public static final int TextAppearance_Compat_Notification_Title_Media = 0x7f130121;
+        public static final int Widget_Compat_NotificationActionContainer = 0x7f1301d1;
+        public static final int Widget_Compat_NotificationActionText = 0x7f1301d2;
+    }
+    public static final class styleable {
+        private styleable() {}
+
+        public static final int[] ColorStateListItem = { 0x10101a5, 0x101031f, 0x7f040028 };
+        public static final int ColorStateListItem_android_color = 0;
+        public static final int ColorStateListItem_android_alpha = 1;
+        public static final int ColorStateListItem_alpha = 2;
+        public static final int[] FontFamily = { 0x7f040117, 0x7f040118, 0x7f040119, 0x7f04011a, 0x7f04011b, 0x7f04011c };
+        public static final int FontFamily_fontProviderAuthority = 0;
+        public static final int FontFamily_fontProviderCerts = 1;
+        public static final int FontFamily_fontProviderFetchStrategy = 2;
+        public static final int FontFamily_fontProviderFetchTimeout = 3;
+        public static final int FontFamily_fontProviderPackage = 4;
+        public static final int FontFamily_fontProviderQuery = 5;
+        public static final int[] FontFamilyFont = { 0x1010532, 0x1010533, 0x101053f, 0x101056f, 0x1010570, 0x7f040115, 0x7f04011d, 0x7f04011e, 0x7f04011f, 0x7f040295 };
+        public static final int FontFamilyFont_android_font = 0;
+        public static final int FontFamilyFont_android_fontWeight = 1;
+        public static final int FontFamilyFont_android_fontStyle = 2;
+        public static final int FontFamilyFont_android_ttcIndex = 3;
+        public static final int FontFamilyFont_android_fontVariationSettings = 4;
+        public static final int FontFamilyFont_font = 5;
+        public static final int FontFamilyFont_fontStyle = 6;
+        public static final int FontFamilyFont_fontVariationSettings = 7;
+        public static final int FontFamilyFont_fontWeight = 8;
+        public static final int FontFamilyFont_ttcIndex = 9;
+        public static final int[] GradientColor = { 0x101019d, 0x101019e, 0x10101a1, 0x10101a2, 0x10101a3, 0x10101a4, 0x1010201, 0x101020b, 0x1010510, 0x1010511, 0x1010512, 0x1010513 };
+        public static final int GradientColor_android_startColor = 0;
+        public static final int GradientColor_android_endColor = 1;
+        public static final int GradientColor_android_type = 2;
+        public static final int GradientColor_android_centerX = 3;
+        public static final int GradientColor_android_centerY = 4;
+        public static final int GradientColor_android_gradientRadius = 5;
+        public static final int GradientColor_android_tileMode = 6;
+        public static final int GradientColor_android_centerColor = 7;
+        public static final int GradientColor_android_startX = 8;
+        public static final int GradientColor_android_startY = 9;
+        public static final int GradientColor_android_endX = 10;
+        public static final int GradientColor_android_endY = 11;
+        public static final int[] GradientColorItem = { 0x10101a5, 0x1010514 };
+        public static final int GradientColorItem_android_color = 0;
+        public static final int GradientColorItem_android_offset = 1;
+    }
+}

app/build/generated/not_namespaced_r_class_sources/debug/r/android/support/slidingpanelayout/R.java

@@ -62,18 +62,18 @@ public final class R {
     public static final class drawable {
         private drawable() {}
 
-        public static final int notification_action_background = 0x7f0800a0;
-        public static final int notification_bg = 0x7f0800a1;
-        public static final int notification_bg_low = 0x7f0800a2;
-        public static final int notification_bg_low_normal = 0x7f0800a3;
-        public static final int notification_bg_low_pressed = 0x7f0800a4;
-        public static final int notification_bg_normal = 0x7f0800a5;
-        public static final int notification_bg_normal_pressed = 0x7f0800a6;
-        public static final int notification_icon_background = 0x7f0800a7;
-        public static final int notification_template_icon_bg = 0x7f0800a8;
-        public static final int notification_template_icon_low_bg = 0x7f0800a9;
-        public static final int notification_tile_bg = 0x7f0800aa;
-        public static final int notify_panel_notification_icon_bg = 0x7f0800ab;
+        public static final int notification_action_background = 0x7f0800a1;
+        public static final int notification_bg = 0x7f0800a2;
+        public static final int notification_bg_low = 0x7f0800a3;
+        public static final int notification_bg_low_normal = 0x7f0800a4;
+        public static final int notification_bg_low_pressed = 0x7f0800a5;
+        public static final int notification_bg_normal = 0x7f0800a6;
+        public static final int notification_bg_normal_pressed = 0x7f0800a7;
+        public static final int notification_icon_background = 0x7f0800a8;
+        public static final int notification_template_icon_bg = 0x7f0800a9;
+        public static final int notification_template_icon_low_bg = 0x7f0800aa;
+        public static final int notification_tile_bg = 0x7f0800ab;
+        public static final int notify_panel_notification_icon_bg = 0x7f0800ac;
     }
     public static final class id {
         private id() {}
@@ -85,27 +85,27 @@ public final class R {
         public static final int actions = 0x7f090020;
         public static final int async = 0x7f09002b;
         public static final int blocking = 0x7f090034;
-        public static final int chronometer = 0x7f090043;
-        public static final int forever = 0x7f09007b;
-        public static final int icon = 0x7f090089;
-        public static final int icon_group = 0x7f09008a;
-        public static final int info = 0x7f090090;
-        public static final int italic = 0x7f090092;
-        public static final int line1 = 0x7f0900aa;
-        public static final int line3 = 0x7f0900ab;
-        public static final int normal = 0x7f0900d9;
-        public static final int notification_background = 0x7f0900e0;
-        public static final int notification_main_column = 0x7f0900e1;
-        public static final int notification_main_column_container = 0x7f0900e2;
-        public static final int right_icon = 0x7f0900fb;
-        public static final int right_side = 0x7f0900fc;
-        public static final int tag_transition_group = 0x7f090137;
-        public static final int tag_unhandled_key_event_manager = 0x7f090138;
-        public static final int tag_unhandled_key_listeners = 0x7f090139;
-        public static final int text = 0x7f09013a;
-        public static final int text2 = 0x7f09013b;
-        public static final int time = 0x7f090147;
-        public static final int title = 0x7f090148;
+        public static final int chronometer = 0x7f090044;
+        public static final int forever = 0x7f09007c;
+        public static final int icon = 0x7f09008a;
+        public static final int icon_group = 0x7f09008b;
+        public static final int info = 0x7f090091;
+        public static final int italic = 0x7f090093;
+        public static final int line1 = 0x7f0900ab;
+        public static final int line3 = 0x7f0900ac;
+        public static final int normal = 0x7f0900dd;
+        public static final int notification_background = 0x7f0900e4;
+        public static final int notification_main_column = 0x7f0900e5;
+        public static final int notification_main_column_container = 0x7f0900e6;
+        public static final int right_icon = 0x7f0900ff;
+        public static final int right_side = 0x7f090100;
+        public static final int tag_transition_group = 0x7f09013b;
+        public static final int tag_unhandled_key_event_manager = 0x7f09013c;
+        public static final int tag_unhandled_key_listeners = 0x7f09013d;
+        public static final int text = 0x7f09013e;
+        public static final int text2 = 0x7f09013f;
+        public static final int time = 0x7f09014b;
+        public static final int title = 0x7f09014c;
     }
     public static final class integer {
         private integer() {}
@@ -125,18 +125,18 @@ public final class R {
     public static final class string {
         private string() {}
 
-        public static final int status_bar_notification_info_overflow = 0x7f11009b;
+        public static final int status_bar_notification_info_overflow = 0x7f12009e;
     }
     public static final class style {
         private style() {}
 
-        public static final int TextAppearance_Compat_Notification = 0x7f120118;
-        public static final int TextAppearance_Compat_Notification_Info = 0x7f120119;
-        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f12011b;
-        public static final int TextAppearance_Compat_Notification_Time = 0x7f12011e;
-        public static final int TextAppearance_Compat_Notification_Title = 0x7f120120;
-        public static final int Widget_Compat_NotificationActionContainer = 0x7f1201d1;
-        public static final int Widget_Compat_NotificationActionText = 0x7f1201d2;
+        public static final int TextAppearance_Compat_Notification = 0x7f130118;
+        public static final int TextAppearance_Compat_Notification_Info = 0x7f130119;
+        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f13011b;
+        public static final int TextAppearance_Compat_Notification_Time = 0x7f13011e;
+        public static final int TextAppearance_Compat_Notification_Title = 0x7f130120;
+        public static final int Widget_Compat_NotificationActionContainer = 0x7f1301d1;
+        public static final int Widget_Compat_NotificationActionText = 0x7f1301d2;
     }
     public static final class styleable {
         private styleable() {}

app/build/generated/not_namespaced_r_class_sources/debug/r/android/support/swiperefreshlayout/R.java

@@ -62,18 +62,18 @@ public final class R {
     public static final class drawable {
         private drawable() {}
 
-        public static final int notification_action_background = 0x7f0800a0;
-        public static final int notification_bg = 0x7f0800a1;
-        public static final int notification_bg_low = 0x7f0800a2;
-        public static final int notification_bg_low_normal = 0x7f0800a3;
-        public static final int notification_bg_low_pressed = 0x7f0800a4;
-        public static final int notification_bg_normal = 0x7f0800a5;
-        public static final int notification_bg_normal_pressed = 0x7f0800a6;
-        public static final int notification_icon_background = 0x7f0800a7;
-        public static final int notification_template_icon_bg = 0x7f0800a8;
-        public static final int notification_template_icon_low_bg = 0x7f0800a9;
-        public static final int notification_tile_bg = 0x7f0800aa;
-        public static final int notify_panel_notification_icon_bg = 0x7f0800ab;
+        public static final int notification_action_background = 0x7f0800a1;
+        public static final int notification_bg = 0x7f0800a2;
+        public static final int notification_bg_low = 0x7f0800a3;
+        public static final int notification_bg_low_normal = 0x7f0800a4;
+        public static final int notification_bg_low_pressed = 0x7f0800a5;
+        public static final int notification_bg_normal = 0x7f0800a6;
+        public static final int notification_bg_normal_pressed = 0x7f0800a7;
+        public static final int notification_icon_background = 0x7f0800a8;
+        public static final int notification_template_icon_bg = 0x7f0800a9;
+        public static final int notification_template_icon_low_bg = 0x7f0800aa;
+        public static final int notification_tile_bg = 0x7f0800ab;
+        public static final int notify_panel_notification_icon_bg = 0x7f0800ac;
     }
     public static final class id {
         private id() {}
@@ -85,27 +85,27 @@ public final class R {
         public static final int actions = 0x7f090020;
         public static final int async = 0x7f09002b;
         public static final int blocking = 0x7f090034;
-        public static final int chronometer = 0x7f090043;
-        public static final int forever = 0x7f09007b;
-        public static final int icon = 0x7f090089;
-        public static final int icon_group = 0x7f09008a;
-        public static final int info = 0x7f090090;
-        public static final int italic = 0x7f090092;
-        public static final int line1 = 0x7f0900aa;
-        public static final int line3 = 0x7f0900ab;
-        public static final int normal = 0x7f0900d9;
-        public static final int notification_background = 0x7f0900e0;
-        public static final int notification_main_column = 0x7f0900e1;
-        public static final int notification_main_column_container = 0x7f0900e2;
-        public static final int right_icon = 0x7f0900fb;
-        public static final int right_side = 0x7f0900fc;
-        public static final int tag_transition_group = 0x7f090137;
-        public static final int tag_unhandled_key_event_manager = 0x7f090138;
-        public static final int tag_unhandled_key_listeners = 0x7f090139;
-        public static final int text = 0x7f09013a;
-        public static final int text2 = 0x7f09013b;
-        public static final int time = 0x7f090147;
-        public static final int title = 0x7f090148;
+        public static final int chronometer = 0x7f090044;
+        public static final int forever = 0x7f09007c;
+        public static final int icon = 0x7f09008a;
+        public static final int icon_group = 0x7f09008b;
+        public static final int info = 0x7f090091;
+        public static final int italic = 0x7f090093;
+        public static final int line1 = 0x7f0900ab;
+        public static final int line3 = 0x7f0900ac;
+        public static final int normal = 0x7f0900dd;
+        public static final int notification_background = 0x7f0900e4;
+        public static final int notification_main_column = 0x7f0900e5;
+        public static final int notification_main_column_container = 0x7f0900e6;
+        public static final int right_icon = 0x7f0900ff;
+        public static final int right_side = 0x7f090100;
+        public static final int tag_transition_group = 0x7f09013b;
+        public static final int tag_unhandled_key_event_manager = 0x7f09013c;
+        public static final int tag_unhandled_key_listeners = 0x7f09013d;
+        public static final int text = 0x7f09013e;
+        public static final int text2 = 0x7f09013f;
+        public static final int time = 0x7f09014b;
+        public static final int title = 0x7f09014c;
     }
     public static final class integer {
         private integer() {}
@@ -125,18 +125,18 @@ public final class R {
     public static final class string {
         private string() {}
 
-        public static final int status_bar_notification_info_overflow = 0x7f11009b;
+        public static final int status_bar_notification_info_overflow = 0x7f12009e;
     }
     public static final class style {
         private style() {}
 
-        public static final int TextAppearance_Compat_Notification = 0x7f120118;
-        public static final int TextAppearance_Compat_Notification_Info = 0x7f120119;
-        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f12011b;
-        public static final int TextAppearance_Compat_Notification_Time = 0x7f12011e;
-        public static final int TextAppearance_Compat_Notification_Title = 0x7f120120;
-        public static final int Widget_Compat_NotificationActionContainer = 0x7f1201d1;
-        public static final int Widget_Compat_NotificationActionText = 0x7f1201d2;
+        public static final int TextAppearance_Compat_Notification = 0x7f130118;
+        public static final int TextAppearance_Compat_Notification_Info = 0x7f130119;
+        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f13011b;
+        public static final int TextAppearance_Compat_Notification_Time = 0x7f13011e;
+        public static final int TextAppearance_Compat_Notification_Title = 0x7f130120;
+        public static final int Widget_Compat_NotificationActionContainer = 0x7f1301d1;
+        public static final int Widget_Compat_NotificationActionText = 0x7f1301d2;
     }
     public static final class styleable {
         private styleable() {}

app/build/generated/not_namespaced_r_class_sources/debug/r/android/support/transition/R.java

@@ -62,18 +62,18 @@ public final class R {
     public static final class drawable {
         private drawable() {}
 
-        public static final int notification_action_background = 0x7f0800a0;
-        public static final int notification_bg = 0x7f0800a1;
-        public static final int notification_bg_low = 0x7f0800a2;
-        public static final int notification_bg_low_normal = 0x7f0800a3;
-        public static final int notification_bg_low_pressed = 0x7f0800a4;
-        public static final int notification_bg_normal = 0x7f0800a5;
-        public static final int notification_bg_normal_pressed = 0x7f0800a6;
-        public static final int notification_icon_background = 0x7f0800a7;
-        public static final int notification_template_icon_bg = 0x7f0800a8;
-        public static final int notification_template_icon_low_bg = 0x7f0800a9;
-        public static final int notification_tile_bg = 0x7f0800aa;
-        public static final int notify_panel_notification_icon_bg = 0x7f0800ab;
+        public static final int notification_action_background = 0x7f0800a1;
+        public static final int notification_bg = 0x7f0800a2;
+        public static final int notification_bg_low = 0x7f0800a3;
+        public static final int notification_bg_low_normal = 0x7f0800a4;
+        public static final int notification_bg_low_pressed = 0x7f0800a5;
+        public static final int notification_bg_normal = 0x7f0800a6;
+        public static final int notification_bg_normal_pressed = 0x7f0800a7;
+        public static final int notification_icon_background = 0x7f0800a8;
+        public static final int notification_template_icon_bg = 0x7f0800a9;
+        public static final int notification_template_icon_low_bg = 0x7f0800aa;
+        public static final int notification_tile_bg = 0x7f0800ab;
+        public static final int notify_panel_notification_icon_bg = 0x7f0800ac;
     }
     public static final class id {
         private id() {}
@@ -85,37 +85,37 @@ public final class R {
         public static final int actions = 0x7f090020;
         public static final int async = 0x7f09002b;
         public static final int blocking = 0x7f090034;
-        public static final int chronometer = 0x7f090043;
-        public static final int forever = 0x7f09007b;
-        public static final int ghost_view = 0x7f09007e;
-        public static final int icon = 0x7f090089;
-        public static final int icon_group = 0x7f09008a;
-        public static final int info = 0x7f090090;
-        public static final int italic = 0x7f090092;
-        public static final int line1 = 0x7f0900aa;
-        public static final int line3 = 0x7f0900ab;
-        public static final int normal = 0x7f0900d9;
-        public static final int notification_background = 0x7f0900e0;
-        public static final int notification_main_column = 0x7f0900e1;
-        public static final int notification_main_column_container = 0x7f0900e2;
-        public static final int parent_matrix = 0x7f0900e9;
-        public static final int right_icon = 0x7f0900fb;
-        public static final int right_side = 0x7f0900fc;
-        public static final int save_image_matrix = 0x7f0900fd;
-        public static final int save_non_transition_alpha = 0x7f0900fe;
-        public static final int save_scale_type = 0x7f0900ff;
-        public static final int tag_transition_group = 0x7f090137;
-        public static final int tag_unhandled_key_event_manager = 0x7f090138;
-        public static final int tag_unhandled_key_listeners = 0x7f090139;
-        public static final int text = 0x7f09013a;
-        public static final int text2 = 0x7f09013b;
-        public static final int time = 0x7f090147;
-        public static final int title = 0x7f090148;
-        public static final int transition_current_scene = 0x7f090151;
-        public static final int transition_layout_save = 0x7f090152;
-        public static final int transition_position = 0x7f090153;
-        public static final int transition_scene_layoutid_cache = 0x7f090154;
-        public static final int transition_transform = 0x7f090155;
+        public static final int chronometer = 0x7f090044;
+        public static final int forever = 0x7f09007c;
+        public static final int ghost_view = 0x7f09007f;
+        public static final int icon = 0x7f09008a;
+        public static final int icon_group = 0x7f09008b;
+        public static final int info = 0x7f090091;
+        public static final int italic = 0x7f090093;
+        public static final int line1 = 0x7f0900ab;
+        public static final int line3 = 0x7f0900ac;
+        public static final int normal = 0x7f0900dd;
+        public static final int notification_background = 0x7f0900e4;
+        public static final int notification_main_column = 0x7f0900e5;
+        public static final int notification_main_column_container = 0x7f0900e6;
+        public static final int parent_matrix = 0x7f0900ed;
+        public static final int right_icon = 0x7f0900ff;
+        public static final int right_side = 0x7f090100;
+        public static final int save_image_matrix = 0x7f090101;
+        public static final int save_non_transition_alpha = 0x7f090102;
+        public static final int save_scale_type = 0x7f090103;
+        public static final int tag_transition_group = 0x7f09013b;
+        public static final int tag_unhandled_key_event_manager = 0x7f09013c;
+        public static final int tag_unhandled_key_listeners = 0x7f09013d;
+        public static final int text = 0x7f09013e;
+        public static final int text2 = 0x7f09013f;
+        public static final int time = 0x7f09014b;
+        public static final int title = 0x7f09014c;
+        public static final int transition_current_scene = 0x7f090155;
+        public static final int transition_layout_save = 0x7f090156;
+        public static final int transition_position = 0x7f090157;
+        public static final int transition_scene_layoutid_cache = 0x7f090158;
+        public static final int transition_transform = 0x7f090159;
     }
     public static final class integer {
         private integer() {}
@@ -135,18 +135,18 @@ public final class R {
     public static final class string {
         private string() {}
 
-        public static final int status_bar_notification_info_overflow = 0x7f11009b;
+        public static final int status_bar_notification_info_overflow = 0x7f12009e;
     }
     public static final class style {
         private style() {}
 
-        public static final int TextAppearance_Compat_Notification = 0x7f120118;
-        public static final int TextAppearance_Compat_Notification_Info = 0x7f120119;
-        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f12011b;
-        public static final int TextAppearance_Compat_Notification_Time = 0x7f12011e;
-        public static final int TextAppearance_Compat_Notification_Title = 0x7f120120;
-        public static final int Widget_Compat_NotificationActionContainer = 0x7f1201d1;
-        public static final int Widget_Compat_NotificationActionText = 0x7f1201d2;
+        public static final int TextAppearance_Compat_Notification = 0x7f130118;
+        public static final int TextAppearance_Compat_Notification_Info = 0x7f130119;
+        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f13011b;
+        public static final int TextAppearance_Compat_Notification_Time = 0x7f13011e;
+        public static final int TextAppearance_Compat_Notification_Title = 0x7f130120;
+        public static final int Widget_Compat_NotificationActionContainer = 0x7f1301d1;
+        public static final int Widget_Compat_NotificationActionText = 0x7f1301d2;
     }
     public static final class styleable {
         private styleable() {}

app/build/generated/not_namespaced_r_class_sources/debug/r/android/support/v4/R.java

@@ -0,0 +1,238 @@
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * gradle plugin from the resource data it found. It
+ * should not be modified by hand.
+ */
+package android.support.v4;
+
+public final class R {
+    private R() {}
+
+    public static final class attr {
+        private attr() {}
+
+        public static final int alpha = 0x7f040028;
+        public static final int coordinatorLayoutStyle = 0x7f0400b5;
+        public static final int font = 0x7f040115;
+        public static final int fontProviderAuthority = 0x7f040117;
+        public static final int fontProviderCerts = 0x7f040118;
+        public static final int fontProviderFetchStrategy = 0x7f040119;
+        public static final int fontProviderFetchTimeout = 0x7f04011a;
+        public static final int fontProviderPackage = 0x7f04011b;
+        public static final int fontProviderQuery = 0x7f04011c;
+        public static final int fontStyle = 0x7f04011d;
+        public static final int fontVariationSettings = 0x7f04011e;
+        public static final int fontWeight = 0x7f04011f;
+        public static final int keylines = 0x7f040150;
+        public static final int layout_anchor = 0x7f040158;
+        public static final int layout_anchorGravity = 0x7f040159;
+        public static final int layout_behavior = 0x7f04015a;
+        public static final int layout_dodgeInsetEdges = 0x7f040187;
+        public static final int layout_insetEdge = 0x7f040190;
+        public static final int layout_keyline = 0x7f040191;
+        public static final int statusBarBackground = 0x7f040225;
+        public static final int ttcIndex = 0x7f040295;
+    }
+    public static final class color {
+        private color() {}
+
+        public static final int notification_action_color_filter = 0x7f06006c;
+        public static final int notification_icon_bg_color = 0x7f06006d;
+        public static final int notification_material_background_media_default_color = 0x7f06006e;
+        public static final int primary_text_default_material_dark = 0x7f060074;
+        public static final int ripple_material_light = 0x7f060079;
+        public static final int secondary_text_default_material_dark = 0x7f06007b;
+        public static final int secondary_text_default_material_light = 0x7f06007c;
+    }
+    public static final class dimen {
+        private dimen() {}
+
+        public static final int compat_button_inset_horizontal_material = 0x7f070050;
+        public static final int compat_button_inset_vertical_material = 0x7f070051;
+        public static final int compat_button_padding_horizontal_material = 0x7f070052;
+        public static final int compat_button_padding_vertical_material = 0x7f070053;
+        public static final int compat_control_corner_material = 0x7f070054;
+        public static final int compat_notification_large_icon_max_height = 0x7f070055;
+        public static final int compat_notification_large_icon_max_width = 0x7f070056;
+        public static final int notification_action_icon_size = 0x7f0700c2;
+        public static final int notification_action_text_size = 0x7f0700c3;
+        public static final int notification_big_circle_margin = 0x7f0700c4;
+        public static final int notification_content_margin_start = 0x7f0700c5;
+        public static final int notification_large_icon_height = 0x7f0700c6;
+        public static final int notification_large_icon_width = 0x7f0700c7;
+        public static final int notification_main_column_padding_top = 0x7f0700c8;
+        public static final int notification_media_narrow_margin = 0x7f0700c9;
+        public static final int notification_right_icon_size = 0x7f0700ca;
+        public static final int notification_right_side_padding_top = 0x7f0700cb;
+        public static final int notification_small_icon_background_padding = 0x7f0700cc;
+        public static final int notification_small_icon_size_as_large = 0x7f0700cd;
+        public static final int notification_subtext_size = 0x7f0700ce;
+        public static final int notification_top_pad = 0x7f0700cf;
+        public static final int notification_top_pad_large_text = 0x7f0700d0;
+        public static final int subtitle_corner_radius = 0x7f0700d1;
+        public static final int subtitle_outline_width = 0x7f0700d2;
+        public static final int subtitle_shadow_offset = 0x7f0700d3;
+        public static final int subtitle_shadow_radius = 0x7f0700d4;
+    }
+    public static final class drawable {
+        private drawable() {}
+
+        public static final int notification_action_background = 0x7f0800a1;
+        public static final int notification_bg = 0x7f0800a2;
+        public static final int notification_bg_low = 0x7f0800a3;
+        public static final int notification_bg_low_normal = 0x7f0800a4;
+        public static final int notification_bg_low_pressed = 0x7f0800a5;
+        public static final int notification_bg_normal = 0x7f0800a6;
+        public static final int notification_bg_normal_pressed = 0x7f0800a7;
+        public static final int notification_icon_background = 0x7f0800a8;
+        public static final int notification_template_icon_bg = 0x7f0800a9;
+        public static final int notification_template_icon_low_bg = 0x7f0800aa;
+        public static final int notification_tile_bg = 0x7f0800ab;
+        public static final int notify_panel_notification_icon_bg = 0x7f0800ac;
+    }
+    public static final class id {
+        private id() {}
+
+        public static final int action0 = 0x7f09000d;
+        public static final int action_container = 0x7f090015;
+        public static final int action_divider = 0x7f090017;
+        public static final int action_image = 0x7f090018;
+        public static final int action_text = 0x7f09001f;
+        public static final int actions = 0x7f090020;
+        public static final int async = 0x7f09002b;
+        public static final int blocking = 0x7f090034;
+        public static final int bottom = 0x7f090035;
+        public static final int cancel_action = 0x7f09003c;
+        public static final int chronometer = 0x7f090044;
+        public static final int end = 0x7f09006c;
+        public static final int end_padder = 0x7f09006d;
+        public static final int forever = 0x7f09007c;
+        public static final int icon = 0x7f09008a;
+        public static final int icon_group = 0x7f09008b;
+        public static final int info = 0x7f090091;
+        public static final int italic = 0x7f090093;
+        public static final int left = 0x7f0900aa;
+        public static final int line1 = 0x7f0900ab;
+        public static final int line3 = 0x7f0900ac;
+        public static final int media_actions = 0x7f0900b5;
+        public static final int none = 0x7f0900dc;
+        public static final int normal = 0x7f0900dd;
+        public static final int notification_background = 0x7f0900e4;
+        public static final int notification_main_column = 0x7f0900e5;
+        public static final int notification_main_column_container = 0x7f0900e6;
+        public static final int right = 0x7f0900fe;
+        public static final int right_icon = 0x7f0900ff;
+        public static final int right_side = 0x7f090100;
+        public static final int start = 0x7f09012c;
+        public static final int status_bar_latest_event_content = 0x7f090132;
+        public static final int tag_transition_group = 0x7f09013b;
+        public static final int tag_unhandled_key_event_manager = 0x7f09013c;
+        public static final int tag_unhandled_key_listeners = 0x7f09013d;
+        public static final int text = 0x7f09013e;
+        public static final int text2 = 0x7f09013f;
+        public static final int time = 0x7f09014b;
+        public static final int title = 0x7f09014c;
+        public static final int top = 0x7f090150;
+    }
+    public static final class integer {
+        private integer() {}
+
+        public static final int cancel_button_image_alpha = 0x7f0a0004;
+        public static final int status_bar_notification_info_maxnum = 0x7f0a000e;
+    }
+    public static final class layout {
+        private layout() {}
+
+        public static final int notification_action = 0x7f0c003b;
+        public static final int notification_action_tombstone = 0x7f0c003c;
+        public static final int notification_media_action = 0x7f0c003d;
+        public static final int notification_media_cancel_action = 0x7f0c003e;
+        public static final int notification_template_big_media = 0x7f0c003f;
+        public static final int notification_template_big_media_custom = 0x7f0c0040;
+        public static final int notification_template_big_media_narrow = 0x7f0c0041;
+        public static final int notification_template_big_media_narrow_custom = 0x7f0c0042;
+        public static final int notification_template_custom_big = 0x7f0c0043;
+        public static final int notification_template_icon_group = 0x7f0c0044;
+        public static final int notification_template_lines_media = 0x7f0c0045;
+        public static final int notification_template_media = 0x7f0c0046;
+        public static final int notification_template_media_custom = 0x7f0c0047;
+        public static final int notification_template_part_chronometer = 0x7f0c0048;
+        public static final int notification_template_part_time = 0x7f0c0049;
+    }
+    public static final class string {
+        private string() {}
+
+        public static final int status_bar_notification_info_overflow = 0x7f12009e;
+    }
+    public static final class style {
+        private style() {}
+
+        public static final int TextAppearance_Compat_Notification = 0x7f130118;
+        public static final int TextAppearance_Compat_Notification_Info = 0x7f130119;
+        public static final int TextAppearance_Compat_Notification_Info_Media = 0x7f13011a;
+        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f13011b;
+        public static final int TextAppearance_Compat_Notification_Line2_Media = 0x7f13011c;
+        public static final int TextAppearance_Compat_Notification_Media = 0x7f13011d;
+        public static final int TextAppearance_Compat_Notification_Time = 0x7f13011e;
+        public static final int TextAppearance_Compat_Notification_Time_Media = 0x7f13011f;
+        public static final int TextAppearance_Compat_Notification_Title = 0x7f130120;
+        public static final int TextAppearance_Compat_Notification_Title_Media = 0x7f130121;
+        public static final int Widget_Compat_NotificationActionContainer = 0x7f1301d1;
+        public static final int Widget_Compat_NotificationActionText = 0x7f1301d2;
+        public static final int Widget_Support_CoordinatorLayout = 0x7f130201;
+    }
+    public static final class styleable {
+        private styleable() {}
+
+        public static final int[] ColorStateListItem = { 0x10101a5, 0x101031f, 0x7f040028 };
+        public static final int ColorStateListItem_android_color = 0;
+        public static final int ColorStateListItem_android_alpha = 1;
+        public static final int ColorStateListItem_alpha = 2;
+        public static final int[] CoordinatorLayout = { 0x7f040150, 0x7f040225 };
+        public static final int CoordinatorLayout_keylines = 0;
+        public static final int CoordinatorLayout_statusBarBackground = 1;
+        public static final int[] CoordinatorLayout_Layout = { 0x10100b3, 0x7f040158, 0x7f040159, 0x7f04015a, 0x7f040187, 0x7f040190, 0x7f040191 };
+        public static final int CoordinatorLayout_Layout_android_layout_gravity = 0;
+        public static final int CoordinatorLayout_Layout_layout_anchor = 1;
+        public static final int CoordinatorLayout_Layout_layout_anchorGravity = 2;
+        public static final int CoordinatorLayout_Layout_layout_behavior = 3;
+        public static final int CoordinatorLayout_Layout_layout_dodgeInsetEdges = 4;
+        public static final int CoordinatorLayout_Layout_layout_insetEdge = 5;
+        public static final int CoordinatorLayout_Layout_layout_keyline = 6;
+        public static final int[] FontFamily = { 0x7f040117, 0x7f040118, 0x7f040119, 0x7f04011a, 0x7f04011b, 0x7f04011c };
+        public static final int FontFamily_fontProviderAuthority = 0;
+        public static final int FontFamily_fontProviderCerts = 1;
+        public static final int FontFamily_fontProviderFetchStrategy = 2;
+        public static final int FontFamily_fontProviderFetchTimeout = 3;
+        public static final int FontFamily_fontProviderPackage = 4;
+        public static final int FontFamily_fontProviderQuery = 5;
+        public static final int[] FontFamilyFont = { 0x1010532, 0x1010533, 0x101053f, 0x101056f, 0x1010570, 0x7f040115, 0x7f04011d, 0x7f04011e, 0x7f04011f, 0x7f040295 };
+        public static final int FontFamilyFont_android_font = 0;
+        public static final int FontFamilyFont_android_fontWeight = 1;
+        public static final int FontFamilyFont_android_fontStyle = 2;
+        public static final int FontFamilyFont_android_ttcIndex = 3;
+        public static final int FontFamilyFont_android_fontVariationSettings = 4;
+        public static final int FontFamilyFont_font = 5;
+        public static final int FontFamilyFont_fontStyle = 6;
+        public static final int FontFamilyFont_fontVariationSettings = 7;
+        public static final int FontFamilyFont_fontWeight = 8;
+        public static final int FontFamilyFont_ttcIndex = 9;
+        public static final int[] GradientColor = { 0x101019d, 0x101019e, 0x10101a1, 0x10101a2, 0x10101a3, 0x10101a4, 0x1010201, 0x101020b, 0x1010510, 0x1010511, 0x1010512, 0x1010513 };
+        public static final int GradientColor_android_startColor = 0;
+        public static final int GradientColor_android_endColor = 1;
+        public static final int GradientColor_android_type = 2;
+        public static final int GradientColor_android_centerX = 3;
+        public static final int GradientColor_android_centerY = 4;
+        public static final int GradientColor_android_gradientRadius = 5;
+        public static final int GradientColor_android_tileMode = 6;
+        public static final int GradientColor_android_centerColor = 7;
+        public static final int GradientColor_android_startX = 8;
+        public static final int GradientColor_android_startY = 9;
+        public static final int GradientColor_android_endX = 10;
+        public static final int GradientColor_android_endY = 11;
+        public static final int[] GradientColorItem = { 0x10101a5, 0x1010514 };
+        public static final int GradientColorItem_android_color = 0;
+        public static final int GradientColorItem_android_offset = 1;
+    }
+}

app/build/generated/not_namespaced_r_class_sources/debug/r/android/support/v7/cardview/R.java

@@ -43,10 +43,10 @@ public final class R {
     public static final class style {
         private style() {}
 
-        public static final int Base_CardView = 0x7f12000b;
-        public static final int CardView = 0x7f1200c2;
-        public static final int CardView_Dark = 0x7f1200c3;
-        public static final int CardView_Light = 0x7f1200c4;
+        public static final int Base_CardView = 0x7f13000b;
+        public static final int CardView = 0x7f1300c2;
+        public static final int CardView_Dark = 0x7f1300c3;
+        public static final int CardView_Light = 0x7f1300c4;
     }
     public static final class styleable {
         private styleable() {}

app/build/generated/not_namespaced_r_class_sources/debug/r/android/support/v7/recyclerview/R.java

@@ -86,18 +86,18 @@ public final class R {
     public static final class drawable {
         private drawable() {}
 
-        public static final int notification_action_background = 0x7f0800a0;
-        public static final int notification_bg = 0x7f0800a1;
-        public static final int notification_bg_low = 0x7f0800a2;
-        public static final int notification_bg_low_normal = 0x7f0800a3;
-        public static final int notification_bg_low_pressed = 0x7f0800a4;
-        public static final int notification_bg_normal = 0x7f0800a5;
-        public static final int notification_bg_normal_pressed = 0x7f0800a6;
-        public static final int notification_icon_background = 0x7f0800a7;
-        public static final int notification_template_icon_bg = 0x7f0800a8;
-        public static final int notification_template_icon_low_bg = 0x7f0800a9;
-        public static final int notification_tile_bg = 0x7f0800aa;
-        public static final int notify_panel_notification_icon_bg = 0x7f0800ab;
+        public static final int notification_action_background = 0x7f0800a1;
+        public static final int notification_bg = 0x7f0800a2;
+        public static final int notification_bg_low = 0x7f0800a3;
+        public static final int notification_bg_low_normal = 0x7f0800a4;
+        public static final int notification_bg_low_pressed = 0x7f0800a5;
+        public static final int notification_bg_normal = 0x7f0800a6;
+        public static final int notification_bg_normal_pressed = 0x7f0800a7;
+        public static final int notification_icon_background = 0x7f0800a8;
+        public static final int notification_template_icon_bg = 0x7f0800a9;
+        public static final int notification_template_icon_low_bg = 0x7f0800aa;
+        public static final int notification_tile_bg = 0x7f0800ab;
+        public static final int notify_panel_notification_icon_bg = 0x7f0800ac;
     }
     public static final class id {
         private id() {}
@@ -110,34 +110,34 @@ public final class R {
         public static final int async = 0x7f09002b;
         public static final int blocking = 0x7f090034;
         public static final int bottom = 0x7f090035;
-        public static final int chronometer = 0x7f090043;
-        public static final int end = 0x7f09006b;
-        public static final int forever = 0x7f09007b;
-        public static final int icon = 0x7f090089;
-        public static final int icon_group = 0x7f09008a;
-        public static final int info = 0x7f090090;
-        public static final int italic = 0x7f090092;
-        public static final int item_touch_helper_previous_elevation = 0x7f090093;
-        public static final int left = 0x7f0900a9;
-        public static final int line1 = 0x7f0900aa;
-        public static final int line3 = 0x7f0900ab;
-        public static final int none = 0x7f0900d8;
-        public static final int normal = 0x7f0900d9;
-        public static final int notification_background = 0x7f0900e0;
-        public static final int notification_main_column = 0x7f0900e1;
-        public static final int notification_main_column_container = 0x7f0900e2;
-        public static final int right = 0x7f0900fa;
-        public static final int right_icon = 0x7f0900fb;
-        public static final int right_side = 0x7f0900fc;
-        public static final int start = 0x7f090128;
-        public static final int tag_transition_group = 0x7f090137;
-        public static final int tag_unhandled_key_event_manager = 0x7f090138;
-        public static final int tag_unhandled_key_listeners = 0x7f090139;
-        public static final int text = 0x7f09013a;
-        public static final int text2 = 0x7f09013b;
-        public static final int time = 0x7f090147;
-        public static final int title = 0x7f090148;
-        public static final int top = 0x7f09014c;
+        public static final int chronometer = 0x7f090044;
+        public static final int end = 0x7f09006c;
+        public static final int forever = 0x7f09007c;
+        public static final int icon = 0x7f09008a;
+        public static final int icon_group = 0x7f09008b;
+        public static final int info = 0x7f090091;
+        public static final int italic = 0x7f090093;
+        public static final int item_touch_helper_previous_elevation = 0x7f090094;
+        public static final int left = 0x7f0900aa;
+        public static final int line1 = 0x7f0900ab;
+        public static final int line3 = 0x7f0900ac;
+        public static final int none = 0x7f0900dc;
+        public static final int normal = 0x7f0900dd;
+        public static final int notification_background = 0x7f0900e4;
+        public static final int notification_main_column = 0x7f0900e5;
+        public static final int notification_main_column_container = 0x7f0900e6;
+        public static final int right = 0x7f0900fe;
+        public static final int right_icon = 0x7f0900ff;
+        public static final int right_side = 0x7f090100;
+        public static final int start = 0x7f09012c;
+        public static final int tag_transition_group = 0x7f09013b;
+        public static final int tag_unhandled_key_event_manager = 0x7f09013c;
+        public static final int tag_unhandled_key_listeners = 0x7f09013d;
+        public static final int text = 0x7f09013e;
+        public static final int text2 = 0x7f09013f;
+        public static final int time = 0x7f09014b;
+        public static final int title = 0x7f09014c;
+        public static final int top = 0x7f090150;
     }
     public static final class integer {
         private integer() {}
@@ -157,19 +157,19 @@ public final class R {
     public static final class string {
         private string() {}
 
-        public static final int status_bar_notification_info_overflow = 0x7f11009b;
+        public static final int status_bar_notification_info_overflow = 0x7f12009e;
     }
     public static final class style {
         private style() {}
 
-        public static final int TextAppearance_Compat_Notification = 0x7f120118;
-        public static final int TextAppearance_Compat_Notification_Info = 0x7f120119;
-        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f12011b;
-        public static final int TextAppearance_Compat_Notification_Time = 0x7f12011e;
-        public static final int TextAppearance_Compat_Notification_Title = 0x7f120120;
-        public static final int Widget_Compat_NotificationActionContainer = 0x7f1201d1;
-        public static final int Widget_Compat_NotificationActionText = 0x7f1201d2;
-        public static final int Widget_Support_CoordinatorLayout = 0x7f120201;
+        public static final int TextAppearance_Compat_Notification = 0x7f130118;
+        public static final int TextAppearance_Compat_Notification_Info = 0x7f130119;
+        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f13011b;
+        public static final int TextAppearance_Compat_Notification_Time = 0x7f13011e;
+        public static final int TextAppearance_Compat_Notification_Title = 0x7f130120;
+        public static final int Widget_Compat_NotificationActionContainer = 0x7f1301d1;
+        public static final int Widget_Compat_NotificationActionText = 0x7f1301d2;
+        public static final int Widget_Support_CoordinatorLayout = 0x7f130201;
     }
     public static final class styleable {
         private styleable() {}

app/build/generated/not_namespaced_r_class_sources/debug/r/android/support/v7/viewpager/R.java

@@ -62,18 +62,18 @@ public final class R {
     public static final class drawable {
         private drawable() {}
 
-        public static final int notification_action_background = 0x7f0800a0;
-        public static final int notification_bg = 0x7f0800a1;
-        public static final int notification_bg_low = 0x7f0800a2;
-        public static final int notification_bg_low_normal = 0x7f0800a3;
-        public static final int notification_bg_low_pressed = 0x7f0800a4;
-        public static final int notification_bg_normal = 0x7f0800a5;
-        public static final int notification_bg_normal_pressed = 0x7f0800a6;
-        public static final int notification_icon_background = 0x7f0800a7;
-        public static final int notification_template_icon_bg = 0x7f0800a8;
-        public static final int notification_template_icon_low_bg = 0x7f0800a9;
-        public static final int notification_tile_bg = 0x7f0800aa;
-        public static final int notify_panel_notification_icon_bg = 0x7f0800ab;
+        public static final int notification_action_background = 0x7f0800a1;
+        public static final int notification_bg = 0x7f0800a2;
+        public static final int notification_bg_low = 0x7f0800a3;
+        public static final int notification_bg_low_normal = 0x7f0800a4;
+        public static final int notification_bg_low_pressed = 0x7f0800a5;
+        public static final int notification_bg_normal = 0x7f0800a6;
+        public static final int notification_bg_normal_pressed = 0x7f0800a7;
+        public static final int notification_icon_background = 0x7f0800a8;
+        public static final int notification_template_icon_bg = 0x7f0800a9;
+        public static final int notification_template_icon_low_bg = 0x7f0800aa;
+        public static final int notification_tile_bg = 0x7f0800ab;
+        public static final int notify_panel_notification_icon_bg = 0x7f0800ac;
     }
     public static final class id {
         private id() {}
@@ -85,27 +85,27 @@ public final class R {
         public static final int actions = 0x7f090020;
         public static final int async = 0x7f09002b;
         public static final int blocking = 0x7f090034;
-        public static final int chronometer = 0x7f090043;
-        public static final int forever = 0x7f09007b;
-        public static final int icon = 0x7f090089;
-        public static final int icon_group = 0x7f09008a;
-        public static final int info = 0x7f090090;
-        public static final int italic = 0x7f090092;
-        public static final int line1 = 0x7f0900aa;
-        public static final int line3 = 0x7f0900ab;
-        public static final int normal = 0x7f0900d9;
-        public static final int notification_background = 0x7f0900e0;
-        public static final int notification_main_column = 0x7f0900e1;
-        public static final int notification_main_column_container = 0x7f0900e2;
-        public static final int right_icon = 0x7f0900fb;
-        public static final int right_side = 0x7f0900fc;
-        public static final int tag_transition_group = 0x7f090137;
-        public static final int tag_unhandled_key_event_manager = 0x7f090138;
-        public static final int tag_unhandled_key_listeners = 0x7f090139;
-        public static final int text = 0x7f09013a;
-        public static final int text2 = 0x7f09013b;
-        public static final int time = 0x7f090147;
-        public static final int title = 0x7f090148;
+        public static final int chronometer = 0x7f090044;
+        public static final int forever = 0x7f09007c;
+        public static final int icon = 0x7f09008a;
+        public static final int icon_group = 0x7f09008b;
+        public static final int info = 0x7f090091;
+        public static final int italic = 0x7f090093;
+        public static final int line1 = 0x7f0900ab;
+        public static final int line3 = 0x7f0900ac;
+        public static final int normal = 0x7f0900dd;
+        public static final int notification_background = 0x7f0900e4;
+        public static final int notification_main_column = 0x7f0900e5;
+        public static final int notification_main_column_container = 0x7f0900e6;
+        public static final int right_icon = 0x7f0900ff;
+        public static final int right_side = 0x7f090100;
+        public static final int tag_transition_group = 0x7f09013b;
+        public static final int tag_unhandled_key_event_manager = 0x7f09013c;
+        public static final int tag_unhandled_key_listeners = 0x7f09013d;
+        public static final int text = 0x7f09013e;
+        public static final int text2 = 0x7f09013f;
+        public static final int time = 0x7f09014b;
+        public static final int title = 0x7f09014c;
     }
     public static final class integer {
         private integer() {}
@@ -125,18 +125,18 @@ public final class R {
     public static final class string {
         private string() {}
 
-        public static final int status_bar_notification_info_overflow = 0x7f11009b;
+        public static final int status_bar_notification_info_overflow = 0x7f12009e;
     }
     public static final class style {
         private style() {}
 
-        public static final int TextAppearance_Compat_Notification = 0x7f120118;
-        public static final int TextAppearance_Compat_Notification_Info = 0x7f120119;
-        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f12011b;
-        public static final int TextAppearance_Compat_Notification_Time = 0x7f12011e;
-        public static final int TextAppearance_Compat_Notification_Title = 0x7f120120;
-        public static final int Widget_Compat_NotificationActionContainer = 0x7f1201d1;
-        public static final int Widget_Compat_NotificationActionText = 0x7f1201d2;
+        public static final int TextAppearance_Compat_Notification = 0x7f130118;
+        public static final int TextAppearance_Compat_Notification_Info = 0x7f130119;
+        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f13011b;
+        public static final int TextAppearance_Compat_Notification_Time = 0x7f13011e;
+        public static final int TextAppearance_Compat_Notification_Title = 0x7f130120;
+        public static final int Widget_Compat_NotificationActionContainer = 0x7f1301d1;
+        public static final int Widget_Compat_NotificationActionText = 0x7f1301d2;
     }
     public static final class styleable {
         private styleable() {}

app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/navigation/R.java

@@ -78,18 +78,18 @@ public final class R {
     public static final class drawable {
         private drawable() {}
 
-        public static final int notification_action_background = 0x7f0800a0;
-        public static final int notification_bg = 0x7f0800a1;
-        public static final int notification_bg_low = 0x7f0800a2;
-        public static final int notification_bg_low_normal = 0x7f0800a3;
-        public static final int notification_bg_low_pressed = 0x7f0800a4;
-        public static final int notification_bg_normal = 0x7f0800a5;
-        public static final int notification_bg_normal_pressed = 0x7f0800a6;
-        public static final int notification_icon_background = 0x7f0800a7;
-        public static final int notification_template_icon_bg = 0x7f0800a8;
-        public static final int notification_template_icon_low_bg = 0x7f0800a9;
-        public static final int notification_tile_bg = 0x7f0800aa;
-        public static final int notify_panel_notification_icon_bg = 0x7f0800ab;
+        public static final int notification_action_background = 0x7f0800a1;
+        public static final int notification_bg = 0x7f0800a2;
+        public static final int notification_bg_low = 0x7f0800a3;
+        public static final int notification_bg_low_normal = 0x7f0800a4;
+        public static final int notification_bg_low_pressed = 0x7f0800a5;
+        public static final int notification_bg_normal = 0x7f0800a6;
+        public static final int notification_bg_normal_pressed = 0x7f0800a7;
+        public static final int notification_icon_background = 0x7f0800a8;
+        public static final int notification_template_icon_bg = 0x7f0800a9;
+        public static final int notification_template_icon_low_bg = 0x7f0800aa;
+        public static final int notification_tile_bg = 0x7f0800ab;
+        public static final int notify_panel_notification_icon_bg = 0x7f0800ac;
     }
     public static final class id {
         private id() {}
@@ -101,28 +101,28 @@ public final class R {
         public static final int actions = 0x7f090020;
         public static final int async = 0x7f09002b;
         public static final int blocking = 0x7f090034;
-        public static final int chronometer = 0x7f090043;
-        public static final int forever = 0x7f09007b;
-        public static final int icon = 0x7f090089;
-        public static final int icon_group = 0x7f09008a;
-        public static final int info = 0x7f090090;
-        public static final int italic = 0x7f090092;
-        public static final int line1 = 0x7f0900aa;
-        public static final int line3 = 0x7f0900ab;
-        public static final int nav_controller_view_tag = 0x7f0900d1;
-        public static final int normal = 0x7f0900d9;
-        public static final int notification_background = 0x7f0900e0;
-        public static final int notification_main_column = 0x7f0900e1;
-        public static final int notification_main_column_container = 0x7f0900e2;
-        public static final int right_icon = 0x7f0900fb;
-        public static final int right_side = 0x7f0900fc;
-        public static final int tag_transition_group = 0x7f090137;
-        public static final int tag_unhandled_key_event_manager = 0x7f090138;
-        public static final int tag_unhandled_key_listeners = 0x7f090139;
-        public static final int text = 0x7f09013a;
-        public static final int text2 = 0x7f09013b;
-        public static final int time = 0x7f090147;
-        public static final int title = 0x7f090148;
+        public static final int chronometer = 0x7f090044;
+        public static final int forever = 0x7f09007c;
+        public static final int icon = 0x7f09008a;
+        public static final int icon_group = 0x7f09008b;
+        public static final int info = 0x7f090091;
+        public static final int italic = 0x7f090093;
+        public static final int line1 = 0x7f0900ab;
+        public static final int line3 = 0x7f0900ac;
+        public static final int nav_controller_view_tag = 0x7f0900d5;
+        public static final int normal = 0x7f0900dd;
+        public static final int notification_background = 0x7f0900e4;
+        public static final int notification_main_column = 0x7f0900e5;
+        public static final int notification_main_column_container = 0x7f0900e6;
+        public static final int right_icon = 0x7f0900ff;
+        public static final int right_side = 0x7f090100;
+        public static final int tag_transition_group = 0x7f09013b;
+        public static final int tag_unhandled_key_event_manager = 0x7f09013c;
+        public static final int tag_unhandled_key_listeners = 0x7f09013d;
+        public static final int text = 0x7f09013e;
+        public static final int text2 = 0x7f09013f;
+        public static final int time = 0x7f09014b;
+        public static final int title = 0x7f09014c;
     }
     public static final class integer {
         private integer() {}
@@ -142,18 +142,18 @@ public final class R {
     public static final class string {
         private string() {}
 
-        public static final int status_bar_notification_info_overflow = 0x7f11009b;
+        public static final int status_bar_notification_info_overflow = 0x7f12009e;
     }
     public static final class style {
         private style() {}
 
-        public static final int TextAppearance_Compat_Notification = 0x7f120118;
-        public static final int TextAppearance_Compat_Notification_Info = 0x7f120119;
-        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f12011b;
-        public static final int TextAppearance_Compat_Notification_Time = 0x7f12011e;
-        public static final int TextAppearance_Compat_Notification_Title = 0x7f120120;
-        public static final int Widget_Compat_NotificationActionContainer = 0x7f1201d1;
-        public static final int Widget_Compat_NotificationActionText = 0x7f1201d2;
+        public static final int TextAppearance_Compat_Notification = 0x7f130118;
+        public static final int TextAppearance_Compat_Notification_Info = 0x7f130119;
+        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f13011b;
+        public static final int TextAppearance_Compat_Notification_Time = 0x7f13011e;
+        public static final int TextAppearance_Compat_Notification_Title = 0x7f130120;
+        public static final int Widget_Compat_NotificationActionContainer = 0x7f1301d1;
+        public static final int Widget_Compat_NotificationActionText = 0x7f1301d2;
     }
     public static final class styleable {
         private styleable() {}

app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/navigation/common/R.java

@@ -74,18 +74,18 @@ public final class R {
     public static final class drawable {
         private drawable() {}
 
-        public static final int notification_action_background = 0x7f0800a0;
-        public static final int notification_bg = 0x7f0800a1;
-        public static final int notification_bg_low = 0x7f0800a2;
-        public static final int notification_bg_low_normal = 0x7f0800a3;
-        public static final int notification_bg_low_pressed = 0x7f0800a4;
-        public static final int notification_bg_normal = 0x7f0800a5;
-        public static final int notification_bg_normal_pressed = 0x7f0800a6;
-        public static final int notification_icon_background = 0x7f0800a7;
-        public static final int notification_template_icon_bg = 0x7f0800a8;
-        public static final int notification_template_icon_low_bg = 0x7f0800a9;
-        public static final int notification_tile_bg = 0x7f0800aa;
-        public static final int notify_panel_notification_icon_bg = 0x7f0800ab;
+        public static final int notification_action_background = 0x7f0800a1;
+        public static final int notification_bg = 0x7f0800a2;
+        public static final int notification_bg_low = 0x7f0800a3;
+        public static final int notification_bg_low_normal = 0x7f0800a4;
+        public static final int notification_bg_low_pressed = 0x7f0800a5;
+        public static final int notification_bg_normal = 0x7f0800a6;
+        public static final int notification_bg_normal_pressed = 0x7f0800a7;
+        public static final int notification_icon_background = 0x7f0800a8;
+        public static final int notification_template_icon_bg = 0x7f0800a9;
+        public static final int notification_template_icon_low_bg = 0x7f0800aa;
+        public static final int notification_tile_bg = 0x7f0800ab;
+        public static final int notify_panel_notification_icon_bg = 0x7f0800ac;
     }
     public static final class id {
         private id() {}
@@ -97,27 +97,27 @@ public final class R {
         public static final int actions = 0x7f090020;
         public static final int async = 0x7f09002b;
         public static final int blocking = 0x7f090034;
-        public static final int chronometer = 0x7f090043;
-        public static final int forever = 0x7f09007b;
-        public static final int icon = 0x7f090089;
-        public static final int icon_group = 0x7f09008a;
-        public static final int info = 0x7f090090;
-        public static final int italic = 0x7f090092;
-        public static final int line1 = 0x7f0900aa;
-        public static final int line3 = 0x7f0900ab;
-        public static final int normal = 0x7f0900d9;
-        public static final int notification_background = 0x7f0900e0;
-        public static final int notification_main_column = 0x7f0900e1;
-        public static final int notification_main_column_container = 0x7f0900e2;
-        public static final int right_icon = 0x7f0900fb;
-        public static final int right_side = 0x7f0900fc;
-        public static final int tag_transition_group = 0x7f090137;
-        public static final int tag_unhandled_key_event_manager = 0x7f090138;
-        public static final int tag_unhandled_key_listeners = 0x7f090139;
-        public static final int text = 0x7f09013a;
-        public static final int text2 = 0x7f09013b;
-        public static final int time = 0x7f090147;
-        public static final int title = 0x7f090148;
+        public static final int chronometer = 0x7f090044;
+        public static final int forever = 0x7f09007c;
+        public static final int icon = 0x7f09008a;
+        public static final int icon_group = 0x7f09008b;
+        public static final int info = 0x7f090091;
+        public static final int italic = 0x7f090093;
+        public static final int line1 = 0x7f0900ab;
+        public static final int line3 = 0x7f0900ac;
+        public static final int normal = 0x7f0900dd;
+        public static final int notification_background = 0x7f0900e4;
+        public static final int notification_main_column = 0x7f0900e5;
+        public static final int notification_main_column_container = 0x7f0900e6;
+        public static final int right_icon = 0x7f0900ff;
+        public static final int right_side = 0x7f090100;
+        public static final int tag_transition_group = 0x7f09013b;
+        public static final int tag_unhandled_key_event_manager = 0x7f09013c;
+        public static final int tag_unhandled_key_listeners = 0x7f09013d;
+        public static final int text = 0x7f09013e;
+        public static final int text2 = 0x7f09013f;
+        public static final int time = 0x7f09014b;
+        public static final int title = 0x7f09014c;
     }
     public static final class integer {
         private integer() {}
@@ -137,18 +137,18 @@ public final class R {
     public static final class string {
         private string() {}
 
-        public static final int status_bar_notification_info_overflow = 0x7f11009b;
+        public static final int status_bar_notification_info_overflow = 0x7f12009e;
     }
     public static final class style {
         private style() {}
 
-        public static final int TextAppearance_Compat_Notification = 0x7f120118;
-        public static final int TextAppearance_Compat_Notification_Info = 0x7f120119;
-        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f12011b;
-        public static final int TextAppearance_Compat_Notification_Time = 0x7f12011e;
-        public static final int TextAppearance_Compat_Notification_Title = 0x7f120120;
-        public static final int Widget_Compat_NotificationActionContainer = 0x7f1201d1;
-        public static final int Widget_Compat_NotificationActionText = 0x7f1201d2;
+        public static final int TextAppearance_Compat_Notification = 0x7f130118;
+        public static final int TextAppearance_Compat_Notification_Info = 0x7f130119;
+        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f13011b;
+        public static final int TextAppearance_Compat_Notification_Time = 0x7f13011e;
+        public static final int TextAppearance_Compat_Notification_Title = 0x7f130120;
+        public static final int Widget_Compat_NotificationActionContainer = 0x7f1301d1;
+        public static final int Widget_Compat_NotificationActionText = 0x7f1301d2;
     }
     public static final class styleable {
         private styleable() {}

app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/navigation/fragment/R.java

@@ -89,18 +89,18 @@ public final class R {
     public static final class drawable {
         private drawable() {}
 
-        public static final int notification_action_background = 0x7f0800a0;
-        public static final int notification_bg = 0x7f0800a1;
-        public static final int notification_bg_low = 0x7f0800a2;
-        public static final int notification_bg_low_normal = 0x7f0800a3;
-        public static final int notification_bg_low_pressed = 0x7f0800a4;
-        public static final int notification_bg_normal = 0x7f0800a5;
-        public static final int notification_bg_normal_pressed = 0x7f0800a6;
-        public static final int notification_icon_background = 0x7f0800a7;
-        public static final int notification_template_icon_bg = 0x7f0800a8;
-        public static final int notification_template_icon_low_bg = 0x7f0800a9;
-        public static final int notification_tile_bg = 0x7f0800aa;
-        public static final int notify_panel_notification_icon_bg = 0x7f0800ab;
+        public static final int notification_action_background = 0x7f0800a1;
+        public static final int notification_bg = 0x7f0800a2;
+        public static final int notification_bg_low = 0x7f0800a3;
+        public static final int notification_bg_low_normal = 0x7f0800a4;
+        public static final int notification_bg_low_pressed = 0x7f0800a5;
+        public static final int notification_bg_normal = 0x7f0800a6;
+        public static final int notification_bg_normal_pressed = 0x7f0800a7;
+        public static final int notification_icon_background = 0x7f0800a8;
+        public static final int notification_template_icon_bg = 0x7f0800a9;
+        public static final int notification_template_icon_low_bg = 0x7f0800aa;
+        public static final int notification_tile_bg = 0x7f0800ab;
+        public static final int notify_panel_notification_icon_bg = 0x7f0800ac;
     }
     public static final class id {
         private id() {}
@@ -113,34 +113,34 @@ public final class R {
         public static final int async = 0x7f09002b;
         public static final int blocking = 0x7f090034;
         public static final int bottom = 0x7f090035;
-        public static final int chronometer = 0x7f090043;
-        public static final int end = 0x7f09006b;
-        public static final int forever = 0x7f09007b;
-        public static final int icon = 0x7f090089;
-        public static final int icon_group = 0x7f09008a;
-        public static final int info = 0x7f090090;
-        public static final int italic = 0x7f090092;
-        public static final int left = 0x7f0900a9;
-        public static final int line1 = 0x7f0900aa;
-        public static final int line3 = 0x7f0900ab;
-        public static final int nav_controller_view_tag = 0x7f0900d1;
-        public static final int none = 0x7f0900d8;
-        public static final int normal = 0x7f0900d9;
-        public static final int notification_background = 0x7f0900e0;
-        public static final int notification_main_column = 0x7f0900e1;
-        public static final int notification_main_column_container = 0x7f0900e2;
-        public static final int right = 0x7f0900fa;
-        public static final int right_icon = 0x7f0900fb;
-        public static final int right_side = 0x7f0900fc;
-        public static final int start = 0x7f090128;
-        public static final int tag_transition_group = 0x7f090137;
-        public static final int tag_unhandled_key_event_manager = 0x7f090138;
-        public static final int tag_unhandled_key_listeners = 0x7f090139;
-        public static final int text = 0x7f09013a;
-        public static final int text2 = 0x7f09013b;
-        public static final int time = 0x7f090147;
-        public static final int title = 0x7f090148;
-        public static final int top = 0x7f09014c;
+        public static final int chronometer = 0x7f090044;
+        public static final int end = 0x7f09006c;
+        public static final int forever = 0x7f09007c;
+        public static final int icon = 0x7f09008a;
+        public static final int icon_group = 0x7f09008b;
+        public static final int info = 0x7f090091;
+        public static final int italic = 0x7f090093;
+        public static final int left = 0x7f0900aa;
+        public static final int line1 = 0x7f0900ab;
+        public static final int line3 = 0x7f0900ac;
+        public static final int nav_controller_view_tag = 0x7f0900d5;
+        public static final int none = 0x7f0900dc;
+        public static final int normal = 0x7f0900dd;
+        public static final int notification_background = 0x7f0900e4;
+        public static final int notification_main_column = 0x7f0900e5;
+        public static final int notification_main_column_container = 0x7f0900e6;
+        public static final int right = 0x7f0900fe;
+        public static final int right_icon = 0x7f0900ff;
+        public static final int right_side = 0x7f090100;
+        public static final int start = 0x7f09012c;
+        public static final int tag_transition_group = 0x7f09013b;
+        public static final int tag_unhandled_key_event_manager = 0x7f09013c;
+        public static final int tag_unhandled_key_listeners = 0x7f09013d;
+        public static final int text = 0x7f09013e;
+        public static final int text2 = 0x7f09013f;
+        public static final int time = 0x7f09014b;
+        public static final int title = 0x7f09014c;
+        public static final int top = 0x7f090150;
     }
     public static final class integer {
         private integer() {}
@@ -160,19 +160,19 @@ public final class R {
     public static final class string {
         private string() {}
 
-        public static final int status_bar_notification_info_overflow = 0x7f11009b;
+        public static final int status_bar_notification_info_overflow = 0x7f12009e;
     }
     public static final class style {
         private style() {}
 
-        public static final int TextAppearance_Compat_Notification = 0x7f120118;
-        public static final int TextAppearance_Compat_Notification_Info = 0x7f120119;
-        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f12011b;
-        public static final int TextAppearance_Compat_Notification_Time = 0x7f12011e;
-        public static final int TextAppearance_Compat_Notification_Title = 0x7f120120;
-        public static final int Widget_Compat_NotificationActionContainer = 0x7f1201d1;
-        public static final int Widget_Compat_NotificationActionText = 0x7f1201d2;
-        public static final int Widget_Support_CoordinatorLayout = 0x7f120201;
+        public static final int TextAppearance_Compat_Notification = 0x7f130118;
+        public static final int TextAppearance_Compat_Notification_Info = 0x7f130119;
+        public static final int TextAppearance_Compat_Notification_Line2 = 0x7f13011b;
+        public static final int TextAppearance_Compat_Notification_Time = 0x7f13011e;
+        public static final int TextAppearance_Compat_Notification_Title = 0x7f130120;
+        public static final int Widget_Compat_NotificationActionContainer = 0x7f1301d1;
+        public static final int Widget_Compat_NotificationActionText = 0x7f1301d2;
+        public static final int Widget_Support_CoordinatorLayout = 0x7f130201;
     }
     public static final class styleable {
         private styleable() {}

app/build/generated/not_namespaced_r_class_sources/debugAndroidTest/r/net/micode/notes/test/R.java

@@ -0,0 +1,11 @@
+/* AUTO-GENERATED FILE. DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found. It
+ * should not be modified by hand.
+ */
+
+package net.micode.notes.test;
+
+public final class R {
+}

app/build/generated/res/pngs/debug/drawable-anydpi-v21/ic_launcher_background.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3DDC84"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+</vector>

app/build/generated/source/buildConfig/androidTest/debug/net/micode/notes/test/BuildConfig.java

@@ -0,0 +1,13 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package net.micode.notes.test;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String APPLICATION_ID = "net.micode.notes.test";
+  public static final String BUILD_TYPE = "debug";
+  public static final String FLAVOR = "";
+  public static final int VERSION_CODE = -1;
+  public static final String VERSION_NAME = "";
+}

app/build/intermediates/annotation_processor_list/debugAndroidTest/annotationProcessors.json

@@ -0,0 +1 @@
+{}

app/build/intermediates/annotation_processor_list/debugUnitTest/annotationProcessors.json

@@ -0,0 +1 @@
+{}

app/build/intermediates/apk_list/debugAndroidTest/mainApkListPersistenceDebugAndroidTest/apk-list.gson

@@ -0,0 +1 @@
+[{"type":"MAIN","splits":[],"versionCode":-1,"enabled":true,"outputFile":"app-debug-androidTest.apk","fullName":"debugAndroidTest","baseName":"debug-androidTest"}]

app/build/intermediates/blame/res/debug/multi-v2/debug.json

@@ -258,6 +258,22 @@
                 }
             ]
         },
+        {
+            "outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\values-watch-v20_values-watch-v20.arsc.flat",
+            "map": [
+                {
+                    "source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\d361875a0d27f2539b74283b5047326b\\appcompat-v7-28.0.0\\res\\values-watch-v20\\values-watch-v20.xml",
+                    "from": {
+                        "startLines": "2,5,8",
+                        "startColumns": "4,4,4",
+                        "startOffsets": "55,214,385",
+                        "endLines": "4,7,10",
+                        "endColumns": "12,12,12",
+                        "endOffsets": "209,380,553"
+                    }
+                }
+            ]
+        },
         {
             "outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\values-mr_values-mr.arsc.flat",
             "map": [
@@ -314,37 +330,6 @@
                 }
             ]
         },
-        {
-            "outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\values-watch-v20_values-watch-v20.arsc.flat",
-            "map": [
-                {
-                    "source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\d361875a0d27f2539b74283b5047326b\\appcompat-v7-28.0.0\\res\\values-watch-v20\\values-watch-v20.xml",
-                    "from": {
-                        "startLines": "2,5,8",
-                        "startColumns": "4,4,4",
-                        "startOffsets": "55,214,385",
-                        "endLines": "4,7,10",
-                        "endColumns": "12,12,12",
-                        "endOffsets": "209,380,553"
-                    }
-                }
-            ]
-        },
-        {
-            "outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\values-port_values-port.arsc.flat",
-            "map": [
-                {
-                    "source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\d361875a0d27f2539b74283b5047326b\\appcompat-v7-28.0.0\\res\\values-port\\values-port.xml",
-                    "from": {
-                        "startLines": "2",
-                        "startColumns": "4",
-                        "startOffsets": "55",
-                        "endColumns": "55",
-                        "endOffsets": "106"
-                    }
-                }
-            ]
-        },
         {
             "outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\values-en-rAU_values-en-rAU.arsc.flat",
             "map": [
@@ -401,6 +386,21 @@
                 }
             ]
         },
+        {
+            "outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\values-port_values-port.arsc.flat",
+            "map": [
+                {
+                    "source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\d361875a0d27f2539b74283b5047326b\\appcompat-v7-28.0.0\\res\\values-port\\values-port.xml",
+                    "from": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "55",
+                        "endColumns": "55",
+                        "endOffsets": "106"
+                    }
+                }
+            ]
+        },
         {
             "outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\values-uk_values-uk.arsc.flat",
             "map": [
@@ -457,62 +457,6 @@
                 }
             ]
         },
-        {
-            "outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\values-gl_values-gl.arsc.flat",
-            "map": [
-                {
-                    "source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\363d498352dbe394a4c2ee8b7d5219bb\\navigation-ui-1.0.0\\res\\values-gl\\values-gl.xml",
-                    "from": {
-                        "startLines": "2,3",
-                        "startColumns": "4,4",
-                        "startOffsets": "55,173",
-                        "endColumns": "117,121",
-                        "endOffsets": "168,290"
-                    },
-                    "to": {
-                        "startLines": "29,30",
-                        "startColumns": "4,4",
-                        "startOffsets": "2838,2956",
-                        "endColumns": "117,121",
-                        "endOffsets": "2951,3073"
-                    }
-                },
-                {
-                    "source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\0a6322d192fdfe18b2f8cfa16184d23a\\support-compat-28.0.0\\res\\values-gl\\values-gl.xml",
-                    "from": {
-                        "startLines": "2",
-                        "startColumns": "4",
-                        "startOffsets": "55",
-                        "endColumns": "100",
-                        "endOffsets": "151"
-                    },
-                    "to": {
-                        "startLines": "32",
-                        "startColumns": "4",
-                        "startOffsets": "3160",
-                        "endColumns": "100",
-                        "endOffsets": "3256"
-                    }
-                },
-                {
-                    "source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\d361875a0d27f2539b74283b5047326b\\appcompat-v7-28.0.0\\res\\values-gl\\values-gl.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,217,329,437,522,624,750,834,915,1007,1101,1199,1293,1394,1488,1584,1679,1771,1863,1945,2052,2161,2260,2368,2472,2579,2738,2838",
-                        "endColumns": "111,111,107,84,101,125,83,80,91,93,97,93,100,93,95,94,91,91,81,106,108,98,107,103,106,158,99,81",
-                        "endOffsets": "212,324,432,517,619,745,829,910,1002,1096,1194,1288,1389,1483,1579,1674,1766,1858,1940,2047,2156,2255,2363,2467,2574,2733,2833,2915"
-                    },
-                    "to": {
-                        "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,31",
-                        "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,217,329,437,522,624,750,834,915,1007,1101,1199,1293,1394,1488,1584,1679,1771,1863,1945,2052,2161,2260,2368,2472,2579,2738,3078",
-                        "endColumns": "111,111,107,84,101,125,83,80,91,93,97,93,100,93,95,94,91,91,81,106,108,98,107,103,106,158,99,81",
-                        "endOffsets": "212,324,432,517,619,745,829,910,1002,1096,1194,1288,1389,1483,1579,1674,1766,1858,1940,2047,2156,2255,2363,2467,2574,2733,2833,3155"
-                    }
-                }
-            ]
-        },
         {
             "outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\values-ne_values-ne.arsc.flat",
             "map": [
@@ -569,6 +513,62 @@
                 }
             ]
         },
+        {
+            "outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\values-gl_values-gl.arsc.flat",
+            "map": [
+                {
+                    "source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\363d498352dbe394a4c2ee8b7d5219bb\\navigation-ui-1.0.0\\res\\values-gl\\values-gl.xml",
+                    "from": {
+                        "startLines": "2,3",
+                        "startColumns": "4,4",
+                        "startOffsets": "55,173",
+                        "endColumns": "117,121",
+                        "endOffsets": "168,290"
+                    },
+                    "to": {
+                        "startLines": "29,30",
+                        "startColumns": "4,4",
+                        "startOffsets": "2838,2956",
+                        "endColumns": "117,121",
+                        "endOffsets": "2951,3073"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\0a6322d192fdfe18b2f8cfa16184d23a\\support-compat-28.0.0\\res\\values-gl\\values-gl.xml",
+                    "from": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "55",
+                        "endColumns": "100",
+                        "endOffsets": "151"
+                    },
+                    "to": {
+                        "startLines": "32",
+                        "startColumns": "4",
+                        "startOffsets": "3160",
+                        "endColumns": "100",
+                        "endOffsets": "3256"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\d361875a0d27f2539b74283b5047326b\\appcompat-v7-28.0.0\\res\\values-gl\\values-gl.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,217,329,437,522,624,750,834,915,1007,1101,1199,1293,1394,1488,1584,1679,1771,1863,1945,2052,2161,2260,2368,2472,2579,2738,2838",
+                        "endColumns": "111,111,107,84,101,125,83,80,91,93,97,93,100,93,95,94,91,91,81,106,108,98,107,103,106,158,99,81",
+                        "endOffsets": "212,324,432,517,619,745,829,910,1002,1096,1194,1288,1389,1483,1579,1674,1766,1858,1940,2047,2156,2255,2363,2467,2574,2733,2833,2915"
+                    },
+                    "to": {
+                        "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,31",
+                        "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,217,329,437,522,624,750,834,915,1007,1101,1199,1293,1394,1488,1584,1679,1771,1863,1945,2052,2161,2260,2368,2472,2579,2738,3078",
+                        "endColumns": "111,111,107,84,101,125,83,80,91,93,97,93,100,93,95,94,91,91,81,106,108,98,107,103,106,158,99,81",
+                        "endOffsets": "212,324,432,517,619,745,829,910,1002,1096,1194,1288,1389,1483,1579,1674,1766,1858,1940,2047,2156,2255,2363,2467,2574,2733,2833,3155"
+                    }
+                }
+            ]
+        },
         {
             "outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\values-v25_values-v25.arsc.flat",
             "map": [
@@ -782,11 +782,11 @@
                         "endOffsets": "151"
                     },
                     "to": {
-                        "startLines": "137",
+                        "startLines": "140",
                         "startColumns": "4",
-                        "startOffsets": "8754",
+                        "startOffsets": "8889",
                         "endColumns": "100",
-                        "endOffsets": "8850"
+                        "endOffsets": "8985"
                     }
                 },
                 {
@@ -799,30 +799,30 @@
                         "endOffsets": "196,291,391,473,570,676,752,828,919,1012,1110,1206,1301,1394,1489,1581,1672,1763,1841,1937,2033,2128,2225,2320,2418,2567,2661,2739"
                     },
                     "to": {
-                        "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,133",
+                        "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,136",
                         "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": "384,480,575,675,757,854,960,1036,1112,1203,1296,1394,1490,1585,1678,1773,1865,1956,2047,2125,2221,2317,2412,2509,2604,2702,2851,8511",
+                        "startOffsets": "384,480,575,675,757,854,960,1036,1112,1203,1296,1394,1490,1585,1678,1773,1865,1956,2047,2125,2221,2317,2412,2509,2604,2702,2851,8646",
                         "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77",
-                        "endOffsets": "475,570,670,752,849,955,1031,1107,1198,1291,1389,1485,1580,1673,1768,1860,1951,2042,2120,2216,2312,2407,2504,2599,2697,2846,2940,8584"
+                        "endOffsets": "475,570,670,752,849,955,1031,1107,1198,1291,1389,1485,1580,1673,1768,1860,1951,2042,2120,2216,2312,2407,2504,2599,2697,2846,2940,8719"
                     }
                 },
                 {
                     "source": "E:\\Notes-master2\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
                     "from": {
-                        "startLines": "123,73,72,71,70,19,20,21,114,115,122,121,63,26,79,80,78,77,76,92,91,90,82,131,130,60,29,30,83,132,74,116,69,65,38,44,49,39,59,58,57,53,52,50,51,54,55,45,68,56,137,128,66,43,48,47,46,64,42,61,138,40,41,67,62,28,34,36,33,35,32,31,25,24,136,99,98,101,113,106,105,107,108,110,109,100,133,104,102,103,97,111,112,120,118,117,119,27,134,135,81,89,94,93,95,88,87,86,85,22,23",
-                        "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,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,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,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": "6618,3581,3515,3442,3392,827,867,915,6169,6214,6564,6514,3023,1199,3947,4015,3888,3823,3760,4678,4618,4555,4147,6901,6858,2877,1369,1422,4201,6953,3654,6271,3333,3120,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3274,2661,7217,6812,3163,2036,2278,2222,2167,3065,1992,2937,7267,1901,1942,3215,2979,1318,1623,1719,1576,1672,1529,1484,1148,1095,7172,5053,4994,5194,6095,5505,5436,5569,5647,5830,5757,5128,7012,5381,5251,5316,4945,5934,6017,6476,6369,6321,6414,1261,7081,7127,4092,4496,4791,4733,4858,4448,4403,4355,4304,963,1029",
-                        "endLines": "125,73,72,71,70,19,20,21,114,115,122,121,63,26,79,80,78,77,76,92,91,90,82,131,130,60,29,30,83,132,74,116,69,65,38,44,49,39,59,58,57,53,52,50,51,54,55,45,68,56,137,128,66,43,48,47,46,64,42,61,138,40,41,67,62,28,34,36,33,35,32,31,25,24,136,99,98,101,113,106,105,107,108,110,109,100,133,104,102,103,97,111,112,120,118,117,119,27,134,135,81,89,94,93,95,88,87,86,85,22,23",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,41,61,67,76,58,64,62,54,59,62,53,51,42,59,52,61,84,58,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,49,44,51,42,46,55,54,54,43,41,49,40,49,58,43,50,48,48,46,46,46,44,50,52,44,74,58,56,73,63,68,77,109,103,72,65,68,54,64,64,48,82,77,37,44,47,61,56,45,44,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6790,3649,3576,3510,3437,862,910,958,6209,6266,6613,6559,3060,1256,4010,4087,3942,3883,3818,4728,4673,4613,4196,6948,6896,2932,1417,1479,4281,7007,3730,6316,3387,3158,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3328,2708,7262,6852,3210,2074,2320,2273,2217,3115,2031,2974,7312,1937,1987,3269,3018,1364,1667,1763,1618,1714,1571,1524,1194,1143,7212,5123,5048,5246,6164,5564,5500,5642,5752,5929,5825,5189,7076,5431,5311,5376,4989,6012,6090,6509,6409,6364,6471,1313,7122,7167,4142,4550,4853,4786,4915,4491,4443,4398,4350,1024,1090"
+                        "startLines": "122,73,72,71,70,19,20,21,114,115,121,120,63,26,79,80,78,77,76,92,91,90,82,130,129,60,29,30,83,131,74,116,69,141,65,38,44,49,39,59,58,57,53,52,50,51,54,55,45,68,56,136,127,66,43,48,47,46,64,42,61,140,137,40,41,67,62,28,34,36,33,35,32,31,25,24,135,99,98,101,113,106,105,107,108,110,109,100,132,104,102,103,97,111,112,138,139,118,117,119,27,133,134,81,89,94,93,95,88,87,86,85,22,23",
+                        "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,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,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,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,4,4",
+                        "startOffsets": "6580,3581,3515,3442,3392,827,867,915,6169,6214,6526,6476,3023,1199,3947,4015,3888,3823,3760,4678,4618,4555,4147,6863,6820,2877,1369,1422,4201,6915,3654,6271,3333,7404,3120,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3274,2661,7179,6774,3163,2036,2278,2222,2167,3065,1992,2937,7361,7229,1901,1942,3215,2979,1318,1623,1719,1576,1672,1529,1484,1148,1095,7134,5053,4994,5194,6095,5505,5436,5569,5647,5830,5757,5128,6974,5381,5251,5316,4945,5934,6017,7279,7322,6369,6321,6414,1261,7043,7089,4092,4496,4791,4733,4858,4448,4403,4355,4304,963,1029",
+                        "endLines": "124,73,72,71,70,19,20,21,114,115,121,120,63,26,79,80,78,77,76,92,91,90,82,130,129,60,29,30,83,131,74,116,69,141,65,38,44,49,39,59,58,57,53,52,50,51,54,55,45,68,56,136,127,66,43,48,47,46,64,42,61,140,137,40,41,67,62,28,34,36,33,35,32,31,25,24,135,99,98,101,113,106,105,107,108,110,109,100,132,104,102,103,97,111,112,138,139,118,117,119,27,133,134,81,89,94,93,95,88,87,86,85,22,23",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,41,61,67,76,58,64,62,54,59,62,53,51,42,59,52,61,84,58,80,49,58,47,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,49,44,51,42,46,55,54,54,43,41,42,49,40,49,58,43,50,48,48,46,46,46,44,50,52,44,74,58,56,73,63,68,77,109,103,72,65,68,54,64,64,48,82,77,42,38,44,47,61,56,45,44,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "6752,3649,3576,3510,3437,862,910,958,6209,6266,6575,6521,3060,1256,4010,4087,3942,3883,3818,4728,4673,4613,4196,6910,6858,2932,1417,1479,4281,6969,3730,6316,3387,7447,3158,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3328,2708,7224,6814,3210,2074,2320,2273,2217,3115,2031,2974,7399,7274,1937,1987,3269,3018,1364,1667,1763,1618,1714,1571,1524,1194,1143,7174,5123,5048,5246,6164,5564,5500,5642,5752,5929,5825,5189,7038,5431,5311,5376,4989,6012,6090,7317,7356,6409,6364,6471,1313,7084,7129,4142,4550,4853,4786,4915,4491,4443,4398,4350,1024,1090"
                     },
                     "to": {
-                        "startLines": "6,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,134,135,136,138,139,140,141,142,143,144,145,146,147,148,149",
-                        "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,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,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,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": "215,2945,3018,3084,3157,3207,3247,3295,3343,3388,3445,3499,3549,3591,3653,3721,3798,3857,3922,3985,4040,4100,4163,4217,4269,4312,4372,4425,4487,4572,4631,4712,4762,4821,4864,4917,4960,5011,5061,5121,5174,5225,5271,5319,5367,5413,5460,5510,5555,5614,5666,5716,5761,5813,5856,5903,5959,6014,6069,6113,6155,6205,6246,6296,6559,6603,6654,6703,6752,6799,6846,6893,6938,6989,7042,7087,7162,7221,7278,7352,7416,7485,7563,7673,7777,7850,7916,7985,8040,8105,8170,8219,8302,8380,8418,8463,8589,8651,8708,8855,8900,8955,9014,9081,9139,9201,9249,9294,9342,9393,9459",
-                        "endLines": "8,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,134,135,136,138,139,140,141,142,143,144,145,146,147,148,149",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,41,61,67,76,58,64,62,54,59,62,53,51,42,59,52,61,84,58,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,49,44,51,42,46,55,54,54,43,41,49,40,49,58,43,50,48,48,46,46,46,44,50,52,44,74,58,56,73,63,68,77,109,103,72,65,68,54,64,64,48,82,77,37,44,47,61,56,45,44,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,3013,3079,3152,3202,3242,3290,3338,3383,3440,3494,3544,3586,3648,3716,3793,3852,3917,3980,4035,4095,4158,4212,4264,4307,4367,4420,4482,4567,4626,4707,4757,4816,4859,4912,4955,5006,5056,5116,5169,5220,5266,5314,5362,5408,5455,5505,5550,5609,5661,5711,5756,5808,5851,5898,5954,6009,6064,6108,6150,6200,6241,6291,6350,6598,6649,6698,6747,6794,6841,6888,6933,6984,7037,7082,7157,7216,7273,7347,7411,7480,7558,7668,7772,7845,7911,7980,8035,8100,8165,8214,8297,8375,8413,8458,8506,8646,8703,8749,8895,8950,9009,9076,9134,9196,9244,9289,9337,9388,9454,9520"
+                        "startLines": "6,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,137,138,139,141,142,143,144,145,146,147,148,149,150,151,152",
+                        "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,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,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,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,4,4",
+                        "startOffsets": "215,2945,3018,3084,3157,3207,3247,3295,3343,3388,3445,3499,3549,3591,3653,3721,3798,3857,3922,3985,4040,4100,4163,4217,4269,4312,4372,4425,4487,4572,4631,4712,4762,4821,4869,4912,4965,5008,5059,5109,5169,5222,5273,5319,5367,5415,5461,5508,5558,5603,5662,5714,5764,5809,5861,5904,5951,6007,6062,6117,6161,6203,6246,6296,6337,6387,6650,6694,6745,6794,6843,6890,6937,6984,7029,7080,7133,7178,7253,7312,7369,7443,7507,7576,7654,7764,7868,7941,8007,8076,8131,8196,8261,8310,8393,8471,8514,8553,8598,8724,8786,8843,8990,9035,9090,9149,9216,9274,9336,9384,9429,9477,9528,9594",
+                        "endLines": "8,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,137,138,139,141,142,143,144,145,146,147,148,149,150,151,152",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,41,61,67,76,58,64,62,54,59,62,53,51,42,59,52,61,84,58,80,49,58,47,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,49,44,51,42,46,55,54,54,43,41,42,49,40,49,58,43,50,48,48,46,46,46,44,50,52,44,74,58,56,73,63,68,77,109,103,72,65,68,54,64,64,48,82,77,42,38,44,47,61,56,45,44,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,3013,3079,3152,3202,3242,3290,3338,3383,3440,3494,3544,3586,3648,3716,3793,3852,3917,3980,4035,4095,4158,4212,4264,4307,4367,4420,4482,4567,4626,4707,4757,4816,4864,4907,4960,5003,5054,5104,5164,5217,5268,5314,5362,5410,5456,5503,5553,5598,5657,5709,5759,5804,5856,5899,5946,6002,6057,6112,6156,6198,6241,6291,6332,6382,6441,6689,6740,6789,6838,6885,6932,6979,7024,7075,7128,7173,7248,7307,7364,7438,7502,7571,7649,7759,7863,7936,8002,8071,8126,8191,8256,8305,8388,8466,8509,8548,8593,8641,8781,8838,8884,9030,9085,9144,9211,9269,9331,9379,9424,9472,9523,9589,9655"
                     }
                 },
                 {
@@ -854,11 +854,11 @@
                         "endOffsets": "151,254"
                     },
                     "to": {
-                        "startLines": "99,100",
+                        "startLines": "101,102",
                         "startColumns": "4,4",
-                        "startOffsets": "6355,6456",
+                        "startOffsets": "6446,6547",
                         "endColumns": "100,102",
-                        "endOffsets": "6451,6554"
+                        "endOffsets": "6542,6645"
                     }
                 }
             ]
@@ -1824,6 +1824,25 @@
                         "endOffsets": "440,543,646,751,858,967,1076,1185,1294,1403,1510,1613,1732,1887,2042,2147,2268,2369,2516,2657,2760,2879,2986,3089,3244,3415,3564,3729,3886,4037,4156,4528,4677,4826,4938,5085,5238,5385,5460,5549,5636,5737,5840,8908,9093,12173,12370,12569,12692,12815,12928,13111,13242,13443,13532,13643,13876,13977,14072,14195,14324,14441,14618,14717,14852,14995,15130,15249,15450,15569,15662,15773,15829,15936,16131,16242,16375,16470,16561,16652,16769,16908,16979,17062,17742,17799,17857,18551,19257"
                     }
                 },
+                {
+                    "source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\f59c416eb71ab4692f8a16a38c64af95\\support-media-compat-28.0.0\\res\\values-v21\\values-v21.xml",
+                    "from": {
+                        "startLines": "2,5,8,11",
+                        "startColumns": "4,4,4,4",
+                        "startOffsets": "55,223,386,554",
+                        "endLines": "4,7,10,13",
+                        "endColumns": "12,12,12,12",
+                        "endOffsets": "218,381,549,716"
+                    },
+                    "to": {
+                        "startLines": "265,268,272,276",
+                        "startColumns": "4,4,4,4",
+                        "startOffsets": "19504,19672,19961,20257",
+                        "endLines": "267,270,274,278",
+                        "endColumns": "12,12,12,12",
+                        "endOffsets": "19667,19830,20124,20419"
+                    }
+                },
                 {
                     "source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\fb1bb4f22fece0afff87deb16da22f79\\design-28.0.0\\res\\values-v21\\values-v21.xml",
                     "from": {
@@ -1861,25 +1880,6 @@
                         "endColumns": "103,63,66,63,115,125,125,127,12,12",
                         "endOffsets": "154,218,285,349,19373,19499,19956,20252,22304,22642"
                     }
-                },
-                {
-                    "source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\108d460d26ccb2e43cfd84ab7c13ec27\\support-media-compat-26.1.0\\res\\values-v21\\values-v21.xml",
-                    "from": {
-                        "startLines": "2,5,8,11",
-                        "startColumns": "4,4,4,4",
-                        "startOffsets": "55,223,386,554",
-                        "endLines": "4,7,10,13",
-                        "endColumns": "12,12,12,12",
-                        "endOffsets": "218,381,549,716"
-                    },
-                    "to": {
-                        "startLines": "265,268,272,276",
-                        "startColumns": "4,4,4,4",
-                        "startOffsets": "19504,19672,19961,20257",
-                        "endLines": "267,270,274,278",
-                        "endColumns": "12,12,12,12",
-                        "endOffsets": "19667,19830,20124,20419"
-                    }
                 }
             ]
         },
@@ -3177,11 +3177,11 @@
                         "endOffsets": "1099,1155,811,864,917,969,759"
                     },
                     "to": {
-                        "startLines": "504,505,638,639,640,641,642",
+                        "startLines": "504,505,642,643,644,645,646",
                         "startColumns": "4,4,4,4,4,4,4",
-                        "startOffsets": "26615,26673,35189,35241,35294,35347,35399",
+                        "startOffsets": "26615,26673,35401,35453,35506,35559,35611",
                         "endColumns": "57,55,51,52,52,51,51",
-                        "endOffsets": "26668,26724,35236,35289,35342,35394,35446"
+                        "endOffsets": "26668,26724,35448,35501,35554,35606,35658"
                     }
                 },
                 {
@@ -3194,11 +3194,11 @@
                         "endOffsets": "90,133,180,235,280,334,386,435,496,546"
                     },
                     "to": {
-                        "startLines": "657,666,669,670,671,684,685,686,687,688",
+                        "startLines": "661,670,673,674,675,688,689,690,691,692",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "36257,36681,36820,36867,36922,37516,37570,37622,37671,37732",
+                        "startOffsets": "36469,36893,37032,37079,37134,37728,37782,37834,37883,37944",
                         "endColumns": "39,42,46,54,44,53,51,48,60,49",
-                        "endOffsets": "36292,36719,36862,36917,36962,37565,37617,37666,37727,37777"
+                        "endOffsets": "36504,36931,37074,37129,37174,37777,37829,37878,37939,37989"
                     }
                 },
                 {
@@ -3212,12 +3212,12 @@
                         "endOffsets": "207"
                     },
                     "to": {
-                        "startLines": "4319",
+                        "startLines": "4326",
                         "startColumns": "4",
-                        "startOffsets": "282099",
-                        "endLines": "4322",
+                        "startOffsets": "282452",
+                        "endLines": "4329",
                         "endColumns": "24",
-                        "endOffsets": "282288"
+                        "endOffsets": "282641"
                     }
                 },
                 {
@@ -3231,12 +3231,12 @@
                         "endOffsets": "102,163,225,287,351,2233,2290,2344,2758,2822,2948,3076,2174"
                     },
                     "to": {
-                        "startLines": "32,356,357,358,359,506,507,508,913,2307,2309,2312,3993",
+                        "startLines": "32,356,357,358,359,506,507,508,920,2314,2316,2319,4000",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "1456,16691,16752,16814,16876,26729,26788,26845,53999,144548,144612,144738,248319",
-                        "endLines": "32,356,357,358,359,506,507,508,919,2308,2311,2314,4020",
+                        "startOffsets": "1456,16691,16752,16814,16876,26729,26788,26845,54352,144901,144965,145091,248672",
+                        "endLines": "32,356,357,358,359,506,507,508,926,2315,2318,2321,4027",
                         "endColumns": "51,60,61,61,63,58,56,53,12,12,12,12,24",
-                        "endOffsets": "1503,16747,16809,16871,16935,26783,26840,26894,54408,144607,144733,144861,250137"
+                        "endOffsets": "1503,16747,16809,16871,16935,26783,26840,26894,54761,144960,145086,145214,250490"
                     }
                 },
                 {
@@ -3250,12 +3250,12 @@
                         "endOffsets": "119,182,7790,7858,7930,8000,8061,8135,8208,8269,8330,8392,8456,8518,8579,8647,8747,8807,8873,8946,9015,9072,9124,9186,9258,9334,9369,9404,9454,9515,9572,9606,9641,9676,9746,9817,9934,10135,10245,10446,10575,10647,10714,612,3518,5583,7343,7720"
                     },
                     "to": {
-                        "startLines": "405,406,509,510,511,512,513,514,515,623,624,625,626,627,628,629,630,631,632,633,634,635,636,637,651,652,660,661,675,676,677,678,679,683,705,866,2583,2584,2589,2592,2597,2999,3000,4074,4240,4283,4323,4360",
+                        "startLines": "405,406,509,510,511,512,513,514,515,623,624,625,626,627,628,629,630,631,632,633,634,635,636,637,655,656,664,665,679,680,681,682,683,687,709,873,2590,2591,2596,2599,2604,3006,3007,4081,4247,4290,4330,4367",
                         "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "19814,19883,26899,26969,27037,27109,27179,27240,27314,34211,34272,34333,34395,34459,34521,34582,34650,34750,34810,34876,34949,35018,35075,35127,35904,35976,36397,36432,37101,37151,37212,37269,37303,37481,38727,50630,165204,165321,165588,165881,166148,192528,192600,254248,276816,279722,282293,284053",
-                        "endLines": "405,406,509,510,511,512,513,514,515,623,624,625,626,627,628,629,630,631,632,633,634,635,636,637,651,652,660,661,675,676,677,678,679,683,705,866,2583,2587,2589,2595,2597,2999,3000,4080,4282,4314,4359,4366",
+                        "startOffsets": "19814,19883,26899,26969,27037,27109,27179,27240,27314,34211,34272,34333,34395,34459,34521,34582,34650,34750,34810,34876,34949,35018,35075,35127,36116,36188,36609,36644,37313,37363,37424,37481,37515,37693,38939,50983,165557,165674,165941,166234,166501,192881,192953,254601,277169,280075,282646,284406",
+                        "endLines": "405,406,509,510,511,512,513,514,515,623,624,625,626,627,628,629,630,631,632,633,634,635,636,637,655,656,664,665,679,680,681,682,683,687,709,873,2590,2594,2596,2602,2604,3006,3007,4087,4289,4321,4366,4373",
                         "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24",
-                        "endOffsets": "19878,19941,26964,27032,27104,27174,27235,27309,27382,34267,34328,34390,34454,34516,34577,34645,34745,34805,34871,34944,35013,35070,35122,35184,35971,36047,36427,36462,37146,37207,37264,37298,37333,37511,38792,50696,165316,165517,165693,166077,166272,192595,192662,254541,279717,281782,284048,284425"
+                        "endOffsets": "19878,19941,26964,27032,27104,27174,27235,27309,27382,34267,34328,34390,34454,34516,34577,34645,34745,34805,34871,34944,35013,35070,35122,35184,36183,36259,36639,36674,37358,37419,37476,37510,37545,37723,39004,51049,165669,165870,166046,166430,166625,192948,193015,254894,280070,282135,284401,284778"
                     }
                 },
                 {
@@ -3286,12 +3286,12 @@
                         "endOffsets": "151,211,272,327,380,438,486,535,580,633,691,751,809,855,915,968,1014,1064,1111,1169,1227,1286,1346,1408,1470,1532,1594,1656,1718,1779,1841,1903,1956,2018,2092,2155,2223,2304,2368,2434,2504,2574,2644,2714,2781,2844,2909,2975,3028,3104,3170,3257,3333,18421,18500,18578,18651,18716,18779,18845,18916,18987,19049,19118,19184,19251,19318,19374,19425,19478,19530,19584,19655,19718,19777,19839,19898,19971,20038,20098,20161,20236,20308,20379,20435,20506,20563,20620,20686,20750,20821,20878,20931,20994,21046,21104,21171,21237,21303,21384,21459,21515,21568,21629,21687,21737,21786,21835,21884,21946,21998,22043,22124,22178,22231,22285,22336,22385,22436,22497,22558,22620,22670,22711,22761,22809,22871,22922,22971,23040,23101,23157,23228,23293,23362,23413,23476,23546,23615,23685,23747,23817,23887,23962,24021,24079,24141,24186,24229,24276,24321,24372,24420,24486,24548,24611,24683,24740,24797,24857,24915,24985,25042,25187,25308,25412,25499,25651,25803,25951,26032,26110,26411,26577,26732,26834,27111,27204,27311,27654,27761,27990,28399,28631,28731,28836,28955,29578,29725,29844,30079,30494,30732,30844,30965,31098,33236,34752,38043,40177,41705,43249,46536,46782,47041,47845,49605,50055,50770,50843,50930,51015,51114,51309,51401,51574,51736,51831,52000,52243,52536,52945,53359,53819,54237,54478,54908,55343,55753,56175,56585,57042,57496,57912,58378,58560,58628,58972,59052,59408,59558,59702,59786,60151,60249,60357,60455,60565,60681,60807,60903,61280,61390,61514,61652,61762,61884,62012,62150,62312,62528,62684,62888,62972,63076,63170,63284,63396,63520,63616,63696,63885,64091,64284,64494,64926,65347,65772,65969,66917,67438,67561,68198,68419,69234,69703,69886,70482,70942,71047,72308,72458,72875,73040,73720,73879,74041,74196,74392,74559,74781,74941,75318,75477,75805,76022,76597,76947,77196,77293,77999,78437,78678,78867,79001,79192,79829,80079,80382,80597,81178,3631,3887,4384,4818,5475,5818,7357,7705,9602,9924,10055,10761,10898,11050,11252,11957,12077,13226,13793,13922,14055,14215,14390,14532,16319,18157,18367"
                     },
                     "to": {
-                        "startLines": "28,29,30,31,34,35,36,38,69,128,250,251,256,273,274,275,277,278,279,281,282,283,284,285,286,287,288,289,290,291,292,293,294,336,360,361,362,363,364,365,366,367,368,369,370,397,398,399,400,401,402,403,404,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,542,543,544,545,546,547,548,549,550,551,552,553,554,555,556,557,558,559,575,576,577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,595,596,597,598,599,600,601,602,603,604,605,606,607,608,609,610,611,612,613,614,615,616,617,618,619,620,621,622,663,664,672,673,680,681,682,690,693,694,697,698,699,700,701,702,703,704,757,758,761,762,777,778,788,822,835,836,837,838,839,888,1152,1153,1154,1159,1160,1164,1170,1174,1175,1176,1177,1188,1189,1190,1194,1200,1204,1274,1275,1276,1306,1326,1372,1402,1422,1442,1488,1492,2234,2248,2289,2297,2447,2448,2449,2450,2599,2602,2603,2606,2609,2610,2613,2617,2622,2630,2638,2647,2655,2659,2667,2675,2683,2691,2699,2708,2717,2725,2734,2800,2802,2807,2809,2814,2818,2822,2823,2828,2829,2830,2831,2832,2833,2835,2836,2841,2842,2843,2844,2845,2846,2847,2849,2853,2857,2861,2879,2880,2881,2882,2883,2884,2885,2886,2887,2890,2894,2897,3001,3009,3016,3025,3029,3044,3052,3055,3064,3069,3080,3088,3091,3100,3107,3108,3127,3130,3136,3139,3148,3151,3154,3157,3160,3163,3167,3170,3179,3182,3190,3195,3203,3208,3212,3213,3224,3231,3235,3239,3240,3244,3252,3256,3261,3266,3463,3464,3465,3968,3974,3984,4021,4022,4023,4066,4211,4230,4238,4239,4315,4429,4435,4436,4668,4737,4738,4776,4777,4890,4891,4929,4948",
+                        "startLines": "28,29,30,31,34,35,36,38,69,128,250,251,256,273,274,275,277,278,279,281,282,283,284,285,286,287,288,289,290,291,292,293,294,336,360,361,362,363,364,365,366,367,368,369,370,397,398,399,400,401,402,403,404,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,542,543,544,545,546,547,548,549,550,551,552,553,554,555,556,557,558,559,575,576,577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,595,596,597,598,599,600,601,602,603,604,605,606,607,608,609,610,611,612,613,614,615,616,617,618,619,620,621,622,667,668,676,677,684,685,686,694,697,698,701,702,703,704,705,706,707,708,761,762,765,766,781,782,792,828,841,842,843,844,845,895,1159,1160,1161,1166,1167,1171,1177,1181,1182,1183,1184,1195,1196,1197,1201,1207,1211,1281,1282,1283,1313,1333,1379,1409,1429,1449,1495,1499,2241,2255,2296,2304,2454,2455,2456,2457,2606,2609,2610,2613,2616,2617,2620,2624,2629,2637,2645,2654,2662,2666,2674,2682,2690,2698,2706,2715,2724,2732,2741,2807,2809,2814,2816,2821,2825,2829,2830,2835,2836,2837,2838,2839,2840,2842,2843,2848,2849,2850,2851,2852,2853,2854,2856,2860,2864,2868,2886,2887,2888,2889,2890,2891,2892,2893,2894,2897,2901,2904,3008,3016,3023,3032,3036,3051,3059,3062,3071,3076,3087,3095,3098,3107,3114,3115,3134,3137,3143,3146,3155,3158,3161,3164,3167,3170,3174,3177,3186,3189,3197,3202,3210,3215,3219,3220,3231,3238,3242,3246,3247,3251,3259,3263,3268,3273,3470,3471,3472,3975,3981,3991,4028,4029,4030,4073,4218,4237,4245,4246,4322,4436,4442,4443,4675,4744,4745,4783,4784,4897,4898,4936,4955",
                         "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,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,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,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,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,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,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,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,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,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,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,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,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "1224,1280,1340,1401,1556,1609,1667,1766,3104,5543,11271,11329,11595,12276,12322,12382,12481,12527,12577,12671,12729,12787,12846,12906,12968,13030,13092,13154,13216,13278,13339,13401,13463,15171,16940,17014,17077,17145,17226,17290,17356,17426,17496,17566,17636,19262,19325,19390,19456,19509,19585,19651,19738,27387,27441,27520,27598,27671,27736,27799,27865,27936,28007,28069,28138,28204,28271,28338,28394,28445,28498,28550,28604,28675,28738,28797,28859,28918,28991,29058,29118,29181,29256,29328,29399,29455,29526,29583,29640,29706,29770,29841,29898,29951,30014,30066,30124,31361,31427,31493,31574,31649,31705,31758,31819,31877,31927,31976,32025,32074,32136,32188,32233,32314,32368,32421,32475,32526,32575,32626,32687,32748,32810,32860,32901,32951,32999,33061,33112,33161,33230,33291,33347,33418,33483,33552,33603,33666,33736,33805,33875,33937,34007,34077,34152,36508,36566,36967,37012,37338,37385,37430,37814,37988,38054,38233,38296,38368,38425,38482,38542,38600,38670,42438,42583,42816,42920,44050,44202,44985,47013,47782,47860,48161,48327,48482,52271,69576,69669,69776,70119,70226,70455,70864,71096,71196,71301,71420,72043,72190,72309,72544,72959,73197,78468,78589,78722,80860,82376,85667,87801,89329,90873,94160,94406,140819,141623,143383,143833,154494,154567,154654,154739,166344,166539,166631,166804,166966,167061,167230,167473,167766,168175,168589,169049,169467,169708,170138,170573,170983,171405,171815,172272,172726,173142,173608,177720,177788,178132,178212,178568,178718,178862,178946,179311,179409,179517,179615,179725,179841,179967,180063,180440,180550,180674,180812,180922,181044,181172,181310,181472,181688,181844,183117,183201,183305,183399,183513,183625,183749,183845,183925,184114,184320,184513,192667,193099,193520,193945,194142,195090,195611,195734,196371,196592,197407,197876,198059,198655,199115,199220,200481,200631,201048,201213,201893,202052,202214,202369,202565,202732,202954,203114,203491,203650,203978,204195,204770,205120,205369,205466,206172,206610,206851,207040,207174,207365,208002,208252,208555,208770,220229,220527,220783,246625,247059,247716,250142,251681,252029,253926,274657,275821,276527,276664,281787,293600,294305,294425,307452,312139,312268,314451,314611,321421,321563,323951,325789",
-                        "endLines": "28,29,30,31,34,35,36,38,69,128,250,251,256,273,274,275,277,278,279,281,282,283,284,285,286,287,288,289,290,291,292,293,294,336,360,361,362,363,364,365,366,367,368,369,370,397,398,399,400,401,402,403,404,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,542,543,544,545,546,547,548,549,550,551,552,553,554,555,556,557,558,559,575,576,577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,595,596,597,598,599,600,601,602,603,604,605,606,607,608,609,610,611,612,613,614,615,616,617,618,619,620,621,622,663,664,672,673,680,681,682,690,693,694,697,698,699,700,701,702,703,704,757,758,761,762,777,778,788,822,835,836,837,838,839,891,1152,1153,1158,1159,1163,1169,1173,1174,1175,1176,1187,1188,1189,1193,1199,1203,1204,1274,1275,1305,1325,1371,1401,1421,1441,1487,1491,1495,2247,2288,2296,2306,2447,2448,2449,2450,2601,2602,2605,2608,2609,2612,2616,2621,2629,2637,2646,2654,2658,2666,2674,2682,2690,2698,2707,2716,2724,2733,2736,2801,2806,2808,2813,2817,2821,2822,2827,2828,2829,2830,2831,2832,2834,2835,2840,2841,2842,2843,2844,2845,2846,2848,2852,2856,2860,2864,2879,2880,2881,2882,2883,2884,2885,2886,2889,2893,2896,2900,3008,3015,3024,3028,3043,3051,3054,3063,3068,3079,3087,3090,3099,3106,3107,3126,3129,3135,3138,3147,3150,3153,3156,3159,3162,3166,3169,3178,3181,3189,3194,3202,3207,3211,3212,3223,3230,3234,3238,3239,3243,3251,3255,3260,3265,3274,3463,3464,3483,3973,3983,3987,4021,4022,4065,4073,4211,4237,4238,4239,4315,4434,4435,4436,4668,4737,4738,4776,4777,4890,4913,4947,4948",
+                        "startOffsets": "1224,1280,1340,1401,1556,1609,1667,1766,3104,5543,11271,11329,11595,12276,12322,12382,12481,12527,12577,12671,12729,12787,12846,12906,12968,13030,13092,13154,13216,13278,13339,13401,13463,15171,16940,17014,17077,17145,17226,17290,17356,17426,17496,17566,17636,19262,19325,19390,19456,19509,19585,19651,19738,27387,27441,27520,27598,27671,27736,27799,27865,27936,28007,28069,28138,28204,28271,28338,28394,28445,28498,28550,28604,28675,28738,28797,28859,28918,28991,29058,29118,29181,29256,29328,29399,29455,29526,29583,29640,29706,29770,29841,29898,29951,30014,30066,30124,31361,31427,31493,31574,31649,31705,31758,31819,31877,31927,31976,32025,32074,32136,32188,32233,32314,32368,32421,32475,32526,32575,32626,32687,32748,32810,32860,32901,32951,32999,33061,33112,33161,33230,33291,33347,33418,33483,33552,33603,33666,33736,33805,33875,33937,34007,34077,34152,36720,36778,37179,37224,37550,37597,37642,38026,38200,38266,38445,38508,38580,38637,38694,38754,38812,38882,42650,42795,43028,43132,44262,44414,45197,47321,48090,48168,48469,48635,48790,52624,69929,70022,70129,70472,70579,70808,71217,71449,71549,71654,71773,72396,72543,72662,72897,73312,73550,78821,78942,79075,81213,82729,86020,88154,89682,91226,94513,94759,141172,141976,143736,144186,154847,154920,155007,155092,166697,166892,166984,167157,167319,167414,167583,167826,168119,168528,168942,169402,169820,170061,170491,170926,171336,171758,172168,172625,173079,173495,173961,178073,178141,178485,178565,178921,179071,179215,179299,179664,179762,179870,179968,180078,180194,180320,180416,180793,180903,181027,181165,181275,181397,181525,181663,181825,182041,182197,183470,183554,183658,183752,183866,183978,184102,184198,184278,184467,184673,184866,193020,193452,193873,194298,194495,195443,195964,196087,196724,196945,197760,198229,198412,199008,199468,199573,200834,200984,201401,201566,202246,202405,202567,202722,202918,203085,203307,203467,203844,204003,204331,204548,205123,205473,205722,205819,206525,206963,207204,207393,207527,207718,208355,208605,208908,209123,220582,220880,221136,246978,247412,248069,250495,252034,252382,254279,275010,276174,276880,277017,282140,293953,294658,294778,307805,312492,312621,314804,314964,321774,321916,324304,326142",
+                        "endLines": "28,29,30,31,34,35,36,38,69,128,250,251,256,273,274,275,277,278,279,281,282,283,284,285,286,287,288,289,290,291,292,293,294,336,360,361,362,363,364,365,366,367,368,369,370,397,398,399,400,401,402,403,404,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,542,543,544,545,546,547,548,549,550,551,552,553,554,555,556,557,558,559,575,576,577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,595,596,597,598,599,600,601,602,603,604,605,606,607,608,609,610,611,612,613,614,615,616,617,618,619,620,621,622,667,668,676,677,684,685,686,694,697,698,701,702,703,704,705,706,707,708,761,762,765,766,781,782,792,828,841,842,843,844,845,898,1159,1160,1165,1166,1170,1176,1180,1181,1182,1183,1194,1195,1196,1200,1206,1210,1211,1281,1282,1312,1332,1378,1408,1428,1448,1494,1498,1502,2254,2295,2303,2313,2454,2455,2456,2457,2608,2609,2612,2615,2616,2619,2623,2628,2636,2644,2653,2661,2665,2673,2681,2689,2697,2705,2714,2723,2731,2740,2743,2808,2813,2815,2820,2824,2828,2829,2834,2835,2836,2837,2838,2839,2841,2842,2847,2848,2849,2850,2851,2852,2853,2855,2859,2863,2867,2871,2886,2887,2888,2889,2890,2891,2892,2893,2896,2900,2903,2907,3015,3022,3031,3035,3050,3058,3061,3070,3075,3086,3094,3097,3106,3113,3114,3133,3136,3142,3145,3154,3157,3160,3163,3166,3169,3173,3176,3185,3188,3196,3201,3209,3214,3218,3219,3230,3237,3241,3245,3246,3250,3258,3262,3267,3272,3281,3470,3471,3490,3980,3990,3994,4028,4029,4072,4080,4218,4244,4245,4246,4322,4441,4442,4443,4675,4744,4745,4783,4784,4897,4920,4954,4955",
                         "endColumns": "55,59,60,54,52,57,47,48,44,52,57,59,57,45,59,52,45,49,46,57,57,58,59,61,61,61,61,61,61,60,61,61,52,61,73,62,67,80,63,65,69,69,69,69,66,62,64,65,52,75,65,86,75,53,78,77,72,64,62,65,70,70,61,68,65,66,66,55,50,52,51,53,70,62,58,61,58,72,66,59,62,74,71,70,55,70,56,56,65,63,70,56,52,62,51,57,66,65,65,80,74,55,52,60,57,49,48,48,48,61,51,44,80,53,52,53,50,48,50,60,60,61,49,40,49,47,61,50,48,68,60,55,70,64,68,50,62,69,68,69,61,69,69,74,58,57,61,44,42,46,44,50,47,65,61,62,71,56,56,59,57,69,56,144,120,103,86,151,151,147,80,77,300,165,154,101,10,92,106,10,106,10,10,10,99,104,118,10,146,118,10,10,10,111,120,132,10,10,10,10,10,10,10,10,10,10,10,10,10,72,86,84,98,10,91,10,10,94,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,83,10,97,107,97,109,115,10,95,10,109,123,137,109,121,127,10,10,10,10,10,83,103,93,113,111,123,95,79,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,104,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,96,10,10,10,10,133,10,10,10,10,10,10,297,255,90,243,367,188,1538,347,95,94,130,412,136,151,201,220,119,1148,566,128,132,159,174,141,125,457,209",
-                        "endOffsets": "1275,1335,1396,1451,1604,1662,1710,1810,3144,5591,11324,11384,11648,12317,12377,12430,12522,12572,12619,12724,12782,12841,12901,12963,13025,13087,13149,13211,13273,13334,13396,13458,13511,15228,17009,17072,17140,17221,17285,17351,17421,17491,17561,17631,17698,19320,19385,19451,19504,19580,19646,19733,19809,27436,27515,27593,27666,27731,27794,27860,27931,28002,28064,28133,28199,28266,28333,28389,28440,28493,28545,28599,28670,28733,28792,28854,28913,28986,29053,29113,29176,29251,29323,29394,29450,29521,29578,29635,29701,29765,29836,29893,29946,30009,30061,30119,30186,31422,31488,31569,31644,31700,31753,31814,31872,31922,31971,32020,32069,32131,32183,32228,32309,32363,32416,32470,32521,32570,32621,32682,32743,32805,32855,32896,32946,32994,33056,33107,33156,33225,33286,33342,33413,33478,33547,33598,33661,33731,33800,33870,33932,34002,34072,34147,34206,36561,36623,37007,37050,37380,37425,37476,37857,38049,38111,38291,38363,38420,38477,38537,38595,38665,38722,42578,42699,42915,43002,44197,44349,45128,47089,47855,48156,48322,48477,48579,52543,69664,69771,70114,70221,70450,70859,71091,71191,71296,71415,72038,72185,72304,72539,72954,73192,73304,78584,78717,80855,82371,85662,87796,89324,90868,94155,94401,94660,141618,143378,143828,144543,154562,154649,154734,154833,166534,166626,166799,166961,167056,167225,167468,167761,168170,168584,169044,169462,169703,170133,170568,170978,171400,171810,172267,172721,173137,173603,173785,177783,178127,178207,178563,178713,178857,178941,179306,179404,179512,179610,179720,179836,179962,180058,180435,180545,180669,180807,180917,181039,181167,181305,181467,181683,181839,182043,183196,183300,183394,183508,183620,183744,183840,183920,184109,184315,184508,184718,193094,193515,193940,194137,195085,195606,195729,196366,196587,197402,197871,198054,198650,199110,199215,200476,200626,201043,201208,201888,202047,202209,202364,202560,202727,202949,203109,203486,203645,203973,204190,204765,205115,205364,205461,206167,206605,206846,207035,207169,207360,207997,208247,208550,208765,209346,220522,220778,221275,247054,247711,248054,251676,252024,253921,254243,274783,276522,276659,276811,281984,294300,294420,295569,308014,312263,312396,314606,314781,321558,323345,325784,325994"
+                        "endOffsets": "1275,1335,1396,1451,1604,1662,1710,1810,3144,5591,11324,11384,11648,12317,12377,12430,12522,12572,12619,12724,12782,12841,12901,12963,13025,13087,13149,13211,13273,13334,13396,13458,13511,15228,17009,17072,17140,17221,17285,17351,17421,17491,17561,17631,17698,19320,19385,19451,19504,19580,19646,19733,19809,27436,27515,27593,27666,27731,27794,27860,27931,28002,28064,28133,28199,28266,28333,28389,28440,28493,28545,28599,28670,28733,28792,28854,28913,28986,29053,29113,29176,29251,29323,29394,29450,29521,29578,29635,29701,29765,29836,29893,29946,30009,30061,30119,30186,31422,31488,31569,31644,31700,31753,31814,31872,31922,31971,32020,32069,32131,32183,32228,32309,32363,32416,32470,32521,32570,32621,32682,32743,32805,32855,32896,32946,32994,33056,33107,33156,33225,33286,33342,33413,33478,33547,33598,33661,33731,33800,33870,33932,34002,34072,34147,34206,36773,36835,37219,37262,37592,37637,37688,38069,38261,38323,38503,38575,38632,38689,38749,38807,38877,38934,42790,42911,43127,43214,44409,44561,45340,47397,48163,48464,48630,48785,48887,52896,70017,70124,70467,70574,70803,71212,71444,71544,71649,71768,72391,72538,72657,72892,73307,73545,73657,78937,79070,81208,82724,86015,88149,89677,91221,94508,94754,95013,141971,143731,144181,144896,154915,155002,155087,155186,166887,166979,167152,167314,167409,167578,167821,168114,168523,168937,169397,169815,170056,170486,170921,171331,171753,172163,172620,173074,173490,173956,174138,178136,178480,178560,178916,179066,179210,179294,179659,179757,179865,179963,180073,180189,180315,180411,180788,180898,181022,181160,181270,181392,181520,181658,181820,182036,182192,182396,183549,183653,183747,183861,183973,184097,184193,184273,184462,184668,184861,185071,193447,193868,194293,194490,195438,195959,196082,196719,196940,197755,198224,198407,199003,199463,199568,200829,200979,201396,201561,202241,202400,202562,202717,202913,203080,203302,203462,203839,203998,204326,204543,205118,205468,205717,205814,206520,206958,207199,207388,207522,207713,208350,208600,208903,209118,209699,220875,221131,221628,247407,248064,248407,252029,252377,254274,254596,275136,276875,277012,277164,282337,294653,294773,295922,308367,312616,312749,314959,315134,321911,323698,326137,326347"
                     }
                 },
                 {
@@ -3305,12 +3305,12 @@
                         "endOffsets": "111,6075,719,5930"
                     },
                     "to": {
-                        "startLines": "43,3275,4111,4121",
+                        "startLines": "43,3282,4118,4128",
                         "startColumns": "4,4,4,4",
-                        "startOffsets": "2036,209351,268335,268943",
-                        "endLines": "43,3277,4120,4209",
+                        "startOffsets": "2036,209704,268688,269296",
+                        "endLines": "43,3284,4127,4216",
                         "endColumns": "60,12,24,24",
-                        "endOffsets": "2092,209491,268938,274149"
+                        "endOffsets": "2092,209844,269291,274502"
                     }
                 },
                 {
@@ -3324,12 +3324,12 @@
                         "endOffsets": "579,823,976,1109,1246"
                     },
                     "to": {
-                        "startLines": "4637,4648,4654,4658,4669",
+                        "startLines": "4644,4655,4661,4665,4676",
                         "startColumns": "4,4,4,4,4",
-                        "startOffsets": "306100,306629,306873,307026,308019",
-                        "endLines": "4647,4653,4657,4660,4672",
+                        "startOffsets": "306453,306982,307226,307379,308372",
+                        "endLines": "4654,4660,4664,4667,4679",
                         "endColumns": "24,24,24,24,24",
-                        "endOffsets": "306624,306868,307021,307154,308151"
+                        "endOffsets": "306977,307221,307374,307507,308504"
                     }
                 },
                 {
@@ -3343,12 +3343,12 @@
                         "endOffsets": "160,338"
                     },
                     "to": {
-                        "startLines": "4316,4661",
+                        "startLines": "4323,4668",
                         "startColumns": "4,4",
-                        "startOffsets": "281989,307159",
-                        "endLines": "4318,4664",
+                        "startOffsets": "282342,307512",
+                        "endLines": "4325,4671",
                         "endColumns": "24,24",
-                        "endOffsets": "282094,307332"
+                        "endOffsets": "282447,307685"
                     }
                 },
                 {
@@ -3362,31 +3362,48 @@
                         "endOffsets": "107,293,354,645,697,745,796,848,909,971,1017,1150,1202,1252,1303,1612,1924,1969,2028,2225,2282,2477,2658,2712,2769,2961,3019,3215,3271,3465,3522,3573,3795,3847,3902,4092,4268,4318,4374,4534,4595,4655,4725,4858,4926,5055,5181,5243,5308,5376,5443,5566,5691,5758,5823,5888,6069,6190,6311,6377,6444,6654,6723,6789,6914,7040,7107,7233,7360,7485,7612,7668,7733,7859,7982,8047,8255,8322,8502,8622,8742,8807,8869,8931,8993,9052,9112,9173,9234,9293,9944,9995,10044,10092,10150,10380,10427,10487,10593,10773,10819,10866,10918,11248,11486,11541,11680,11726,11781,11826,12167,12304,37365,16564,20210,20354,24701,25204,25624,26255,26907,26948,27002,27052,27674,28327,28825,31743,32089,32321,32461,32966,33096,33523,33918,34950,35182,35309,35415,35899,37021,37324"
                     },
                     "to": {
-                        "startLines": "12,13,18,19,27,33,37,39,40,41,42,44,48,49,50,51,59,68,70,71,76,77,82,87,88,89,94,95,100,101,106,107,108,114,115,116,121,126,130,131,135,136,137,138,141,142,145,148,149,150,151,152,155,158,159,160,161,166,169,172,173,174,179,180,181,184,187,188,191,194,197,200,201,202,205,208,209,214,215,220,223,226,227,228,229,230,231,232,233,234,235,252,253,254,255,257,263,264,265,268,276,280,296,297,306,312,313,317,318,319,320,329,662,4107,4108,4109,4110,4210,4367,4368,4369,4370,4371,4372,4373,4378,4379,4380,4621,4622,4623,4624,4630,4631,4673,4680,4702,4790,4823,5014,5015,5032",
+                        "startLines": "12,13,18,19,27,33,37,39,40,41,42,44,48,49,50,51,59,68,70,71,76,77,82,87,88,89,94,95,100,101,106,107,108,114,115,116,121,126,130,131,135,136,137,138,141,142,145,148,149,150,151,152,155,158,159,160,161,166,169,172,173,174,179,180,181,184,187,188,191,194,197,200,201,202,205,208,209,214,215,220,223,226,227,228,229,230,231,232,233,234,235,252,253,254,255,257,263,264,265,268,276,280,296,297,306,312,313,317,318,319,320,329,666,4114,4115,4116,4117,4217,4374,4375,4376,4377,4378,4379,4380,4385,4386,4387,4628,4629,4630,4631,4637,4638,4680,4687,4709,4797,4830,5021,5022,5039",
                         "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,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,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,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,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,4,4",
-                        "startOffsets": "577,634,820,881,1172,1508,1715,1815,1867,1928,1990,2097,2230,2282,2332,2383,2692,3059,3149,3208,3405,3462,3657,3838,3892,3949,4141,4199,4395,4451,4645,4702,4753,4975,5027,5082,5272,5448,5645,5701,5861,5922,5982,6052,6185,6253,6382,6508,6570,6635,6703,6770,6893,7018,7085,7150,7215,7396,7517,7638,7704,7771,7981,8050,8116,8241,8367,8434,8560,8687,8812,8939,8995,9060,9186,9309,9374,9582,9649,9829,9949,10069,10134,10196,10258,10320,10379,10439,10500,10561,10620,11389,11440,11489,11537,11653,11883,11930,11990,12096,12435,12624,13557,13609,13939,14177,14232,14371,14417,14472,14517,14858,36467,255938,260198,263844,263988,274154,284430,284850,285481,286133,286174,286228,286278,286900,287553,288051,304320,304666,304898,305038,305543,305673,308156,308551,310100,315434,317464,329808,330292,331414",
-                        "endLines": "12,17,18,26,27,33,37,39,40,41,42,47,48,49,50,58,66,68,70,75,76,81,86,87,88,93,94,99,100,105,106,107,113,114,115,120,125,126,130,134,135,136,137,140,141,144,147,148,149,150,151,154,157,158,159,160,165,168,171,172,173,178,179,180,183,186,187,190,193,196,199,200,201,204,207,208,213,214,219,222,225,226,227,228,229,230,231,232,233,234,249,252,253,254,255,262,263,264,267,272,276,280,296,305,311,312,316,317,318,319,328,332,662,4107,4108,4109,4110,4210,4367,4368,4369,4370,4371,4372,4377,4378,4379,4380,4621,4622,4623,4629,4630,4636,4679,4691,4702,4790,4823,5014,5031,5032",
+                        "startOffsets": "577,634,820,881,1172,1508,1715,1815,1867,1928,1990,2097,2230,2282,2332,2383,2692,3059,3149,3208,3405,3462,3657,3838,3892,3949,4141,4199,4395,4451,4645,4702,4753,4975,5027,5082,5272,5448,5645,5701,5861,5922,5982,6052,6185,6253,6382,6508,6570,6635,6703,6770,6893,7018,7085,7150,7215,7396,7517,7638,7704,7771,7981,8050,8116,8241,8367,8434,8560,8687,8812,8939,8995,9060,9186,9309,9374,9582,9649,9829,9949,10069,10134,10196,10258,10320,10379,10439,10500,10561,10620,11389,11440,11489,11537,11653,11883,11930,11990,12096,12435,12624,13557,13609,13939,14177,14232,14371,14417,14472,14517,14858,36679,256291,260551,264197,264341,274507,284783,285203,285834,286486,286527,286581,286631,287253,287906,288404,304673,305019,305251,305391,305896,306026,308509,308904,310453,315787,317817,330161,330645,331767",
+                        "endLines": "12,17,18,26,27,33,37,39,40,41,42,47,48,49,50,58,66,68,70,75,76,81,86,87,88,93,94,99,100,105,106,107,113,114,115,120,125,126,130,134,135,136,137,140,141,144,147,148,149,150,151,154,157,158,159,160,165,168,171,172,173,178,179,180,183,186,187,190,193,196,199,200,201,204,207,208,213,214,219,222,225,226,227,228,229,230,231,232,233,234,249,252,253,254,255,262,263,264,267,272,276,280,296,305,311,312,316,317,318,319,328,332,666,4114,4115,4116,4117,4217,4374,4375,4376,4377,4378,4379,4384,4385,4386,4387,4628,4629,4630,4636,4637,4643,4686,4698,4709,4797,4830,5021,5038,5039",
                         "endColumns": "56,11,60,11,51,47,50,51,60,61,45,11,51,49,50,11,11,44,58,11,56,11,11,53,56,11,57,11,55,11,56,50,11,51,54,11,11,49,55,11,60,59,69,11,67,11,11,61,64,67,66,11,11,66,64,64,11,11,11,65,66,11,68,65,11,11,66,11,11,11,11,55,64,11,11,64,11,66,11,11,11,64,61,61,61,58,59,60,60,58,11,50,48,47,57,11,46,59,11,11,45,46,51,11,11,54,11,45,54,44,11,11,40,4259,3645,143,4346,502,419,630,651,40,53,49,382,652,497,2917,345,231,139,35,129,133,35,35,231,126,105,483,35,302",
-                        "endOffsets": "629,815,876,1167,1219,1551,1761,1862,1923,1985,2031,2225,2277,2327,2378,2687,2999,3099,3203,3400,3457,3652,3833,3887,3944,4136,4194,4390,4446,4640,4697,4748,4970,5022,5077,5267,5443,5493,5696,5856,5917,5977,6047,6180,6248,6377,6503,6565,6630,6698,6765,6888,7013,7080,7145,7210,7391,7512,7633,7699,7766,7976,8045,8111,8236,8362,8429,8555,8682,8807,8934,8990,9055,9181,9304,9369,9577,9644,9824,9944,10064,10129,10191,10253,10315,10374,10434,10495,10556,10615,11266,11435,11484,11532,11590,11878,11925,11985,12091,12271,12476,12666,13604,13934,14172,14227,14366,14412,14467,14512,14853,14990,36503,260193,263839,263983,268330,274652,284845,285476,286128,286169,286223,286273,286895,287548,288046,290964,304661,304893,305033,305538,305668,306095,308546,309578,310327,315556,317565,330287,331409,331712"
+                        "endOffsets": "629,815,876,1167,1219,1551,1761,1862,1923,1985,2031,2225,2277,2327,2378,2687,2999,3099,3203,3400,3457,3652,3833,3887,3944,4136,4194,4390,4446,4640,4697,4748,4970,5022,5077,5267,5443,5493,5696,5856,5917,5977,6047,6180,6248,6377,6503,6565,6630,6698,6765,6888,7013,7080,7145,7210,7391,7512,7633,7699,7766,7976,8045,8111,8236,8362,8429,8555,8682,8807,8934,8990,9055,9181,9304,9369,9577,9644,9824,9944,10064,10129,10191,10253,10315,10374,10434,10495,10556,10615,11266,11435,11484,11532,11590,11878,11925,11985,12091,12271,12476,12666,13604,13934,14172,14227,14366,14412,14467,14512,14853,14990,36715,260546,264192,264336,268683,275005,285198,285829,286481,286522,286576,286626,287248,287901,288399,291317,305014,305246,305386,305891,306021,306448,308899,309931,310680,315909,317918,330640,331762,332065"
                     }
                 },
                 {
                     "source": "E:\\Notes-master2\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "startLines": "132,72,75,74,73,19,20,21,118,119,131,130,123,26,150,151,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,146,147,68,47,52,51,50,66,46,65,148,44,45,69,124,28,34,36,33,35,32,31,25,24,142,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,129,127,126,128,27,140,141,83,91,96,95,97,90,89,88,87,149,144,143,145,22,23",
-                        "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,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,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,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,4,4,4,4,4",
-                        "startOffsets": "8130,3895,4156,4060,3991,824,867,919,7503,7552,8072,8021,7697,1279,9121,9175,4610,4704,4539,4455,4372,5571,5488,5386,4880,2001,1950,3394,1483,1536,4941,2094,4239,7615,3824,3579,2153,2468,2769,2211,3323,3262,3205,2983,2931,2828,2881,3033,3083,2515,3758,3143,8895,8952,3628,2421,2714,2626,2568,3517,2371,3472,8999,2268,2311,3691,7745,1428,1747,1855,1700,1802,1644,1596,1224,1171,8665,6027,5960,6268,7406,6632,6551,6706,6795,7037,6958,6111,6186,6492,6332,6412,5905,7181,7303,7980,7853,7796,7906,1363,8559,8613,4812,5300,5706,5637,5786,5241,5186,5124,5064,9056,8767,8717,8827,971,1081",
-                        "endLines": "136,72,75,74,73,19,20,21,118,119,131,130,123,26,150,151,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,146,147,68,47,52,51,50,66,46,65,148,44,45,69,124,28,34,36,33,35,32,31,25,24,142,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,129,127,126,128,27,140,141,83,91,96,95,97,90,89,88,87,149,144,143,145,22,23",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,56,46,62,46,54,87,57,61,49,44,56,42,59,66,49,54,54,52,46,52,55,47,54,52,51,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,53,51,67,85,79,68,93,58,54,61,59,64,59,49,67,109,89",
-                        "endOffsets": "8533,3986,4234,4151,4055,862,914,966,7547,7610,8125,8067,7740,1358,9170,9227,4699,4807,4605,4534,4450,5632,5566,5483,4936,2058,1996,3467,1531,1591,5041,2148,4336,7665,3890,3623,2206,2510,2823,2263,3389,3318,3257,3028,2978,2876,2926,3078,3138,2563,3819,3200,8947,8994,3686,2463,2764,2709,2621,3574,2416,3512,9051,2306,2366,3753,7790,1478,1797,1903,1742,1850,1695,1639,1274,1219,8712,6106,6022,6327,7497,6701,6627,6790,6953,7176,7032,6181,6263,6546,6407,6487,5955,7298,7401,8016,7901,7848,7975,1423,8608,8660,4875,5381,5781,5701,5875,5295,5236,5181,5119,9116,8822,8762,8890,1076,1166"
+                        "startLines": "131,72,75,74,73,19,20,21,118,119,130,129,123,26,149,150,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,154,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,145,146,68,47,52,51,50,66,46,65,153,147,44,45,69,124,28,34,36,33,35,32,31,25,24,141,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,151,152,127,126,128,27,139,140,83,91,96,95,97,90,89,88,87,148,143,142,144,22,23",
+                        "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,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,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,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,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8089,3895,4156,4060,3991,824,867,919,7503,7552,8031,7980,7697,1279,9080,9134,4610,4704,4539,4455,4372,5571,5488,5386,4880,2001,1950,3394,1483,1536,4941,2094,4239,7615,3824,9320,3579,2153,2468,2769,2211,3323,3262,3205,2983,2931,2828,2881,3033,3083,2515,3758,3143,8854,8911,3628,2421,2714,2626,2568,3517,2371,3472,9277,8958,2268,2311,3691,7745,1428,1747,1855,1700,1802,1644,1596,1224,1171,8624,6027,5960,6268,7406,6632,6551,6706,6795,7037,6958,6111,6186,6492,6332,6412,5905,7181,7303,9191,9235,7853,7796,7906,1363,8518,8572,4812,5300,5706,5637,5786,5241,5186,5124,5064,9015,8726,8676,8786,971,1081",
+                        "endLines": "135,72,75,74,73,19,20,21,118,119,130,129,123,26,149,150,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,154,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,145,146,68,47,52,51,50,66,46,65,153,147,44,45,69,124,28,34,36,33,35,32,31,25,24,141,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,151,152,127,126,128,27,139,140,83,91,96,95,97,90,89,88,87,148,143,142,144,22,23",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,52,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,56,46,62,46,54,87,57,61,49,44,42,56,42,59,66,49,54,54,52,46,52,55,47,54,52,51,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,43,41,52,56,73,64,53,51,67,85,79,68,93,58,54,61,59,64,59,49,67,109,89",
+                        "endOffsets": "8492,3986,4234,4151,4055,862,914,966,7547,7610,8084,8026,7740,1358,9129,9186,4699,4807,4605,4534,4450,5632,5566,5483,4936,2058,1996,3467,1531,1591,5041,2148,4336,7665,3890,9368,3623,2206,2510,2823,2263,3389,3318,3257,3028,2978,2876,2926,3078,3138,2563,3819,3200,8906,8953,3686,2463,2764,2709,2621,3574,2416,3512,9315,9010,2306,2366,3753,7790,1478,1797,1903,1742,1850,1695,1639,1274,1219,8671,6106,6022,6327,7497,6701,6627,6790,6953,7176,7032,6181,6263,6546,6407,6487,5955,7298,7401,9230,9272,7901,7848,7975,1423,8567,8619,4875,5381,5781,5701,5875,5295,5236,5181,5119,9075,8781,8721,8849,1076,1166"
+                    },
+                    "to": {
+                        "startLines": "710,754,755,756,757,758,759,760,763,764,767,768,769,770,771,772,773,774,775,776,777,778,779,780,783,784,785,786,787,788,789,790,791,793,794,795,796,797,798,799,800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,815,816,817,818,819,820,821,822,823,824,825,826,827,831,832,833,834,835,836,837,838,839,840,846,847,848,849,850,851,852,853,854,855,856,857,858,859,860,861,862,863,864,865,866,867,868,870,871,872,874,875,876,877,878,879,880,881,882,883,884,885,886,887,888,889",
+                        "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,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,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,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,4,4,4,4,4,4,4,4",
+                        "startOffsets": "39009,42159,42255,42338,42434,42503,42546,42598,42916,42965,43219,43277,43328,43376,43460,43514,43571,43665,43773,43844,43928,44011,44077,44160,44566,44627,44689,44740,44818,44871,44931,45036,45095,45345,45400,45471,45524,45573,45631,45678,45737,45794,45865,45926,45983,46033,46085,46138,46188,46238,46298,46351,46417,46479,46536,46583,46646,46693,46748,46836,46894,46956,47006,47051,47094,47151,47194,47254,47565,47615,47670,47725,47778,47825,47878,47934,47982,48037,48892,48944,49028,49095,49159,49255,49329,49410,49499,49662,49806,49885,49960,50042,50101,50181,50261,50316,50438,50541,50585,50627,50680,50790,50864,50929,51054,51106,51174,51260,51340,51409,51503,51562,51617,51679,51739,51804,51864,51914,51982,52092",
+                        "endLines": "714,754,755,756,757,758,759,760,763,764,767,768,769,770,771,772,773,774,775,776,777,778,779,780,783,784,785,786,787,788,789,790,791,793,794,795,796,797,798,799,800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,815,816,817,818,819,820,821,822,823,824,825,826,827,831,832,833,834,835,836,837,838,839,840,846,847,848,849,850,851,852,853,854,855,856,857,858,859,860,861,862,863,864,865,866,867,868,870,871,872,874,875,876,877,878,879,880,881,882,883,884,885,886,887,888,889",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,52,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,56,46,62,46,54,87,57,61,49,44,42,56,42,59,66,49,54,54,52,46,52,55,47,54,52,51,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,43,41,52,56,73,64,53,51,67,85,79,68,93,58,54,61,59,64,59,49,67,109,89",
+                        "endOffsets": "39396,42250,42333,42429,42498,42541,42593,42645,42960,43023,43272,43323,43371,43455,43509,43566,43660,43768,43839,43923,44006,44072,44155,44257,44622,44684,44735,44813,44866,44926,45031,45090,45192,45395,45466,45519,45568,45626,45673,45732,45789,45860,45921,45978,46028,46080,46133,46183,46233,46293,46346,46412,46474,46531,46578,46641,46688,46743,46831,46889,46951,47001,47046,47089,47146,47189,47249,47316,47610,47665,47720,47773,47820,47873,47929,47977,48032,48085,48939,49023,49090,49154,49250,49324,49405,49494,49657,49801,49880,49955,50037,50096,50176,50256,50311,50433,50536,50580,50622,50675,50732,50859,50924,50978,51101,51169,51255,51335,51404,51498,51557,51612,51674,51734,51799,51859,51909,51977,52087,52177"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\f59c416eb71ab4692f8a16a38c64af95\\support-media-compat-28.0.0\\res\\values\\values.xml",
+                    "from": {
+                        "startLines": "2,5,6,7,8,10,11,12,13,14",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "55,288,341,394,447,560,626,748,809,875",
+                        "endColumns": "88,52,52,52,52,65,121,60,65,66",
+                        "endOffsets": "139,336,389,442,495,621,743,804,870,937"
                     },
                     "to": {
-                        "startLines": "706,750,751,752,753,754,755,756,759,760,763,764,765,766,767,768,769,770,771,772,773,774,775,776,779,780,781,782,783,784,785,786,787,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,815,816,817,818,819,820,821,825,826,827,828,829,830,831,832,833,834,840,841,842,843,844,845,846,847,848,849,850,851,852,853,854,855,856,857,858,859,860,861,863,864,865,867,868,869,870,871,872,873,874,875,876,877,878,879,880,881,882",
-                        "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,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,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,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,4,4,4,4,4",
-                        "startOffsets": "38797,41947,42043,42126,42222,42291,42334,42386,42704,42753,43007,43065,43116,43164,43248,43302,43359,43453,43561,43632,43716,43799,43865,43948,44354,44415,44477,44528,44606,44659,44719,44824,44883,45133,45188,45259,45308,45366,45413,45472,45529,45600,45661,45718,45768,45820,45873,45923,45973,46033,46086,46152,46214,46271,46318,46381,46428,46483,46571,46629,46691,46741,46786,46843,46886,46946,47257,47307,47362,47417,47470,47517,47570,47626,47674,47729,48584,48636,48720,48787,48851,48947,49021,49102,49191,49354,49498,49577,49652,49734,49793,49873,49953,50008,50130,50233,50274,50327,50437,50511,50576,50701,50753,50821,50907,50987,51056,51150,51209,51264,51326,51386,51451,51511,51561,51629,51739",
-                        "endLines": "710,750,751,752,753,754,755,756,759,760,763,764,765,766,767,768,769,770,771,772,773,774,775,776,779,780,781,782,783,784,785,786,787,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,815,816,817,818,819,820,821,825,826,827,828,829,830,831,832,833,834,840,841,842,843,844,845,846,847,848,849,850,851,852,853,854,855,856,857,858,859,860,861,863,864,865,867,868,869,870,871,872,873,874,875,876,877,878,879,880,881,882",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,47,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,56,46,62,46,54,87,57,61,49,44,56,42,59,66,49,54,54,52,46,52,55,47,54,52,51,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,53,51,67,85,79,68,93,58,54,61,59,64,59,49,67,109,89",
-                        "endOffsets": "39184,42038,42121,42217,42286,42329,42381,42433,42748,42811,43060,43111,43159,43243,43297,43354,43448,43556,43627,43711,43794,43860,43943,44045,44410,44472,44523,44601,44654,44714,44819,44878,44980,45183,45254,45303,45361,45408,45467,45524,45595,45656,45713,45763,45815,45868,45918,45968,46028,46081,46147,46209,46266,46313,46376,46423,46478,46566,46624,46686,46736,46781,46838,46881,46941,47008,47302,47357,47412,47465,47512,47565,47621,47669,47724,47777,48631,48715,48782,48846,48942,49016,49097,49186,49349,49493,49572,49647,49729,49788,49868,49948,50003,50125,50228,50269,50322,50379,50506,50571,50625,50748,50816,50902,50982,51051,51145,51204,51259,51321,51381,51446,51506,51556,51624,51734,51824"
+                        "startLines": "407,638,639,640,641,2595,2597,2598,2603,2605",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "19946,35189,35242,35295,35348,165875,166051,166173,166435,166630",
+                        "endColumns": "88,52,52,52,52,65,121,60,65,66",
+                        "endOffsets": "20030,35237,35290,35343,35396,165936,166168,166229,166496,166692"
                     }
                 },
                 {
@@ -3400,12 +3417,12 @@
                         "endOffsets": "2269,2481,2861,2642,1075,1261,1447,1651,1858,891,2060,3045,3283"
                     },
                     "to": {
-                        "startLines": "2315,2319,2323,2327,2743,2747,2751,2755,2759,2763,2767,3278,3281",
+                        "startLines": "2322,2326,2330,2334,2750,2754,2758,2762,2766,2770,2774,3285,3288",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "144866,145074,145285,145503,174218,174401,174586,174771,174974,175180,175363,209496,209679",
-                        "endLines": "2318,2322,2326,2329,2746,2750,2754,2758,2762,2766,2770,3280,3284",
+                        "startOffsets": "145219,145427,145638,145856,174571,174754,174939,175124,175327,175533,175716,209849,210032",
+                        "endLines": "2325,2329,2333,2336,2753,2757,2761,2765,2769,2773,2777,3287,3291",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "145069,145280,145498,145658,174396,174581,174766,174969,175175,175358,175559,209674,209911"
+                        "endOffsets": "145422,145633,145851,146011,174749,174934,175119,175322,175528,175711,175912,210027,210264"
                     }
                 },
                 {
@@ -3418,11 +3435,11 @@
                         "endOffsets": "126,213"
                     },
                     "to": {
-                        "startLines": "823,824",
+                        "startLines": "829,830",
                         "startColumns": "4,4",
-                        "startOffsets": "47094,47170",
+                        "startOffsets": "47402,47478",
                         "endColumns": "75,86",
-                        "endOffsets": "47165,47252"
+                        "endOffsets": "47473,47560"
                     }
                 },
                 {
@@ -3455,12 +3472,12 @@
                         "endOffsets": "83,411,647"
                     },
                     "to": {
-                        "startLines": "2865,2866,2901",
+                        "startLines": "2872,2873,2908",
                         "startColumns": "4,4,4",
-                        "startOffsets": "182048,182118,184723",
-                        "endLines": "2865,2871,2904",
+                        "startOffsets": "182401,182471,185076",
+                        "endLines": "2872,2878,2911",
                         "endColumns": "69,12,12",
-                        "endOffsets": "182113,182440,184953"
+                        "endOffsets": "182466,182793,185306"
                     }
                 },
                 {
@@ -3474,12 +3491,12 @@
                         "endOffsets": "1589,1637,1693,1768,1844,1916,1982,1530"
                     },
                     "to": {
-                        "startLines": "562,563,564,572,573,574,659,4709",
+                        "startLines": "562,563,564,572,573,574,663,4716",
                         "startColumns": "4,4,4,4,4,4,4,4",
-                        "startOffsets": "30364,30423,30471,31138,31213,31289,36331,310659",
-                        "endLines": "562,563,564,572,573,574,659,4736",
+                        "startOffsets": "30364,30423,30471,31138,31213,31289,36543,311012",
+                        "endLines": "562,563,564,572,573,574,663,4743",
                         "endColumns": "58,47,55,74,75,71,65,24",
-                        "endOffsets": "30418,30466,30522,31208,31284,31356,36392,312134"
+                        "endOffsets": "30418,30466,30522,31208,31284,31356,36604,312487"
                     }
                 },
                 {
@@ -3493,29 +3510,12 @@
                         "endOffsets": "155,200,249,290,345,404,466,547,608,683,759,836,914,999,1081,1157,1233,1310,1388,1494,1600,1679,1759,1816,1874,1948,2023,2088,2154,2214,2275,2347,2420,2487,2555,2614,2673,2732,2791,2850,2904,2958,3011,3065,3119,3173,3227,3301,3380,3453,3527,3598,3670,3742,3815,3872,3930,4003,4077,4151,4226,4298,4371,4441,4512,4572,4633,70975,71044,71114,71188,71264,71328,71405,71481,71558,71623,71692,71769,71844,71913,71981,72058,72124,72185,72282,72347,72416,72515,72586,72645,72703,72760,72819,72883,72954,73026,73098,73170,73242,73309,73377,73445,73504,73567,73631,73721,73812,73872,73938,74005,74071,74141,74205,74258,74371,74429,74492,74557,74622,74697,74770,74842,74891,74952,75013,75074,75136,75200,75264,75328,75393,75456,75516,75577,75643,75702,75762,75824,75895,75955,76023,76109,76196,76286,76373,76461,76543,76626,76716,76807,76859,76917,76962,77028,77092,77149,77206,77260,77317,77365,77414,77465,77499,77546,77595,77641,77673,77737,77799,77859,77916,77990,78060,78138,78192,78262,78347,78395,78441,78512,78590,78668,78740,78814,78888,78962,79042,79115,79184,79256,79333,79394,79457,79523,79587,79658,79721,79786,79850,79911,79972,80024,80097,80171,80240,80315,80389,80463,80604,80674,80727,80805,80895,80983,81079,81169,81751,81840,82087,82368,82620,82905,83298,83775,83997,84219,84495,84722,84952,85182,85412,85642,85869,86288,86514,86939,87169,87597,87816,88099,88307,88438,88665,89091,89316,89743,89964,90389,90509,90785,91086,91410,91701,92015,92152,92283,92388,92630,92797,93001,93209,93480,93592,93704,93809,93926,94140,94286,94426,94512,94860,94948,95194,95612,95861,95943,96041,96658,96758,97010,97434,97689,97783,97872,98109,100161,100403,100505,100758,102942,113663,115179,125999,127527,129284,129910,130330,131391,132656,132912,133148,133695,134189,134794,134992,135572,136136,136511,136629,137167,137324,137520,137793,138049,138219,138360,138424,138706,138992,139668,139932,140270,140623,140717,140903,141209,141471,141596,141723,141962,142173,142292,142485,142662,143117,143298,143420,143679,143792,143979,144081,144188,144317,144592,145100,145596,146473,146767,147337,147486,148218,148390,148726,148818,149096,153440,157927,157989,158619,159233,159324,159437,159666,159826,159978,160149,160315,160484,160651,160814,161057,161227,161400,161571,161845,162044,162249,162579,162663,162759,162855,162953,163053,163155,163257,163359,163461,163563,163663,163759,163871,164000,164123,164254,164385,164483,164597,164691,164831,164965,165061,165173,165273,165389,165485,165597,165697,165837,165973,166137,166267,166425,166575,166716,166860,166995,167107,167257,167385,167513,167649,167781,167911,168041,168153,168293,168439,168583,168721,168787,168877,168953,169057,169147,169249,169357,169465,169565,169645,169737,169835,169945,170023,170129,170221,170325,170435,170557,170720,170877,170957,171057,171147,171257,171351,171457,171549,171649,171761,171875,171991,172107,172201,172315,172427,172529,172649,172771,172853,172957,173077,173203,173301,173395,173483,173595,173711,173833,173945,174120,174236,174322,174414,174526,174650,174717,174843,174911,175039,175183,175311,175380,175475,175590,175703,175802,175911,176022,176133,176234,176339,176439,176569,176660,176783,176877,176989,177075,177179,177275,177363,177481,177585,177689,177815,177903,178011,178111,178201,178311,178395,178497,178581,178635,178699,178805,178915,178999,179119,9777,9895,10010,10142,10857,11549,12066,13713,14098,14695,16294,17827,18215,20522,40040,40300,41692,42725,44738,45000,45356,46186,52968,54102,54396,54619,54946,56996,57644,59277,59547,63398,63999,67808,69023,70432,70906"
                     },
                     "to": {
-                        "startLines": "67,127,129,295,333,334,335,337,338,339,340,341,342,343,344,345,346,348,349,350,351,352,353,354,355,371,372,373,374,375,376,377,378,379,380,385,386,387,388,389,390,391,392,393,394,395,396,408,409,410,411,412,413,414,415,416,417,418,419,420,421,422,423,424,425,426,427,429,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,560,561,565,566,567,568,569,570,571,643,644,645,646,647,648,649,650,653,654,655,656,658,667,668,674,689,691,692,695,696,711,712,713,714,715,716,717,718,719,720,721,722,723,724,725,726,727,728,729,730,731,732,733,734,735,736,737,738,739,740,741,742,743,744,745,746,747,748,749,862,883,884,885,886,887,892,900,901,905,909,920,925,931,938,942,946,951,955,959,963,967,971,975,981,985,991,995,1001,1005,1010,1014,1017,1021,1027,1031,1037,1041,1047,1050,1054,1058,1062,1066,1070,1071,1072,1073,1076,1079,1082,1085,1089,1090,1091,1092,1093,1096,1098,1100,1102,1107,1108,1112,1118,1122,1123,1125,1136,1137,1141,1147,1151,1205,1206,1210,1237,1241,1242,1246,1496,1664,1690,1859,1885,1916,1924,1930,1944,1966,1971,1976,1986,1995,2004,2008,2015,2023,2030,2031,2040,2043,2046,2050,2054,2058,2061,2062,2066,2070,2080,2085,2092,2098,2099,2102,2106,2111,2113,2115,2118,2121,2123,2127,2130,2137,2140,2143,2147,2149,2153,2155,2157,2159,2163,2171,2179,2191,2197,2206,2209,2220,2223,2228,2229,2330,2388,2451,2452,2462,2471,2472,2474,2478,2481,2484,2487,2490,2493,2496,2499,2503,2506,2509,2512,2516,2519,2523,2527,2528,2529,2530,2531,2532,2533,2534,2535,2536,2537,2538,2539,2540,2541,2542,2543,2544,2545,2546,2547,2549,2551,2552,2553,2554,2555,2556,2557,2558,2560,2561,2563,2564,2566,2568,2569,2571,2572,2573,2574,2575,2576,2578,2579,2580,2581,2582,2737,2739,2741,2771,2772,2773,2774,2775,2776,2777,2778,2779,2780,2781,2782,2783,2785,2786,2787,2788,2789,2790,2792,2796,2872,2873,2874,2875,2876,2877,2878,2905,2907,2909,2911,2913,2915,2916,2917,2918,2920,2922,2924,2925,2926,2927,2928,2929,2930,2931,2932,2933,2934,2935,2938,2939,2940,2941,2943,2945,2946,2948,2949,2951,2953,2955,2956,2957,2958,2959,2960,2961,2962,2963,2964,2965,2966,2968,2969,2970,2971,2973,2974,2975,2976,2977,2979,2981,2983,2985,2986,2987,2988,2989,2990,2991,2992,2993,2994,2995,2996,2997,2998,3285,3368,3371,3374,3377,3391,3408,3418,3445,3452,3484,3514,3541,3550,3587,3988,4081,4212,4381,4417,4423,4437,4460,4601,4692,4698,4703,4739,4778,4791,4818,4824,4914,4949,5033,5052,5078",
+                        "startLines": "67,127,129,295,333,334,335,337,338,339,340,341,342,343,344,345,346,348,349,350,351,352,353,354,355,371,372,373,374,375,376,377,378,379,380,385,386,387,388,389,390,391,392,393,394,395,396,408,409,410,411,412,413,414,415,416,417,418,419,420,421,422,423,424,425,426,427,429,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,560,561,565,566,567,568,569,570,571,647,648,649,650,651,652,653,654,657,658,659,660,662,671,672,678,693,695,696,699,700,715,716,717,718,719,720,721,722,723,724,725,726,727,728,729,730,731,732,733,734,735,736,737,738,739,740,741,742,743,744,745,746,747,748,749,750,751,752,753,869,890,891,892,893,894,899,907,908,912,916,927,932,938,945,949,953,958,962,966,970,974,978,982,988,992,998,1002,1008,1012,1017,1021,1024,1028,1034,1038,1044,1048,1054,1057,1061,1065,1069,1073,1077,1078,1079,1080,1083,1086,1089,1092,1096,1097,1098,1099,1100,1103,1105,1107,1109,1114,1115,1119,1125,1129,1130,1132,1143,1144,1148,1154,1158,1212,1213,1217,1244,1248,1249,1253,1503,1671,1697,1866,1892,1923,1931,1937,1951,1973,1978,1983,1993,2002,2011,2015,2022,2030,2037,2038,2047,2050,2053,2057,2061,2065,2068,2069,2073,2077,2087,2092,2099,2105,2106,2109,2113,2118,2120,2122,2125,2128,2130,2134,2137,2144,2147,2150,2154,2156,2160,2162,2164,2166,2170,2178,2186,2198,2204,2213,2216,2227,2230,2235,2236,2337,2395,2458,2459,2469,2478,2479,2481,2485,2488,2491,2494,2497,2500,2503,2506,2510,2513,2516,2519,2523,2526,2530,2534,2535,2536,2537,2538,2539,2540,2541,2542,2543,2544,2545,2546,2547,2548,2549,2550,2551,2552,2553,2554,2556,2558,2559,2560,2561,2562,2563,2564,2565,2567,2568,2570,2571,2573,2575,2576,2578,2579,2580,2581,2582,2583,2585,2586,2587,2588,2589,2744,2746,2748,2778,2779,2780,2781,2782,2783,2784,2785,2786,2787,2788,2789,2790,2792,2793,2794,2795,2796,2797,2799,2803,2879,2880,2881,2882,2883,2884,2885,2912,2914,2916,2918,2920,2922,2923,2924,2925,2927,2929,2931,2932,2933,2934,2935,2936,2937,2938,2939,2940,2941,2942,2945,2946,2947,2948,2950,2952,2953,2955,2956,2958,2960,2962,2963,2964,2965,2966,2967,2968,2969,2970,2971,2972,2973,2975,2976,2977,2978,2980,2981,2982,2983,2984,2986,2988,2990,2992,2993,2994,2995,2996,2997,2998,2999,3000,3001,3002,3003,3004,3005,3292,3375,3378,3381,3384,3398,3415,3425,3452,3459,3491,3521,3548,3557,3594,3995,4088,4219,4388,4424,4430,4444,4467,4608,4699,4705,4710,4746,4785,4798,4825,4831,4921,4956,5040,5059,5085",
                         "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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,4,4,4,4,4,4,4",
-                        "startOffsets": "3004,5498,5596,13516,14995,15050,15109,15233,15314,15375,15450,15526,15603,15681,15766,15848,15924,16050,16127,16205,16311,16417,16496,16576,16633,17703,17777,17852,17917,17983,18043,18104,18176,18249,18316,18590,18649,18708,18767,18826,18885,18939,18993,19046,19100,19154,19208,20035,20109,20188,20261,20335,20406,20478,20550,20623,20680,20738,20811,20885,20959,21034,21106,21179,21249,21320,21380,21498,21567,21636,21706,21780,21856,21920,21997,22073,22150,22215,22284,22361,22436,22505,22573,22650,22716,22777,22874,22939,23008,23107,23178,23237,23295,23352,23411,23475,23546,23618,23690,23762,23834,23901,23969,24037,24096,24159,24223,24313,24404,24464,24530,24597,24663,24733,24797,24850,24963,25021,25084,25149,25214,25289,25362,25434,25483,25544,25605,25666,25728,25792,25856,25920,25985,26048,26108,26169,26235,26294,26354,26416,26487,26547,30191,30277,30527,30617,30704,30792,30874,30957,31047,35451,35503,35561,35606,35672,35736,35793,35850,36052,36109,36157,36206,36297,36724,36771,37055,37782,37862,37926,38116,38176,39189,39263,39333,39411,39465,39535,39620,39668,39714,39785,39863,39941,40013,40087,40161,40235,40315,40388,40457,40529,40606,40667,40730,40796,40860,40931,40994,41059,41123,41184,41245,41297,41370,41444,41513,41588,41662,41736,41877,50384,51829,51907,51997,52085,52181,52548,53130,53219,53466,53747,54413,54698,55091,55568,55790,56012,56288,56515,56745,56975,57205,57435,57662,58081,58307,58732,58962,59390,59609,59892,60100,60231,60458,60884,61109,61536,61757,62182,62302,62578,62879,63203,63494,63808,63945,64076,64181,64423,64590,64794,65002,65273,65385,65497,65602,65719,65933,66079,66219,66305,66653,66741,66987,67405,67654,67736,67834,68451,68551,68803,69227,69482,73309,73398,73635,75687,75929,76031,76284,94665,105386,106902,117722,119250,121007,121633,122053,123114,124379,124635,124871,125418,125912,126517,126715,127295,127859,128234,128352,128890,129047,129243,129516,129772,129942,130083,130147,130429,130715,131391,131655,131993,132346,132440,132626,132932,133194,133319,133446,133685,133896,134015,134208,134385,134840,135021,135143,135402,135515,135702,135804,135911,136040,136315,136823,137319,138196,138490,139060,139209,139941,140113,140449,140541,145663,150007,154838,154900,155530,156144,156235,156348,156577,156737,156889,157060,157226,157395,157562,157725,157968,158138,158311,158482,158756,158955,159160,159490,159574,159670,159766,159864,159964,160066,160168,160270,160372,160474,160574,160670,160782,160911,161034,161165,161296,161394,161508,161602,161742,161876,161972,162084,162184,162300,162396,162508,162608,162748,162884,163048,163178,163336,163486,163627,163771,163906,164018,164168,164296,164424,164560,164692,164822,164952,165064,173790,173936,174080,175564,175630,175720,175796,175900,175990,176092,176200,176308,176408,176488,176580,176678,176788,176866,176972,177064,177168,177278,177400,177563,182445,182525,182625,182715,182825,182919,183025,184958,185058,185170,185284,185400,185516,185610,185724,185836,185938,186058,186180,186262,186366,186486,186612,186710,186804,186892,187004,187120,187242,187354,187529,187645,187731,187823,187935,188059,188126,188252,188320,188448,188592,188720,188789,188884,188999,189112,189211,189320,189431,189542,189643,189748,189848,189978,190069,190192,190286,190398,190484,190588,190684,190772,190890,190994,191098,191224,191312,191420,191520,191610,191720,191804,191906,191990,192044,192108,192214,192324,192408,209916,215060,215178,215293,215425,216140,217083,217600,219247,219632,221280,222879,224412,224800,227107,248059,254546,274788,290969,292982,293244,295574,296404,303186,309583,309877,310332,312401,314786,315561,317194,317570,323350,325999,331717,332932,334341",
-                        "endLines": "67,127,129,295,333,334,335,337,338,339,340,341,342,343,344,345,346,348,349,350,351,352,353,354,355,371,372,373,374,375,376,377,378,379,380,385,386,387,388,389,390,391,392,393,394,395,396,408,409,410,411,412,413,414,415,416,417,418,419,420,421,422,423,424,425,426,427,429,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,560,561,565,566,567,568,569,570,571,643,644,645,646,647,648,649,650,653,654,655,656,658,667,668,674,689,691,692,695,696,711,712,713,714,715,716,717,718,719,720,721,722,723,724,725,726,727,728,729,730,731,732,733,734,735,736,737,738,739,740,741,742,743,744,745,746,747,748,749,862,883,884,885,886,887,899,900,904,908,912,924,930,937,941,945,950,954,958,962,966,970,974,980,984,990,994,1000,1004,1009,1013,1016,1020,1026,1030,1036,1040,1046,1049,1053,1057,1061,1065,1069,1070,1071,1072,1075,1078,1081,1084,1088,1089,1090,1091,1092,1095,1097,1099,1101,1106,1107,1111,1117,1121,1122,1124,1135,1136,1140,1146,1150,1151,1205,1209,1236,1240,1241,1245,1273,1663,1689,1858,1884,1915,1923,1929,1943,1965,1970,1975,1985,1994,2003,2007,2014,2022,2029,2030,2039,2042,2045,2049,2053,2057,2060,2061,2065,2069,2079,2084,2091,2097,2098,2101,2105,2110,2112,2114,2117,2120,2122,2126,2129,2136,2139,2142,2146,2148,2152,2154,2156,2158,2162,2170,2178,2190,2196,2205,2208,2219,2222,2227,2228,2233,2387,2446,2451,2461,2470,2471,2473,2477,2480,2483,2486,2489,2492,2495,2498,2502,2505,2508,2511,2515,2518,2522,2526,2527,2528,2529,2530,2531,2532,2533,2534,2535,2536,2537,2538,2539,2540,2541,2542,2543,2544,2545,2546,2548,2550,2551,2552,2553,2554,2555,2556,2557,2559,2560,2562,2563,2565,2567,2568,2570,2571,2572,2573,2574,2575,2577,2578,2579,2580,2581,2582,2738,2740,2742,2771,2772,2773,2774,2775,2776,2777,2778,2779,2780,2781,2782,2784,2785,2786,2787,2788,2789,2791,2795,2799,2872,2873,2874,2875,2876,2877,2878,2906,2908,2910,2912,2914,2915,2916,2917,2919,2921,2923,2924,2925,2926,2927,2928,2929,2930,2931,2932,2933,2934,2937,2938,2939,2940,2942,2944,2945,2947,2948,2950,2952,2954,2955,2956,2957,2958,2959,2960,2961,2962,2963,2964,2965,2967,2968,2969,2970,2972,2973,2974,2975,2976,2978,2980,2982,2984,2985,2986,2987,2988,2989,2990,2991,2992,2993,2994,2995,2996,2997,2998,3367,3370,3373,3376,3390,3401,3417,3444,3451,3462,3513,3540,3549,3586,3967,3992,4106,4229,4416,4422,4428,4459,4600,4620,4697,4701,4708,4775,4789,4817,4822,4889,4928,5013,5051,5077,5086",
+                        "startOffsets": "3004,5498,5596,13516,14995,15050,15109,15233,15314,15375,15450,15526,15603,15681,15766,15848,15924,16050,16127,16205,16311,16417,16496,16576,16633,17703,17777,17852,17917,17983,18043,18104,18176,18249,18316,18590,18649,18708,18767,18826,18885,18939,18993,19046,19100,19154,19208,20035,20109,20188,20261,20335,20406,20478,20550,20623,20680,20738,20811,20885,20959,21034,21106,21179,21249,21320,21380,21498,21567,21636,21706,21780,21856,21920,21997,22073,22150,22215,22284,22361,22436,22505,22573,22650,22716,22777,22874,22939,23008,23107,23178,23237,23295,23352,23411,23475,23546,23618,23690,23762,23834,23901,23969,24037,24096,24159,24223,24313,24404,24464,24530,24597,24663,24733,24797,24850,24963,25021,25084,25149,25214,25289,25362,25434,25483,25544,25605,25666,25728,25792,25856,25920,25985,26048,26108,26169,26235,26294,26354,26416,26487,26547,30191,30277,30527,30617,30704,30792,30874,30957,31047,35663,35715,35773,35818,35884,35948,36005,36062,36264,36321,36369,36418,36509,36936,36983,37267,37994,38074,38138,38328,38388,39401,39475,39545,39623,39677,39747,39832,39880,39926,39997,40075,40153,40225,40299,40373,40447,40527,40600,40669,40741,40818,40879,40942,41008,41072,41143,41206,41271,41335,41396,41457,41509,41582,41656,41725,41800,41874,41948,42089,50737,52182,52260,52350,52438,52534,52901,53483,53572,53819,54100,54766,55051,55444,55921,56143,56365,56641,56868,57098,57328,57558,57788,58015,58434,58660,59085,59315,59743,59962,60245,60453,60584,60811,61237,61462,61889,62110,62535,62655,62931,63232,63556,63847,64161,64298,64429,64534,64776,64943,65147,65355,65626,65738,65850,65955,66072,66286,66432,66572,66658,67006,67094,67340,67758,68007,68089,68187,68804,68904,69156,69580,69835,73662,73751,73988,76040,76282,76384,76637,95018,105739,107255,118075,119603,121360,121986,122406,123467,124732,124988,125224,125771,126265,126870,127068,127648,128212,128587,128705,129243,129400,129596,129869,130125,130295,130436,130500,130782,131068,131744,132008,132346,132699,132793,132979,133285,133547,133672,133799,134038,134249,134368,134561,134738,135193,135374,135496,135755,135868,136055,136157,136264,136393,136668,137176,137672,138549,138843,139413,139562,140294,140466,140802,140894,146016,150360,155191,155253,155883,156497,156588,156701,156930,157090,157242,157413,157579,157748,157915,158078,158321,158491,158664,158835,159109,159308,159513,159843,159927,160023,160119,160217,160317,160419,160521,160623,160725,160827,160927,161023,161135,161264,161387,161518,161649,161747,161861,161955,162095,162229,162325,162437,162537,162653,162749,162861,162961,163101,163237,163401,163531,163689,163839,163980,164124,164259,164371,164521,164649,164777,164913,165045,165175,165305,165417,174143,174289,174433,175917,175983,176073,176149,176253,176343,176445,176553,176661,176761,176841,176933,177031,177141,177219,177325,177417,177521,177631,177753,177916,182798,182878,182978,183068,183178,183272,183378,185311,185411,185523,185637,185753,185869,185963,186077,186189,186291,186411,186533,186615,186719,186839,186965,187063,187157,187245,187357,187473,187595,187707,187882,187998,188084,188176,188288,188412,188479,188605,188673,188801,188945,189073,189142,189237,189352,189465,189564,189673,189784,189895,189996,190101,190201,190331,190422,190545,190639,190751,190837,190941,191037,191125,191243,191347,191451,191577,191665,191773,191873,191963,192073,192157,192259,192343,192397,192461,192567,192677,192761,210269,215413,215531,215646,215778,216493,217436,217953,219600,219985,221633,223232,224765,225153,227460,248412,254899,275141,291322,293335,293597,295927,296757,303539,309936,310230,310685,312754,315139,315914,317547,317923,323703,326352,332070,333285,334694",
+                        "endLines": "67,127,129,295,333,334,335,337,338,339,340,341,342,343,344,345,346,348,349,350,351,352,353,354,355,371,372,373,374,375,376,377,378,379,380,385,386,387,388,389,390,391,392,393,394,395,396,408,409,410,411,412,413,414,415,416,417,418,419,420,421,422,423,424,425,426,427,429,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,560,561,565,566,567,568,569,570,571,647,648,649,650,651,652,653,654,657,658,659,660,662,671,672,678,693,695,696,699,700,715,716,717,718,719,720,721,722,723,724,725,726,727,728,729,730,731,732,733,734,735,736,737,738,739,740,741,742,743,744,745,746,747,748,749,750,751,752,753,869,890,891,892,893,894,906,907,911,915,919,931,937,944,948,952,957,961,965,969,973,977,981,987,991,997,1001,1007,1011,1016,1020,1023,1027,1033,1037,1043,1047,1053,1056,1060,1064,1068,1072,1076,1077,1078,1079,1082,1085,1088,1091,1095,1096,1097,1098,1099,1102,1104,1106,1108,1113,1114,1118,1124,1128,1129,1131,1142,1143,1147,1153,1157,1158,1212,1216,1243,1247,1248,1252,1280,1670,1696,1865,1891,1922,1930,1936,1950,1972,1977,1982,1992,2001,2010,2014,2021,2029,2036,2037,2046,2049,2052,2056,2060,2064,2067,2068,2072,2076,2086,2091,2098,2104,2105,2108,2112,2117,2119,2121,2124,2127,2129,2133,2136,2143,2146,2149,2153,2155,2159,2161,2163,2165,2169,2177,2185,2197,2203,2212,2215,2226,2229,2234,2235,2240,2394,2453,2458,2468,2477,2478,2480,2484,2487,2490,2493,2496,2499,2502,2505,2509,2512,2515,2518,2522,2525,2529,2533,2534,2535,2536,2537,2538,2539,2540,2541,2542,2543,2544,2545,2546,2547,2548,2549,2550,2551,2552,2553,2555,2557,2558,2559,2560,2561,2562,2563,2564,2566,2567,2569,2570,2572,2574,2575,2577,2578,2579,2580,2581,2582,2584,2585,2586,2587,2588,2589,2745,2747,2749,2778,2779,2780,2781,2782,2783,2784,2785,2786,2787,2788,2789,2791,2792,2793,2794,2795,2796,2798,2802,2806,2879,2880,2881,2882,2883,2884,2885,2913,2915,2917,2919,2921,2922,2923,2924,2926,2928,2930,2931,2932,2933,2934,2935,2936,2937,2938,2939,2940,2941,2944,2945,2946,2947,2949,2951,2952,2954,2955,2957,2959,2961,2962,2963,2964,2965,2966,2967,2968,2969,2970,2971,2972,2974,2975,2976,2977,2979,2980,2981,2982,2983,2985,2987,2989,2991,2992,2993,2994,2995,2996,2997,2998,2999,3000,3001,3002,3003,3004,3005,3374,3377,3380,3383,3397,3408,3424,3451,3458,3469,3520,3547,3556,3593,3974,3999,4113,4236,4423,4429,4435,4466,4607,4627,4704,4708,4715,4782,4796,4824,4829,4896,4935,5020,5058,5084,5093",
                         "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24",
-                        "endOffsets": "3054,5538,5640,13552,15045,15104,15166,15309,15370,15445,15521,15598,15676,15761,15843,15919,15995,16122,16200,16306,16412,16491,16571,16628,16686,17772,17847,17912,17978,18038,18099,18171,18244,18311,18379,18644,18703,18762,18821,18880,18934,18988,19041,19095,19149,19203,19257,20104,20183,20256,20330,20401,20473,20545,20618,20675,20733,20806,20880,20954,21029,21101,21174,21244,21315,21375,21436,21562,21631,21701,21775,21851,21915,21992,22068,22145,22210,22279,22356,22431,22500,22568,22645,22711,22772,22869,22934,23003,23102,23173,23232,23290,23347,23406,23470,23541,23613,23685,23757,23829,23896,23964,24032,24091,24154,24218,24308,24399,24459,24525,24592,24658,24728,24792,24845,24958,25016,25079,25144,25209,25284,25357,25429,25478,25539,25600,25661,25723,25787,25851,25915,25980,26043,26103,26164,26230,26289,26349,26411,26482,26542,26610,30272,30359,30612,30699,30787,30869,30952,31042,31133,35498,35556,35601,35667,35731,35788,35845,35899,36104,36152,36201,36252,36326,36766,36815,37096,37809,37921,37983,38171,38228,39258,39328,39406,39460,39530,39615,39663,39709,39780,39858,39936,40008,40082,40156,40230,40310,40383,40452,40524,40601,40662,40725,40791,40855,40926,40989,41054,41118,41179,41240,41292,41365,41439,41508,41583,41657,41731,41872,41942,50432,51902,51992,52080,52176,52266,53125,53214,53461,53742,53994,54693,55086,55563,55785,56007,56283,56510,56740,56970,57200,57430,57657,58076,58302,58727,58957,59385,59604,59887,60095,60226,60453,60879,61104,61531,61752,62177,62297,62573,62874,63198,63489,63803,63940,64071,64176,64418,64585,64789,64997,65268,65380,65492,65597,65714,65928,66074,66214,66300,66648,66736,66982,67400,67649,67731,67829,68446,68546,68798,69222,69477,69571,73393,73630,75682,75924,76026,76279,78463,105381,106897,117717,119245,121002,121628,122048,123109,124374,124630,124866,125413,125907,126512,126710,127290,127854,128229,128347,128885,129042,129238,129511,129767,129937,130078,130142,130424,130710,131386,131650,131988,132341,132435,132621,132927,133189,133314,133441,133680,133891,134010,134203,134380,134835,135016,135138,135397,135510,135697,135799,135906,136035,136310,136818,137314,138191,138485,139055,139204,139936,140108,140444,140536,140814,150002,154489,154895,155525,156139,156230,156343,156572,156732,156884,157055,157221,157390,157557,157720,157963,158133,158306,158477,158751,158950,159155,159485,159569,159665,159761,159859,159959,160061,160163,160265,160367,160469,160569,160665,160777,160906,161029,161160,161291,161389,161503,161597,161737,161871,161967,162079,162179,162295,162391,162503,162603,162743,162879,163043,163173,163331,163481,163622,163766,163901,164013,164163,164291,164419,164555,164687,164817,164947,165059,165199,173931,174075,174213,175625,175715,175791,175895,175985,176087,176195,176303,176403,176483,176575,176673,176783,176861,176967,177059,177163,177273,177395,177558,177715,182520,182620,182710,182820,182914,183020,183112,185053,185165,185279,185395,185511,185605,185719,185831,185933,186053,186175,186257,186361,186481,186607,186705,186799,186887,186999,187115,187237,187349,187524,187640,187726,187818,187930,188054,188121,188247,188315,188443,188587,188715,188784,188879,188994,189107,189206,189315,189426,189537,189638,189743,189843,189973,190064,190187,190281,190393,190479,190583,190679,190767,190885,190989,191093,191219,191307,191415,191515,191605,191715,191799,191901,191985,192039,192103,192209,192319,192403,192523,215055,215173,215288,215420,216135,216827,217595,219242,219627,220224,222874,224407,224795,227102,246620,248314,255933,275816,292977,293239,293595,296399,303181,304315,309872,310095,310654,314446,315429,317189,317459,321416,323946,329803,332927,334336,334810"
-                    }
-                },
-                {
-                    "source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\108d460d26ccb2e43cfd84ab7c13ec27\\support-media-compat-26.1.0\\res\\values\\values.xml",
-                    "from": {
-                        "startLines": "2,6,7,8,9,10",
-                        "startColumns": "4,4,4,4,4,4",
-                        "startOffsets": "55,348,414,536,597,663",
-                        "endColumns": "88,65,121,60,65,66",
-                        "endOffsets": "139,409,531,592,658,725"
-                    },
-                    "to": {
-                        "startLines": "407,2588,2590,2591,2596,2598",
-                        "startColumns": "4,4,4,4,4,4",
-                        "startOffsets": "19946,165522,165698,165820,166082,166277",
-                        "endColumns": "88,65,121,60,65,66",
-                        "endOffsets": "20030,165583,165815,165876,166143,166339"
+                        "endOffsets": "3054,5538,5640,13552,15045,15104,15166,15309,15370,15445,15521,15598,15676,15761,15843,15919,15995,16122,16200,16306,16412,16491,16571,16628,16686,17772,17847,17912,17978,18038,18099,18171,18244,18311,18379,18644,18703,18762,18821,18880,18934,18988,19041,19095,19149,19203,19257,20104,20183,20256,20330,20401,20473,20545,20618,20675,20733,20806,20880,20954,21029,21101,21174,21244,21315,21375,21436,21562,21631,21701,21775,21851,21915,21992,22068,22145,22210,22279,22356,22431,22500,22568,22645,22711,22772,22869,22934,23003,23102,23173,23232,23290,23347,23406,23470,23541,23613,23685,23757,23829,23896,23964,24032,24091,24154,24218,24308,24399,24459,24525,24592,24658,24728,24792,24845,24958,25016,25079,25144,25209,25284,25357,25429,25478,25539,25600,25661,25723,25787,25851,25915,25980,26043,26103,26164,26230,26289,26349,26411,26482,26542,26610,30272,30359,30612,30699,30787,30869,30952,31042,31133,35710,35768,35813,35879,35943,36000,36057,36111,36316,36364,36413,36464,36538,36978,37027,37308,38021,38133,38195,38383,38440,39470,39540,39618,39672,39742,39827,39875,39921,39992,40070,40148,40220,40294,40368,40442,40522,40595,40664,40736,40813,40874,40937,41003,41067,41138,41201,41266,41330,41391,41452,41504,41577,41651,41720,41795,41869,41943,42084,42154,50785,52255,52345,52433,52529,52619,53478,53567,53814,54095,54347,55046,55439,55916,56138,56360,56636,56863,57093,57323,57553,57783,58010,58429,58655,59080,59310,59738,59957,60240,60448,60579,60806,61232,61457,61884,62105,62530,62650,62926,63227,63551,63842,64156,64293,64424,64529,64771,64938,65142,65350,65621,65733,65845,65950,66067,66281,66427,66567,66653,67001,67089,67335,67753,68002,68084,68182,68799,68899,69151,69575,69830,69924,73746,73983,76035,76277,76379,76632,78816,105734,107250,118070,119598,121355,121981,122401,123462,124727,124983,125219,125766,126260,126865,127063,127643,128207,128582,128700,129238,129395,129591,129864,130120,130290,130431,130495,130777,131063,131739,132003,132341,132694,132788,132974,133280,133542,133667,133794,134033,134244,134363,134556,134733,135188,135369,135491,135750,135863,136050,136152,136259,136388,136663,137171,137667,138544,138838,139408,139557,140289,140461,140797,140889,141167,150355,154842,155248,155878,156492,156583,156696,156925,157085,157237,157408,157574,157743,157910,158073,158316,158486,158659,158830,159104,159303,159508,159838,159922,160018,160114,160212,160312,160414,160516,160618,160720,160822,160922,161018,161130,161259,161382,161513,161644,161742,161856,161950,162090,162224,162320,162432,162532,162648,162744,162856,162956,163096,163232,163396,163526,163684,163834,163975,164119,164254,164366,164516,164644,164772,164908,165040,165170,165300,165412,165552,174284,174428,174566,175978,176068,176144,176248,176338,176440,176548,176656,176756,176836,176928,177026,177136,177214,177320,177412,177516,177626,177748,177911,178068,182873,182973,183063,183173,183267,183373,183465,185406,185518,185632,185748,185864,185958,186072,186184,186286,186406,186528,186610,186714,186834,186960,187058,187152,187240,187352,187468,187590,187702,187877,187993,188079,188171,188283,188407,188474,188600,188668,188796,188940,189068,189137,189232,189347,189460,189559,189668,189779,189890,189991,190096,190196,190326,190417,190540,190634,190746,190832,190936,191032,191120,191238,191342,191446,191572,191660,191768,191868,191958,192068,192152,192254,192338,192392,192456,192562,192672,192756,192876,215408,215526,215641,215773,216488,217180,217948,219595,219980,220577,223227,224760,225148,227455,246973,248667,256286,276169,293330,293592,293948,296752,303534,304668,310225,310448,311007,314799,315782,317542,317812,321769,324299,330156,333280,334689,335163"
                     }
                 },
                 {
@@ -3529,12 +3529,12 @@
                         "endOffsets": "103,354,469"
                     },
                     "to": {
-                        "startLines": "665,3402,4665",
+                        "startLines": "669,3409,4672",
                         "startColumns": "4,4,4",
-                        "startOffsets": "36628,216832,307337",
-                        "endLines": "665,3407,4667",
+                        "startOffsets": "36840,217185,307690",
+                        "endLines": "669,3414,4674",
                         "endColumns": "52,24,24",
-                        "endOffsets": "36676,217078,307447"
+                        "endOffsets": "36888,217431,307800"
                     }
                 }
             ]
@@ -5192,7 +5192,7 @@
             "outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\values-v24_values-v24.arsc.flat",
             "map": [
                 {
-                    "source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\108d460d26ccb2e43cfd84ab7c13ec27\\support-media-compat-26.1.0\\res\\values-v24\\values-v24.xml",
+                    "source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\f59c416eb71ab4692f8a16a38c64af95\\support-media-compat-28.0.0\\res\\values-v24\\values-v24.xml",
                     "from": {
                         "startLines": "2,3,4,5",
                         "startColumns": "4,4,4,4",
@@ -5321,11 +5321,11 @@
                         "endOffsets": "151"
                     },
                     "to": {
-                        "startLines": "136",
+                        "startLines": "139",
                         "startColumns": "4",
-                        "startOffsets": "8706",
+                        "startOffsets": "8839",
                         "endColumns": "100",
-                        "endOffsets": "8802"
+                        "endOffsets": "8935"
                     }
                 },
                 {
@@ -5338,11 +5338,11 @@
                         "endOffsets": "195,288,388,470,567,675,751,827,919,1013,1111,1207,1303,1397,1493,1585,1677,1769,1847,1943,2039,2134,2231,2326,2426,2576,2670,2748"
                     },
                     "to": {
-                        "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,132",
+                        "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,135",
                         "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": "384,479,572,672,754,851,959,1035,1111,1203,1297,1395,1491,1587,1681,1777,1869,1961,2053,2131,2227,2323,2418,2515,2610,2710,2860,8463",
+                        "startOffsets": "384,479,572,672,754,851,959,1035,1111,1203,1297,1395,1491,1587,1681,1777,1869,1961,2053,2131,2227,2323,2418,2515,2610,2710,2860,8596",
                         "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77",
-                        "endOffsets": "474,567,667,749,846,954,1030,1106,1198,1292,1390,1486,1582,1676,1772,1864,1956,2048,2126,2222,2318,2413,2510,2605,2705,2855,2949,8536"
+                        "endOffsets": "474,567,667,749,846,954,1030,1106,1198,1292,1390,1486,1582,1676,1772,1864,1956,2048,2126,2222,2318,2413,2510,2605,2705,2855,2949,8669"
                     }
                 },
                 {
@@ -5355,11 +5355,11 @@
                         "endOffsets": "149,249"
                     },
                     "to": {
-                        "startLines": "98,99",
+                        "startLines": "100,101",
                         "startColumns": "4,4",
-                        "startOffsets": "6312,6411",
+                        "startOffsets": "6401,6500",
                         "endColumns": "98,99",
-                        "endOffsets": "6406,6506"
+                        "endOffsets": "6495,6595"
                     }
                 },
                 {
@@ -5384,20 +5384,20 @@
                 {
                     "source": "E:\\Notes-master2\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
                     "from": {
-                        "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,125,26,76,77,75,74,73,89,88,87,79,129,128,61,29,30,80,130,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,135,127,65,44,49,48,47,63,43,62,41,42,66,126,28,34,36,33,35,32,31,25,24,134,96,95,98,110,103,102,104,105,107,106,97,131,101,99,100,94,108,109,119,117,116,118,27,132,133,78,86,91,90,92,85,84,83,82,22,23",
-                        "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,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,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,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": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,6684,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,6858,6815,2957,1369,1422,4089,6910,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,7174,6770,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,6726,1318,1623,1719,1576,1672,1529,1484,1148,1095,7129,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,6969,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,7038,7084,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
-                        "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,125,26,76,77,75,74,73,89,88,87,79,129,128,61,29,30,80,130,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,135,127,65,44,49,48,47,63,43,62,41,42,66,126,28,34,36,33,35,32,31,25,24,134,96,95,98,110,103,102,104,105,107,106,97,131,101,99,100,94,108,109,119,117,116,118,27,132,133,78,86,91,90,92,85,84,83,82,22,23",
-                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,41,61,67,76,58,65,62,54,59,62,53,51,42,59,52,61,83,58,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,49,44,51,42,46,55,54,54,43,41,40,49,58,43,50,48,48,46,46,46,44,50,52,44,74,58,56,73,63,68,77,109,103,72,65,68,54,64,64,48,82,77,37,44,47,61,56,45,44,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,6721,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,6905,6853,3012,1417,1479,4168,6964,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,7219,6810,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,6765,1364,1667,1763,1618,1714,1571,1524,1194,1143,7169,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,7033,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,7079,7124,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
+                        "startLines": "121,72,71,70,69,19,20,21,112,113,120,119,124,26,76,77,75,74,73,89,88,87,79,128,127,61,29,30,80,129,37,114,68,138,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,134,126,65,44,49,48,47,63,43,62,137,41,42,66,125,28,34,36,33,35,32,31,25,24,133,96,95,98,110,103,102,104,105,107,106,97,130,101,99,100,94,108,109,135,136,117,116,118,27,131,132,78,86,91,90,92,85,84,83,82,22,23",
+                        "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,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,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,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,4",
+                        "startOffsets": "6469,3575,3509,3436,3386,827,867,915,6057,6102,6415,6365,6646,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,6820,6777,2957,1369,1422,4089,6872,1768,6159,3327,7309,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,7136,6732,3157,2116,2358,2302,2247,3059,2072,3017,7268,1981,2022,3209,6688,1318,1623,1719,1576,1672,1529,1484,1148,1095,7091,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,6931,5268,5138,5203,4832,5821,5904,7186,7229,6258,6210,6303,1261,7000,7046,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
+                        "endLines": "123,72,71,70,69,19,20,21,112,113,120,119,124,26,76,77,75,74,73,89,88,87,79,128,127,61,29,30,80,129,37,114,68,138,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,134,126,65,44,49,48,47,63,43,62,137,41,42,66,125,28,34,36,33,35,32,31,25,24,133,96,95,98,110,103,102,104,105,107,106,97,130,101,99,100,94,108,109,135,136,117,116,118,27,131,132,78,86,91,90,92,85,84,83,82,22,23",
+                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,41,61,67,76,58,65,62,54,59,62,53,51,42,59,52,61,83,58,79,49,58,47,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,49,44,51,42,46,55,54,54,43,41,40,40,49,58,43,50,48,48,46,46,46,44,50,52,44,74,58,56,73,63,68,77,109,103,72,65,68,54,64,64,48,82,77,42,38,44,47,61,56,45,44,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "6641,3642,3570,3504,3431,862,910,958,6097,6154,6464,6410,6683,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,6867,6815,3012,1417,1479,4168,6926,1843,6204,3381,7352,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,7181,6772,3204,2154,2400,2353,2297,3109,2111,3054,7304,2017,2067,3263,6727,1364,1667,1763,1618,1714,1571,1524,1194,1143,7131,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,6995,5318,5198,5263,4876,5899,5977,7224,7263,6298,6253,6360,1313,7041,7086,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
                     },
                     "to": {
-                        "startLines": "6,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,133,134,135,137,138,139,140,141,142,143,144,145,146,147,148",
-                        "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,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,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,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": "215,2954,3026,3092,3165,3215,3255,3303,3351,3396,3453,3507,3557,3599,3661,3729,3806,3865,3931,3994,4049,4109,4172,4226,4278,4321,4381,4434,4496,4580,4639,4719,4769,4828,4871,4924,4967,5018,5068,5128,5181,5232,5278,5326,5374,5420,5467,5517,5562,5621,5673,5723,5768,5820,5863,5910,5966,6021,6076,6120,6162,6203,6253,6511,6555,6606,6655,6704,6751,6798,6845,6890,6941,6994,7039,7114,7173,7230,7304,7368,7437,7515,7625,7729,7802,7868,7937,7992,8057,8122,8171,8254,8332,8370,8415,8541,8603,8660,8807,8852,8907,8966,9033,9091,9153,9201,9246,9294,9345,9411",
-                        "endLines": "8,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,133,134,135,137,138,139,140,141,142,143,144,145,146,147,148",
-                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,41,61,67,76,58,65,62,54,59,62,53,51,42,59,52,61,83,58,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,49,44,51,42,46,55,54,54,43,41,40,49,58,43,50,48,48,46,46,46,44,50,52,44,74,58,56,73,63,68,77,109,103,72,65,68,54,64,64,48,82,77,37,44,47,61,56,45,44,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,3021,3087,3160,3210,3250,3298,3346,3391,3448,3502,3552,3594,3656,3724,3801,3860,3926,3989,4044,4104,4167,4221,4273,4316,4376,4429,4491,4575,4634,4714,4764,4823,4866,4919,4962,5013,5063,5123,5176,5227,5273,5321,5369,5415,5462,5512,5557,5616,5668,5718,5763,5815,5858,5905,5961,6016,6071,6115,6157,6198,6248,6307,6550,6601,6650,6699,6746,6793,6840,6885,6936,6989,7034,7109,7168,7225,7299,7363,7432,7510,7620,7724,7797,7863,7932,7987,8052,8117,8166,8249,8327,8365,8410,8458,8598,8655,8701,8847,8902,8961,9028,9086,9148,9196,9241,9289,9340,9406,9472"
+                        "startLines": "6,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,136,137,138,140,141,142,143,144,145,146,147,148,149,150,151",
+                        "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,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,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,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,4",
+                        "startOffsets": "215,2954,3026,3092,3165,3215,3255,3303,3351,3396,3453,3507,3557,3599,3661,3729,3806,3865,3931,3994,4049,4109,4172,4226,4278,4321,4381,4434,4496,4580,4639,4719,4769,4828,4876,4919,4972,5015,5066,5116,5176,5229,5280,5326,5374,5422,5468,5515,5565,5610,5669,5721,5771,5816,5868,5911,5958,6014,6069,6124,6168,6210,6251,6292,6342,6600,6644,6695,6744,6793,6840,6887,6934,6979,7030,7083,7128,7203,7262,7319,7393,7457,7526,7604,7714,7818,7891,7957,8026,8081,8146,8211,8260,8343,8421,8464,8503,8548,8674,8736,8793,8940,8985,9040,9099,9166,9224,9286,9334,9379,9427,9478,9544",
+                        "endLines": "8,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,136,137,138,140,141,142,143,144,145,146,147,148,149,150,151",
+                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,41,61,67,76,58,65,62,54,59,62,53,51,42,59,52,61,83,58,79,49,58,47,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,49,44,51,42,46,55,54,54,43,41,40,40,49,58,43,50,48,48,46,46,46,44,50,52,44,74,58,56,73,63,68,77,109,103,72,65,68,54,64,64,48,82,77,42,38,44,47,61,56,45,44,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,3021,3087,3160,3210,3250,3298,3346,3391,3448,3502,3552,3594,3656,3724,3801,3860,3926,3989,4044,4104,4167,4221,4273,4316,4376,4429,4491,4575,4634,4714,4764,4823,4871,4914,4967,5010,5061,5111,5171,5224,5275,5321,5369,5417,5463,5510,5560,5605,5664,5716,5766,5811,5863,5906,5953,6009,6064,6119,6163,6205,6246,6287,6337,6396,6639,6690,6739,6788,6835,6882,6929,6974,7025,7078,7123,7198,7257,7314,7388,7452,7521,7599,7709,7813,7886,7952,8021,8076,8141,8206,8255,8338,8416,8459,8498,8543,8591,8731,8788,8834,8980,9035,9094,9161,9219,9281,9329,9374,9422,9473,9539,9605"
                     }
                 }
             ]