diff --git a/test/.gradle/5.4.1/executionHistory/executionHistory.bin b/test/.gradle/5.4.1/executionHistory/executionHistory.bin
index 1a8d420..17fc696 100644
Binary files a/test/.gradle/5.4.1/executionHistory/executionHistory.bin and b/test/.gradle/5.4.1/executionHistory/executionHistory.bin differ
diff --git a/test/.gradle/5.4.1/executionHistory/executionHistory.lock b/test/.gradle/5.4.1/executionHistory/executionHistory.lock
index 2ec43d5..f2a694f 100644
Binary files a/test/.gradle/5.4.1/executionHistory/executionHistory.lock and b/test/.gradle/5.4.1/executionHistory/executionHistory.lock differ
diff --git a/test/.gradle/5.4.1/fileHashes/fileHashes.bin b/test/.gradle/5.4.1/fileHashes/fileHashes.bin
index 6c717dc..d0ead9d 100644
Binary files a/test/.gradle/5.4.1/fileHashes/fileHashes.bin and b/test/.gradle/5.4.1/fileHashes/fileHashes.bin differ
diff --git a/test/.gradle/5.4.1/fileHashes/fileHashes.lock b/test/.gradle/5.4.1/fileHashes/fileHashes.lock
index 2d7156c..cf14a94 100644
Binary files a/test/.gradle/5.4.1/fileHashes/fileHashes.lock and b/test/.gradle/5.4.1/fileHashes/fileHashes.lock differ
diff --git a/test/.gradle/5.4.1/javaCompile/classAnalysis.bin b/test/.gradle/5.4.1/javaCompile/classAnalysis.bin
index e7fa7e3..28ca27f 100644
Binary files a/test/.gradle/5.4.1/javaCompile/classAnalysis.bin and b/test/.gradle/5.4.1/javaCompile/classAnalysis.bin differ
diff --git a/test/.gradle/5.4.1/javaCompile/javaCompile.lock b/test/.gradle/5.4.1/javaCompile/javaCompile.lock
index a4b28e6..3ac3497 100644
Binary files a/test/.gradle/5.4.1/javaCompile/javaCompile.lock and b/test/.gradle/5.4.1/javaCompile/javaCompile.lock differ
diff --git a/test/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/test/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 7feb7b7..5adaa49 100644
Binary files a/test/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/test/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/test/.idea/workspace.xml b/test/.idea/workspace.xml
index 42e9e63..be1908b 100644
--- a/test/.idea/workspace.xml
+++ b/test/.idea/workspace.xml
@@ -6,6 +6,7 @@
+
@@ -21,7 +22,7 @@
-
+
@@ -32,114 +33,121 @@
-
-
+
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
+
+
-
-
+
+
+
+
+
-
+
-
-
+
+
-
+
-
+
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
+
+
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
+
+
@@ -179,16 +187,12 @@
-
-
-
-
@@ -196,15 +200,33 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
@@ -213,6 +235,7 @@
+
@@ -221,6 +244,11 @@
+
+
+
+
+
@@ -244,6 +272,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -255,11 +295,14 @@
+
+
+
+
-
@@ -371,7 +414,6 @@
-
@@ -382,11 +424,11 @@
-
+
-
+
-
+
@@ -405,92 +447,23 @@
+
+
+
+
+
+
+
+
+
+
+ productCartAdapter
+ JAVA
+ EXPRESSION
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -515,77 +488,90 @@
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
-
+
+
-
-
+
+
-
-
+
+
@@ -593,105 +579,282 @@
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
-
-
+
+
-
-
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/activity/R.java b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/activity/R.java
index 825568e..02b2441 100644
--- a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/activity/R.java
+++ b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/activity/R.java
@@ -131,20 +131,20 @@ public final class R {
public static final int notification_background = 0x7f07008d;
public static final int notification_main_column = 0x7f07008e;
public static final int notification_main_column_container = 0x7f07008f;
- public static final int right_icon = 0x7f0700a0;
- public static final int right_side = 0x7f0700a1;
- public static final int tag_accessibility_actions = 0x7f0700ca;
- public static final int tag_accessibility_clickable_spans = 0x7f0700cb;
- public static final int tag_accessibility_heading = 0x7f0700cc;
- public static final int tag_accessibility_pane_title = 0x7f0700cd;
- public static final int tag_screen_reader_focusable = 0x7f0700ce;
- public static final int tag_transition_group = 0x7f0700cf;
- public static final int tag_unhandled_key_event_manager = 0x7f0700d0;
- public static final int tag_unhandled_key_listeners = 0x7f0700d1;
- public static final int text = 0x7f0700d2;
- public static final int text2 = 0x7f0700d3;
- public static final int time = 0x7f0700d6;
- public static final int title = 0x7f0700d7;
+ public static final int right_icon = 0x7f0700a6;
+ public static final int right_side = 0x7f0700a7;
+ public static final int tag_accessibility_actions = 0x7f0700d0;
+ public static final int tag_accessibility_clickable_spans = 0x7f0700d1;
+ public static final int tag_accessibility_heading = 0x7f0700d2;
+ public static final int tag_accessibility_pane_title = 0x7f0700d3;
+ public static final int tag_screen_reader_focusable = 0x7f0700d4;
+ public static final int tag_transition_group = 0x7f0700d5;
+ public static final int tag_unhandled_key_event_manager = 0x7f0700d6;
+ public static final int tag_unhandled_key_listeners = 0x7f0700d7;
+ public static final int text = 0x7f0700d8;
+ public static final int text2 = 0x7f0700d9;
+ public static final int time = 0x7f0700dc;
+ public static final int title = 0x7f0700dd;
}
public static final class integer {
private integer() {}
@@ -155,12 +155,12 @@ public final class R {
private layout() {}
public static final int custom_dialog = 0x7f0a0023;
- public static final int notification_action = 0x7f0a0028;
- public static final int notification_action_tombstone = 0x7f0a0029;
- public static final int notification_template_custom_big = 0x7f0a002a;
- public static final int notification_template_icon_group = 0x7f0a002b;
- public static final int notification_template_part_chronometer = 0x7f0a002c;
- public static final int notification_template_part_time = 0x7f0a002d;
+ public static final int notification_action = 0x7f0a002a;
+ public static final int notification_action_tombstone = 0x7f0a002b;
+ public static final int notification_template_custom_big = 0x7f0a002c;
+ public static final int notification_template_icon_group = 0x7f0a002d;
+ public static final int notification_template_part_chronometer = 0x7f0a002e;
+ public static final int notification_template_part_time = 0x7f0a002f;
}
public static final class string {
private string() {}
diff --git a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/appcompat/R.java b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/appcompat/R.java
index 9d9c9af..16368db 100644
--- a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/appcompat/R.java
+++ b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/appcompat/R.java
@@ -741,57 +741,57 @@ public final class R {
public static final int notification_main_column_container = 0x7f07008f;
public static final int off = 0x7f070090;
public static final int on = 0x7f070091;
- public static final int parentPanel = 0x7f070094;
- public static final int progress_circular = 0x7f07009c;
- public static final int progress_horizontal = 0x7f07009d;
- public static final int radio = 0x7f07009e;
- public static final int right_icon = 0x7f0700a0;
- public static final int right_side = 0x7f0700a1;
- public static final int screen = 0x7f0700aa;
- public static final int scrollIndicatorDown = 0x7f0700ab;
- public static final int scrollIndicatorUp = 0x7f0700ac;
- public static final int scrollView = 0x7f0700ad;
- public static final int search_badge = 0x7f0700ae;
- public static final int search_bar = 0x7f0700af;
- public static final int search_button = 0x7f0700b0;
- public static final int search_close_btn = 0x7f0700b1;
- public static final int search_edit_frame = 0x7f0700b2;
- public static final int search_go_btn = 0x7f0700b3;
- public static final int search_mag_icon = 0x7f0700b4;
- public static final int search_plate = 0x7f0700b5;
- public static final int search_src_text = 0x7f0700b6;
- public static final int search_voice_btn = 0x7f0700b7;
- public static final int select_dialog_listview = 0x7f0700b8;
- public static final int shortcut = 0x7f0700b9;
- public static final int spacer = 0x7f0700bd;
- public static final int split_action_bar = 0x7f0700be;
- public static final int src_atop = 0x7f0700c1;
- public static final int src_in = 0x7f0700c2;
- public static final int src_over = 0x7f0700c3;
- public static final int submenuarrow = 0x7f0700c6;
- public static final int submit_area = 0x7f0700c7;
- public static final int tabMode = 0x7f0700c9;
- public static final int tag_accessibility_actions = 0x7f0700ca;
- public static final int tag_accessibility_clickable_spans = 0x7f0700cb;
- public static final int tag_accessibility_heading = 0x7f0700cc;
- public static final int tag_accessibility_pane_title = 0x7f0700cd;
- public static final int tag_screen_reader_focusable = 0x7f0700ce;
- public static final int tag_transition_group = 0x7f0700cf;
- public static final int tag_unhandled_key_event_manager = 0x7f0700d0;
- public static final int tag_unhandled_key_listeners = 0x7f0700d1;
- public static final int text = 0x7f0700d2;
- public static final int text2 = 0x7f0700d3;
- public static final int textSpacerNoButtons = 0x7f0700d4;
- public static final int textSpacerNoTitle = 0x7f0700d5;
- public static final int time = 0x7f0700d6;
- public static final int title = 0x7f0700d7;
- public static final int titleDividerNoCustom = 0x7f0700d8;
- public static final int title_template = 0x7f0700da;
- public static final int topPanel = 0x7f0700dc;
- public static final int unchecked = 0x7f0700ee;
- public static final int uniform = 0x7f0700ef;
- public static final int up = 0x7f0700f0;
- public static final int wrap_content = 0x7f0700f4;
+ public static final int parentPanel = 0x7f07009a;
+ public static final int progress_circular = 0x7f0700a2;
+ public static final int progress_horizontal = 0x7f0700a3;
+ public static final int radio = 0x7f0700a4;
+ public static final int right_icon = 0x7f0700a6;
+ public static final int right_side = 0x7f0700a7;
+ public static final int screen = 0x7f0700b0;
+ public static final int scrollIndicatorDown = 0x7f0700b1;
+ public static final int scrollIndicatorUp = 0x7f0700b2;
+ public static final int scrollView = 0x7f0700b3;
+ public static final int search_badge = 0x7f0700b4;
+ public static final int search_bar = 0x7f0700b5;
+ public static final int search_button = 0x7f0700b6;
+ public static final int search_close_btn = 0x7f0700b7;
+ public static final int search_edit_frame = 0x7f0700b8;
+ public static final int search_go_btn = 0x7f0700b9;
+ public static final int search_mag_icon = 0x7f0700ba;
+ public static final int search_plate = 0x7f0700bb;
+ public static final int search_src_text = 0x7f0700bc;
+ public static final int search_voice_btn = 0x7f0700bd;
+ public static final int select_dialog_listview = 0x7f0700be;
+ public static final int shortcut = 0x7f0700bf;
+ public static final int spacer = 0x7f0700c3;
+ public static final int split_action_bar = 0x7f0700c4;
+ public static final int src_atop = 0x7f0700c7;
+ public static final int src_in = 0x7f0700c8;
+ public static final int src_over = 0x7f0700c9;
+ public static final int submenuarrow = 0x7f0700cc;
+ public static final int submit_area = 0x7f0700cd;
+ public static final int tabMode = 0x7f0700cf;
+ public static final int tag_accessibility_actions = 0x7f0700d0;
+ public static final int tag_accessibility_clickable_spans = 0x7f0700d1;
+ public static final int tag_accessibility_heading = 0x7f0700d2;
+ public static final int tag_accessibility_pane_title = 0x7f0700d3;
+ public static final int tag_screen_reader_focusable = 0x7f0700d4;
+ public static final int tag_transition_group = 0x7f0700d5;
+ public static final int tag_unhandled_key_event_manager = 0x7f0700d6;
+ public static final int tag_unhandled_key_listeners = 0x7f0700d7;
+ public static final int text = 0x7f0700d8;
+ public static final int text2 = 0x7f0700d9;
+ public static final int textSpacerNoButtons = 0x7f0700da;
+ public static final int textSpacerNoTitle = 0x7f0700db;
+ public static final int time = 0x7f0700dc;
+ public static final int title = 0x7f0700dd;
+ public static final int titleDividerNoCustom = 0x7f0700de;
+ public static final int title_template = 0x7f0700e0;
+ public static final int topPanel = 0x7f0700e2;
+ public static final int unchecked = 0x7f0700f4;
+ public static final int uniform = 0x7f0700f5;
+ public static final int up = 0x7f0700f6;
+ public static final int wrap_content = 0x7f0700fa;
}
public static final class integer {
private integer() {}
@@ -845,16 +845,16 @@ public final class R {
public static final int abc_select_dialog_material = 0x7f0a001a;
public static final int abc_tooltip = 0x7f0a001b;
public static final int custom_dialog = 0x7f0a0023;
- public static final int notification_action = 0x7f0a0028;
- public static final int notification_action_tombstone = 0x7f0a0029;
- public static final int notification_template_custom_big = 0x7f0a002a;
- public static final int notification_template_icon_group = 0x7f0a002b;
- public static final int notification_template_part_chronometer = 0x7f0a002c;
- public static final int notification_template_part_time = 0x7f0a002d;
- public static final int select_dialog_item_material = 0x7f0a002f;
- public static final int select_dialog_multichoice_material = 0x7f0a0030;
- public static final int select_dialog_singlechoice_material = 0x7f0a0031;
- public static final int support_simple_spinner_dropdown_item = 0x7f0a0032;
+ public static final int notification_action = 0x7f0a002a;
+ public static final int notification_action_tombstone = 0x7f0a002b;
+ public static final int notification_template_custom_big = 0x7f0a002c;
+ public static final int notification_template_icon_group = 0x7f0a002d;
+ public static final int notification_template_part_chronometer = 0x7f0a002e;
+ public static final int notification_template_part_time = 0x7f0a002f;
+ public static final int select_dialog_item_material = 0x7f0a0033;
+ public static final int select_dialog_multichoice_material = 0x7f0a0034;
+ public static final int select_dialog_singlechoice_material = 0x7f0a0035;
+ public static final int support_simple_spinner_dropdown_item = 0x7f0a0036;
}
public static final class string {
private string() {}
diff --git a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/appcompat/resources/R.java b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/appcompat/resources/R.java
index 94ce38d..f37e4d6 100644
--- a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/appcompat/resources/R.java
+++ b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/appcompat/resources/R.java
@@ -132,20 +132,20 @@ public final class R {
public static final int notification_background = 0x7f07008d;
public static final int notification_main_column = 0x7f07008e;
public static final int notification_main_column_container = 0x7f07008f;
- public static final int right_icon = 0x7f0700a0;
- public static final int right_side = 0x7f0700a1;
- public static final int tag_accessibility_actions = 0x7f0700ca;
- public static final int tag_accessibility_clickable_spans = 0x7f0700cb;
- public static final int tag_accessibility_heading = 0x7f0700cc;
- public static final int tag_accessibility_pane_title = 0x7f0700cd;
- public static final int tag_screen_reader_focusable = 0x7f0700ce;
- public static final int tag_transition_group = 0x7f0700cf;
- public static final int tag_unhandled_key_event_manager = 0x7f0700d0;
- public static final int tag_unhandled_key_listeners = 0x7f0700d1;
- public static final int text = 0x7f0700d2;
- public static final int text2 = 0x7f0700d3;
- public static final int time = 0x7f0700d6;
- public static final int title = 0x7f0700d7;
+ public static final int right_icon = 0x7f0700a6;
+ public static final int right_side = 0x7f0700a7;
+ public static final int tag_accessibility_actions = 0x7f0700d0;
+ public static final int tag_accessibility_clickable_spans = 0x7f0700d1;
+ public static final int tag_accessibility_heading = 0x7f0700d2;
+ public static final int tag_accessibility_pane_title = 0x7f0700d3;
+ public static final int tag_screen_reader_focusable = 0x7f0700d4;
+ public static final int tag_transition_group = 0x7f0700d5;
+ public static final int tag_unhandled_key_event_manager = 0x7f0700d6;
+ public static final int tag_unhandled_key_listeners = 0x7f0700d7;
+ public static final int text = 0x7f0700d8;
+ public static final int text2 = 0x7f0700d9;
+ public static final int time = 0x7f0700dc;
+ public static final int title = 0x7f0700dd;
}
public static final class integer {
private integer() {}
@@ -156,12 +156,12 @@ public final class R {
private layout() {}
public static final int custom_dialog = 0x7f0a0023;
- public static final int notification_action = 0x7f0a0028;
- public static final int notification_action_tombstone = 0x7f0a0029;
- public static final int notification_template_custom_big = 0x7f0a002a;
- public static final int notification_template_icon_group = 0x7f0a002b;
- public static final int notification_template_part_chronometer = 0x7f0a002c;
- public static final int notification_template_part_time = 0x7f0a002d;
+ public static final int notification_action = 0x7f0a002a;
+ public static final int notification_action_tombstone = 0x7f0a002b;
+ public static final int notification_template_custom_big = 0x7f0a002c;
+ public static final int notification_template_icon_group = 0x7f0a002d;
+ public static final int notification_template_part_chronometer = 0x7f0a002e;
+ public static final int notification_template_part_time = 0x7f0a002f;
}
public static final class string {
private string() {}
diff --git a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/constraintlayout/widget/R.java b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/constraintlayout/widget/R.java
index f254b09..2bc5bb1 100644
--- a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/constraintlayout/widget/R.java
+++ b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/constraintlayout/widget/R.java
@@ -78,15 +78,15 @@ public final class R {
public static final int gone = 0x7f07006e;
public static final int invisible = 0x7f070078;
public static final int left = 0x7f07007d;
- public static final int packed = 0x7f070092;
- public static final int parent = 0x7f070093;
- public static final int percent = 0x7f070096;
- public static final int right = 0x7f07009f;
- public static final int spread = 0x7f0700bf;
- public static final int spread_inside = 0x7f0700c0;
- public static final int start = 0x7f0700c5;
- public static final int top = 0x7f0700db;
- public static final int wrap = 0x7f0700f3;
+ public static final int packed = 0x7f070098;
+ public static final int parent = 0x7f070099;
+ public static final int percent = 0x7f07009c;
+ public static final int right = 0x7f0700a5;
+ public static final int spread = 0x7f0700c5;
+ public static final int spread_inside = 0x7f0700c6;
+ public static final int start = 0x7f0700cb;
+ public static final int top = 0x7f0700e1;
+ public static final int wrap = 0x7f0700f9;
}
public static final class styleable {
private styleable() {}
diff --git a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/core/R.java b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/core/R.java
index a9e13ca..6695867 100644
--- a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/core/R.java
+++ b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/core/R.java
@@ -131,20 +131,20 @@ public final class R {
public static final int notification_background = 0x7f07008d;
public static final int notification_main_column = 0x7f07008e;
public static final int notification_main_column_container = 0x7f07008f;
- public static final int right_icon = 0x7f0700a0;
- public static final int right_side = 0x7f0700a1;
- public static final int tag_accessibility_actions = 0x7f0700ca;
- public static final int tag_accessibility_clickable_spans = 0x7f0700cb;
- public static final int tag_accessibility_heading = 0x7f0700cc;
- public static final int tag_accessibility_pane_title = 0x7f0700cd;
- public static final int tag_screen_reader_focusable = 0x7f0700ce;
- public static final int tag_transition_group = 0x7f0700cf;
- public static final int tag_unhandled_key_event_manager = 0x7f0700d0;
- public static final int tag_unhandled_key_listeners = 0x7f0700d1;
- public static final int text = 0x7f0700d2;
- public static final int text2 = 0x7f0700d3;
- public static final int time = 0x7f0700d6;
- public static final int title = 0x7f0700d7;
+ public static final int right_icon = 0x7f0700a6;
+ public static final int right_side = 0x7f0700a7;
+ public static final int tag_accessibility_actions = 0x7f0700d0;
+ public static final int tag_accessibility_clickable_spans = 0x7f0700d1;
+ public static final int tag_accessibility_heading = 0x7f0700d2;
+ public static final int tag_accessibility_pane_title = 0x7f0700d3;
+ public static final int tag_screen_reader_focusable = 0x7f0700d4;
+ public static final int tag_transition_group = 0x7f0700d5;
+ public static final int tag_unhandled_key_event_manager = 0x7f0700d6;
+ public static final int tag_unhandled_key_listeners = 0x7f0700d7;
+ public static final int text = 0x7f0700d8;
+ public static final int text2 = 0x7f0700d9;
+ public static final int time = 0x7f0700dc;
+ public static final int title = 0x7f0700dd;
}
public static final class integer {
private integer() {}
@@ -155,12 +155,12 @@ public final class R {
private layout() {}
public static final int custom_dialog = 0x7f0a0023;
- public static final int notification_action = 0x7f0a0028;
- public static final int notification_action_tombstone = 0x7f0a0029;
- public static final int notification_template_custom_big = 0x7f0a002a;
- public static final int notification_template_icon_group = 0x7f0a002b;
- public static final int notification_template_part_chronometer = 0x7f0a002c;
- public static final int notification_template_part_time = 0x7f0a002d;
+ public static final int notification_action = 0x7f0a002a;
+ public static final int notification_action_tombstone = 0x7f0a002b;
+ public static final int notification_template_custom_big = 0x7f0a002c;
+ public static final int notification_template_icon_group = 0x7f0a002d;
+ public static final int notification_template_part_chronometer = 0x7f0a002e;
+ public static final int notification_template_part_time = 0x7f0a002f;
}
public static final class string {
private string() {}
diff --git a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/customview/R.java b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/customview/R.java
index c4a0fbd..eb26fff 100644
--- a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/customview/R.java
+++ b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/customview/R.java
@@ -97,15 +97,15 @@ public final class R {
public static final int notification_background = 0x7f07008d;
public static final int notification_main_column = 0x7f07008e;
public static final int notification_main_column_container = 0x7f07008f;
- public static final int right_icon = 0x7f0700a0;
- public static final int right_side = 0x7f0700a1;
- public static final int tag_transition_group = 0x7f0700cf;
- public static final int tag_unhandled_key_event_manager = 0x7f0700d0;
- public static final int tag_unhandled_key_listeners = 0x7f0700d1;
- public static final int text = 0x7f0700d2;
- public static final int text2 = 0x7f0700d3;
- public static final int time = 0x7f0700d6;
- public static final int title = 0x7f0700d7;
+ public static final int right_icon = 0x7f0700a6;
+ public static final int right_side = 0x7f0700a7;
+ public static final int tag_transition_group = 0x7f0700d5;
+ public static final int tag_unhandled_key_event_manager = 0x7f0700d6;
+ public static final int tag_unhandled_key_listeners = 0x7f0700d7;
+ public static final int text = 0x7f0700d8;
+ public static final int text2 = 0x7f0700d9;
+ public static final int time = 0x7f0700dc;
+ public static final int title = 0x7f0700dd;
}
public static final class integer {
private integer() {}
@@ -115,12 +115,12 @@ public final class R {
public static final class layout {
private layout() {}
- public static final int notification_action = 0x7f0a0028;
- public static final int notification_action_tombstone = 0x7f0a0029;
- public static final int notification_template_custom_big = 0x7f0a002a;
- public static final int notification_template_icon_group = 0x7f0a002b;
- public static final int notification_template_part_chronometer = 0x7f0a002c;
- public static final int notification_template_part_time = 0x7f0a002d;
+ public static final int notification_action = 0x7f0a002a;
+ public static final int notification_action_tombstone = 0x7f0a002b;
+ public static final int notification_template_custom_big = 0x7f0a002c;
+ public static final int notification_template_icon_group = 0x7f0a002d;
+ public static final int notification_template_part_chronometer = 0x7f0a002e;
+ public static final int notification_template_part_time = 0x7f0a002f;
}
public static final class string {
private string() {}
diff --git a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/drawerlayout/R.java b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/drawerlayout/R.java
index deefa43..7604410 100644
--- a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/drawerlayout/R.java
+++ b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/drawerlayout/R.java
@@ -97,15 +97,15 @@ public final class R {
public static final int notification_background = 0x7f07008d;
public static final int notification_main_column = 0x7f07008e;
public static final int notification_main_column_container = 0x7f07008f;
- public static final int right_icon = 0x7f0700a0;
- public static final int right_side = 0x7f0700a1;
- public static final int tag_transition_group = 0x7f0700cf;
- public static final int tag_unhandled_key_event_manager = 0x7f0700d0;
- public static final int tag_unhandled_key_listeners = 0x7f0700d1;
- public static final int text = 0x7f0700d2;
- public static final int text2 = 0x7f0700d3;
- public static final int time = 0x7f0700d6;
- public static final int title = 0x7f0700d7;
+ public static final int right_icon = 0x7f0700a6;
+ public static final int right_side = 0x7f0700a7;
+ public static final int tag_transition_group = 0x7f0700d5;
+ public static final int tag_unhandled_key_event_manager = 0x7f0700d6;
+ public static final int tag_unhandled_key_listeners = 0x7f0700d7;
+ public static final int text = 0x7f0700d8;
+ public static final int text2 = 0x7f0700d9;
+ public static final int time = 0x7f0700dc;
+ public static final int title = 0x7f0700dd;
}
public static final class integer {
private integer() {}
@@ -115,12 +115,12 @@ public final class R {
public static final class layout {
private layout() {}
- public static final int notification_action = 0x7f0a0028;
- public static final int notification_action_tombstone = 0x7f0a0029;
- public static final int notification_template_custom_big = 0x7f0a002a;
- public static final int notification_template_icon_group = 0x7f0a002b;
- public static final int notification_template_part_chronometer = 0x7f0a002c;
- public static final int notification_template_part_time = 0x7f0a002d;
+ public static final int notification_action = 0x7f0a002a;
+ public static final int notification_action_tombstone = 0x7f0a002b;
+ public static final int notification_template_custom_big = 0x7f0a002c;
+ public static final int notification_template_icon_group = 0x7f0a002d;
+ public static final int notification_template_part_chronometer = 0x7f0a002e;
+ public static final int notification_template_part_time = 0x7f0a002f;
}
public static final class string {
private string() {}
diff --git a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/fragment/R.java b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/fragment/R.java
index 264e7f7..63a8eab 100644
--- a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/fragment/R.java
+++ b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/fragment/R.java
@@ -131,20 +131,20 @@ public final class R {
public static final int notification_background = 0x7f07008d;
public static final int notification_main_column = 0x7f07008e;
public static final int notification_main_column_container = 0x7f07008f;
- public static final int right_icon = 0x7f0700a0;
- public static final int right_side = 0x7f0700a1;
- public static final int tag_accessibility_actions = 0x7f0700ca;
- public static final int tag_accessibility_clickable_spans = 0x7f0700cb;
- public static final int tag_accessibility_heading = 0x7f0700cc;
- public static final int tag_accessibility_pane_title = 0x7f0700cd;
- public static final int tag_screen_reader_focusable = 0x7f0700ce;
- public static final int tag_transition_group = 0x7f0700cf;
- public static final int tag_unhandled_key_event_manager = 0x7f0700d0;
- public static final int tag_unhandled_key_listeners = 0x7f0700d1;
- public static final int text = 0x7f0700d2;
- public static final int text2 = 0x7f0700d3;
- public static final int time = 0x7f0700d6;
- public static final int title = 0x7f0700d7;
+ public static final int right_icon = 0x7f0700a6;
+ public static final int right_side = 0x7f0700a7;
+ public static final int tag_accessibility_actions = 0x7f0700d0;
+ public static final int tag_accessibility_clickable_spans = 0x7f0700d1;
+ public static final int tag_accessibility_heading = 0x7f0700d2;
+ public static final int tag_accessibility_pane_title = 0x7f0700d3;
+ public static final int tag_screen_reader_focusable = 0x7f0700d4;
+ public static final int tag_transition_group = 0x7f0700d5;
+ public static final int tag_unhandled_key_event_manager = 0x7f0700d6;
+ public static final int tag_unhandled_key_listeners = 0x7f0700d7;
+ public static final int text = 0x7f0700d8;
+ public static final int text2 = 0x7f0700d9;
+ public static final int time = 0x7f0700dc;
+ public static final int title = 0x7f0700dd;
}
public static final class integer {
private integer() {}
@@ -155,12 +155,12 @@ public final class R {
private layout() {}
public static final int custom_dialog = 0x7f0a0023;
- public static final int notification_action = 0x7f0a0028;
- public static final int notification_action_tombstone = 0x7f0a0029;
- public static final int notification_template_custom_big = 0x7f0a002a;
- public static final int notification_template_icon_group = 0x7f0a002b;
- public static final int notification_template_part_chronometer = 0x7f0a002c;
- public static final int notification_template_part_time = 0x7f0a002d;
+ public static final int notification_action = 0x7f0a002a;
+ public static final int notification_action_tombstone = 0x7f0a002b;
+ public static final int notification_template_custom_big = 0x7f0a002c;
+ public static final int notification_template_icon_group = 0x7f0a002d;
+ public static final int notification_template_part_chronometer = 0x7f0a002e;
+ public static final int notification_template_part_time = 0x7f0a002f;
}
public static final class string {
private string() {}
diff --git a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/loader/R.java b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/loader/R.java
index 951a804..416de0a 100644
--- a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/loader/R.java
+++ b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/loader/R.java
@@ -97,15 +97,15 @@ public final class R {
public static final int notification_background = 0x7f07008d;
public static final int notification_main_column = 0x7f07008e;
public static final int notification_main_column_container = 0x7f07008f;
- public static final int right_icon = 0x7f0700a0;
- public static final int right_side = 0x7f0700a1;
- public static final int tag_transition_group = 0x7f0700cf;
- public static final int tag_unhandled_key_event_manager = 0x7f0700d0;
- public static final int tag_unhandled_key_listeners = 0x7f0700d1;
- public static final int text = 0x7f0700d2;
- public static final int text2 = 0x7f0700d3;
- public static final int time = 0x7f0700d6;
- public static final int title = 0x7f0700d7;
+ public static final int right_icon = 0x7f0700a6;
+ public static final int right_side = 0x7f0700a7;
+ public static final int tag_transition_group = 0x7f0700d5;
+ public static final int tag_unhandled_key_event_manager = 0x7f0700d6;
+ public static final int tag_unhandled_key_listeners = 0x7f0700d7;
+ public static final int text = 0x7f0700d8;
+ public static final int text2 = 0x7f0700d9;
+ public static final int time = 0x7f0700dc;
+ public static final int title = 0x7f0700dd;
}
public static final class integer {
private integer() {}
@@ -115,12 +115,12 @@ public final class R {
public static final class layout {
private layout() {}
- public static final int notification_action = 0x7f0a0028;
- public static final int notification_action_tombstone = 0x7f0a0029;
- public static final int notification_template_custom_big = 0x7f0a002a;
- public static final int notification_template_icon_group = 0x7f0a002b;
- public static final int notification_template_part_chronometer = 0x7f0a002c;
- public static final int notification_template_part_time = 0x7f0a002d;
+ public static final int notification_action = 0x7f0a002a;
+ public static final int notification_action_tombstone = 0x7f0a002b;
+ public static final int notification_template_custom_big = 0x7f0a002c;
+ public static final int notification_template_icon_group = 0x7f0a002d;
+ public static final int notification_template_part_chronometer = 0x7f0a002e;
+ public static final int notification_template_part_time = 0x7f0a002f;
}
public static final class string {
private string() {}
diff --git a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/vectordrawable/R.java b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/vectordrawable/R.java
index 82b3b0e..a3bb40f 100644
--- a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/vectordrawable/R.java
+++ b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/vectordrawable/R.java
@@ -131,20 +131,20 @@ public final class R {
public static final int notification_background = 0x7f07008d;
public static final int notification_main_column = 0x7f07008e;
public static final int notification_main_column_container = 0x7f07008f;
- public static final int right_icon = 0x7f0700a0;
- public static final int right_side = 0x7f0700a1;
- public static final int tag_accessibility_actions = 0x7f0700ca;
- public static final int tag_accessibility_clickable_spans = 0x7f0700cb;
- public static final int tag_accessibility_heading = 0x7f0700cc;
- public static final int tag_accessibility_pane_title = 0x7f0700cd;
- public static final int tag_screen_reader_focusable = 0x7f0700ce;
- public static final int tag_transition_group = 0x7f0700cf;
- public static final int tag_unhandled_key_event_manager = 0x7f0700d0;
- public static final int tag_unhandled_key_listeners = 0x7f0700d1;
- public static final int text = 0x7f0700d2;
- public static final int text2 = 0x7f0700d3;
- public static final int time = 0x7f0700d6;
- public static final int title = 0x7f0700d7;
+ public static final int right_icon = 0x7f0700a6;
+ public static final int right_side = 0x7f0700a7;
+ public static final int tag_accessibility_actions = 0x7f0700d0;
+ public static final int tag_accessibility_clickable_spans = 0x7f0700d1;
+ public static final int tag_accessibility_heading = 0x7f0700d2;
+ public static final int tag_accessibility_pane_title = 0x7f0700d3;
+ public static final int tag_screen_reader_focusable = 0x7f0700d4;
+ public static final int tag_transition_group = 0x7f0700d5;
+ public static final int tag_unhandled_key_event_manager = 0x7f0700d6;
+ public static final int tag_unhandled_key_listeners = 0x7f0700d7;
+ public static final int text = 0x7f0700d8;
+ public static final int text2 = 0x7f0700d9;
+ public static final int time = 0x7f0700dc;
+ public static final int title = 0x7f0700dd;
}
public static final class integer {
private integer() {}
@@ -155,12 +155,12 @@ public final class R {
private layout() {}
public static final int custom_dialog = 0x7f0a0023;
- public static final int notification_action = 0x7f0a0028;
- public static final int notification_action_tombstone = 0x7f0a0029;
- public static final int notification_template_custom_big = 0x7f0a002a;
- public static final int notification_template_icon_group = 0x7f0a002b;
- public static final int notification_template_part_chronometer = 0x7f0a002c;
- public static final int notification_template_part_time = 0x7f0a002d;
+ public static final int notification_action = 0x7f0a002a;
+ public static final int notification_action_tombstone = 0x7f0a002b;
+ public static final int notification_template_custom_big = 0x7f0a002c;
+ public static final int notification_template_icon_group = 0x7f0a002d;
+ public static final int notification_template_part_chronometer = 0x7f0a002e;
+ public static final int notification_template_part_time = 0x7f0a002f;
}
public static final class string {
private string() {}
diff --git a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/vectordrawable/animated/R.java b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/vectordrawable/animated/R.java
index f60ae07..c2286bb 100644
--- a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/vectordrawable/animated/R.java
+++ b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/vectordrawable/animated/R.java
@@ -131,20 +131,20 @@ public final class R {
public static final int notification_background = 0x7f07008d;
public static final int notification_main_column = 0x7f07008e;
public static final int notification_main_column_container = 0x7f07008f;
- public static final int right_icon = 0x7f0700a0;
- public static final int right_side = 0x7f0700a1;
- public static final int tag_accessibility_actions = 0x7f0700ca;
- public static final int tag_accessibility_clickable_spans = 0x7f0700cb;
- public static final int tag_accessibility_heading = 0x7f0700cc;
- public static final int tag_accessibility_pane_title = 0x7f0700cd;
- public static final int tag_screen_reader_focusable = 0x7f0700ce;
- public static final int tag_transition_group = 0x7f0700cf;
- public static final int tag_unhandled_key_event_manager = 0x7f0700d0;
- public static final int tag_unhandled_key_listeners = 0x7f0700d1;
- public static final int text = 0x7f0700d2;
- public static final int text2 = 0x7f0700d3;
- public static final int time = 0x7f0700d6;
- public static final int title = 0x7f0700d7;
+ public static final int right_icon = 0x7f0700a6;
+ public static final int right_side = 0x7f0700a7;
+ public static final int tag_accessibility_actions = 0x7f0700d0;
+ public static final int tag_accessibility_clickable_spans = 0x7f0700d1;
+ public static final int tag_accessibility_heading = 0x7f0700d2;
+ public static final int tag_accessibility_pane_title = 0x7f0700d3;
+ public static final int tag_screen_reader_focusable = 0x7f0700d4;
+ public static final int tag_transition_group = 0x7f0700d5;
+ public static final int tag_unhandled_key_event_manager = 0x7f0700d6;
+ public static final int tag_unhandled_key_listeners = 0x7f0700d7;
+ public static final int text = 0x7f0700d8;
+ public static final int text2 = 0x7f0700d9;
+ public static final int time = 0x7f0700dc;
+ public static final int title = 0x7f0700dd;
}
public static final class integer {
private integer() {}
@@ -155,12 +155,12 @@ public final class R {
private layout() {}
public static final int custom_dialog = 0x7f0a0023;
- public static final int notification_action = 0x7f0a0028;
- public static final int notification_action_tombstone = 0x7f0a0029;
- public static final int notification_template_custom_big = 0x7f0a002a;
- public static final int notification_template_icon_group = 0x7f0a002b;
- public static final int notification_template_part_chronometer = 0x7f0a002c;
- public static final int notification_template_part_time = 0x7f0a002d;
+ public static final int notification_action = 0x7f0a002a;
+ public static final int notification_action_tombstone = 0x7f0a002b;
+ public static final int notification_template_custom_big = 0x7f0a002c;
+ public static final int notification_template_icon_group = 0x7f0a002d;
+ public static final int notification_template_part_chronometer = 0x7f0a002e;
+ public static final int notification_template_part_time = 0x7f0a002f;
}
public static final class string {
private string() {}
diff --git a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/viewpager/R.java b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/viewpager/R.java
index 2390059..8ef4dad 100644
--- a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/viewpager/R.java
+++ b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/androidx/viewpager/R.java
@@ -97,15 +97,15 @@ public final class R {
public static final int notification_background = 0x7f07008d;
public static final int notification_main_column = 0x7f07008e;
public static final int notification_main_column_container = 0x7f07008f;
- public static final int right_icon = 0x7f0700a0;
- public static final int right_side = 0x7f0700a1;
- public static final int tag_transition_group = 0x7f0700cf;
- public static final int tag_unhandled_key_event_manager = 0x7f0700d0;
- public static final int tag_unhandled_key_listeners = 0x7f0700d1;
- public static final int text = 0x7f0700d2;
- public static final int text2 = 0x7f0700d3;
- public static final int time = 0x7f0700d6;
- public static final int title = 0x7f0700d7;
+ public static final int right_icon = 0x7f0700a6;
+ public static final int right_side = 0x7f0700a7;
+ public static final int tag_transition_group = 0x7f0700d5;
+ public static final int tag_unhandled_key_event_manager = 0x7f0700d6;
+ public static final int tag_unhandled_key_listeners = 0x7f0700d7;
+ public static final int text = 0x7f0700d8;
+ public static final int text2 = 0x7f0700d9;
+ public static final int time = 0x7f0700dc;
+ public static final int title = 0x7f0700dd;
}
public static final class integer {
private integer() {}
@@ -115,12 +115,12 @@ public final class R {
public static final class layout {
private layout() {}
- public static final int notification_action = 0x7f0a0028;
- public static final int notification_action_tombstone = 0x7f0a0029;
- public static final int notification_template_custom_big = 0x7f0a002a;
- public static final int notification_template_icon_group = 0x7f0a002b;
- public static final int notification_template_part_chronometer = 0x7f0a002c;
- public static final int notification_template_part_time = 0x7f0a002d;
+ public static final int notification_action = 0x7f0a002a;
+ public static final int notification_action_tombstone = 0x7f0a002b;
+ public static final int notification_template_custom_big = 0x7f0a002c;
+ public static final int notification_template_icon_group = 0x7f0a002d;
+ public static final int notification_template_part_chronometer = 0x7f0a002e;
+ public static final int notification_template_part_time = 0x7f0a002f;
}
public static final class string {
private string() {}
diff --git a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/com/example/test/R.java b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/com/example/test/R.java
index 85d6138..324ddc6 100644
--- a/test/app/build/generated/not_namespaced_r_class_sources/debug/r/com/example/test/R.java
+++ b/test/app/build/generated/not_namespaced_r_class_sources/debug/r/com/example/test/R.java
@@ -3606,105 +3606,111 @@ public final class R {
public static final int notification_main_column_container=0x7f07008f;
public static final int off=0x7f070090;
public static final int on=0x7f070091;
- public static final int packed=0x7f070092;
- public static final int parent=0x7f070093;
- public static final int parentPanel=0x7f070094;
- public static final int pay_button=0x7f070095;
- public static final int percent=0x7f070096;
- public static final int product_cart_count=0x7f070097;
- public static final int product_cart_name=0x7f070098;
- public static final int product_cart_price=0x7f070099;
- public static final int product_name=0x7f07009a;
- public static final int product_price=0x7f07009b;
- public static final int progress_circular=0x7f07009c;
- public static final int progress_horizontal=0x7f07009d;
- public static final int radio=0x7f07009e;
- public static final int right=0x7f07009f;
- public static final int right_icon=0x7f0700a0;
- public static final int right_side=0x7f0700a1;
- public static final int rl_account=0x7f0700a2;
- public static final int rl_course_history=0x7f0700a3;
- public static final int rl_head=0x7f0700a4;
- public static final int rl_nickName=0x7f0700a5;
- public static final int rl_pay=0x7f0700a6;
- public static final int rl_phone=0x7f0700a7;
- public static final int rl_qq=0x7f0700a8;
- public static final int rl_sex=0x7f0700a9;
- public static final int screen=0x7f0700aa;
- public static final int scrollIndicatorDown=0x7f0700ab;
- public static final int scrollIndicatorUp=0x7f0700ac;
- public static final int scrollView=0x7f0700ad;
- public static final int search_badge=0x7f0700ae;
- public static final int search_bar=0x7f0700af;
- public static final int search_button=0x7f0700b0;
- public static final int search_close_btn=0x7f0700b1;
- public static final int search_edit_frame=0x7f0700b2;
- public static final int search_go_btn=0x7f0700b3;
- public static final int search_mag_icon=0x7f0700b4;
- public static final int search_plate=0x7f0700b5;
- public static final int search_src_text=0x7f0700b6;
- public static final int search_voice_btn=0x7f0700b7;
- public static final int select_dialog_listview=0x7f0700b8;
- public static final int shortcut=0x7f0700b9;
- public static final int showCustom=0x7f0700ba;
- public static final int showHome=0x7f0700bb;
- public static final int showTitle=0x7f0700bc;
- public static final int spacer=0x7f0700bd;
- public static final int split_action_bar=0x7f0700be;
- public static final int spread=0x7f0700bf;
- public static final int spread_inside=0x7f0700c0;
- public static final int src_atop=0x7f0700c1;
- public static final int src_in=0x7f0700c2;
- public static final int src_over=0x7f0700c3;
- public static final int standard=0x7f0700c4;
- public static final int start=0x7f0700c5;
- public static final int submenuarrow=0x7f0700c6;
- public static final int submit_area=0x7f0700c7;
- public static final int sum_price=0x7f0700c8;
- public static final int tabMode=0x7f0700c9;
- public static final int tag_accessibility_actions=0x7f0700ca;
- public static final int tag_accessibility_clickable_spans=0x7f0700cb;
- public static final int tag_accessibility_heading=0x7f0700cc;
- public static final int tag_accessibility_pane_title=0x7f0700cd;
- public static final int tag_screen_reader_focusable=0x7f0700ce;
- public static final int tag_transition_group=0x7f0700cf;
- public static final int tag_unhandled_key_event_manager=0x7f0700d0;
- public static final int tag_unhandled_key_listeners=0x7f0700d1;
- public static final int text=0x7f0700d2;
- public static final int text2=0x7f0700d3;
- public static final int textSpacerNoButtons=0x7f0700d4;
- public static final int textSpacerNoTitle=0x7f0700d5;
- public static final int time=0x7f0700d6;
- public static final int title=0x7f0700d7;
- public static final int titleDividerNoCustom=0x7f0700d8;
- public static final int title_bar=0x7f0700d9;
- public static final int title_template=0x7f0700da;
- public static final int top=0x7f0700db;
- public static final int topPanel=0x7f0700dc;
- public static final int tv_Raddress=0x7f0700dd;
- public static final int tv_Raddress_show=0x7f0700de;
- public static final int tv_back=0x7f0700df;
- public static final int tv_course_history=0x7f0700e0;
- public static final int tv_main_title=0x7f0700e1;
- public static final int tv_name=0x7f0700e2;
- public static final int tv_pay_address=0x7f0700e3;
- public static final int tv_pay_user_name_show=0x7f0700e4;
- public static final int tv_phone=0x7f0700e5;
- public static final int tv_phone_show=0x7f0700e6;
- public static final int tv_save=0x7f0700e7;
- public static final int tv_sex=0x7f0700e8;
- public static final int tv_true_name=0x7f0700e9;
- public static final int tv_true_name_show=0x7f0700ea;
- public static final int tv_user_name=0x7f0700eb;
- public static final int tv_user_name_show=0x7f0700ec;
- public static final int tv_version=0x7f0700ed;
- public static final int unchecked=0x7f0700ee;
- public static final int uniform=0x7f0700ef;
- public static final int up=0x7f0700f0;
- public static final int useLogo=0x7f0700f1;
- public static final int withText=0x7f0700f2;
- public static final int wrap=0x7f0700f3;
- public static final int wrap_content=0x7f0700f4;
+ public static final int order=0x7f070092;
+ public static final int order_item=0x7f070093;
+ public static final int order_list_view=0x7f070094;
+ public static final int order_list_view_item=0x7f070095;
+ public static final int order_price_item=0x7f070096;
+ public static final int order_time=0x7f070097;
+ public static final int packed=0x7f070098;
+ public static final int parent=0x7f070099;
+ public static final int parentPanel=0x7f07009a;
+ public static final int pay_button=0x7f07009b;
+ public static final int percent=0x7f07009c;
+ public static final int product_cart_count=0x7f07009d;
+ public static final int product_cart_name=0x7f07009e;
+ public static final int product_cart_price=0x7f07009f;
+ public static final int product_name=0x7f0700a0;
+ public static final int product_price=0x7f0700a1;
+ public static final int progress_circular=0x7f0700a2;
+ public static final int progress_horizontal=0x7f0700a3;
+ public static final int radio=0x7f0700a4;
+ public static final int right=0x7f0700a5;
+ public static final int right_icon=0x7f0700a6;
+ public static final int right_side=0x7f0700a7;
+ public static final int rl_account=0x7f0700a8;
+ public static final int rl_head=0x7f0700a9;
+ public static final int rl_nickName=0x7f0700aa;
+ public static final int rl_pay=0x7f0700ab;
+ public static final int rl_phone=0x7f0700ac;
+ public static final int rl_qq=0x7f0700ad;
+ public static final int rl_sex=0x7f0700ae;
+ public static final int rl_shopping_history=0x7f0700af;
+ public static final int screen=0x7f0700b0;
+ public static final int scrollIndicatorDown=0x7f0700b1;
+ public static final int scrollIndicatorUp=0x7f0700b2;
+ public static final int scrollView=0x7f0700b3;
+ public static final int search_badge=0x7f0700b4;
+ public static final int search_bar=0x7f0700b5;
+ public static final int search_button=0x7f0700b6;
+ public static final int search_close_btn=0x7f0700b7;
+ public static final int search_edit_frame=0x7f0700b8;
+ public static final int search_go_btn=0x7f0700b9;
+ public static final int search_mag_icon=0x7f0700ba;
+ public static final int search_plate=0x7f0700bb;
+ public static final int search_src_text=0x7f0700bc;
+ public static final int search_voice_btn=0x7f0700bd;
+ public static final int select_dialog_listview=0x7f0700be;
+ public static final int shortcut=0x7f0700bf;
+ public static final int showCustom=0x7f0700c0;
+ public static final int showHome=0x7f0700c1;
+ public static final int showTitle=0x7f0700c2;
+ public static final int spacer=0x7f0700c3;
+ public static final int split_action_bar=0x7f0700c4;
+ public static final int spread=0x7f0700c5;
+ public static final int spread_inside=0x7f0700c6;
+ public static final int src_atop=0x7f0700c7;
+ public static final int src_in=0x7f0700c8;
+ public static final int src_over=0x7f0700c9;
+ public static final int standard=0x7f0700ca;
+ public static final int start=0x7f0700cb;
+ public static final int submenuarrow=0x7f0700cc;
+ public static final int submit_area=0x7f0700cd;
+ public static final int sum_price=0x7f0700ce;
+ public static final int tabMode=0x7f0700cf;
+ public static final int tag_accessibility_actions=0x7f0700d0;
+ public static final int tag_accessibility_clickable_spans=0x7f0700d1;
+ public static final int tag_accessibility_heading=0x7f0700d2;
+ public static final int tag_accessibility_pane_title=0x7f0700d3;
+ public static final int tag_screen_reader_focusable=0x7f0700d4;
+ public static final int tag_transition_group=0x7f0700d5;
+ public static final int tag_unhandled_key_event_manager=0x7f0700d6;
+ public static final int tag_unhandled_key_listeners=0x7f0700d7;
+ public static final int text=0x7f0700d8;
+ public static final int text2=0x7f0700d9;
+ public static final int textSpacerNoButtons=0x7f0700da;
+ public static final int textSpacerNoTitle=0x7f0700db;
+ public static final int time=0x7f0700dc;
+ public static final int title=0x7f0700dd;
+ public static final int titleDividerNoCustom=0x7f0700de;
+ public static final int title_bar=0x7f0700df;
+ public static final int title_template=0x7f0700e0;
+ public static final int top=0x7f0700e1;
+ public static final int topPanel=0x7f0700e2;
+ public static final int tv_Raddress=0x7f0700e3;
+ public static final int tv_Raddress_show=0x7f0700e4;
+ public static final int tv_back=0x7f0700e5;
+ public static final int tv_main_title=0x7f0700e6;
+ public static final int tv_name=0x7f0700e7;
+ public static final int tv_pay_address=0x7f0700e8;
+ public static final int tv_pay_user_name_show=0x7f0700e9;
+ public static final int tv_phone=0x7f0700ea;
+ public static final int tv_phone_show=0x7f0700eb;
+ public static final int tv_save=0x7f0700ec;
+ public static final int tv_sex=0x7f0700ed;
+ public static final int tv_shopping_history=0x7f0700ee;
+ public static final int tv_true_name=0x7f0700ef;
+ public static final int tv_true_name_show=0x7f0700f0;
+ public static final int tv_user_name=0x7f0700f1;
+ public static final int tv_user_name_show=0x7f0700f2;
+ public static final int tv_version=0x7f0700f3;
+ public static final int unchecked=0x7f0700f4;
+ public static final int uniform=0x7f0700f5;
+ public static final int up=0x7f0700f6;
+ public static final int useLogo=0x7f0700f7;
+ public static final int withText=0x7f0700f8;
+ public static final int wrap=0x7f0700f9;
+ public static final int wrap_content=0x7f0700fa;
}
public static final class integer {
public static final int abc_config_activityDefaultDur=0x7f080000;
@@ -3759,24 +3765,28 @@ public final class R {
public static final int activity_user_info=0x7f0a0021;
public static final int cartproduct_item=0x7f0a0022;
public static final int custom_dialog=0x7f0a0023;
- public static final int fragment_shop=0x7f0a0024;
- public static final int fragment_shopping_cart=0x7f0a0025;
- public static final int fragment_user=0x7f0a0026;
- public static final int main_title_bar=0x7f0a0027;
- public static final int notification_action=0x7f0a0028;
- public static final int notification_action_tombstone=0x7f0a0029;
- public static final int notification_template_custom_big=0x7f0a002a;
- public static final int notification_template_icon_group=0x7f0a002b;
- public static final int notification_template_part_chronometer=0x7f0a002c;
- public static final int notification_template_part_time=0x7f0a002d;
- public static final int product_item=0x7f0a002e;
- public static final int select_dialog_item_material=0x7f0a002f;
- public static final int select_dialog_multichoice_material=0x7f0a0030;
- public static final int select_dialog_singlechoice_material=0x7f0a0031;
- public static final int support_simple_spinner_dropdown_item=0x7f0a0032;
- public static final int tool=0x7f0a0033;
- public static final int total=0x7f0a0034;
- public static final int userinfo_change=0x7f0a0035;
+ public static final int fragment_order=0x7f0a0024;
+ public static final int fragment_order_item=0x7f0a0025;
+ public static final int fragment_shop=0x7f0a0026;
+ public static final int fragment_shopping_cart=0x7f0a0027;
+ public static final int fragment_user=0x7f0a0028;
+ public static final int main_title_bar=0x7f0a0029;
+ public static final int notification_action=0x7f0a002a;
+ public static final int notification_action_tombstone=0x7f0a002b;
+ public static final int notification_template_custom_big=0x7f0a002c;
+ public static final int notification_template_icon_group=0x7f0a002d;
+ public static final int notification_template_part_chronometer=0x7f0a002e;
+ public static final int notification_template_part_time=0x7f0a002f;
+ public static final int order_item=0x7f0a0030;
+ public static final int order_item_item=0x7f0a0031;
+ public static final int product_item=0x7f0a0032;
+ public static final int select_dialog_item_material=0x7f0a0033;
+ public static final int select_dialog_multichoice_material=0x7f0a0034;
+ public static final int select_dialog_singlechoice_material=0x7f0a0035;
+ public static final int support_simple_spinner_dropdown_item=0x7f0a0036;
+ public static final int tool=0x7f0a0037;
+ public static final int total=0x7f0a0038;
+ public static final int userinfo_change=0x7f0a0039;
}
public static final class mipmap {
public static final int ic_launcher=0x7f0b0000;
diff --git a/test/app/build/intermediates/blame/res/debug/single/debug.json b/test/app/build/intermediates/blame/res/debug/single/debug.json
index 9d03b59..7da6f5c 100644
--- a/test/app/build/intermediates/blame/res/debug/single/debug.json
+++ b/test/app/build/intermediates/blame/res/debug/single/debug.json
@@ -3,14 +3,14 @@
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_ic_star_black_48dp.png.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxxhdpi-v4\\abc_ic_star_black_48dp.png"
},
- {
- "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_btn_colored_material.xml.flat",
- "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_btn_colored_material.xml"
- },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_fragment_shop.xml.flat",
"source": "F:\\diedai2\\test\\app\\src\\main\\res\\layout\\fragment_shop.xml"
},
+ {
+ "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_btn_colored_material.xml.flat",
+ "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_btn_colored_material.xml"
+ },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_notify_panel_notification_icon_bg.png.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\drawable-xhdpi-v4\\notify_panel_notification_icon_bg.png"
@@ -59,14 +59,14 @@
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\anim_abc_slide_in_top.xml.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\anim\\abc_slide_in_top.xml"
},
- {
- "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\anim_btn_radio_to_on_mtrl_ring_outer_animation.xml.flat",
- "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\anim\\btn_radio_to_on_mtrl_ring_outer_animation.xml"
- },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_ic_menu_selectall_mtrl_alpha.png.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxxhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png"
},
+ {
+ "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\anim_btn_radio_to_on_mtrl_ring_outer_animation.xml.flat",
+ "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\anim\\btn_radio_to_on_mtrl_ring_outer_animation.xml"
+ },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_btn_radio_to_on_mtrl_000.png.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_btn_radio_to_on_mtrl_000.png"
@@ -135,38 +135,38 @@
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_menu_hardkey_panel_mtrl_mult.9.png.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_menu_hardkey_panel_mtrl_mult.9.png"
},
- {
- "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_tooltip.xml.flat",
- "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_tooltip.xml"
- },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-ldrtl-hdpi-v17_abc_ic_menu_copy_mtrl_am_alpha.png.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_copy_mtrl_am_alpha.png"
},
{
- "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_ic_menu_selectall_mtrl_alpha.png.flat",
- "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png"
+ "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_tooltip.xml.flat",
+ "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_tooltip.xml"
+ },
+ {
+ "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_ic_menu_cut_mtrl_alpha.png.flat",
+ "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xhdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png"
},
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_tab_indicator_mtrl_alpha.9.png.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png"
},
{
- "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_ic_menu_cut_mtrl_alpha.png.flat",
- "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xhdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png"
+ "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_ic_menu_selectall_mtrl_alpha.png.flat",
+ "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png"
},
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_text_select_handle_right_mtrl_dark.png.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_text_select_handle_right_mtrl_dark.png"
},
- {
- "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-watch-v20_abc_dialog_material_background.xml.flat",
- "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-watch-v20\\abc_dialog_material_background.xml"
- },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\anim_abc_slide_in_bottom.xml.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\anim\\abc_slide_in_bottom.xml"
},
+ {
+ "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-watch-v20_abc_dialog_material_background.xml.flat",
+ "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-watch-v20\\abc_dialog_material_background.xml"
+ },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v24_find_psw_icon.png.flat",
"source": "F:\\diedai2\\test\\app\\src\\main\\res\\drawable-v24\\find_psw_icon.png"
@@ -187,14 +187,14 @@
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v24_main_my_icon_selected.png.flat",
"source": "F:\\diedai2\\test\\app\\src\\main\\res\\drawable-v24\\main_my_icon_selected.png"
},
- {
- "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_list_focused_holo.9.png.flat",
- "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xhdpi-v4\\abc_list_focused_holo.9.png"
- },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_popup_menu_header_item_layout.xml.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_popup_menu_header_item_layout.xml"
},
+ {
+ "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_list_focused_holo.9.png.flat",
+ "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xhdpi-v4\\abc_list_focused_holo.9.png"
+ },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout-v21_notification_action.xml.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\layout-v21\\notification_action.xml"
@@ -255,22 +255,22 @@
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_login.xml.flat",
"source": "F:\\diedai2\\test\\app\\src\\main\\res\\layout\\activity_login.xml"
},
- {
- "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_list_selector_disabled_holo_light.9.png.flat",
- "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_list_selector_disabled_holo_light.9.png"
- },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_btn_borderless_material.xml.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_btn_borderless_material.xml"
},
{
- "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher_round.png.flat",
- "source": "F:\\diedai2\\test\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher_round.png"
+ "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_list_selector_disabled_holo_light.9.png.flat",
+ "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_list_selector_disabled_holo_light.9.png"
},
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_btn_radio_to_on_mtrl_000.png.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_btn_radio_to_on_mtrl_000.png"
},
+ {
+ "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher_round.png.flat",
+ "source": "F:\\diedai2\\test\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher_round.png"
+ },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_list_focused_holo.9.png.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_list_focused_holo.9.png"
@@ -303,22 +303,22 @@
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_ratingbar_material.xml.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_ratingbar_material.xml"
},
- {
- "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_alert_dialog_material.xml.flat",
- "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_alert_dialog_material.xml"
- },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_user_name_icon.png.flat",
"source": "F:\\diedai2\\test\\app\\src\\main\\res\\drawable\\user_name_icon.png"
},
{
- "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_notification_bg.xml.flat",
- "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\drawable\\notification_bg.xml"
+ "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_alert_dialog_material.xml.flat",
+ "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_alert_dialog_material.xml"
},
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\interpolator_btn_checkbox_unchecked_mtrl_animation_interpolator_0.xml.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\interpolator\\btn_checkbox_unchecked_mtrl_animation_interpolator_0.xml"
},
+ {
+ "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_notification_bg.xml.flat",
+ "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\drawable\\notification_bg.xml"
+ },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_btn_check_material_anim.xml.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_btn_check_material_anim.xml"
@@ -351,14 +351,14 @@
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_ic_menu_overflow_material.xml.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_ic_menu_overflow_material.xml"
},
- {
- "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_list_pressed_holo_dark.9.png.flat",
- "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_list_pressed_holo_dark.9.png"
- },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_list_focused_holo.9.png.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_list_focused_holo.9.png"
},
+ {
+ "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_list_pressed_holo_dark.9.png.flat",
+ "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_list_pressed_holo_dark.9.png"
+ },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_cab_background_top_material.xml.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_cab_background_top_material.xml"
@@ -391,14 +391,14 @@
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_ic_menu_share_mtrl_alpha.png.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_ic_menu_share_mtrl_alpha.png"
},
- {
- "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_notify_panel_notification_icon_bg.png.flat",
- "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\drawable-mdpi-v4\\notify_panel_notification_icon_bg.png"
- },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_text_select_handle_left_mtrl_dark.png.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xhdpi-v4\\abc_text_select_handle_left_mtrl_dark.png"
},
+ {
+ "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_notify_panel_notification_icon_bg.png.flat",
+ "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\drawable-mdpi-v4\\notify_panel_notification_icon_bg.png"
+ },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_spinner_textfield_background_material.xml.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_spinner_textfield_background_material.xml"
@@ -467,14 +467,14 @@
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_text_select_handle_right_mtrl_dark.png.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_text_select_handle_right_mtrl_dark.png"
},
- {
- "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_tab_indicator_mtrl_alpha.9.png.flat",
- "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png"
- },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_switch_track_mtrl_alpha.9.png.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xhdpi-v4\\abc_switch_track_mtrl_alpha.9.png"
},
+ {
+ "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_tab_indicator_mtrl_alpha.9.png.flat",
+ "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png"
+ },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_ic_star_half_black_36dp.png.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxxhdpi-v4\\abc_ic_star_half_black_36dp.png"
@@ -503,14 +503,14 @@
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout-v26_abc_screen_toolbar.xml.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout-v26\\abc_screen_toolbar.xml"
},
- {
- "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_btn_radio_to_on_mtrl_015.png.flat",
- "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_btn_radio_to_on_mtrl_015.png"
- },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_part_chronometer.xml.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\layout\\notification_template_part_chronometer.xml"
},
+ {
+ "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_btn_radio_to_on_mtrl_015.png.flat",
+ "source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_btn_radio_to_on_mtrl_015.png"
+ },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v24_iv_right_arrow.png.flat",
"source": "F:\\diedai2\\test\\app\\src\\main\\res\\drawable-v24\\iv_right_arrow.png"
@@ -1091,6 +1091,10 @@
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_scrubber_control_to_pressed_mtrl_000.png.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png"
},
+ {
+ "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_order_item.xml.flat",
+ "source": "F:\\diedai2\\test\\app\\src\\main\\res\\layout\\order_item.xml"
+ },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_text_select_handle_right_mtrl_light.png.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_text_select_handle_right_mtrl_light.png"
@@ -1219,6 +1223,10 @@
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_text_select_handle_left_mtrl_light.png.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_text_select_handle_left_mtrl_light.png"
},
+ {
+ "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_order_item_item.xml.flat",
+ "source": "F:\\diedai2\\test\\app\\src\\main\\res\\layout\\order_item_item.xml"
+ },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-ldrtl-xxhdpi-v17_abc_ic_menu_cut_mtrl_alpha.png.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-ldrtl-xxhdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png"
@@ -1575,6 +1583,10 @@
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_item_background_holo_dark.xml.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_item_background_holo_dark.xml"
},
+ {
+ "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_fragment_order.xml.flat",
+ "source": "F:\\diedai2\\test\\app\\src\\main\\res\\layout\\fragment_order.xml"
+ },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_notification_bg_low.xml.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\drawable\\notification_bg_low.xml"
@@ -1587,6 +1599,10 @@
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_ic_menu_paste_mtrl_am_alpha.png.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png"
},
+ {
+ "merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_fragment_order_item.xml.flat",
+ "source": "F:\\diedai2\\test\\app\\src\\main\\res\\layout\\fragment_order_item.xml"
+ },
{
"merged": "F:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_btn_switch_to_on_mtrl_00012.9.png.flat",
"source": "C:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xhdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png"
diff --git a/test/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex b/test/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex
index e659f0b..2743a24 100644
Binary files a/test/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex and b/test/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex differ
diff --git a/test/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/test/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
index a460e1d..b56e7fe 100644
--- a/test/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+++ b/test/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Sun Jan 05 20:09:35 GMT+08:00 2020
+#Mon Jan 06 22:53:19 GMT+08:00 2020
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_tooltip.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_tooltip.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_ic_menu_share_mtrl_alpha.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_ic_menu_selectall_mtrl_alpha.png.flat
@@ -24,6 +24,7 @@ C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxxhdpi-v4\\abc_ic_star_black_36dp.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_ic_star_black_36dp.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxxhdpi-v4\\abc_btn_check_to_on_mtrl_015.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_btn_check_to_on_mtrl_015.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\anim\\btn_radio_to_off_mtrl_ring_outer_animation.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\anim_btn_radio_to_off_mtrl_ring_outer_animation.xml.flat
+F\:\\diedai2\\test\\app\\src\\main\\res\\layout\\order_item_item.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_order_item_item.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_text_select_handle_right_mtrl_dark.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_text_select_handle_right_mtrl_dark.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\anim\\btn_radio_to_off_mtrl_ring_outer_path_animation.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\anim_btn_radio_to_off_mtrl_ring_outer_path_animation.xml.flat
F\:\\diedai2\\test\\app\\src\\main\\res\\drawable\\user_name_icon.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_user_name_icon.png.flat
@@ -231,6 +232,7 @@ C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\anim\\abc_slide_out_top.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\anim_abc_slide_out_top.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\btn_checkbox_checked_to_unchecked_mtrl_animation.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_btn_checkbox_checked_to_unchecked_mtrl_animation.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_menu_hardkey_panel_mtrl_mult.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_menu_hardkey_panel_mtrl_mult.9.png.flat
+F\:\\diedai2\\test\\app\\src\\main\\res\\layout\\fragment_order.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_fragment_order.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxxhdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_btn_switch_to_on_mtrl_00001.9.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\color\\abc_search_url_text.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\color_abc_search_url_text.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_search_dropdown_item_icons_2line.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_search_dropdown_item_icons_2line.xml.flat
@@ -292,11 +294,11 @@ C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_action_mode_close_item_material.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_action_mode_close_item_material.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxxhdpi-v4\\abc_ic_star_half_black_16dp.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_ic_star_half_black_16dp.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxxhdpi-v4\\abc_btn_radio_to_on_mtrl_015.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_btn_radio_to_on_mtrl_015.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\color\\abc_tint_seek_thumb.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\color_abc_tint_seek_thumb.xml.flat
-F\:\\diedai2\\test\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher_round.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher_round.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_list_selector_disabled_holo_light.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_list_selector_disabled_holo_light.9.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\drawable-hdpi-v4\\notification_bg_normal_pressed.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_notification_bg_normal_pressed.9.png.flat
+F\:\\diedai2\\test\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher_round.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher_round.png.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\color\\abc_tint_seek_thumb.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\color_abc_tint_seek_thumb.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_textfield_activated_mtrl_alpha.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_textfield_activated_mtrl_alpha.9.png.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\drawable-hdpi-v4\\notification_bg_normal_pressed.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_notification_bg_normal_pressed.9.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\anim\\btn_radio_to_on_mtrl_ring_outer_path_animation.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\anim_btn_radio_to_on_mtrl_ring_outer_path_animation.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_scrubber_control_off_mtrl_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_scrubber_control_off_mtrl_alpha.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\color\\abc_secondary_text_material_dark.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\color_abc_secondary_text_material_dark.xml.flat
@@ -308,92 +310,93 @@ C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d
F\:\\diedai2\\test\\app\\src\\main\\res\\layout\\activity_pay.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_pay.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_scrubber_track_mtrl_alpha.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_scrubber_track_mtrl_alpha.9.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_scrubber_track_mtrl_alpha.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_scrubber_track_mtrl_alpha.9.png.flat
-F\:\\diedai2\\test\\app\\src\\main\\res\\mipmap-xxxhdpi\\ic_launcher_round.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxxhdpi_ic_launcher_round.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\drawable-mdpi-v4\\notification_bg_low_normal.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_notification_bg_low_normal.9.png.flat
+F\:\\diedai2\\test\\app\\src\\main\\res\\mipmap-xxxhdpi\\ic_launcher_round.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxxhdpi_ic_launcher_round.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_scrubber_control_off_mtrl_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_scrubber_control_off_mtrl_alpha.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_ic_star_black_16dp.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_ic_star_black_16dp.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_list_pressed_holo_light.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_list_pressed_holo_light.9.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\interpolator\\btn_radio_to_off_mtrl_animation_interpolator_0.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\interpolator_btn_radio_to_off_mtrl_animation_interpolator_0.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_ic_menu_share_mtrl_alpha.png.flat
-F\:\\diedai2\\test\\app\\src\\main\\res\\layout\\fragment_shopping_cart.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_fragment_shopping_cart.xml.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_ic_menu_copy_mtrl_am_alpha.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_text_select_handle_left_mtrl_dark.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_text_select_handle_left_mtrl_dark.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxxhdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_ic_menu_cut_mtrl_alpha.png.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_ic_menu_copy_mtrl_am_alpha.png.flat
+F\:\\diedai2\\test\\app\\src\\main\\res\\layout\\fragment_shopping_cart.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_fragment_shopping_cart.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_text_select_handle_left_mtrl_light.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_text_select_handle_left_mtrl_light.png.flat
-F\:\\diedai2\\test\\app\\build\\generated\\res\\pngs\\debug\\drawable-xxxhdpi\\ic_launcher_background.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi_ic_launcher_background.png.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxxhdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_ic_menu_cut_mtrl_alpha.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\drawable-xhdpi-v4\\notification_bg_normal.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_notification_bg_normal.9.png.flat
+F\:\\diedai2\\test\\app\\build\\generated\\res\\pngs\\debug\\drawable-xxxhdpi\\ic_launcher_background.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi_ic_launcher_background.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xhdpi-v4\\abc_list_longpressed_holo.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_list_longpressed_holo.9.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xhdpi-v4\\abc_btn_check_to_on_mtrl_000.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_btn_check_to_on_mtrl_000.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_list_divider_material.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_list_divider_material.xml.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xhdpi-v4\\abc_btn_check_to_on_mtrl_000.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_btn_check_to_on_mtrl_000.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_list_pressed_holo_dark.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_list_pressed_holo_dark.9.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_text_select_handle_middle_mtrl_dark.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_text_select_handle_middle_mtrl_dark.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\anim\\btn_checkbox_to_checked_box_inner_merged_animation.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\anim_btn_checkbox_to_checked_box_inner_merged_animation.xml.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_text_select_handle_middle_mtrl_dark.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_text_select_handle_middle_mtrl_dark.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_alert_dialog_material.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_alert_dialog_material.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_list_pressed_holo_light.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_list_pressed_holo_light.9.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\color\\abc_secondary_text_material_light.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\color_abc_secondary_text_material_light.xml.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\drawable-hdpi-v4\\notify_panel_notification_icon_bg.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_notify_panel_notification_icon_bg.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxxhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_scrubber_control_to_pressed_mtrl_000.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_scrubber_control_to_pressed_mtrl_005.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_scrubber_control_to_pressed_mtrl_005.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\anim\\btn_checkbox_to_unchecked_box_inner_merged_animation.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\anim_btn_checkbox_to_unchecked_box_inner_merged_animation.xml.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\drawable-hdpi-v4\\notify_panel_notification_icon_bg.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_notify_panel_notification_icon_bg.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_scrubber_primary_mtrl_alpha.9.png.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\anim\\btn_checkbox_to_unchecked_box_inner_merged_animation.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\anim_btn_checkbox_to_unchecked_box_inner_merged_animation.xml.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_scrubber_control_to_pressed_mtrl_005.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_scrubber_control_to_pressed_mtrl_005.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_popup_background_mtrl_mult.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_popup_background_mtrl_mult.9.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\btn_radio_on_to_off_mtrl_animation.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_btn_radio_on_to_off_mtrl_animation.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_ic_clear_material.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_ic_clear_material.xml.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\btn_radio_on_to_off_mtrl_animation.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_btn_radio_on_to_off_mtrl_animation.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_text_select_handle_left_mtrl_dark.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_text_select_handle_left_mtrl_dark.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_ic_star_half_black_36dp.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_ic_star_half_black_36dp.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxxhdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_btn_switch_to_on_mtrl_00012.9.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\anim\\btn_checkbox_to_checked_icon_null_animation.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\anim_btn_checkbox_to_checked_icon_null_animation.xml.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxxhdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_btn_switch_to_on_mtrl_00012.9.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\anim\\btn_radio_to_on_mtrl_dot_group_animation.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\anim_btn_radio_to_on_mtrl_dot_group_animation.xml.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\color\\abc_btn_colored_text_material.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\color_abc_btn_colored_text_material.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxxhdpi-v4\\abc_text_select_handle_left_mtrl_light.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_text_select_handle_left_mtrl_light.png.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\color\\abc_btn_colored_text_material.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\color_abc_btn_colored_text_material.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_ic_menu_overflow_material.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_ic_menu_overflow_material.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_text_select_handle_left_mtrl_light.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_text_select_handle_left_mtrl_light.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_action_mode_bar.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_action_mode_bar.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_dialog_title_material.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_dialog_title_material.xml.flat
F\:\\diedai2\\test\\app\\src\\main\\res\\layout\\fragment_shop.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_fragment_shop.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xhdpi-v4\\abc_list_divider_mtrl_alpha.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_list_divider_mtrl_alpha.9.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_list_focused_holo.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_list_focused_holo.9.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_btn_check_to_on_mtrl_015.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_btn_check_to_on_mtrl_015.png.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_list_focused_holo.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_list_focused_holo.9.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_ic_menu_selectall_mtrl_alpha.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_list_pressed_holo_dark.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_list_pressed_holo_dark.9.png.flat
-F\:\\diedai2\\test\\app\\src\\main\\res\\drawable-v24\\main_my_icon_selected.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v24_main_my_icon_selected.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_list_focused_holo.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_list_focused_holo.9.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout-watch-v20\\abc_alert_dialog_button_bar_material.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout-watch-v20_abc_alert_dialog_button_bar_material.xml.flat
+F\:\\diedai2\\test\\app\\src\\main\\res\\drawable-v24\\main_my_icon_selected.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v24_main_my_icon_selected.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\anim\\abc_tooltip_exit.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\anim_abc_tooltip_exit.xml.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout-watch-v20\\abc_alert_dialog_button_bar_material.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout-watch-v20_abc_alert_dialog_button_bar_material.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\btn_checkbox_unchecked_mtrl.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_btn_checkbox_unchecked_mtrl.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\interpolator\\fast_out_slow_in.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\interpolator_fast_out_slow_in.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xhdpi-v4\\abc_btn_radio_to_on_mtrl_015.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_btn_radio_to_on_mtrl_015.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_text_select_handle_left_mtrl_light.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_text_select_handle_left_mtrl_light.png.flat
-F\:\\diedai2\\test\\app\\src\\main\\res\\layout\\activity_login.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_login.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\anim\\abc_slide_out_bottom.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\anim_abc_slide_out_bottom.xml.flat
+F\:\\diedai2\\test\\app\\src\\main\\res\\layout\\activity_login.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_login.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_textfield_search_activated_mtrl_alpha.9.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_btn_borderless_material.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_btn_borderless_material.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\drawable-xhdpi-v4\\notification_bg_low_pressed.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_notification_bg_low_pressed.9.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\layout\\notification_template_part_chronometer.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_part_chronometer.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\drawable-hdpi-v4\\notification_bg_normal.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_notification_bg_normal.9.png.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\layout\\notification_template_part_chronometer.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_part_chronometer.xml.flat
F\:\\diedai2\\test\\app\\src\\main\\res\\drawable-v24\\myinfo_login_bg.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v24_myinfo_login_bg.png.flat
F\:\\diedai2\\test\\app\\src\\main\\res\\drawable\\psw_icon.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_psw_icon.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\layout-v21\\notification_template_icon_group.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout-v21_notification_template_icon_group.xml.flat
+F\:\\diedai2\\test\\app\\src\\main\\res\\layout\\fragment_order_item.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_fragment_order_item.xml.flat
F\:\\diedai2\\test\\app\\src\\main\\res\\layout\\cartproduct_item.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_cartproduct_item.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_list_menu_item_layout.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_list_menu_item_layout.xml.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_btn_radio_to_on_mtrl_000.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_btn_radio_to_on_mtrl_000.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\drawable-mdpi-v4\\notify_panel_notification_icon_bg.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_notify_panel_notification_icon_bg.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_btn_radio_to_on_mtrl_000.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_btn_radio_to_on_mtrl_000.png.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_btn_radio_to_on_mtrl_000.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_btn_radio_to_on_mtrl_000.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_scrubber_primary_mtrl_alpha.9.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_textfield_activated_mtrl_alpha.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_textfield_activated_mtrl_alpha.9.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\layout-v21\\notification_action.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout-v21_notification_action.xml.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_btn_radio_to_on_mtrl_000.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_btn_radio_to_on_mtrl_000.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\drawable-v21\\notification_action_background.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21_notification_action_background.xml.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\layout-v21\\notification_action.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout-v21_notification_action.xml.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_textfield_activated_mtrl_alpha.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_textfield_activated_mtrl_alpha.9.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_list_longpressed_holo.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_list_longpressed_holo.9.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xhdpi-v4\\abc_ic_star_half_black_48dp.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_ic_star_half_black_48dp.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_btn_check_to_on_mtrl_015.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_btn_check_to_on_mtrl_015.png.flat
-F\:\\diedai2\\test\\app\\src\\main\\res\\drawable\\app_icon.jpg=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_app_icon.jpg.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xhdpi-v4\\abc_ic_star_half_black_48dp.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_ic_star_half_black_48dp.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_005.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_scrubber_control_to_pressed_mtrl_005.png.flat
+F\:\\diedai2\\test\\app\\src\\main\\res\\drawable\\app_icon.jpg=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_app_icon.jpg.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\anim\\abc_popup_exit.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\anim_abc_popup_exit.xml.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_scrubber_primary_mtrl_alpha.9.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_action_bar_title_item.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_action_bar_title_item.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_tab_indicator_material.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_tab_indicator_material.xml.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_ic_voice_search_api_material.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_ic_voice_search_api_material.xml.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_action_bar_title_item.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_action_bar_title_item.xml.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_scrubber_primary_mtrl_alpha.9.png.flat
F\:\\diedai2\\test\\app\\src\\main\\res\\mipmap-xhdpi\\ic_launcher_round.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xhdpi_ic_launcher_round.png.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_ic_voice_search_api_material.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_ic_voice_search_api_material.xml.flat
F\:\\diedai2\\test\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\color-v23\\abc_tint_default.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\color-v23_abc_tint_default.xml.flat
F\:\\diedai2\\test\\app\\src\\main\\res\\drawable-v24\\info_delete.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v24_info_delete.png.flat
@@ -401,29 +404,29 @@ C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_ic_arrow_drop_right_black_24dp.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_ic_arrow_drop_right_black_24dp.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_textfield_search_default_mtrl_alpha.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_textfield_search_default_mtrl_alpha.9.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-ldrtl-mdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-ldrtl-mdpi-v17_abc_ic_menu_cut_mtrl_alpha.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xhdpi-v4\\abc_ic_star_black_16dp.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_ic_star_black_16dp.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_switch_thumb_material.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_switch_thumb_material.xml.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_popup_menu_header_item_layout.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_popup_menu_header_item_layout.xml.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xhdpi-v4\\abc_ic_star_black_16dp.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_ic_star_black_16dp.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\interpolator\\btn_checkbox_checked_mtrl_animation_interpolator_1.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\interpolator_btn_checkbox_checked_mtrl_animation_interpolator_1.xml.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_popup_menu_header_item_layout.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_popup_menu_header_item_layout.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_list_selector_background_transition_holo_light.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_list_selector_background_transition_holo_light.xml.flat
F\:\\diedai2\\test\\app\\build\\generated\\res\\pngs\\debug\\drawable-anydpi-v21\\ic_launcher_background.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-anydpi-v21_ic_launcher_background.xml.flat
-F\:\\diedai2\\test\\app\\src\\main\\res\\drawable\\register_icon_selected.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_register_icon_selected.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\drawable\\notification_tile_bg.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_notification_tile_bg.xml.flat
+F\:\\diedai2\\test\\app\\src\\main\\res\\drawable\\register_icon_selected.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_register_icon_selected.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_action_menu_layout.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_action_menu_layout.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\color-v23\\abc_tint_seek_thumb.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\color-v23_abc_tint_seek_thumb.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_ic_commit_search_api_mtrl_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_ic_commit_search_api_mtrl_alpha.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_dialog_material_background.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_dialog_material_background.xml.flat
-F\:\\diedai2\\test\\app\\build\\generated\\res\\pngs\\debug\\drawable-xxhdpi\\ic_launcher_background.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi_ic_launcher_background.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\layout\\custom_dialog.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_custom_dialog.xml.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\btn_checkbox_unchecked_to_checked_mtrl_animation.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_btn_checkbox_unchecked_to_checked_mtrl_animation.xml.flat
+F\:\\diedai2\\test\\app\\build\\generated\\res\\pngs\\debug\\drawable-xxhdpi\\ic_launcher_background.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi_ic_launcher_background.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_btn_radio_material_anim.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_btn_radio_material_anim.xml.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\btn_checkbox_unchecked_to_checked_mtrl_animation.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_btn_checkbox_unchecked_to_checked_mtrl_animation.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xhdpi-v4\\abc_list_selector_disabled_holo_dark.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_list_selector_disabled_holo_dark.9.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_btn_radio_to_on_mtrl_000.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_btn_radio_to_on_mtrl_000.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\color\\abc_hint_foreground_material_dark.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\color_abc_hint_foreground_material_dark.xml.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_btn_radio_to_on_mtrl_000.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_btn_radio_to_on_mtrl_000.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_ic_search_api_material.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_ic_search_api_material.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\color\\abc_primary_text_material_light.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\color_abc_primary_text_material_light.xml.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_btn_switch_to_on_mtrl_00012.9.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_action_menu_item_layout.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_action_menu_item_layout.xml.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_btn_switch_to_on_mtrl_00012.9.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\color\\abc_primary_text_disable_only_material_light.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\color_abc_primary_text_disable_only_material_light.xml.flat
F\:\\diedai2\\test\\app\\src\\main\\res\\drawable\\default_icon.jpg=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_default_icon.jpg.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_action_bar_up_container.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_action_bar_up_container.xml.flat
@@ -431,44 +434,45 @@ C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xhdpi-v4\\abc_popup_background_mtrl_mult.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_popup_background_mtrl_mult.9.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\color-v23\\abc_color_highlight_material.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\color-v23_abc_color_highlight_material.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_list_selector_holo_dark.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_list_selector_holo_dark.xml.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_ic_commit_search_api_mtrl_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_ic_commit_search_api_mtrl_alpha.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_textfield_default_mtrl_alpha.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_textfield_default_mtrl_alpha.9.png.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_ic_commit_search_api_mtrl_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_ic_commit_search_api_mtrl_alpha.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\anim\\btn_checkbox_to_unchecked_check_path_merged_animation.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\anim_btn_checkbox_to_unchecked_check_path_merged_animation.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\anim\\abc_shrink_fade_out_from_bottom.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\anim_abc_shrink_fade_out_from_bottom.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xhdpi-v4\\abc_spinner_mtrl_am_alpha.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_spinner_mtrl_am_alpha.9.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\color\\abc_primary_text_material_dark.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\color_abc_primary_text_material_dark.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\tooltip_frame_light.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_tooltip_frame_light.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_list_menu_item_icon.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_list_menu_item_icon.xml.flat
-F\:\\diedai2\\test\\app\\src\\main\\res\\drawable\\main_shop_icon.jpg=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_main_shop_icon.jpg.flat
F\:\\diedai2\\test\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_ic_star_black_16dp.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_ic_star_black_16dp.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\color-v23\\abc_tint_spinner.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\color-v23_abc_tint_spinner.xml.flat
+F\:\\diedai2\\test\\app\\src\\main\\res\\drawable\\main_shop_icon.jpg=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_main_shop_icon.jpg.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\interpolator\\btn_checkbox_checked_mtrl_animation_interpolator_0.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\interpolator_btn_checkbox_checked_mtrl_animation_interpolator_0.xml.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\color-v23\\abc_tint_spinner.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\color-v23_abc_tint_spinner.xml.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_ic_star_black_16dp.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_ic_star_black_16dp.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_btn_switch_to_on_mtrl_00001.9.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_ic_menu_cut_mtrl_alpha.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_ic_menu_share_mtrl_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_ic_menu_share_mtrl_alpha.png.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_ic_menu_cut_mtrl_alpha.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_textfield_search_activated_mtrl_alpha.9.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_list_menu_item_radio.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_list_menu_item_radio.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_btn_check_to_on_mtrl_000.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_btn_check_to_on_mtrl_000.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_ic_menu_selectall_mtrl_alpha.png.flat
-F\:\\diedai2\\test\\app\\src\\main\\res\\drawable\\login_user_name_bg.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_login_user_name_bg.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\anim\\abc_popup_enter.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\anim_abc_popup_enter.xml.flat
+F\:\\diedai2\\test\\app\\src\\main\\res\\drawable\\login_user_name_bg.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_login_user_name_bg.png.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4_abc_ic_menu_selectall_mtrl_alpha.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_tab_indicator_mtrl_alpha.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_tab_indicator_mtrl_alpha.9.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_text_select_handle_middle_mtrl_light.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_text_select_handle_middle_mtrl_light.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_popup_background_mtrl_mult.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_popup_background_mtrl_mult.9.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\layout\\notification_template_custom_big.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_custom_big.xml.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_text_select_handle_middle_mtrl_light.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_text_select_handle_middle_mtrl_light.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-ldrtl-xxhdpi-v17\\abc_ic_menu_copy_mtrl_am_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-ldrtl-xxhdpi-v17_abc_ic_menu_copy_mtrl_am_alpha.png.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\f01b27bb220ecb79298884ef36a7a2fb\\core-1.1.0\\res\\layout\\notification_template_custom_big.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_notification_template_custom_big.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_menu_hardkey_panel_mtrl_mult.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_menu_hardkey_panel_mtrl_mult.9.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable\\abc_seekbar_thumb_material.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_abc_seekbar_thumb_material.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_cab_background_top_mtrl_alpha.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_cab_background_top_mtrl_alpha.9.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_list_longpressed_holo.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_list_longpressed_holo.9.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_activity_chooser_view.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_activity_chooser_view.xml.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_list_longpressed_holo.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_list_longpressed_holo.9.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\color-v23\\abc_btn_colored_text_material.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\color-v23_abc_btn_colored_text_material.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_textfield_search_default_mtrl_alpha.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_textfield_search_default_mtrl_alpha.9.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_ic_menu_cut_mtrl_alpha.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_ic_star_half_black_16dp.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_ic_star_half_black_16dp.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-v21\\abc_action_bar_item_background_material.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21_abc_action_bar_item_background_material.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxxhdpi-v4\\abc_spinner_mtrl_am_alpha.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_spinner_mtrl_am_alpha.9.png.flat
-C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\color\\abc_background_cache_hint_selector_material_light.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\color_abc_background_cache_hint_selector_material_light.xml.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-v21\\abc_action_bar_item_background_material.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v21_abc_action_bar_item_background_material.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_text_select_handle_middle_mtrl_dark.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_text_select_handle_middle_mtrl_dark.png.flat
+C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\color\\abc_background_cache_hint_selector_material_light.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\color_abc_background_cache_hint_selector_material_light.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_menu_hardkey_panel_mtrl_mult.9.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_menu_hardkey_panel_mtrl_mult.9.png.flat
+F\:\\diedai2\\test\\app\\src\\main\\res\\layout\\order_item.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_order_item.xml.flat
diff --git a/test/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/test/app/build/intermediates/incremental/mergeDebugResources/merger.xml
index 6d8811f..ab6f402 100644
--- a/test/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/test/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -2685,7 +2685,7 @@
@color/colorPrimary@color/colorPrimaryDark@color/colorAccent
-
+
diff --git a/test/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/test/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index bbd1008..27ede52 100644
--- a/test/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/test/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Sun Jan 05 20:18:26 GMT+08:00 2020
+#Mon Jan 06 23:39:13 GMT+08:00 2020
base.0=F\:\\diedai2\\test\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\out\\classes.dex
path.0=classes.dex
renamed.0=classes.dex
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/activity/R$id.class b/test/app/build/intermediates/javac/debug/classes/androidx/activity/R$id.class
index 823036b..44d612a 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/activity/R$id.class and b/test/app/build/intermediates/javac/debug/classes/androidx/activity/R$id.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/activity/R$layout.class b/test/app/build/intermediates/javac/debug/classes/androidx/activity/R$layout.class
index 35efe95..08c75e7 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/activity/R$layout.class and b/test/app/build/intermediates/javac/debug/classes/androidx/activity/R$layout.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/appcompat/R$id.class b/test/app/build/intermediates/javac/debug/classes/androidx/appcompat/R$id.class
index 1330203..d26b6c1 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/appcompat/R$id.class and b/test/app/build/intermediates/javac/debug/classes/androidx/appcompat/R$id.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/appcompat/R$layout.class b/test/app/build/intermediates/javac/debug/classes/androidx/appcompat/R$layout.class
index 45890ec..a32953a 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/appcompat/R$layout.class and b/test/app/build/intermediates/javac/debug/classes/androidx/appcompat/R$layout.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/appcompat/resources/R$id.class b/test/app/build/intermediates/javac/debug/classes/androidx/appcompat/resources/R$id.class
index aeb34c5..cf8a512 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/appcompat/resources/R$id.class and b/test/app/build/intermediates/javac/debug/classes/androidx/appcompat/resources/R$id.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/appcompat/resources/R$layout.class b/test/app/build/intermediates/javac/debug/classes/androidx/appcompat/resources/R$layout.class
index 4cfce62..2040127 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/appcompat/resources/R$layout.class and b/test/app/build/intermediates/javac/debug/classes/androidx/appcompat/resources/R$layout.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/constraintlayout/widget/R$id.class b/test/app/build/intermediates/javac/debug/classes/androidx/constraintlayout/widget/R$id.class
index e55759d..7cda887 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/constraintlayout/widget/R$id.class and b/test/app/build/intermediates/javac/debug/classes/androidx/constraintlayout/widget/R$id.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/core/R$id.class b/test/app/build/intermediates/javac/debug/classes/androidx/core/R$id.class
index 72693bd..6938eee 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/core/R$id.class and b/test/app/build/intermediates/javac/debug/classes/androidx/core/R$id.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/core/R$layout.class b/test/app/build/intermediates/javac/debug/classes/androidx/core/R$layout.class
index c516d93..a273ef4 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/core/R$layout.class and b/test/app/build/intermediates/javac/debug/classes/androidx/core/R$layout.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/customview/R$id.class b/test/app/build/intermediates/javac/debug/classes/androidx/customview/R$id.class
index 6690064..2163fec 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/customview/R$id.class and b/test/app/build/intermediates/javac/debug/classes/androidx/customview/R$id.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/customview/R$layout.class b/test/app/build/intermediates/javac/debug/classes/androidx/customview/R$layout.class
index aafc38b..0be519b 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/customview/R$layout.class and b/test/app/build/intermediates/javac/debug/classes/androidx/customview/R$layout.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/drawerlayout/R$id.class b/test/app/build/intermediates/javac/debug/classes/androidx/drawerlayout/R$id.class
index d93be4f..51d89a3 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/drawerlayout/R$id.class and b/test/app/build/intermediates/javac/debug/classes/androidx/drawerlayout/R$id.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/drawerlayout/R$layout.class b/test/app/build/intermediates/javac/debug/classes/androidx/drawerlayout/R$layout.class
index 37ce6c8..2a87a0f 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/drawerlayout/R$layout.class and b/test/app/build/intermediates/javac/debug/classes/androidx/drawerlayout/R$layout.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/fragment/R$id.class b/test/app/build/intermediates/javac/debug/classes/androidx/fragment/R$id.class
index 88f788f..a8be576 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/fragment/R$id.class and b/test/app/build/intermediates/javac/debug/classes/androidx/fragment/R$id.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/fragment/R$layout.class b/test/app/build/intermediates/javac/debug/classes/androidx/fragment/R$layout.class
index 2a5492a..520b489 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/fragment/R$layout.class and b/test/app/build/intermediates/javac/debug/classes/androidx/fragment/R$layout.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/loader/R$id.class b/test/app/build/intermediates/javac/debug/classes/androidx/loader/R$id.class
index 04a15ee..440b4a9 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/loader/R$id.class and b/test/app/build/intermediates/javac/debug/classes/androidx/loader/R$id.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/loader/R$layout.class b/test/app/build/intermediates/javac/debug/classes/androidx/loader/R$layout.class
index f0b007b..0618724 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/loader/R$layout.class and b/test/app/build/intermediates/javac/debug/classes/androidx/loader/R$layout.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/vectordrawable/R$id.class b/test/app/build/intermediates/javac/debug/classes/androidx/vectordrawable/R$id.class
index aaf50bb..16a4dee 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/vectordrawable/R$id.class and b/test/app/build/intermediates/javac/debug/classes/androidx/vectordrawable/R$id.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/vectordrawable/R$layout.class b/test/app/build/intermediates/javac/debug/classes/androidx/vectordrawable/R$layout.class
index 0f6344a..55c9a88 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/vectordrawable/R$layout.class and b/test/app/build/intermediates/javac/debug/classes/androidx/vectordrawable/R$layout.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/vectordrawable/animated/R$id.class b/test/app/build/intermediates/javac/debug/classes/androidx/vectordrawable/animated/R$id.class
index 5f3fedf..af7a288 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/vectordrawable/animated/R$id.class and b/test/app/build/intermediates/javac/debug/classes/androidx/vectordrawable/animated/R$id.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/vectordrawable/animated/R$layout.class b/test/app/build/intermediates/javac/debug/classes/androidx/vectordrawable/animated/R$layout.class
index 12a30f9..988ec11 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/vectordrawable/animated/R$layout.class and b/test/app/build/intermediates/javac/debug/classes/androidx/vectordrawable/animated/R$layout.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/viewpager/R$id.class b/test/app/build/intermediates/javac/debug/classes/androidx/viewpager/R$id.class
index 894c87e..8bd5279 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/viewpager/R$id.class and b/test/app/build/intermediates/javac/debug/classes/androidx/viewpager/R$id.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/androidx/viewpager/R$layout.class b/test/app/build/intermediates/javac/debug/classes/androidx/viewpager/R$layout.class
index af92b16..f6463b2 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/androidx/viewpager/R$layout.class and b/test/app/build/intermediates/javac/debug/classes/androidx/viewpager/R$layout.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/com/example/test/CartBean.class b/test/app/build/intermediates/javac/debug/classes/com/example/test/CartBean.class
index de4c18e..519384b 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/com/example/test/CartBean.class and b/test/app/build/intermediates/javac/debug/classes/com/example/test/CartBean.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/com/example/test/MainActivity.class b/test/app/build/intermediates/javac/debug/classes/com/example/test/MainActivity.class
index 4445988..0367bc9 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/com/example/test/MainActivity.class and b/test/app/build/intermediates/javac/debug/classes/com/example/test/MainActivity.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/com/example/test/MyinfoFragment.class b/test/app/build/intermediates/javac/debug/classes/com/example/test/MyinfoFragment.class
index 6450093..f2e9016 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/com/example/test/MyinfoFragment.class and b/test/app/build/intermediates/javac/debug/classes/com/example/test/MyinfoFragment.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/com/example/test/ProductAdapter.class b/test/app/build/intermediates/javac/debug/classes/com/example/test/ProductAdapter.class
index b9cc045..7ea1b2a 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/com/example/test/ProductAdapter.class and b/test/app/build/intermediates/javac/debug/classes/com/example/test/ProductAdapter.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/com/example/test/ProductCartAdapter.class b/test/app/build/intermediates/javac/debug/classes/com/example/test/ProductCartAdapter.class
index 598c7cf..3e97cc2 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/com/example/test/ProductCartAdapter.class and b/test/app/build/intermediates/javac/debug/classes/com/example/test/ProductCartAdapter.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/com/example/test/R$id.class b/test/app/build/intermediates/javac/debug/classes/com/example/test/R$id.class
index 9224fb0..ab1a719 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/com/example/test/R$id.class and b/test/app/build/intermediates/javac/debug/classes/com/example/test/R$id.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/com/example/test/R$integer.class b/test/app/build/intermediates/javac/debug/classes/com/example/test/R$integer.class
index b0e8ca9..41a1f9b 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/com/example/test/R$integer.class and b/test/app/build/intermediates/javac/debug/classes/com/example/test/R$integer.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/com/example/test/R$interpolator.class b/test/app/build/intermediates/javac/debug/classes/com/example/test/R$interpolator.class
index cdc6143..beaec3f 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/com/example/test/R$interpolator.class and b/test/app/build/intermediates/javac/debug/classes/com/example/test/R$interpolator.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/com/example/test/R$layout.class b/test/app/build/intermediates/javac/debug/classes/com/example/test/R$layout.class
index 8abd569..adb1648 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/com/example/test/R$layout.class and b/test/app/build/intermediates/javac/debug/classes/com/example/test/R$layout.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/com/example/test/R$mipmap.class b/test/app/build/intermediates/javac/debug/classes/com/example/test/R$mipmap.class
index cf8ae73..2d2c899 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/com/example/test/R$mipmap.class and b/test/app/build/intermediates/javac/debug/classes/com/example/test/R$mipmap.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/com/example/test/R$string.class b/test/app/build/intermediates/javac/debug/classes/com/example/test/R$string.class
index d5fc80c..e4f8378 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/com/example/test/R$string.class and b/test/app/build/intermediates/javac/debug/classes/com/example/test/R$string.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/com/example/test/R$style.class b/test/app/build/intermediates/javac/debug/classes/com/example/test/R$style.class
index 8f37499..6d49bcc 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/com/example/test/R$style.class and b/test/app/build/intermediates/javac/debug/classes/com/example/test/R$style.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/com/example/test/R$styleable.class b/test/app/build/intermediates/javac/debug/classes/com/example/test/R$styleable.class
index e5b55e4..43fb2fd 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/com/example/test/R$styleable.class and b/test/app/build/intermediates/javac/debug/classes/com/example/test/R$styleable.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/com/example/test/R$xml.class b/test/app/build/intermediates/javac/debug/classes/com/example/test/R$xml.class
index 8e55f43..82e37ff 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/com/example/test/R$xml.class and b/test/app/build/intermediates/javac/debug/classes/com/example/test/R$xml.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/com/example/test/SLogin/DBUtils.class b/test/app/build/intermediates/javac/debug/classes/com/example/test/SLogin/DBUtils.class
index 479d842..ed99bd5 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/com/example/test/SLogin/DBUtils.class and b/test/app/build/intermediates/javac/debug/classes/com/example/test/SLogin/DBUtils.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/com/example/test/SLogin/RegisterActivity.class b/test/app/build/intermediates/javac/debug/classes/com/example/test/SLogin/RegisterActivity.class
index ae59db1..0863a39 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/com/example/test/SLogin/RegisterActivity.class and b/test/app/build/intermediates/javac/debug/classes/com/example/test/SLogin/RegisterActivity.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/com/example/test/SLogin/SplashActivity.class b/test/app/build/intermediates/javac/debug/classes/com/example/test/SLogin/SplashActivity.class
index 971cfba..4ef9de6 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/com/example/test/SLogin/SplashActivity.class and b/test/app/build/intermediates/javac/debug/classes/com/example/test/SLogin/SplashActivity.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/com/example/test/ShopFragment.class b/test/app/build/intermediates/javac/debug/classes/com/example/test/ShopFragment.class
index 69da04b..dbcc6f6 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/com/example/test/ShopFragment.class and b/test/app/build/intermediates/javac/debug/classes/com/example/test/ShopFragment.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/com/example/test/Shopping_CartFragment$1.class b/test/app/build/intermediates/javac/debug/classes/com/example/test/Shopping_CartFragment$1.class
index 39fe16b..21bc479 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/com/example/test/Shopping_CartFragment$1.class and b/test/app/build/intermediates/javac/debug/classes/com/example/test/Shopping_CartFragment$1.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/com/example/test/Shopping_CartFragment$UploadCartThread.class b/test/app/build/intermediates/javac/debug/classes/com/example/test/Shopping_CartFragment$UploadCartThread.class
index a37edd3..578a512 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/com/example/test/Shopping_CartFragment$UploadCartThread.class and b/test/app/build/intermediates/javac/debug/classes/com/example/test/Shopping_CartFragment$UploadCartThread.class differ
diff --git a/test/app/build/intermediates/javac/debug/classes/com/example/test/Shopping_CartFragment.class b/test/app/build/intermediates/javac/debug/classes/com/example/test/Shopping_CartFragment.class
index cd9e026..7f40ec4 100644
Binary files a/test/app/build/intermediates/javac/debug/classes/com/example/test/Shopping_CartFragment.class and b/test/app/build/intermediates/javac/debug/classes/com/example/test/Shopping_CartFragment.class differ
diff --git a/test/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_ b/test/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_
index 8e4e757..fda260a 100644
Binary files a/test/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_ and b/test/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_ differ
diff --git a/test/app/build/intermediates/res/merged/debug/drawable-v24_main_shop_icon.jpg.flat b/test/app/build/intermediates/res/merged/debug/drawable-v24_main_shop_icon.jpg.flat
deleted file mode 100644
index 60f9b08..0000000
Binary files a/test/app/build/intermediates/res/merged/debug/drawable-v24_main_shop_icon.jpg.flat and /dev/null differ
diff --git a/test/app/build/intermediates/res/merged/debug/drawable-v24_myinfo_setting_icon.png.flat b/test/app/build/intermediates/res/merged/debug/drawable-v24_myinfo_setting_icon.png.flat
deleted file mode 100644
index eb925d9..0000000
Binary files a/test/app/build/intermediates/res/merged/debug/drawable-v24_myinfo_setting_icon.png.flat and /dev/null differ
diff --git a/test/app/build/intermediates/res/merged/debug/drawable_snack1.png.flat b/test/app/build/intermediates/res/merged/debug/drawable_snack1.png.flat
deleted file mode 100644
index ea10d94..0000000
Binary files a/test/app/build/intermediates/res/merged/debug/drawable_snack1.png.flat and /dev/null differ
diff --git a/test/app/build/intermediates/res/merged/debug/drawable_snack2.jpg.flat b/test/app/build/intermediates/res/merged/debug/drawable_snack2.jpg.flat
deleted file mode 100644
index 8c87ea2..0000000
Binary files a/test/app/build/intermediates/res/merged/debug/drawable_snack2.jpg.flat and /dev/null differ
diff --git a/test/app/build/intermediates/res/merged/debug/drawable_snack3.jpg.flat b/test/app/build/intermediates/res/merged/debug/drawable_snack3.jpg.flat
deleted file mode 100644
index f412444..0000000
Binary files a/test/app/build/intermediates/res/merged/debug/drawable_snack3.jpg.flat and /dev/null differ
diff --git a/test/app/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt b/test/app/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
index 7d89734..e27b754 100644
--- a/test/app/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
+++ b/test/app/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
@@ -846,6 +846,12 @@ id notification_main_column
id notification_main_column_container
id off
id on
+id order
+id order_item
+id order_list_view
+id order_list_view_item
+id order_price_item
+id order_time
id packed
id parent
id parentPanel
@@ -863,13 +869,13 @@ id right
id right_icon
id right_side
id rl_account
-id rl_course_history
id rl_head
id rl_nickName
id rl_pay
id rl_phone
id rl_qq
id rl_sex
+id rl_shopping_history
id screen
id scrollIndicatorDown
id scrollIndicatorUp
@@ -924,7 +930,6 @@ id topPanel
id tv_Raddress
id tv_Raddress_show
id tv_back
-id tv_course_history
id tv_main_title
id tv_name
id tv_pay_address
@@ -933,6 +938,7 @@ id tv_phone
id tv_phone_show
id tv_save
id tv_sex
+id tv_shopping_history
id tv_true_name
id tv_true_name_show
id tv_user_name
@@ -993,6 +999,8 @@ layout activity_splash
layout activity_user_info
layout cartproduct_item
layout custom_dialog
+layout fragment_order
+layout fragment_order_item
layout fragment_shop
layout fragment_shopping_cart
layout fragment_user
@@ -1003,6 +1011,8 @@ layout notification_template_custom_big
layout notification_template_icon_group
layout notification_template_part_chronometer
layout notification_template_part_time
+layout order_item
+layout order_item_item
layout product_item
layout select_dialog_item_material
layout select_dialog_multichoice_material
diff --git a/test/app/build/intermediates/symbols/debug/R.txt b/test/app/build/intermediates/symbols/debug/R.txt
index 8286377..2309aaf 100644
--- a/test/app/build/intermediates/symbols/debug/R.txt
+++ b/test/app/build/intermediates/symbols/debug/R.txt
@@ -845,105 +845,111 @@ int id notification_main_column 0x7f07008e
int id notification_main_column_container 0x7f07008f
int id off 0x7f070090
int id on 0x7f070091
-int id packed 0x7f070092
-int id parent 0x7f070093
-int id parentPanel 0x7f070094
-int id pay_button 0x7f070095
-int id percent 0x7f070096
-int id product_cart_count 0x7f070097
-int id product_cart_name 0x7f070098
-int id product_cart_price 0x7f070099
-int id product_name 0x7f07009a
-int id product_price 0x7f07009b
-int id progress_circular 0x7f07009c
-int id progress_horizontal 0x7f07009d
-int id radio 0x7f07009e
-int id right 0x7f07009f
-int id right_icon 0x7f0700a0
-int id right_side 0x7f0700a1
-int id rl_account 0x7f0700a2
-int id rl_course_history 0x7f0700a3
-int id rl_head 0x7f0700a4
-int id rl_nickName 0x7f0700a5
-int id rl_pay 0x7f0700a6
-int id rl_phone 0x7f0700a7
-int id rl_qq 0x7f0700a8
-int id rl_sex 0x7f0700a9
-int id screen 0x7f0700aa
-int id scrollIndicatorDown 0x7f0700ab
-int id scrollIndicatorUp 0x7f0700ac
-int id scrollView 0x7f0700ad
-int id search_badge 0x7f0700ae
-int id search_bar 0x7f0700af
-int id search_button 0x7f0700b0
-int id search_close_btn 0x7f0700b1
-int id search_edit_frame 0x7f0700b2
-int id search_go_btn 0x7f0700b3
-int id search_mag_icon 0x7f0700b4
-int id search_plate 0x7f0700b5
-int id search_src_text 0x7f0700b6
-int id search_voice_btn 0x7f0700b7
-int id select_dialog_listview 0x7f0700b8
-int id shortcut 0x7f0700b9
-int id showCustom 0x7f0700ba
-int id showHome 0x7f0700bb
-int id showTitle 0x7f0700bc
-int id spacer 0x7f0700bd
-int id split_action_bar 0x7f0700be
-int id spread 0x7f0700bf
-int id spread_inside 0x7f0700c0
-int id src_atop 0x7f0700c1
-int id src_in 0x7f0700c2
-int id src_over 0x7f0700c3
-int id standard 0x7f0700c4
-int id start 0x7f0700c5
-int id submenuarrow 0x7f0700c6
-int id submit_area 0x7f0700c7
-int id sum_price 0x7f0700c8
-int id tabMode 0x7f0700c9
-int id tag_accessibility_actions 0x7f0700ca
-int id tag_accessibility_clickable_spans 0x7f0700cb
-int id tag_accessibility_heading 0x7f0700cc
-int id tag_accessibility_pane_title 0x7f0700cd
-int id tag_screen_reader_focusable 0x7f0700ce
-int id tag_transition_group 0x7f0700cf
-int id tag_unhandled_key_event_manager 0x7f0700d0
-int id tag_unhandled_key_listeners 0x7f0700d1
-int id text 0x7f0700d2
-int id text2 0x7f0700d3
-int id textSpacerNoButtons 0x7f0700d4
-int id textSpacerNoTitle 0x7f0700d5
-int id time 0x7f0700d6
-int id title 0x7f0700d7
-int id titleDividerNoCustom 0x7f0700d8
-int id title_bar 0x7f0700d9
-int id title_template 0x7f0700da
-int id top 0x7f0700db
-int id topPanel 0x7f0700dc
-int id tv_Raddress 0x7f0700dd
-int id tv_Raddress_show 0x7f0700de
-int id tv_back 0x7f0700df
-int id tv_course_history 0x7f0700e0
-int id tv_main_title 0x7f0700e1
-int id tv_name 0x7f0700e2
-int id tv_pay_address 0x7f0700e3
-int id tv_pay_user_name_show 0x7f0700e4
-int id tv_phone 0x7f0700e5
-int id tv_phone_show 0x7f0700e6
-int id tv_save 0x7f0700e7
-int id tv_sex 0x7f0700e8
-int id tv_true_name 0x7f0700e9
-int id tv_true_name_show 0x7f0700ea
-int id tv_user_name 0x7f0700eb
-int id tv_user_name_show 0x7f0700ec
-int id tv_version 0x7f0700ed
-int id unchecked 0x7f0700ee
-int id uniform 0x7f0700ef
-int id up 0x7f0700f0
-int id useLogo 0x7f0700f1
-int id withText 0x7f0700f2
-int id wrap 0x7f0700f3
-int id wrap_content 0x7f0700f4
+int id order 0x7f070092
+int id order_item 0x7f070093
+int id order_list_view 0x7f070094
+int id order_list_view_item 0x7f070095
+int id order_price_item 0x7f070096
+int id order_time 0x7f070097
+int id packed 0x7f070098
+int id parent 0x7f070099
+int id parentPanel 0x7f07009a
+int id pay_button 0x7f07009b
+int id percent 0x7f07009c
+int id product_cart_count 0x7f07009d
+int id product_cart_name 0x7f07009e
+int id product_cart_price 0x7f07009f
+int id product_name 0x7f0700a0
+int id product_price 0x7f0700a1
+int id progress_circular 0x7f0700a2
+int id progress_horizontal 0x7f0700a3
+int id radio 0x7f0700a4
+int id right 0x7f0700a5
+int id right_icon 0x7f0700a6
+int id right_side 0x7f0700a7
+int id rl_account 0x7f0700a8
+int id rl_head 0x7f0700a9
+int id rl_nickName 0x7f0700aa
+int id rl_pay 0x7f0700ab
+int id rl_phone 0x7f0700ac
+int id rl_qq 0x7f0700ad
+int id rl_sex 0x7f0700ae
+int id rl_shopping_history 0x7f0700af
+int id screen 0x7f0700b0
+int id scrollIndicatorDown 0x7f0700b1
+int id scrollIndicatorUp 0x7f0700b2
+int id scrollView 0x7f0700b3
+int id search_badge 0x7f0700b4
+int id search_bar 0x7f0700b5
+int id search_button 0x7f0700b6
+int id search_close_btn 0x7f0700b7
+int id search_edit_frame 0x7f0700b8
+int id search_go_btn 0x7f0700b9
+int id search_mag_icon 0x7f0700ba
+int id search_plate 0x7f0700bb
+int id search_src_text 0x7f0700bc
+int id search_voice_btn 0x7f0700bd
+int id select_dialog_listview 0x7f0700be
+int id shortcut 0x7f0700bf
+int id showCustom 0x7f0700c0
+int id showHome 0x7f0700c1
+int id showTitle 0x7f0700c2
+int id spacer 0x7f0700c3
+int id split_action_bar 0x7f0700c4
+int id spread 0x7f0700c5
+int id spread_inside 0x7f0700c6
+int id src_atop 0x7f0700c7
+int id src_in 0x7f0700c8
+int id src_over 0x7f0700c9
+int id standard 0x7f0700ca
+int id start 0x7f0700cb
+int id submenuarrow 0x7f0700cc
+int id submit_area 0x7f0700cd
+int id sum_price 0x7f0700ce
+int id tabMode 0x7f0700cf
+int id tag_accessibility_actions 0x7f0700d0
+int id tag_accessibility_clickable_spans 0x7f0700d1
+int id tag_accessibility_heading 0x7f0700d2
+int id tag_accessibility_pane_title 0x7f0700d3
+int id tag_screen_reader_focusable 0x7f0700d4
+int id tag_transition_group 0x7f0700d5
+int id tag_unhandled_key_event_manager 0x7f0700d6
+int id tag_unhandled_key_listeners 0x7f0700d7
+int id text 0x7f0700d8
+int id text2 0x7f0700d9
+int id textSpacerNoButtons 0x7f0700da
+int id textSpacerNoTitle 0x7f0700db
+int id time 0x7f0700dc
+int id title 0x7f0700dd
+int id titleDividerNoCustom 0x7f0700de
+int id title_bar 0x7f0700df
+int id title_template 0x7f0700e0
+int id top 0x7f0700e1
+int id topPanel 0x7f0700e2
+int id tv_Raddress 0x7f0700e3
+int id tv_Raddress_show 0x7f0700e4
+int id tv_back 0x7f0700e5
+int id tv_main_title 0x7f0700e6
+int id tv_name 0x7f0700e7
+int id tv_pay_address 0x7f0700e8
+int id tv_pay_user_name_show 0x7f0700e9
+int id tv_phone 0x7f0700ea
+int id tv_phone_show 0x7f0700eb
+int id tv_save 0x7f0700ec
+int id tv_sex 0x7f0700ed
+int id tv_shopping_history 0x7f0700ee
+int id tv_true_name 0x7f0700ef
+int id tv_true_name_show 0x7f0700f0
+int id tv_user_name 0x7f0700f1
+int id tv_user_name_show 0x7f0700f2
+int id tv_version 0x7f0700f3
+int id unchecked 0x7f0700f4
+int id uniform 0x7f0700f5
+int id up 0x7f0700f6
+int id useLogo 0x7f0700f7
+int id withText 0x7f0700f8
+int id wrap 0x7f0700f9
+int id wrap_content 0x7f0700fa
int integer abc_config_activityDefaultDur 0x7f080000
int integer abc_config_activityShortDur 0x7f080001
int integer cancel_button_image_alpha 0x7f080002
@@ -992,24 +998,28 @@ int layout activity_splash 0x7f0a0020
int layout activity_user_info 0x7f0a0021
int layout cartproduct_item 0x7f0a0022
int layout custom_dialog 0x7f0a0023
-int layout fragment_shop 0x7f0a0024
-int layout fragment_shopping_cart 0x7f0a0025
-int layout fragment_user 0x7f0a0026
-int layout main_title_bar 0x7f0a0027
-int layout notification_action 0x7f0a0028
-int layout notification_action_tombstone 0x7f0a0029
-int layout notification_template_custom_big 0x7f0a002a
-int layout notification_template_icon_group 0x7f0a002b
-int layout notification_template_part_chronometer 0x7f0a002c
-int layout notification_template_part_time 0x7f0a002d
-int layout product_item 0x7f0a002e
-int layout select_dialog_item_material 0x7f0a002f
-int layout select_dialog_multichoice_material 0x7f0a0030
-int layout select_dialog_singlechoice_material 0x7f0a0031
-int layout support_simple_spinner_dropdown_item 0x7f0a0032
-int layout tool 0x7f0a0033
-int layout total 0x7f0a0034
-int layout userinfo_change 0x7f0a0035
+int layout fragment_order 0x7f0a0024
+int layout fragment_order_item 0x7f0a0025
+int layout fragment_shop 0x7f0a0026
+int layout fragment_shopping_cart 0x7f0a0027
+int layout fragment_user 0x7f0a0028
+int layout main_title_bar 0x7f0a0029
+int layout notification_action 0x7f0a002a
+int layout notification_action_tombstone 0x7f0a002b
+int layout notification_template_custom_big 0x7f0a002c
+int layout notification_template_icon_group 0x7f0a002d
+int layout notification_template_part_chronometer 0x7f0a002e
+int layout notification_template_part_time 0x7f0a002f
+int layout order_item 0x7f0a0030
+int layout order_item_item 0x7f0a0031
+int layout product_item 0x7f0a0032
+int layout select_dialog_item_material 0x7f0a0033
+int layout select_dialog_multichoice_material 0x7f0a0034
+int layout select_dialog_singlechoice_material 0x7f0a0035
+int layout support_simple_spinner_dropdown_item 0x7f0a0036
+int layout tool 0x7f0a0037
+int layout total 0x7f0a0038
+int layout userinfo_change 0x7f0a0039
int mipmap ic_launcher 0x7f0b0000
int mipmap ic_launcher_round 0x7f0b0001
int string abc_action_bar_home_description 0x7f0c0000
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/activity/R$id.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/activity/R$id.dex
index 41794d9..4971612 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/activity/R$id.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/activity/R$id.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/activity/R$layout.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/activity/R$layout.dex
index 4f1f1b5..b6dcb79 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/activity/R$layout.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/activity/R$layout.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/appcompat/R$id.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/appcompat/R$id.dex
index 618fc9c..38c7d69 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/appcompat/R$id.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/appcompat/R$id.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/appcompat/R$layout.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/appcompat/R$layout.dex
index d1aef35..320038f 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/appcompat/R$layout.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/appcompat/R$layout.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/appcompat/resources/R$id.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/appcompat/resources/R$id.dex
index 0bac30e..33c3ddc 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/appcompat/resources/R$id.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/appcompat/resources/R$id.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/appcompat/resources/R$layout.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/appcompat/resources/R$layout.dex
index 826138a..40349ec 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/appcompat/resources/R$layout.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/appcompat/resources/R$layout.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/constraintlayout/widget/R$id.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/constraintlayout/widget/R$id.dex
index b0142c5..b2cfd1e 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/constraintlayout/widget/R$id.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/constraintlayout/widget/R$id.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/core/R$id.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/core/R$id.dex
index 1fd35fb..5dde6f6 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/core/R$id.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/core/R$id.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/core/R$layout.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/core/R$layout.dex
index 4ab9a60..203a6b9 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/core/R$layout.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/core/R$layout.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/customview/R$id.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/customview/R$id.dex
index f6cfd4e..ced9f84 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/customview/R$id.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/customview/R$id.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/customview/R$layout.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/customview/R$layout.dex
index 6c903e4..ceb9d05 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/customview/R$layout.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/customview/R$layout.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/drawerlayout/R$id.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/drawerlayout/R$id.dex
index ea372aa..008446f 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/drawerlayout/R$id.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/drawerlayout/R$id.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/drawerlayout/R$layout.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/drawerlayout/R$layout.dex
index 49c02ce..705c1c8 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/drawerlayout/R$layout.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/drawerlayout/R$layout.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/fragment/R$id.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/fragment/R$id.dex
index d3a3571..dfdaed9 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/fragment/R$id.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/fragment/R$id.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/fragment/R$layout.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/fragment/R$layout.dex
index 391a948..fdbc656 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/fragment/R$layout.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/fragment/R$layout.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/loader/R$id.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/loader/R$id.dex
index f311032..eb65a61 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/loader/R$id.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/loader/R$id.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/loader/R$layout.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/loader/R$layout.dex
index 0b9484a..3df6e76 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/loader/R$layout.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/loader/R$layout.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/vectordrawable/R$id.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/vectordrawable/R$id.dex
index 922f242..7b9539c 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/vectordrawable/R$id.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/vectordrawable/R$id.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/vectordrawable/R$layout.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/vectordrawable/R$layout.dex
index a532412..b0ba9db 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/vectordrawable/R$layout.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/vectordrawable/R$layout.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/vectordrawable/animated/R$id.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/vectordrawable/animated/R$id.dex
index d8b1f16..aea0c0a 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/vectordrawable/animated/R$id.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/vectordrawable/animated/R$id.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/vectordrawable/animated/R$layout.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/vectordrawable/animated/R$layout.dex
index 4c56ed2..143cf3a 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/vectordrawable/animated/R$layout.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/vectordrawable/animated/R$layout.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/viewpager/R$id.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/viewpager/R$id.dex
index 5b9d049..5215285 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/viewpager/R$id.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/viewpager/R$id.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/viewpager/R$layout.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/viewpager/R$layout.dex
index 8957fe5..002d850 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/viewpager/R$layout.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/androidx/viewpager/R$layout.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/CartBean.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/CartBean.dex
index 15ac025..4b80eb0 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/CartBean.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/CartBean.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/MainActivity.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/MainActivity.dex
index c5b040a..269d33b 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/MainActivity.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/MainActivity.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/MyinfoFragment.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/MyinfoFragment.dex
index e3c2d8d..c73f09f 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/MyinfoFragment.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/MyinfoFragment.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/ProductAdapter.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/ProductAdapter.dex
index cb50e3a..c37870d 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/ProductAdapter.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/ProductAdapter.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/ProductCartAdapter.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/ProductCartAdapter.dex
index 8e60848..6a9c54a 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/ProductCartAdapter.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/ProductCartAdapter.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$id.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$id.dex
index ab8f587..ee8e5b9 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$id.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$id.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$integer.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$integer.dex
index ed998b8..123b9b9 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$integer.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$integer.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$interpolator.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$interpolator.dex
index cc991e6..7ea554a 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$interpolator.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$interpolator.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$layout.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$layout.dex
index 4aaca44..ae7fc65 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$layout.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$layout.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$mipmap.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$mipmap.dex
index 84a1683..4d7810e 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$mipmap.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$mipmap.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$string.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$string.dex
index 3fce847..0feffd9 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$string.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$string.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$style.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$style.dex
index 9ec1a7a..9361a65 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$style.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$style.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$styleable.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$styleable.dex
index f8b4141..89561f9 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$styleable.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$styleable.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$xml.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$xml.dex
index c210204..ec95179 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$xml.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/R$xml.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/SLogin/DBUtils.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/SLogin/DBUtils.dex
index 988ac67..e4de4f5 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/SLogin/DBUtils.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/SLogin/DBUtils.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/SLogin/RegisterActivity.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/SLogin/RegisterActivity.dex
index 651d0d5..a3df29d 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/SLogin/RegisterActivity.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/SLogin/RegisterActivity.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/SLogin/SplashActivity.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/SLogin/SplashActivity.dex
index 70e6bcd..612181a 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/SLogin/SplashActivity.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/SLogin/SplashActivity.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/ShopFragment.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/ShopFragment.dex
index dbc1c98..7259644 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/ShopFragment.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/ShopFragment.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/Shopping_CartFragment$1.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/Shopping_CartFragment$1.dex
index cbc8755..592c83d 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/Shopping_CartFragment$1.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/Shopping_CartFragment$1.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/Shopping_CartFragment$UploadCartThread.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/Shopping_CartFragment$UploadCartThread.dex
index ca69039..41f6738 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/Shopping_CartFragment$UploadCartThread.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/Shopping_CartFragment$UploadCartThread.dex differ
diff --git a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/Shopping_CartFragment.dex b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/Shopping_CartFragment.dex
index e1afa0a..0f8ab54 100644
Binary files a/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/Shopping_CartFragment.dex and b/test/app/build/intermediates/transforms/dexBuilder/debug/0/com/example/test/Shopping_CartFragment.dex differ
diff --git a/test/app/build/outputs/apk/debug/app-debug.apk b/test/app/build/outputs/apk/debug/app-debug.apk
index acd82c4..95b369c 100644
Binary files a/test/app/build/outputs/apk/debug/app-debug.apk and b/test/app/build/outputs/apk/debug/app-debug.apk differ
diff --git a/test/app/src/main/java/com/example/test/CartBean.java b/test/app/src/main/java/com/example/test/CartBean.java
index 82d01e0..2d614f1 100644
--- a/test/app/src/main/java/com/example/test/CartBean.java
+++ b/test/app/src/main/java/com/example/test/CartBean.java
@@ -5,10 +5,20 @@ import android.util.Log;
public class CartBean {
public String cart_image;
+ public int CartId;
public String cart_name;
public int cart_price;
public int cart_count;
+
+ public void setCartIdId(int id){
+ this.CartId = id;
+ }
+
+ public int getCartId(){
+ return CartId;
+ }
+
public void setImage(String cart_image){
this.cart_image = cart_image;
}
diff --git a/test/app/src/main/java/com/example/test/MyinfoFragment.java b/test/app/src/main/java/com/example/test/MyinfoFragment.java
index 5c8dd29..a603d1f 100644
--- a/test/app/src/main/java/com/example/test/MyinfoFragment.java
+++ b/test/app/src/main/java/com/example/test/MyinfoFragment.java
@@ -8,8 +8,11 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
+import android.widget.Toast;
import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
import com.example.test.R;
@@ -18,6 +21,8 @@ import com.example.test.R;
public class MyinfoFragment extends Fragment {
private LinearLayout myInfo_bar;
+
+ private RelativeLayout rl_shopping_history;
int mess = 0;//用来接受ID
public MyinfoFragment() {
@@ -42,6 +47,8 @@ public class MyinfoFragment extends Fragment {
public void onViewCreated(View view, Bundle savedInstanceState){
myInfo_bar = (LinearLayout)view.findViewById(R.id.ll_head);
+ rl_shopping_history = (RelativeLayout)view.findViewById(R.id.rl_shopping_history);
+
myInfo_bar.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@@ -53,6 +60,24 @@ public class MyinfoFragment extends Fragment {
}
});
+ rl_shopping_history.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ {
+ OrderFragment1 fragment = new OrderFragment1();
+ Bundle bundle = new Bundle();
+ bundle.putInt("data",mess);
+ fragment.setArguments(bundle);
+ FragmentManager fragmentManager = (MyinfoFragment.this).getFragmentManager();
+ FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+ fragmentTransaction.replace(R.id.main_body,fragment);
+ fragmentTransaction.commit();
+
+ Toast.makeText(getActivity(), "购物记录", Toast.LENGTH_SHORT).show();
+ }
+ }
+ });
+
}
}
\ No newline at end of file
diff --git a/test/app/src/main/java/com/example/test/OrderAdapter.java b/test/app/src/main/java/com/example/test/OrderAdapter.java
new file mode 100644
index 0000000..5418f9d
--- /dev/null
+++ b/test/app/src/main/java/com/example/test/OrderAdapter.java
@@ -0,0 +1,78 @@
+package com.example.test;
+
+import android.content.Context;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.squareup.picasso.Picasso;
+
+import java.util.ArrayList;
+
+public class OrderAdapter extends BaseAdapter {
+
+ private ArrayList list;
+ private Context context;
+
+ //通过构造方法接受要显示的新闻数据集合
+ public OrderAdapter(Context context, ArrayList list) {
+ this.list = list;
+ this.context = context;
+ Log.v("context",list.size()+"kkkkkk");
+ }
+
+
+ //返回列表长度
+ public int getCount() {
+ return list.size();
+ }
+
+
+ public Object getItem(int position) {
+ return list.get(position);
+ }
+
+
+ public long getItemId(int position) {
+ return position;
+ }
+
+
+ public View getView(int position, View convertView, ViewGroup parent) {
+ View view = null;
+ Log.v("789987", view+"");
+ //1.复用converView优化listview,创建一个view作为getview的返回值用来显示一个条目
+ if (convertView != null) {
+ view = convertView;
+
+ } else {
+ //方法一：推荐
+ //context:上下文, resource:要转换成view对象的layout的id, root:将layout用root(ViewGroup)包一层作为codify的返回值,一般传null
+ view = View.inflate(context, R.layout.order_item, null);//将一个布局文件转换成一个view对象
+
+ //方法二
+ //通过LayoutInflater将布局转换成view对象
+ //view = LayoutInflater.from(context).inflate(R.layout.item_news_layout, null);
+
+ //方法三：系统级开发
+ //通过context获取系统服务得到一个LayoutInflater，通过LayoutInflater将一个布局转换为view对象
+ //LayoutInflater layoutInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ //view = layoutInflater.inflate(R.layout.item_news_layout, null);
+
+ }
+ //2.获取view上的子控件对象
+ TextView orderId = (TextView) view.findViewById(R.id.order);
+ TextView orderTime = (TextView) view.findViewById(R.id.order_time);
+ //3.获取postion位置条目对应的list集合中的新闻数据，Bean对象
+ OrderBean bean = list.get(position);
+ //4.将数据设置给这些子控件做显示
+
+ orderId.setText(bean.getOrderId()+"");
+ orderTime.setText(bean.getOrderTime());
+ return view;
+ }
+
+}
diff --git a/test/app/src/main/java/com/example/test/OrderBean.java b/test/app/src/main/java/com/example/test/OrderBean.java
new file mode 100644
index 0000000..9aef21b
--- /dev/null
+++ b/test/app/src/main/java/com/example/test/OrderBean.java
@@ -0,0 +1,24 @@
+package com.example.test;
+
+public class OrderBean {
+
+ public int orderId;
+ public String order_time;
+
+ public void setOrderId(int orderId){
+ this.orderId = orderId;
+ }
+
+ public int getOrderId(){
+ return orderId;
+ }
+
+ public void setOrderTime(String orderTime){
+ this.order_time = orderTime;
+ }
+
+ public String getOrderTime(){
+ return order_time;
+ }
+
+}
diff --git a/test/app/src/main/java/com/example/test/OrderFragment1.java b/test/app/src/main/java/com/example/test/OrderFragment1.java
new file mode 100644
index 0000000..ec2981b
--- /dev/null
+++ b/test/app/src/main/java/com/example/test/OrderFragment1.java
@@ -0,0 +1,103 @@
+package com.example.test;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.Toast;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
+import java.util.ArrayList;
+
+public class OrderFragment1 extends Fragment implements AdapterView.OnItemClickListener{
+
+ OrderAdapter orderadapter;
+ private ListView order_list;
+ ArrayList list = new ArrayList<>();
+ int mess = 0;
+ OrderBean Obean;
+
+ public OrderFragment1() {
+ // Required empty public constructor
+ }
+
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+
+ Bundle bundle =this.getArguments();//得到从Activity传来的数据
+ //Log.v("YDYDYDYDY",bundle+"");
+ if(bundle!=null) {
+ mess = bundle.getInt("data");
+ //Log.v("YYYYYYYYY",mess+"");
+ }
+
+ return inflater.inflate(R.layout.fragment_order, container, false);
+ }
+
+ public void onViewCreated(View view, Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ //Log.v("contextxx","hhhhhhhhh"+ getActivity().getApplicationContext());
+ new UploadOrderThread().start();
+ orderadapter = new OrderAdapter(getActivity().getApplicationContext() , list);
+ //Log.d("NNNNNN",new OrderAdapter(getActivity().getApplicationContext(), list).toString());
+ order_list = (ListView)view.findViewById(R.id.order_list_view);
+ order_list.setAdapter(orderadapter);
+ order_list.setOnItemClickListener(this);//列表点击响应
+
+
+
+ }
+
+ public void onItemClick(AdapterView parent, View view, int position,
+ long id) {
+
+ Obean = (OrderBean) parent.getItemAtPosition(position);
+
+ OrderItem fragment = new OrderItem();
+ Bundle bundle = new Bundle();
+ bundle.putInt("data",Obean.getOrderId());
+ fragment.setArguments(bundle);
+ FragmentManager fragmentManager = (OrderFragment1.this).getFragmentManager();
+ FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+ fragmentTransaction.replace(R.id.main_body,fragment);
+ fragmentTransaction.commit();
+
+ Toast.makeText(getActivity(), "订单明细", Toast.LENGTH_SHORT).show();
+ }
+
+
+ private class UploadOrderThread extends Thread{
+
+
+ public void run() {
+
+ Message message = mhandler.obtainMessage();
+ int isload = OrderUtils.getAllOrder(getActivity().getApplicationContext(), list, mess);
+ //Log.v("77777",mess+"");
+ Log.v("77777",isload+"");
+ message.what = isload;
+ mhandler.sendMessage(message);
+
+ }
+ }
+
+ private Handler mhandler = new Handler(){
+ public void handleMessage(Message msg){
+ super.handleMessage(msg);
+ if(msg.what == 1){
+ orderadapter.notifyDataSetChanged();
+
+ }
+ }
+ };
+
+}
diff --git a/test/app/src/main/java/com/example/test/OrderItem.java b/test/app/src/main/java/com/example/test/OrderItem.java
new file mode 100644
index 0000000..1479435
--- /dev/null
+++ b/test/app/src/main/java/com/example/test/OrderItem.java
@@ -0,0 +1,78 @@
+package com.example.test;
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+
+import androidx.fragment.app.Fragment;
+
+import java.util.ArrayList;
+
+public class OrderItem extends Fragment {
+
+ int mess;
+ OrderItemAdapter orderitemadapter;
+ private ListView order_item_list;
+ ArrayList list = new ArrayList<>();
+
+ public OrderItem() {
+ // Required empty public constructor
+ }
+
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+
+ Bundle bundle =this.getArguments();//得到从Activity传来的数据
+ //Log.v("YDYDYDYDY",bundle+"");
+ if(bundle!=null) {
+ mess = bundle.getInt("data");
+ //Log.v("YYYYYYYYY",mess+"");
+ }
+
+ return inflater.inflate(R.layout.fragment_order_item, container, false);
+ }
+
+ public void onViewCreated(View view, Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+
+ orderitemadapter = new OrderItemAdapter(getActivity().getApplicationContext() , list);
+ //Log.d("NNNNNN",new OrderAdapter(getActivity().getApplicationContext(), list).toString());
+ order_item_list = (ListView)view.findViewById(R.id.order_list_view_item);
+ order_item_list.setAdapter(orderitemadapter);
+
+ new UploadOrderItemThread().start();
+
+ }
+
+ private class UploadOrderItemThread extends Thread{
+
+
+ public void run() {
+
+ Message message = mhandler.obtainMessage();
+ int isload = OrderItemUtils.getAllOrderItem(getActivity().getApplicationContext(),list ,mess);
+ //Log.v("77777",mess+"");
+ //Log.v("77777",isload+"");
+ message.what = isload;
+ mhandler.sendMessage(message);
+
+ }
+ }
+
+ private Handler mhandler = new Handler(){
+ public void handleMessage(Message msg){
+ super.handleMessage(msg);
+ if(msg.what == 1){
+ orderitemadapter.notifyDataSetChanged();
+
+ }
+ }
+ };
+
+}
diff --git a/test/app/src/main/java/com/example/test/OrderItemAdapter.java b/test/app/src/main/java/com/example/test/OrderItemAdapter.java
new file mode 100644
index 0000000..d8959ef
--- /dev/null
+++ b/test/app/src/main/java/com/example/test/OrderItemAdapter.java
@@ -0,0 +1,75 @@
+package com.example.test;
+
+import android.content.Context;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+
+public class OrderItemAdapter extends BaseAdapter {
+
+ private ArrayList list;
+ private Context context;
+
+ //通过构造方法接受要显示的新闻数据集合
+ public OrderItemAdapter(Context context, ArrayList list) {
+ this.list = list;
+ this.context = context;
+ Log.v("context",list.size()+"kkkkkk");
+ }
+
+
+ //返回列表长度
+ public int getCount() {
+ return list.size();
+ }
+
+
+ public Object getItem(int position) {
+ return list.get(position);
+ }
+
+
+ public long getItemId(int position) {
+ return position;
+ }
+
+
+ public View getView(int position, View convertView, ViewGroup parent) {
+ View view = null;
+ Log.v("789987", view+"");
+ //1.复用converView优化listview,创建一个view作为getview的返回值用来显示一个条目
+ if (convertView != null) {
+ view = convertView;
+
+ } else {
+ //方法一：推荐
+ //context:上下文, resource:要转换成view对象的layout的id, root:将layout用root(ViewGroup)包一层作为codify的返回值,一般传null
+ view = View.inflate(context, R.layout.order_item_item, null);//将一个布局文件转换成一个view对象
+
+ //方法二
+ //通过LayoutInflater将布局转换成view对象
+ //view = LayoutInflater.from(context).inflate(R.layout.item_news_layout, null);
+
+ //方法三：系统级开发
+ //通过context获取系统服务得到一个LayoutInflater，通过LayoutInflater将一个布局转换为view对象
+ //LayoutInflater layoutInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ //view = layoutInflater.inflate(R.layout.item_news_layout, null);
+
+ }
+ //2.获取view上的子控件对象
+ TextView orderName = (TextView) view.findViewById(R.id.order_item);
+ TextView orderPrice = (TextView) view.findViewById(R.id.order_price_item);
+ //3.获取postion位置条目对应的list集合中的新闻数据，Bean对象
+ OrderItemBean bean = list.get(position);
+ //4.将数据设置给这些子控件做显示
+
+ orderName.setText(bean.getName());
+ orderPrice.setText(bean.getPrice()+"");
+ return view;
+ }
+
+}
diff --git a/test/app/src/main/java/com/example/test/OrderItemBean.java b/test/app/src/main/java/com/example/test/OrderItemBean.java
new file mode 100644
index 0000000..0bfc42b
--- /dev/null
+++ b/test/app/src/main/java/com/example/test/OrderItemBean.java
@@ -0,0 +1,24 @@
+package com.example.test;
+
+public class OrderItemBean {
+
+ public String name;
+ public int price;
+
+ public void setName(String name){
+ this.name = name;
+ }
+
+ public String getName(){
+ return name;
+ }
+
+ public void setPrice(int price){
+ this.price = price;
+ }
+
+ public int getPrice(){
+ return price;
+ }
+
+}
diff --git a/test/app/src/main/java/com/example/test/OrderItemUtils.java b/test/app/src/main/java/com/example/test/OrderItemUtils.java
new file mode 100644
index 0000000..c6570c7
--- /dev/null
+++ b/test/app/src/main/java/com/example/test/OrderItemUtils.java
@@ -0,0 +1,22 @@
+package com.example.test;
+
+import android.content.Context;
+
+import com.example.test.SLogin.DBUtils;
+
+import java.util.ArrayList;
+
+public class OrderItemUtils {
+
+ public static int getAllOrderItem(Context context, ArrayList list, int orderid) {
+
+ DBUtils db = new DBUtils();//初始化数据库类实例
+
+ //SharedPreferences mSharedPreferences = getSharedPreferences("loginUser", Context.MODE_PRIVATE);
+
+ db.getAllOrderItem(context,orderid,list);//调用此方法获取数据库里的数据
+
+ return 1;
+ }
+
+}
diff --git a/test/app/src/main/java/com/example/test/OrderUtils.java b/test/app/src/main/java/com/example/test/OrderUtils.java
new file mode 100644
index 0000000..63bce9c
--- /dev/null
+++ b/test/app/src/main/java/com/example/test/OrderUtils.java
@@ -0,0 +1,22 @@
+package com.example.test;
+
+import android.content.Context;
+
+import com.example.test.SLogin.DBUtils;
+
+import java.util.ArrayList;
+
+public class OrderUtils {
+
+ public static int getAllOrder(Context context, ArrayList list, int mess) {
+
+ DBUtils db = new DBUtils();//初始化数据库类实例
+
+ //SharedPreferences mSharedPreferences = getSharedPreferences("loginUser", Context.MODE_PRIVATE);
+
+ db.getAllOrder(context, mess,list);//调用此方法获取数据库里的数据
+
+ return 1;
+ }
+
+}
diff --git a/test/app/src/main/java/com/example/test/PayActivity.java b/test/app/src/main/java/com/example/test/PayActivity.java
index 9356723..f9bbe44 100644
--- a/test/app/src/main/java/com/example/test/PayActivity.java
+++ b/test/app/src/main/java/com/example/test/PayActivity.java
@@ -27,6 +27,7 @@ public class PayActivity extends AppCompatActivity {
TextView adReceName;
TextView userName_bu;
Button Pay;
+ int CheckCC = 0;
ArrayListlist = new ArrayList<>();
@@ -55,15 +56,18 @@ public class PayActivity extends AppCompatActivity {
Pay.setOnClickListener(new View.OnClickListener(){
public void onClick(View view){
-// db = new DBUtils();
-// if(db.searchAddress(ID)){
+
+ new cheakAddress().start();
+
+// if(CheckCC == 1){
// Toast toast=Toast.makeText(PayActivity.this, "请完善个人信息",Toast.LENGTH_SHORT);
// toast.show();
// finish();;
-// }else{
+// }else if(CheckCC == 2){
// Toast toast=Toast.makeText(PayActivity.this, "支付成功",Toast.LENGTH_SHORT);
// toast.show();
// }
+
}
});
}
@@ -86,6 +90,32 @@ public class PayActivity extends AppCompatActivity {
}
}
+ private class cheakAddress extends Thread{
+ public void run() {
+ Message message = mhandler.obtainMessage();
+ db = new DBUtils();
+ boolean checkSymbol = db.searchAddress(ID);
+ if(checkSymbol){
+ message.what = 2;
+ db = new DBUtils();
+ CartBean bean=new CartBean();
+ db.insertOrderDetails(ID,bean);
+
+ }else {
+ message.what = 3;
+ }
+// Log.v("uuuuuu",check+"");
+// if(check){
+// checkC = 2;
+// }else{
+// checkC = 0;
+// }
+// message.what = checkC;
+// mhandler.sendMessage(message);
+ mhandler.sendMessage(message);
+ }
+ }
+
private Handler mhandler = new Handler(){
public void handleMessage(Message msg){
super.handleMessage(msg);
@@ -97,8 +127,15 @@ public class PayActivity extends AppCompatActivity {
adAdress.setText(address);
adPhone.setText(phone);
userName_bu.setText(SuserName);
- }
- }
+ }else if(msg.what == 2){
+ Log.v("TTTTTTT",msg.what+"");
+ Toast toast=Toast.makeText(PayActivity.this, "支付成功",Toast.LENGTH_SHORT);
+ toast.show();
+ }else{
+ Toast toast=Toast.makeText(PayActivity.this, "请完善个人信息",Toast.LENGTH_SHORT);
+ toast.show();
+ }
+ }
};
diff --git a/test/app/src/main/java/com/example/test/SLogin/DBUtils.java b/test/app/src/main/java/com/example/test/SLogin/DBUtils.java
index db2669b..639d998 100644
--- a/test/app/src/main/java/com/example/test/SLogin/DBUtils.java
+++ b/test/app/src/main/java/com/example/test/SLogin/DBUtils.java
@@ -1,15 +1,21 @@
package com.example.test.SLogin;
import android.content.Context;
import android.util.Log;
+import android.widget.Toast;
import androidx.core.content.ContextCompat;
import com.example.test.AddressBean;
import com.example.test.CartBean;
+import com.example.test.OrderBean;
+import com.example.test.OrderItemBean;
+import com.example.test.PayActivity;
import com.example.test.ProductBean;
import com.example.test.R;
import com.example.test.UserBean;
+import java.net.URL;
+import java.net.URLConnection;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
@@ -17,6 +23,7 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
+import java.util.Date;
// 这个类用来连接服务器数据库
public class DBUtils extends Thread {
@@ -220,32 +227,44 @@ public class DBUtils extends Thread {
return false;
}
- public void getAllCartProducts(Context context, ArrayList list, int mess){
+ public void getAllCartProducts(Context context, ArrayList list, int mess) {
Connection conn = getConnection();
// int Gid = id;
+ Statement st = null;
- String sql = "select * from product p, shopping_cart c where p.product_id = c.product_id and user_id='"+mess+"'";
- try{
+ String sql = "select * from product p, shopping_cart c where p.product_id = c.product_id and user_id='" + mess + "'";
+ try {
+ st = conn.createStatement();
PreparedStatement ps = conn.prepareStatement(sql);
ResultSet rs = ps.executeQuery();
- while (rs.next()){
- CartBean news= new CartBean();
+ while (rs.next()) {
+ CartBean news = new CartBean();
news.setName(rs.getNString("product_name"));
news.setPrice(rs.getInt("product_price"));
news.setImage(rs.getNString("product_picture"));
//news.setId(rs.getInt("product_id"));
news.setCount(rs.getInt("product_count"));
+ news.setCartIdId(rs.getInt("product_id"));
list.add(news);
+ st.close();
}
- }catch(SQLException e){
+ } catch (SQLException e) {
e.printStackTrace();
+ } finally {
+ try {
+ if (st != null) {
+ st.close();
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
}
}
public int SUM(int mess) {
Connection conn = getConnection();
// int Gid = id;
-
+ Statement st = null;
String sql = "select sum((product_count * product_price)) as Tolal_amount from(\n" +
" select product_price, product_count, product_name, product_id, user_id, product_picture\n" +
" from product inner join shopping_cart\n" +
@@ -253,6 +272,7 @@ public class DBUtils extends Thread {
" where user_id = ?\n" +
" )as temp where user_id =?";
try {
+ st = conn.createStatement();
PreparedStatement ps = conn.prepareStatement(sql);
ps.setInt(1, mess);
ps.setInt(2, mess);
@@ -262,40 +282,49 @@ public class DBUtils extends Thread {
//Log.v("mess222",mess+"");
return sum;
-
}
+ st.close();
} catch (SQLException e) {
e.printStackTrace();
}
+ finally {
+ try {
+ if (st != null) {
+ st.close();
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
return -1;
}
- public void getPay(ArrayList list,AddressBean news) {
- Connection conn = getConnection();
- // int Gid = id;
-
- String sql = "select * from address A, user U where A.user_id = U.user_id";
- try {
- PreparedStatement ps = conn.prepareStatement(sql);
- ResultSet rs = ps.executeQuery();
- if (rs.next()) {
-// AddressBean news = new AddressBean();
- news.setUserName(rs.getNString("user_name"));
- Log.v("CCCCCCC",news.getUserName()+"");
- //Log.v("CCCCCCCC",adName.getText()+"")
- news.setReceiveAddress(rs.getNString("receive_address"));
- //news.setImage(ContextCompat.getDrawable(context, R.drawable.snack1));
- //news.setId(rs.getInt("product_id"));
- news.setReceiverName(rs.getNString("receiver_name"));
- news.setReceiverPhone(rs.getNString("receiver_phone"));
- list.add(news);
- }
- } catch (SQLException e) {
- e.printStackTrace();
-
- }
- }
+// public void getPay(ArrayList list,AddressBean news) {
+// Connection conn = getConnection();
+// // int Gid = id;
+//
+// String sql = "select * from address A, user U where A.user_id = U.user_id";
+// try {
+// PreparedStatement ps = conn.prepareStatement(sql);
+// ResultSet rs = ps.executeQuery();
+// if (rs.next()) {
+//// AddressBean news = new AddressBean();
+// news.setUserName(rs.getNString("user_name"));
+// Log.v("CCCCCCC",news.getUserName()+"");
+// //Log.v("CCCCCCCC",adName.getText()+"")
+// news.setReceiveAddress(rs.getNString("receive_address"));
+// //news.setImage(ContextCompat.getDrawable(context, R.drawable.snack1));
+// //news.setId(rs.getInt("product_id"));
+// news.setReceiverName(rs.getNString("receiver_name"));
+// news.setReceiverPhone(rs.getNString("receiver_phone"));
+// list.add(news);
+// }
+// } catch (SQLException e) {
+// e.printStackTrace();
+//
+// }
+// }
public boolean insertAddress(int userid) {
Connection conn = getConnection();
@@ -307,6 +336,7 @@ public class DBUtils extends Thread {
ps.setInt(1, userid);
ps.executeUpdate();
return true;
+
} catch (SQLException e) {
e.printStackTrace();
} finally {
@@ -324,9 +354,10 @@ public class DBUtils extends Thread {
public void alteration(int id, String trueName, String phone, String address) {
Connection conn = getConnection();
-
+ Statement st = null;
String sql = "update address set receive_address = ?, receiver_name = ? ,receiver_phone = ? where user_id = ?";
try {
+ st = conn.createStatement();
PreparedStatement ps = conn.prepareStatement(sql);
ps.setNString(1, address);
ps.setNString(2, trueName);
@@ -338,15 +369,24 @@ public class DBUtils extends Thread {
} catch (SQLException e) {
e.printStackTrace();
+ }finally {
+ try {
+ if (st != null) {
+ st.close();
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
}
}
public void getMyinfoShow(int id, AddressBean news) {
Connection conn = getConnection();
// int Gid = id;
-
+ Statement st = null;
String sql = "select * from address where user_id = ?";
try {
+ st = conn.createStatement();
PreparedStatement ps = conn.prepareStatement(sql);
ps.setInt(1, id);
ResultSet rs = ps.executeQuery();
@@ -362,15 +402,24 @@ public class DBUtils extends Thread {
} catch (SQLException e) {
e.printStackTrace();
+ }finally {
+ try {
+ if (st != null) {
+ st.close();
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
}
}
public String getUserName(int id) {
Connection conn = getConnection();
// int Gid = id;
-
+ Statement st = null;
String sql = "select user_name from user where user_id = ?";
try {
+ st = conn.createStatement();
PreparedStatement ps = conn.prepareStatement(sql);
ps.setInt(1, id);
ResultSet rs = ps.executeQuery();
@@ -380,6 +429,14 @@ public class DBUtils extends Thread {
}
} catch (SQLException e) {
e.printStackTrace();
+ }finally {
+ try {
+ if (st != null) {
+ st.close();
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
}
return "cuole";
}
@@ -387,21 +444,37 @@ public class DBUtils extends Thread {
public boolean searchAddress(int userid) {
Connection conn = getConnection();
Statement st = null;
- String sql = "select distinct if(exists(select * from address where user_id = ? ),1,0) as a from address";
+ Log.v("check_searchAddress","调用");
+ //Log.v("userid",userid+"");
+ String sql = "select receive_address,receiver_phone,receiver_name from address where user_id = ?";
try {
st = conn.createStatement();
PreparedStatement ps = conn.prepareStatement(sql);
ps.setInt(1, userid);
ResultSet rs = ps.executeQuery();
- int result = rs.getInt("a");
- if(result == 0){
+ rs.next();
+ String address = rs.getString("receive_address");
+ String phone = rs.getString("receiver_phone");
+ String name = rs.getString("receiver_name");
+// Log.v("QQQQQQQQ_address",address+"");
+// Log.v("QQQQQQQQ_phone",phone+"");
+// Log.v("QQQQQQQQ_name",name+"");
+// Log.v("QQQQQQQQ",name+"");
+ if(address == null || phone == null || name == null ) {
return false;
- }else{
- return true;
+ } else {
+ address = address.trim();
+ phone = phone.trim();
+ name = name.trim();
+ if(address.equals("") || phone.equals("") || name.equals("") ) {
+ return false;
+ } else {
+ return true;
+ }
}
} catch (SQLException e) {
e.printStackTrace();
- } finally {
+ }finally {
try {
if (st != null) {
st.close();
@@ -413,4 +486,247 @@ public class DBUtils extends Thread {
return false;
}
+ public void cutCartCount(int userid,int productid) {
+ Connection conn = getConnection();
+ Statement st = null;
+ String sql = "update shopping_cart set product_count = product_count-1 where user_id = ? and product_id = ?";
+ String sql1 = "select product_count from shopping_cart where user_id = ? and product_id = ?";
+ try {
+ st = conn.createStatement();
+ PreparedStatement ps = conn.prepareStatement(sql);
+ ps.setInt(1, userid);
+ ps.setInt(2,productid);
+ ps.executeUpdate();
+
+ PreparedStatement ps1 = conn.prepareStatement(sql1);
+ ps1.setInt(1, userid);
+ ps1.setInt(2, productid);
+ ResultSet rs = ps1.executeQuery();
+ rs.next();
+ int count = rs.getInt("product_count");
+ Log.v("vvvvvvv",count+"");
+ if(count <= 0){
+ deleteItem(userid, productid);
+ }
+
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }finally {
+ try {
+ if (st != null) {
+ st.close();
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ };
+ }
+
+ public void deleteItem(int userid,int productid) {
+ Connection conn = getConnection();
+ Statement st = null;
+ String sql = "delete from shopping_cart where user_id = ? and product_id = ?";
+ try {
+ st = conn.createStatement();
+ PreparedStatement ps = conn.prepareStatement(sql);
+ ps.setInt(1, userid);
+ ps.setInt(2, productid);
+ ps.executeUpdate();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ if (st != null) {
+ st.close();
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+// public boolean searchCart(int userid) {
+// Connection conn = getConnection();
+// Statement st = null;
+// //Log.v("check_searchAddress","调用");
+// //Log.v("userid",userid+"");
+// String sql = "select * from shopping_cart where user_id = ?";
+// try {
+// st = conn.createStatement();
+// PreparedStatement ps = conn.prepareStatement(sql);
+// ps.setInt(1, userid);
+// ResultSet rs = ps.executeQuery();
+// rs.next();
+// String user_id = rs.getString("user_id");
+// String product_id = rs.getString("product_id");
+//// Log.v("QQQQQQQQ_address",address+"");
+//// Log.v("QQQQQQQQ_phone",phone+"");
+//// Log.v("QQQQQQQQ_name",name+"");
+//// Log.v("QQQQQQQQ",name+"");
+// if(user_id == null || product_id == null ) {
+// return false;
+// }else{
+// return true;
+// }
+//// Log.v("QQQQQQQQ_address",address+"");
+//// Log.v("QQQQQQQQ_phone",phone+"");
+//// Log.v("QQQQQQQQ_name",name+"");
+//// Log.v("QQQQQQQQ",name+"");
+//
+// } catch (SQLException e) {
+// e.printStackTrace();
+// }finally {
+// try {
+// if (st != null) {
+// st.close();
+// }
+// } catch (SQLException e) {
+// e.printStackTrace();
+// }
+// }
+// return false;
+// }
+ public void insertOrderDetails(int userId,CartBean bean) {
+ Connection conn = getConnection();
+ Statement st = null;
+ Log.v("gggg","12121321312");
+ try {
+ st = conn.createStatement();
+ String sql ="select address_id from address where user_id=?";
+ PreparedStatement ps = conn.prepareStatement(sql);
+ ps.setInt(1, userId);
+ ResultSet rs =ps.executeQuery();
+ rs.next();
+ int addressId = rs.getInt("address_id");
+ sql="insert into user_order(user_id,address_id,order_time) values(?,?,?)";
+ ps = conn.prepareStatement(sql,new String[]{"orderId"});
+
+ ps.setInt(1, userId);
+ ps.setInt(2, addressId);
+ Date date = getNetTime();
+ String time=date.toString();
+ ps.setNString(3,time);
+ int orderId = -1;
+ ps.executeUpdate();
+ rs = ps.getGeneratedKeys();
+ rs.next();
+ orderId = rs.getInt(1);
+// sql="select order_id from user_order where user_id=? and address_id=? and order_time=?";
+// ps = conn.prepareStatement(sql);
+// ps.setInt(1, userId);
+// ps.setInt(2, addressId);
+// ps.setNString(3,time);
+// ps.executeQuery();
+// int orderId=rs.getInt("order_id");
+ // Log.v("gou",orderId+"");
+ sql = "select * from shopping_cart where user_id=" + userId + "";
+ ps = conn.prepareStatement(sql);
+ rs =ps.executeQuery();
+ String sql2 ="insert into order_details(order_id,user_id,product_id,product_count) values(?,?,?,?)";
+ PreparedStatement ps2 = conn.prepareStatement(sql2);
+ while (rs.next())
+ {
+ bean.setCartIdId(rs.getInt("product_id"));
+ bean.setCount(rs.getInt("product_count"));
+ ps2.setInt(1, orderId);
+ ps2.setInt(2, userId);
+ ps2.setInt(3, bean.getCartId());
+ ps2.setInt(4, bean.getCount());
+ ps2.executeUpdate();
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ if (st != null) {
+ st.close();
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ public static Date getNetTime(){
+ String webUrl = "http://www.ntsc.ac.cn";//中国科学院国家授时中心
+ try {
+ URL url = new URL(webUrl);
+ URLConnection uc = url.openConnection();
+ uc.setReadTimeout(5000);
+ uc.setConnectTimeout(5000);
+ uc.connect();
+ long correctTime = uc.getDate();
+ Date date = new Date(correctTime);
+ return date;
+ } catch (Exception e) {
+ return new Date();
+ }
+ }
+
+ public void getAllOrder(Context context, int mess,ArrayListlist) {
+ Connection conn = getConnection();
+ // int Gid = id;
+ Statement st = null;
+
+ String sql = "select * from user_order where user_id = ?";
+ try {
+ st = conn.createStatement();
+
+ PreparedStatement ps = conn.prepareStatement(sql);
+ ps.setInt(1,mess);
+ ResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ OrderBean news = new OrderBean();
+ news.setOrderId(rs.getInt("order_id"));
+ news.setOrderTime(rs.getNString("order_time"));
+ list.add(news);
+ //Log.v("111111",news.getOrderId()+"");
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ if (st != null) {
+ st.close();
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ public void getAllOrderItem(Context context, int orderid, ArrayListlist) {
+ Connection conn = getConnection();
+ // int Gid = id;
+ Statement st = null;
+
+ String sql = "select product.product_name, \n" +
+ " order_details.product_count, \n" +
+ " product.product_price \n" +
+ "from order_details, product \n" +
+ "where product.product_id = order_details.product_id and order_id = ?;";
+ try {
+ st = conn.createStatement();
+ PreparedStatement ps = conn.prepareStatement(sql);
+ ps.setInt(1,orderid);
+ ResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ OrderItemBean news = new OrderItemBean();
+ news.setPrice(rs.getInt("product.product_price"));
+ news.setName(rs.getNString("product.product_name"));
+ list.add(news);
+ Log.v("111111",news.getName()+"");
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ if (st != null) {
+ st.close();
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
}
\ No newline at end of file
diff --git a/test/app/src/main/java/com/example/test/Shopping_CartFragment.java b/test/app/src/main/java/com/example/test/Shopping_CartFragment.java
index 7bfb88b..1a63118 100644
--- a/test/app/src/main/java/com/example/test/Shopping_CartFragment.java
+++ b/test/app/src/main/java/com/example/test/Shopping_CartFragment.java
@@ -20,17 +20,21 @@ import android.widget.Toast;
import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
import com.example.test.R;
import com.example.test.SLogin.DBUtils;
import java.util.ArrayList;
-public class Shopping_CartFragment extends Fragment {
+public class Shopping_CartFragment extends Fragment implements AdapterView.OnItemClickListener {
ProductCartAdapter productCartAdapter;//购物车适配器
private ListView product_cart_list;//购物车列表实例
ArrayList cartlist = new ArrayList();
+ CartBean Cbean;
DBUtils db;//数据库实例
int Money;//获取总价
TextView tolal_amount;//控件
@@ -58,9 +62,10 @@ public class Shopping_CartFragment extends Fragment {
super.onViewCreated(view, savedInstanceState);
productCartAdapter = new ProductCartAdapter(getActivity().getApplicationContext(), cartlist);
- //Log.d("NNNNNN",new ProductCartAdapter(getActivity().getApplicationContext(), cartlist).toString());
+ Log.d("NNNNNN",new ProductCartAdapter(getActivity().getApplicationContext(), cartlist).toString());
product_cart_list = (ListView)view.findViewById(R.id.cart_list_view);
product_cart_list.setAdapter(productCartAdapter);
+ product_cart_list.setOnItemClickListener(this);//列表点击响应
new UploadCartThread().start();//启动子线程形成列表
@@ -69,21 +74,66 @@ public class Shopping_CartFragment extends Fragment {
new putMoney().start();//启动子线程更新控件里的总价
settle = view.findViewById(R.id.sum_price);
+
+
settle.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- Intent intent = new Intent(getContext(), PayActivity.class);
- Bundle bundle1 = new Bundle();
- bundle1.putInt("MyinfoID", mess);
- intent.putExtras(bundle1);
- getContext().startActivity(intent);
- Toast toast=Toast.makeText(getActivity().getApplicationContext(), "生成订单",Toast.LENGTH_SHORT);
- toast.show();
+
+ if(Money>0) {
+ Intent intent = new Intent(getContext(), PayActivity.class);
+ Bundle bundle1 = new Bundle();
+ bundle1.putInt("MyinfoID", mess);
+ intent.putExtras(bundle1);
+ getContext().startActivity(intent);
+ Toast toast = Toast.makeText(getActivity().getApplicationContext(), "生成订单", Toast.LENGTH_SHORT);
+ toast.show();
+ }else{
+ Toast toast = Toast.makeText(getActivity().getApplicationContext(), "购物车空空如也", Toast.LENGTH_SHORT);
+ toast.show();
+ }
}
});
}
+ public void onItemClick(AdapterView parent, View view, int position,
+ long id){
+
+ Cbean = (CartBean) parent.getItemAtPosition(position);
+
+// new Thread(){
+// public void run(){
+// db.cutCartCount(mess,Cbean.getCartId());
+// Log.v("xxxxxx",Cbean.getCartId()+"");
+// productCartAdapter.notifyDataSetChanged();
+// }
+// }.start();
+ new Cutitem().start();
+
+ Toast toast=Toast.makeText(getActivity().getApplicationContext(), "取消加入购物车成功",Toast.LENGTH_SHORT);
+ toast.show();
+
+ }
+
+
+
+ private class Cutitem extends Thread{
+ public void run(){
+ db.cutCartCount(mess,Cbean.getCartId());
+ Log.v("xxxxxx",Cbean.getCartId()+"");
+ }
+ }
+
+// private class CheckNull extends Thread{
+// public void run(){
+// Message message = mhandler.obtainMessage();
+// int x = db.SUM(mess);
+// message.what = x;
+// mhandler.sendMessage(message);
+// }
+// }
+
private class UploadCartThread extends Thread{
@Override
public void run() {
diff --git a/test/app/src/main/res/drawable-v24/main_shop_icon.jpg b/test/app/src/main/res/drawable-v24/main_shop_icon.jpg
deleted file mode 100644
index 7e1b696..0000000
Binary files a/test/app/src/main/res/drawable-v24/main_shop_icon.jpg and /dev/null differ
diff --git a/test/app/src/main/res/drawable-v24/myinfo_setting_icon.png b/test/app/src/main/res/drawable-v24/myinfo_setting_icon.png
deleted file mode 100644
index 6cdf472..0000000
Binary files a/test/app/src/main/res/drawable-v24/myinfo_setting_icon.png and /dev/null differ
diff --git a/test/app/src/main/res/drawable/snack1.png b/test/app/src/main/res/drawable/snack1.png
deleted file mode 100644
index f571933..0000000
Binary files a/test/app/src/main/res/drawable/snack1.png and /dev/null differ
diff --git a/test/app/src/main/res/drawable/snack2.jpg b/test/app/src/main/res/drawable/snack2.jpg
deleted file mode 100644
index a089bfa..0000000
Binary files a/test/app/src/main/res/drawable/snack2.jpg and /dev/null differ
diff --git a/test/app/src/main/res/drawable/snack3.jpg b/test/app/src/main/res/drawable/snack3.jpg
deleted file mode 100644
index c450095..0000000
Binary files a/test/app/src/main/res/drawable/snack3.jpg and /dev/null differ
diff --git a/test/app/src/main/res/layout/activity_change_user_info.xml b/test/app/src/main/res/layout/activity_change_user_info.xml
deleted file mode 100644
index 9177a8b..0000000
--- a/test/app/src/main/res/layout/activity_change_user_info.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/app/src/main/res/layout/fragment_order.xml b/test/app/src/main/res/layout/fragment_order.xml
new file mode 100644
index 0000000..1b8e7de
--- /dev/null
+++ b/test/app/src/main/res/layout/fragment_order.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/app/src/main/res/layout/fragment_order_item.xml b/test/app/src/main/res/layout/fragment_order_item.xml
new file mode 100644
index 0000000..0f8b816
--- /dev/null
+++ b/test/app/src/main/res/layout/fragment_order_item.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/app/src/main/res/layout/fragment_user.xml b/test/app/src/main/res/layout/fragment_user.xml
index 7182ada..e2af0ba 100644
--- a/test/app/src/main/res/layout/fragment_user.xml
+++ b/test/app/src/main/res/layout/fragment_user.xml
@@ -33,7 +33,7 @@
android:layout_marginTop="20dp"
android:background="#E3E3E3" />
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/app/src/main/res/layout/order_item_item.xml b/test/app/src/main/res/layout/order_item_item.xml
new file mode 100644
index 0000000..9e05e9e
--- /dev/null
+++ b/test/app/src/main/res/layout/order_item_item.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
\ No newline at end of file