diff --git a/src/.gradle/5.4.1/executionHistory/executionHistory.bin b/src/.gradle/5.4.1/executionHistory/executionHistory.bin index 7e02088..d36ccd1 100644 Binary files a/src/.gradle/5.4.1/executionHistory/executionHistory.bin and b/src/.gradle/5.4.1/executionHistory/executionHistory.bin differ diff --git a/src/.gradle/5.4.1/executionHistory/executionHistory.lock b/src/.gradle/5.4.1/executionHistory/executionHistory.lock index 4ae7383..9908dfa 100644 Binary files a/src/.gradle/5.4.1/executionHistory/executionHistory.lock and b/src/.gradle/5.4.1/executionHistory/executionHistory.lock differ diff --git a/src/.gradle/5.4.1/fileHashes/fileHashes.bin b/src/.gradle/5.4.1/fileHashes/fileHashes.bin index 197edd5..c62b23a 100644 Binary files a/src/.gradle/5.4.1/fileHashes/fileHashes.bin and b/src/.gradle/5.4.1/fileHashes/fileHashes.bin differ diff --git a/src/.gradle/5.4.1/fileHashes/fileHashes.lock b/src/.gradle/5.4.1/fileHashes/fileHashes.lock index 81bf460..0947e72 100644 Binary files a/src/.gradle/5.4.1/fileHashes/fileHashes.lock and b/src/.gradle/5.4.1/fileHashes/fileHashes.lock differ diff --git a/src/.gradle/5.4.1/javaCompile/classAnalysis.bin b/src/.gradle/5.4.1/javaCompile/classAnalysis.bin index d247ab0..722575c 100644 Binary files a/src/.gradle/5.4.1/javaCompile/classAnalysis.bin and b/src/.gradle/5.4.1/javaCompile/classAnalysis.bin differ diff --git a/src/.gradle/5.4.1/javaCompile/javaCompile.lock b/src/.gradle/5.4.1/javaCompile/javaCompile.lock index bd3db0b..ffb486d 100644 Binary files a/src/.gradle/5.4.1/javaCompile/javaCompile.lock and b/src/.gradle/5.4.1/javaCompile/javaCompile.lock differ diff --git a/src/.gradle/5.4.1/javaCompile/taskHistory.bin b/src/.gradle/5.4.1/javaCompile/taskHistory.bin index 1c3da30..6de96e4 100644 Binary files a/src/.gradle/5.4.1/javaCompile/taskHistory.bin and b/src/.gradle/5.4.1/javaCompile/taskHistory.bin differ diff --git a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock index c034219..9d8e062 100644 Binary files a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/.gradle/buildOutputCleanup/outputFiles.bin b/src/.gradle/buildOutputCleanup/outputFiles.bin index bb41783..1dfdeec 100644 Binary files a/src/.gradle/buildOutputCleanup/outputFiles.bin and b/src/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/.idea/caches/build_file_checksums.ser b/src/.idea/caches/build_file_checksums.ser index 6e7e06e..fe8f1db 100644 Binary files a/src/.idea/caches/build_file_checksums.ser and b/src/.idea/caches/build_file_checksums.ser differ diff --git a/src/.idea/caches/gradle_models.ser b/src/.idea/caches/gradle_models.ser index 21949a8..45f997f 100644 Binary files a/src/.idea/caches/gradle_models.ser and b/src/.idea/caches/gradle_models.ser differ diff --git a/src/.idea/libraries/Gradle__com_android_support_support_v4_19_0_0_jar.xml b/src/.idea/libraries/Gradle__com_android_support_support_v4_19_0_0_jar.xml new file mode 100644 index 0000000..36a3104 --- /dev/null +++ b/src/.idea/libraries/Gradle__com_android_support_support_v4_19_0_0_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/.idea/libraries/Gradle__com_astuetz_pagerslidingtabstrip_1_0_1_aar.xml b/src/.idea/libraries/Gradle__com_astuetz_pagerslidingtabstrip_1_0_1_aar.xml new file mode 100644 index 0000000..4fdf773 --- /dev/null +++ b/src/.idea/libraries/Gradle__com_astuetz_pagerslidingtabstrip_1_0_1_aar.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/.idea/workspace.xml b/src/.idea/workspace.xml index f407e8e..a01fcdb 100644 --- a/src/.idea/workspace.xml +++ b/src/.idea/workspace.xml @@ -12,43 +12,248 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WrongNoteID @@ -147,6 +415,7 @@ working_ working_note_length mNoteEditor + Adapter WRONGNOTEID @@ -168,7 +437,6 @@ @@ -218,155 +491,6 @@ - - - - - - - - - - - @@ -509,6 +633,17 @@ + + @@ -520,6 +655,162 @@ + + @@ -939,10 +1230,10 @@ - + - + @@ -957,7 +1248,7 @@ - + @@ -1049,45 +1340,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1114,10 +1369,6 @@ - - - - @@ -1149,13 +1400,6 @@ - - - - - - - @@ -1181,63 +1425,32 @@ - - - - - - - - - - - - - - - - + - + - + - - - - - - - - - - - - - - - - @@ -1261,8 +1474,8 @@ - + @@ -1275,28 +1488,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -1322,39 +1513,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1364,7 +1525,6 @@ - @@ -1375,34 +1535,153 @@ + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/app.iml b/src/app/app.iml index aba4e1b..4a842d2 100644 --- a/src/app/app.iml +++ b/src/app/app.iml @@ -89,6 +89,8 @@ + + \ No newline at end of file diff --git a/src/app/build.gradle b/src/app/build.gradle index e5a9b07..c1bfe6b 100644 --- a/src/app/build.gradle +++ b/src/app/build.gradle @@ -7,8 +7,8 @@ android { defaultConfig { applicationId "net.micode.notes" - minSdkVersion 14 - targetSdkVersion 14 + minSdkVersion 17 + targetSdkVersion 17 } buildTypes { @@ -17,4 +17,8 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } + + dependencies { + implementation 'com.astuetz:pagerslidingtabstrip:1.0.1' + } } diff --git a/src/app/build/generated/not_namespaced_r_class_sources/debug/r/net/micode/notes/R.java b/src/app/build/generated/not_namespaced_r_class_sources/debug/r/net/micode/notes/R.java index 757fbee..9efb1bb 100644 --- a/src/app/build/generated/not_namespaced_r_class_sources/debug/r/net/micode/notes/R.java +++ b/src/app/build/generated/not_namespaced_r_class_sources/debug/r/net/micode/notes/R.java @@ -12,308 +12,558 @@ public final class R { public static final int format_for_exported_note=0x7f010000; public static final int menu_share_ways=0x7f010001; } + public static final class attr { + /** + *

May be a color value, in the form of "#rgb", + * "#argb", "#rrggbb", or + * "#aarrggbb". + */ + public static final int pstsDividerColor=0x7f020000; + /** + *

May be a dimension value, which is a floating point number appended with a + * unit such as "14.5sp". + * Available units are: px (pixels), dp (density-independent pixels), + * sp (scaled pixels based on preferred font size), in (inches), and + * mm (millimeters). + */ + public static final int pstsDividerPadding=0x7f020001; + /** + *

May be a color value, in the form of "#rgb", + * "#argb", "#rrggbb", or + * "#aarrggbb". + */ + public static final int pstsIndicatorColor=0x7f020002; + /** + *

May be a dimension value, which is a floating point number appended with a + * unit such as "14.5sp". + * Available units are: px (pixels), dp (density-independent pixels), + * sp (scaled pixels based on preferred font size), in (inches), and + * mm (millimeters). + */ + public static final int pstsIndicatorHeight=0x7f020003; + /** + *

May be a dimension value, which is a floating point number appended with a + * unit such as "14.5sp". + * Available units are: px (pixels), dp (density-independent pixels), + * sp (scaled pixels based on preferred font size), in (inches), and + * mm (millimeters). + */ + public static final int pstsScrollOffset=0x7f020004; + /** + *

May be a boolean value, such as "true" or + * "false". + */ + public static final int pstsShouldExpand=0x7f020005; + /** + *

May be a reference to another resource, in the form + * "@[+][package:]type/name" or a theme + * attribute in the form + * "?[package:]type/name". + */ + public static final int pstsTabBackground=0x7f020006; + /** + *

May be a dimension value, which is a floating point number appended with a + * unit such as "14.5sp". + * Available units are: px (pixels), dp (density-independent pixels), + * sp (scaled pixels based on preferred font size), in (inches), and + * mm (millimeters). + */ + public static final int pstsTabPaddingLeftRight=0x7f020007; + /** + *

May be a boolean value, such as "true" or + * "false". + */ + public static final int pstsTextAllCaps=0x7f020008; + /** + *

May be a color value, in the form of "#rgb", + * "#argb", "#rrggbb", or + * "#aarrggbb". + */ + public static final int pstsUnderlineColor=0x7f020009; + /** + *

May be a dimension value, which is a floating point number appended with a + * unit such as "14.5sp". + * Available units are: px (pixels), dp (density-independent pixels), + * sp (scaled pixels based on preferred font size), in (inches), and + * mm (millimeters). + */ + public static final int pstsUnderlineHeight=0x7f02000a; + } public static final class color { - public static final int primary_text_dark=0x7f020000; - public static final int secondary_text_dark=0x7f020001; - public static final int user_query_highlight=0x7f020002; + public static final int background_tab_pressed=0x7f030000; + public static final int primary_text_dark=0x7f030001; + public static final int secondary_text_dark=0x7f030002; + public static final int user_query_highlight=0x7f030003; } public static final class dimen { - public static final int text_font_size_large=0x7f030000; - public static final int text_font_size_medium=0x7f030001; - public static final int text_font_size_normal=0x7f030002; - public static final int text_font_size_small=0x7f030003; - public static final int text_font_size_super=0x7f030004; + public static final int text_font_size_large=0x7f040000; + public static final int text_font_size_medium=0x7f040001; + public static final int text_font_size_normal=0x7f040002; + public static final int text_font_size_small=0x7f040003; + public static final int text_font_size_super=0x7f040004; } public static final class drawable { - public static final int bg_btn_set_color=0x7f040000; - public static final int bg_color_btn_mask=0x7f040001; - public static final int call_record=0x7f040002; - public static final int clock=0x7f040003; - public static final int delete=0x7f040004; - public static final int dropdown_icon=0x7f040005; - public static final int edit_blue=0x7f040006; - public static final int edit_green=0x7f040007; - public static final int edit_red=0x7f040008; - public static final int edit_title_blue=0x7f040009; - public static final int edit_title_green=0x7f04000a; - public static final int edit_title_red=0x7f04000b; - public static final int edit_title_white=0x7f04000c; - public static final int edit_title_yellow=0x7f04000d; - public static final int edit_white=0x7f04000e; - public static final int edit_yellow=0x7f04000f; - public static final int font_large=0x7f040010; - public static final int font_normal=0x7f040011; - public static final int font_size_selector_bg=0x7f040012; - public static final int font_small=0x7f040013; - public static final int font_super=0x7f040014; - public static final int icon_app=0x7f040015; - public static final int list_background=0x7f040016; - public static final int list_blue_down=0x7f040017; - public static final int list_blue_middle=0x7f040018; - public static final int list_blue_single=0x7f040019; - public static final int list_blue_up=0x7f04001a; - public static final int list_folder=0x7f04001b; - public static final int list_footer_bg=0x7f04001c; - public static final int list_green_down=0x7f04001d; - public static final int list_green_middle=0x7f04001e; - public static final int list_green_single=0x7f04001f; - public static final int list_green_up=0x7f040020; - public static final int list_red_down=0x7f040021; - public static final int list_red_middle=0x7f040022; - public static final int list_red_single=0x7f040023; - public static final int list_red_up=0x7f040024; - public static final int list_white_down=0x7f040025; - public static final int list_white_middle=0x7f040026; - public static final int list_white_single=0x7f040027; - public static final int list_white_up=0x7f040028; - public static final int list_yellow_down=0x7f040029; - public static final int list_yellow_middle=0x7f04002a; - public static final int list_yellow_single=0x7f04002b; - public static final int list_yellow_up=0x7f04002c; - public static final int menu_delete=0x7f04002d; - public static final int menu_move=0x7f04002e; - public static final int new_note=0x7f04002f; - public static final int new_note_normal=0x7f040030; - public static final int new_note_pressed=0x7f040031; - public static final int note_edit_color_selector_panel=0x7f040032; - public static final int notification=0x7f040033; - public static final int search_result=0x7f040034; - public static final int selected=0x7f040035; - public static final int title_alert=0x7f040036; - public static final int title_bar_bg=0x7f040037; - public static final int widget_2x_blue=0x7f040038; - public static final int widget_2x_green=0x7f040039; - public static final int widget_2x_red=0x7f04003a; - public static final int widget_2x_white=0x7f04003b; - public static final int widget_2x_yellow=0x7f04003c; - public static final int widget_4x_blue=0x7f04003d; - public static final int widget_4x_green=0x7f04003e; - public static final int widget_4x_red=0x7f04003f; - public static final int widget_4x_white=0x7f040040; - public static final int widget_4x_yellow=0x7f040041; + public static final int background_tab=0x7f050000; + public static final int bg_btn_set_color=0x7f050001; + public static final int bg_color_btn_mask=0x7f050002; + public static final int call_record=0x7f050003; + public static final int clock=0x7f050004; + public static final int delete=0x7f050005; + public static final int dropdown_icon=0x7f050006; + public static final int edit_blue=0x7f050007; + public static final int edit_green=0x7f050008; + public static final int edit_red=0x7f050009; + public static final int edit_title_blue=0x7f05000a; + public static final int edit_title_green=0x7f05000b; + public static final int edit_title_red=0x7f05000c; + public static final int edit_title_white=0x7f05000d; + public static final int edit_title_yellow=0x7f05000e; + public static final int edit_white=0x7f05000f; + public static final int edit_yellow=0x7f050010; + public static final int font_large=0x7f050011; + public static final int font_normal=0x7f050012; + public static final int font_size_selector_bg=0x7f050013; + public static final int font_small=0x7f050014; + public static final int font_super=0x7f050015; + public static final int icon_actionbar=0x7f050016; + public static final int icon_app=0x7f050017; + public static final int list_background=0x7f050018; + public static final int list_blue_down=0x7f050019; + public static final int list_blue_middle=0x7f05001a; + public static final int list_blue_single=0x7f05001b; + public static final int list_blue_up=0x7f05001c; + public static final int list_folder=0x7f05001d; + public static final int list_footer_bg=0x7f05001e; + public static final int list_green_down=0x7f05001f; + public static final int list_green_middle=0x7f050020; + public static final int list_green_single=0x7f050021; + public static final int list_green_up=0x7f050022; + public static final int list_red_down=0x7f050023; + public static final int list_red_middle=0x7f050024; + public static final int list_red_single=0x7f050025; + public static final int list_red_up=0x7f050026; + public static final int list_white_down=0x7f050027; + public static final int list_white_middle=0x7f050028; + public static final int list_white_single=0x7f050029; + public static final int list_white_up=0x7f05002a; + public static final int list_yellow_down=0x7f05002b; + public static final int list_yellow_middle=0x7f05002c; + public static final int list_yellow_single=0x7f05002d; + public static final int list_yellow_up=0x7f05002e; + public static final int menu_delete=0x7f05002f; + public static final int menu_move=0x7f050030; + public static final int new_folder=0x7f050031; + public static final int new_note=0x7f050032; + public static final int new_note_normal=0x7f050033; + public static final int new_note_pressed=0x7f050034; + public static final int note_edit_color_selector_panel=0x7f050035; + public static final int notification=0x7f050036; + public static final int search_result=0x7f050037; + public static final int selected=0x7f050038; + public static final int title_alert=0x7f050039; + public static final int title_bar_bg=0x7f05003a; + public static final int todo_icon=0x7f05003b; + public static final int widget_2x_blue=0x7f05003c; + public static final int widget_2x_green=0x7f05003d; + public static final int widget_2x_red=0x7f05003e; + public static final int widget_2x_white=0x7f05003f; + public static final int widget_2x_yellow=0x7f050040; + public static final int widget_4x_blue=0x7f050041; + public static final int widget_4x_green=0x7f050042; + public static final int widget_4x_red=0x7f050043; + public static final int widget_4x_white=0x7f050044; + public static final int widget_4x_yellow=0x7f050045; } public static final class id { - public static final int account_dialog_subtitle=0x7f050000; - public static final int account_dialog_title=0x7f050001; - public static final int action_select_all=0x7f050002; - public static final int amPm=0x7f050003; - public static final int btn_new_note=0x7f050004; - public static final int btn_set_bg_color=0x7f050005; - public static final int cb_edit_item=0x7f050006; - public static final int date=0x7f050007; - public static final int delete=0x7f050008; - public static final int et_edit_text=0x7f050009; - public static final int et_foler_name=0x7f05000a; - public static final int font_size_selector=0x7f05000b; - public static final int hour=0x7f05000c; - public static final int iv_alert_icon=0x7f05000d; - public static final int iv_bg_blue=0x7f05000e; - public static final int iv_bg_blue_select=0x7f05000f; - public static final int iv_bg_green=0x7f050010; - public static final int iv_bg_green_select=0x7f050011; - public static final int iv_bg_red=0x7f050012; - public static final int iv_bg_red_select=0x7f050013; - public static final int iv_bg_white=0x7f050014; - public static final int iv_bg_white_select=0x7f050015; - public static final int iv_bg_yellow=0x7f050016; - public static final int iv_bg_yellow_select=0x7f050017; - public static final int iv_large_select=0x7f050018; - public static final int iv_medium_select=0x7f050019; - public static final int iv_small_select=0x7f05001a; - public static final int iv_super_select=0x7f05001b; - public static final int ll_font_large=0x7f05001c; - public static final int ll_font_normal=0x7f05001d; - public static final int ll_font_small=0x7f05001e; - public static final int ll_font_super=0x7f05001f; - public static final int menu_alert=0x7f050020; - public static final int menu_delete=0x7f050021; - public static final int menu_delete_remind=0x7f050022; - public static final int menu_export_text=0x7f050023; - public static final int menu_font_size=0x7f050024; - public static final int menu_list_mode=0x7f050025; - public static final int menu_new_folder=0x7f050026; - public static final int menu_new_note=0x7f050027; - public static final int menu_search=0x7f050028; - public static final int menu_send_to_desktop=0x7f050029; - public static final int menu_setting=0x7f05002a; - public static final int menu_share=0x7f05002b; - public static final int menu_sync=0x7f05002c; - public static final int minute=0x7f05002d; - public static final int move=0x7f05002e; - public static final int navigation_bar=0x7f05002f; - public static final int note_bg_color_selector=0x7f050030; - public static final int note_edit_list=0x7f050031; - public static final int note_edit_view=0x7f050032; - public static final int note_item=0x7f050033; - public static final int note_title=0x7f050034; - public static final int notes_list=0x7f050035; - public static final int prefenerece_sync_status_textview=0x7f050036; - public static final int preference_sync_button=0x7f050037; - public static final int selection_menu=0x7f050038; - public static final int sv_note_edit=0x7f050039; - public static final int tv_alert_date=0x7f05003a; - public static final int tv_folder_name=0x7f05003b; - public static final int tv_modified_date=0x7f05003c; - public static final int tv_name=0x7f05003d; - public static final int tv_time=0x7f05003e; - public static final int tv_title=0x7f05003f; - public static final int tv_title_bar=0x7f050040; - public static final int widget_bg_image=0x7f050041; - public static final int widget_text=0x7f050042; + public static final int account_dialog_subtitle=0x7f060000; + public static final int account_dialog_title=0x7f060001; + public static final int action_select_all=0x7f060002; + public static final int amPm=0x7f060003; + public static final int btn_new_note=0x7f060004; + public static final int btn_set_bg_color=0x7f060005; + public static final int cb_edit_item=0x7f060006; + public static final int date=0x7f060007; + public static final int delete=0x7f060008; + public static final int et_edit_text=0x7f060009; + public static final int et_foler_name=0x7f06000a; + public static final int font_size_selector=0x7f06000b; + public static final int hour=0x7f06000c; + public static final int iv_alert_icon=0x7f06000d; + public static final int iv_bg_blue=0x7f06000e; + public static final int iv_bg_blue_select=0x7f06000f; + public static final int iv_bg_green=0x7f060010; + public static final int iv_bg_green_select=0x7f060011; + public static final int iv_bg_red=0x7f060012; + public static final int iv_bg_red_select=0x7f060013; + public static final int iv_bg_white=0x7f060014; + public static final int iv_bg_white_select=0x7f060015; + public static final int iv_bg_yellow=0x7f060016; + public static final int iv_bg_yellow_select=0x7f060017; + public static final int iv_large_select=0x7f060018; + public static final int iv_medium_select=0x7f060019; + public static final int iv_small_select=0x7f06001a; + public static final int iv_super_select=0x7f06001b; + public static final int ll_font_large=0x7f06001c; + public static final int ll_font_normal=0x7f06001d; + public static final int ll_font_small=0x7f06001e; + public static final int ll_font_super=0x7f06001f; + public static final int menu_alert=0x7f060020; + public static final int menu_delete=0x7f060021; + public static final int menu_delete_remind=0x7f060022; + public static final int menu_export_text=0x7f060023; + public static final int menu_font_size=0x7f060024; + public static final int menu_list_mode=0x7f060025; + public static final int menu_new_folder=0x7f060026; + public static final int menu_new_note=0x7f060027; + public static final int menu_search=0x7f060028; + public static final int menu_send_to_desktop=0x7f060029; + public static final int menu_setting=0x7f06002a; + public static final int menu_share=0x7f06002b; + public static final int menu_sync=0x7f06002c; + public static final int minute=0x7f06002d; + public static final int move=0x7f06002e; + public static final int navigation_bar=0x7f06002f; + public static final int note_bg_color_selector=0x7f060030; + public static final int note_edit_list=0x7f060031; + public static final int note_edit_view=0x7f060032; + public static final int note_item=0x7f060033; + public static final int note_title=0x7f060034; + public static final int notes_list=0x7f060035; + public static final int prefenerece_sync_status_textview=0x7f060036; + public static final int preference_sync_button=0x7f060037; + public static final int selection_menu=0x7f060038; + public static final int sv_note_edit=0x7f060039; + public static final int tv_alert_date=0x7f06003a; + public static final int tv_folder_name=0x7f06003b; + public static final int tv_modified_date=0x7f06003c; + public static final int tv_name=0x7f06003d; + public static final int tv_time=0x7f06003e; + public static final int tv_title=0x7f06003f; + public static final int tv_title_bar=0x7f060040; + public static final int widget_bg_image=0x7f060041; + public static final int widget_text=0x7f060042; } public static final class layout { - public static final int account_dialog_title=0x7f060000; - public static final int add_account_text=0x7f060001; - public static final int datetime_picker=0x7f060002; - public static final int dialog_edit_text=0x7f060003; - public static final int folder_list_item=0x7f060004; - public static final int note_edit=0x7f060005; - public static final int note_edit_list_item=0x7f060006; - public static final int note_item=0x7f060007; - public static final int note_list=0x7f060008; - public static final int note_list_dropdown_menu=0x7f060009; - public static final int note_list_footer=0x7f06000a; - public static final int settings_header=0x7f06000b; - public static final int widget_2x=0x7f06000c; - public static final int widget_4x=0x7f06000d; + public static final int account_dialog_title=0x7f070000; + public static final int add_account_text=0x7f070001; + public static final int datetime_picker=0x7f070002; + public static final int dialog_edit_text=0x7f070003; + public static final int folder_list_item=0x7f070004; + public static final int note_edit=0x7f070005; + public static final int note_edit_list_item=0x7f070006; + public static final int note_item=0x7f070007; + public static final int note_list=0x7f070008; + public static final int note_list_dropdown_menu=0x7f070009; + public static final int note_list_footer=0x7f07000a; + public static final int settings_header=0x7f07000b; + public static final int widget_2x=0x7f07000c; + public static final int widget_4x=0x7f07000d; } public static final class menu { - public static final int call_note_edit=0x7f070000; - public static final int call_record_folder=0x7f070001; - public static final int note_edit=0x7f070002; - public static final int note_list=0x7f070003; - public static final int note_list_dropdown=0x7f070004; - public static final int note_list_options=0x7f070005; - public static final int sub_folder=0x7f070006; + public static final int call_note_edit=0x7f080000; + public static final int call_record_folder=0x7f080001; + public static final int note_edit=0x7f080002; + public static final int note_list=0x7f080003; + public static final int note_list_dropdown=0x7f080004; + public static final int note_list_options=0x7f080005; + public static final int sub_folder=0x7f080006; } public static final class plurals { - public static final int search_results_title=0x7f080000; + public static final int search_results_title=0x7f090000; } public static final class raw { - public static final int introduction=0x7f090000; + public static final int introduction=0x7f0a0000; } public static final class string { - public static final int alert_message_delete_folder=0x7f0a0000; - public static final int alert_message_delete_note=0x7f0a0001; - public static final int alert_message_delete_notes=0x7f0a0002; - public static final int alert_title_delete=0x7f0a0003; - public static final int app_name=0x7f0a0004; - public static final int app_widget2x2=0x7f0a0005; - public static final int app_widget4x4=0x7f0a0006; - public static final int button_delete=0x7f0a0007; - public static final int call_record_folder_name=0x7f0a0008; - public static final int datetime_dialog_cancel=0x7f0a0009; - public static final int datetime_dialog_ok=0x7f0a000a; - public static final int delete_remind_time_message=0x7f0a000b; - public static final int error_note_empty_for_clock=0x7f0a000c; - public static final int error_note_empty_for_send_to_desktop=0x7f0a000d; - public static final int error_note_not_exist=0x7f0a000e; - public static final int error_sdcard_export=0x7f0a000f; - public static final int error_sdcard_unmounted=0x7f0a0010; - public static final int error_sync_cancelled=0x7f0a0011; - public static final int error_sync_internal=0x7f0a0012; - public static final int error_sync_network=0x7f0a0013; - public static final int failed_sdcard_export=0x7f0a0014; - public static final int file_name_txt_format=0x7f0a0015; - public static final int file_path=0x7f0a0016; - public static final int folder_exist=0x7f0a0017; - public static final int format_date_ymd=0x7f0a0018; - public static final int format_datetime_mdhm=0x7f0a0019; - public static final int format_exported_file_location=0x7f0a001a; - public static final int format_folder_files_count=0x7f0a001b; - public static final int format_move_notes_to_folder=0x7f0a001c; - public static final int hint_foler_name=0x7f0a001d; - public static final int info_note_enter_desktop=0x7f0a001e; - public static final int menu_alert=0x7f0a001f; - public static final int menu_create_folder=0x7f0a0020; - public static final int menu_delete=0x7f0a0021; - public static final int menu_deselect_all=0x7f0a0022; - public static final int menu_export_text=0x7f0a0023; - public static final int menu_folder_change_name=0x7f0a0024; - public static final int menu_folder_delete=0x7f0a0025; - public static final int menu_folder_view=0x7f0a0026; - public static final int menu_font_large=0x7f0a0027; - public static final int menu_font_normal=0x7f0a0028; - public static final int menu_font_size=0x7f0a0029; - public static final int menu_font_small=0x7f0a002a; - public static final int menu_font_super=0x7f0a002b; - public static final int menu_list_mode=0x7f0a002c; - public static final int menu_move=0x7f0a002d; - public static final int menu_move_parent_folder=0x7f0a002e; - public static final int menu_normal_mode=0x7f0a002f; - public static final int menu_remove_remind=0x7f0a0030; - public static final int menu_search=0x7f0a0031; - public static final int menu_select_all=0x7f0a0032; - public static final int menu_select_none=0x7f0a0033; - public static final int menu_select_title=0x7f0a0034; - public static final int menu_send_to_desktop=0x7f0a0035; - public static final int menu_setting=0x7f0a0036; - public static final int menu_share=0x7f0a0037; - public static final int menu_sync=0x7f0a0038; - public static final int menu_sync_cancel=0x7f0a0039; - public static final int menu_title_select_folder=0x7f0a003a; - public static final int note_alert_expired=0x7f0a003b; - public static final int note_length=0x7f0a003c; - public static final int note_link_email=0x7f0a003d; - public static final int note_link_other=0x7f0a003e; - public static final int note_link_tel=0x7f0a003f; - public static final int note_link_web=0x7f0a0040; - public static final int notealert_enter=0x7f0a0041; - public static final int notealert_ok=0x7f0a0042; - public static final int notelist_menu_new=0x7f0a0043; - public static final int notelist_string_info=0x7f0a0044; - public static final int preferences_account_summary=0x7f0a0045; - public static final int preferences_account_title=0x7f0a0046; - public static final int preferences_add_account=0x7f0a0047; - public static final int preferences_bg_random_appear_title=0x7f0a0048; - public static final int preferences_button_sync_cancel=0x7f0a0049; - public static final int preferences_button_sync_immediately=0x7f0a004a; - public static final int preferences_dialog_change_account_title=0x7f0a004b; - public static final int preferences_dialog_change_account_warn_msg=0x7f0a004c; - public static final int preferences_dialog_select_account_tips=0x7f0a004d; - public static final int preferences_dialog_select_account_title=0x7f0a004e; - public static final int preferences_last_sync_time=0x7f0a004f; - public static final int preferences_last_sync_time_format=0x7f0a0050; - public static final int preferences_menu_cancel=0x7f0a0051; - public static final int preferences_menu_change_account=0x7f0a0052; - public static final int preferences_menu_remove_account=0x7f0a0053; - public static final int preferences_title=0x7f0a0054; - public static final int preferences_toast_cannot_change_account=0x7f0a0055; - public static final int preferences_toast_success_set_accout=0x7f0a0056; - public static final int search=0x7f0a0057; - public static final int search_hint=0x7f0a0058; - public static final int search_label=0x7f0a0059; - public static final int search_setting_description=0x7f0a005a; - public static final int set_remind_time_message=0x7f0a005b; - public static final int success_sdcard_export=0x7f0a005c; - public static final int success_sync_account=0x7f0a005d; - public static final int sync_progress_init_list=0x7f0a005e; - public static final int sync_progress_login=0x7f0a005f; - public static final int sync_progress_syncing=0x7f0a0060; - public static final int ticker_cancel=0x7f0a0061; - public static final int ticker_fail=0x7f0a0062; - public static final int ticker_success=0x7f0a0063; - public static final int ticker_syncing=0x7f0a0064; - public static final int widget_havenot_content=0x7f0a0065; - public static final int widget_under_visit_mode=0x7f0a0066; + public static final int alert_message_delete_folder=0x7f0b0000; + public static final int alert_message_delete_note=0x7f0b0001; + public static final int alert_message_delete_notes=0x7f0b0002; + public static final int alert_title_delete=0x7f0b0003; + public static final int app_name=0x7f0b0004; + public static final int app_widget2x2=0x7f0b0005; + public static final int app_widget4x4=0x7f0b0006; + public static final int button_delete=0x7f0b0007; + public static final int call_record_folder_name=0x7f0b0008; + public static final int datetime_dialog_cancel=0x7f0b0009; + public static final int datetime_dialog_ok=0x7f0b000a; + public static final int delete_remind_time_message=0x7f0b000b; + public static final int error_note_empty_for_clock=0x7f0b000c; + public static final int error_note_empty_for_send_to_desktop=0x7f0b000d; + public static final int error_note_not_exist=0x7f0b000e; + public static final int error_sdcard_export=0x7f0b000f; + public static final int error_sdcard_unmounted=0x7f0b0010; + public static final int error_sync_cancelled=0x7f0b0011; + public static final int error_sync_internal=0x7f0b0012; + public static final int error_sync_network=0x7f0b0013; + public static final int failed_sdcard_export=0x7f0b0014; + public static final int file_name_txt_format=0x7f0b0015; + public static final int file_path=0x7f0b0016; + public static final int folder_exist=0x7f0b0017; + public static final int format_date_ymd=0x7f0b0018; + public static final int format_datetime_mdhm=0x7f0b0019; + public static final int format_exported_file_location=0x7f0b001a; + public static final int format_folder_files_count=0x7f0b001b; + public static final int format_move_notes_to_folder=0x7f0b001c; + public static final int hint_foler_name=0x7f0b001d; + public static final int info_note_enter_desktop=0x7f0b001e; + public static final int menu_alert=0x7f0b001f; + public static final int menu_create_folder=0x7f0b0020; + public static final int menu_delete=0x7f0b0021; + public static final int menu_deselect_all=0x7f0b0022; + public static final int menu_export_text=0x7f0b0023; + public static final int menu_folder_change_name=0x7f0b0024; + public static final int menu_folder_delete=0x7f0b0025; + public static final int menu_folder_view=0x7f0b0026; + public static final int menu_font_large=0x7f0b0027; + public static final int menu_font_normal=0x7f0b0028; + public static final int menu_font_size=0x7f0b0029; + public static final int menu_font_small=0x7f0b002a; + public static final int menu_font_super=0x7f0b002b; + public static final int menu_list_mode=0x7f0b002c; + public static final int menu_move=0x7f0b002d; + public static final int menu_move_parent_folder=0x7f0b002e; + public static final int menu_normal_mode=0x7f0b002f; + public static final int menu_remove_remind=0x7f0b0030; + public static final int menu_search=0x7f0b0031; + public static final int menu_select_all=0x7f0b0032; + public static final int menu_select_none=0x7f0b0033; + public static final int menu_select_title=0x7f0b0034; + public static final int menu_send_to_desktop=0x7f0b0035; + public static final int menu_setting=0x7f0b0036; + public static final int menu_share=0x7f0b0037; + public static final int menu_sync=0x7f0b0038; + public static final int menu_sync_cancel=0x7f0b0039; + public static final int menu_title_select_folder=0x7f0b003a; + public static final int note_alert_expired=0x7f0b003b; + public static final int note_length=0x7f0b003c; + public static final int note_link_email=0x7f0b003d; + public static final int note_link_other=0x7f0b003e; + public static final int note_link_tel=0x7f0b003f; + public static final int note_link_web=0x7f0b0040; + public static final int notealert_enter=0x7f0b0041; + public static final int notealert_ok=0x7f0b0042; + public static final int notelist_menu_new=0x7f0b0043; + public static final int notelist_string_info=0x7f0b0044; + public static final int preferences_account_summary=0x7f0b0045; + public static final int preferences_account_title=0x7f0b0046; + public static final int preferences_add_account=0x7f0b0047; + public static final int preferences_bg_random_appear_title=0x7f0b0048; + public static final int preferences_button_sync_cancel=0x7f0b0049; + public static final int preferences_button_sync_immediately=0x7f0b004a; + public static final int preferences_dialog_change_account_title=0x7f0b004b; + public static final int preferences_dialog_change_account_warn_msg=0x7f0b004c; + public static final int preferences_dialog_select_account_tips=0x7f0b004d; + public static final int preferences_dialog_select_account_title=0x7f0b004e; + public static final int preferences_last_sync_time=0x7f0b004f; + public static final int preferences_last_sync_time_format=0x7f0b0050; + public static final int preferences_menu_cancel=0x7f0b0051; + public static final int preferences_menu_change_account=0x7f0b0052; + public static final int preferences_menu_remove_account=0x7f0b0053; + public static final int preferences_title=0x7f0b0054; + public static final int preferences_toast_cannot_change_account=0x7f0b0055; + public static final int preferences_toast_success_set_accout=0x7f0b0056; + public static final int search=0x7f0b0057; + public static final int search_hint=0x7f0b0058; + public static final int search_label=0x7f0b0059; + public static final int search_setting_description=0x7f0b005a; + public static final int set_remind_time_message=0x7f0b005b; + public static final int success_sdcard_export=0x7f0b005c; + public static final int success_sync_account=0x7f0b005d; + public static final int sync_progress_init_list=0x7f0b005e; + public static final int sync_progress_login=0x7f0b005f; + public static final int sync_progress_syncing=0x7f0b0060; + public static final int ticker_cancel=0x7f0b0061; + public static final int ticker_fail=0x7f0b0062; + public static final int ticker_success=0x7f0b0063; + public static final int ticker_syncing=0x7f0b0064; + public static final int widget_havenot_content=0x7f0b0065; + public static final int widget_under_visit_mode=0x7f0b0066; } public static final class style { - public static final int HighlightTextAppearancePrimary=0x7f0b0000; - public static final int HighlightTextAppearanceSecondary=0x7f0b0001; - public static final int NoteActionBarStyle=0x7f0b0002; - public static final int NoteTheme=0x7f0b0003; - public static final int TextAppearanceLarge=0x7f0b0004; - public static final int TextAppearanceMedium=0x7f0b0005; - public static final int TextAppearanceNormal=0x7f0b0006; - public static final int TextAppearancePrimaryItem=0x7f0b0007; - public static final int TextAppearanceSecondaryItem=0x7f0b0008; - public static final int TextAppearanceSuper=0x7f0b0009; - public static final int TextAppearanceUnderMenuIcon=0x7f0b000a; + public static final int HighlightTextAppearancePrimary=0x7f0c0000; + public static final int HighlightTextAppearanceSecondary=0x7f0c0001; + public static final int NoteActionBarStyle=0x7f0c0002; + public static final int NoteTheme=0x7f0c0003; + public static final int TextAppearanceLarge=0x7f0c0004; + public static final int TextAppearanceMedium=0x7f0c0005; + public static final int TextAppearanceNormal=0x7f0c0006; + public static final int TextAppearancePrimaryItem=0x7f0c0007; + public static final int TextAppearanceSecondaryItem=0x7f0c0008; + public static final int TextAppearanceSuper=0x7f0c0009; + public static final int TextAppearanceUnderMenuIcon=0x7f0c000a; + } + public static final class styleable { + /** + * Attributes that can be used with a PagerSlidingTabStrip. + *

Includes the following attributes:

+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
AttributeDescription
{@link #PagerSlidingTabStrip_pstsDividerColor net.micode.notes:pstsDividerColor}
{@link #PagerSlidingTabStrip_pstsDividerPadding net.micode.notes:pstsDividerPadding}
{@link #PagerSlidingTabStrip_pstsIndicatorColor net.micode.notes:pstsIndicatorColor}
{@link #PagerSlidingTabStrip_pstsIndicatorHeight net.micode.notes:pstsIndicatorHeight}
{@link #PagerSlidingTabStrip_pstsScrollOffset net.micode.notes:pstsScrollOffset}
{@link #PagerSlidingTabStrip_pstsShouldExpand net.micode.notes:pstsShouldExpand}
{@link #PagerSlidingTabStrip_pstsTabBackground net.micode.notes:pstsTabBackground}
{@link #PagerSlidingTabStrip_pstsTabPaddingLeftRight net.micode.notes:pstsTabPaddingLeftRight}
{@link #PagerSlidingTabStrip_pstsTextAllCaps net.micode.notes:pstsTextAllCaps}
{@link #PagerSlidingTabStrip_pstsUnderlineColor net.micode.notes:pstsUnderlineColor}
{@link #PagerSlidingTabStrip_pstsUnderlineHeight net.micode.notes:pstsUnderlineHeight}
+ * @see #PagerSlidingTabStrip_pstsDividerColor + * @see #PagerSlidingTabStrip_pstsDividerPadding + * @see #PagerSlidingTabStrip_pstsIndicatorColor + * @see #PagerSlidingTabStrip_pstsIndicatorHeight + * @see #PagerSlidingTabStrip_pstsScrollOffset + * @see #PagerSlidingTabStrip_pstsShouldExpand + * @see #PagerSlidingTabStrip_pstsTabBackground + * @see #PagerSlidingTabStrip_pstsTabPaddingLeftRight + * @see #PagerSlidingTabStrip_pstsTextAllCaps + * @see #PagerSlidingTabStrip_pstsUnderlineColor + * @see #PagerSlidingTabStrip_pstsUnderlineHeight + */ + public static final int[] PagerSlidingTabStrip={ + 0x7f020000, 0x7f020001, 0x7f020002, 0x7f020003, + 0x7f020004, 0x7f020005, 0x7f020006, 0x7f020007, + 0x7f020008, 0x7f020009, 0x7f02000a + }; + /** + *

This symbol is the offset where the {@link net.micode.notes.R.attr#pstsDividerColor} + * attribute's value can be found in the {@link #PagerSlidingTabStrip} array. + * + *

May be a color value, in the form of "#rgb", + * "#argb", "#rrggbb", or + * "#aarrggbb". + * + * @attr name net.micode.notes:pstsDividerColor + */ + public static final int PagerSlidingTabStrip_pstsDividerColor=0; + /** + *

This symbol is the offset where the {@link net.micode.notes.R.attr#pstsDividerPadding} + * attribute's value can be found in the {@link #PagerSlidingTabStrip} array. + * + *

May be a dimension value, which is a floating point number appended with a + * unit such as "14.5sp". + * Available units are: px (pixels), dp (density-independent pixels), + * sp (scaled pixels based on preferred font size), in (inches), and + * mm (millimeters). + * + * @attr name net.micode.notes:pstsDividerPadding + */ + public static final int PagerSlidingTabStrip_pstsDividerPadding=1; + /** + *

This symbol is the offset where the {@link net.micode.notes.R.attr#pstsIndicatorColor} + * attribute's value can be found in the {@link #PagerSlidingTabStrip} array. + * + *

May be a color value, in the form of "#rgb", + * "#argb", "#rrggbb", or + * "#aarrggbb". + * + * @attr name net.micode.notes:pstsIndicatorColor + */ + public static final int PagerSlidingTabStrip_pstsIndicatorColor=2; + /** + *

This symbol is the offset where the {@link net.micode.notes.R.attr#pstsIndicatorHeight} + * attribute's value can be found in the {@link #PagerSlidingTabStrip} array. + * + *

May be a dimension value, which is a floating point number appended with a + * unit such as "14.5sp". + * Available units are: px (pixels), dp (density-independent pixels), + * sp (scaled pixels based on preferred font size), in (inches), and + * mm (millimeters). + * + * @attr name net.micode.notes:pstsIndicatorHeight + */ + public static final int PagerSlidingTabStrip_pstsIndicatorHeight=3; + /** + *

This symbol is the offset where the {@link net.micode.notes.R.attr#pstsScrollOffset} + * attribute's value can be found in the {@link #PagerSlidingTabStrip} array. + * + *

May be a dimension value, which is a floating point number appended with a + * unit such as "14.5sp". + * Available units are: px (pixels), dp (density-independent pixels), + * sp (scaled pixels based on preferred font size), in (inches), and + * mm (millimeters). + * + * @attr name net.micode.notes:pstsScrollOffset + */ + public static final int PagerSlidingTabStrip_pstsScrollOffset=4; + /** + *

This symbol is the offset where the {@link net.micode.notes.R.attr#pstsShouldExpand} + * attribute's value can be found in the {@link #PagerSlidingTabStrip} array. + * + *

May be a boolean value, such as "true" or + * "false". + * + * @attr name net.micode.notes:pstsShouldExpand + */ + public static final int PagerSlidingTabStrip_pstsShouldExpand=5; + /** + *

This symbol is the offset where the {@link net.micode.notes.R.attr#pstsTabBackground} + * attribute's value can be found in the {@link #PagerSlidingTabStrip} array. + * + *

May be a reference to another resource, in the form + * "@[+][package:]type/name" or a theme + * attribute in the form + * "?[package:]type/name". + * + * @attr name net.micode.notes:pstsTabBackground + */ + public static final int PagerSlidingTabStrip_pstsTabBackground=6; + /** + *

This symbol is the offset where the {@link net.micode.notes.R.attr#pstsTabPaddingLeftRight} + * attribute's value can be found in the {@link #PagerSlidingTabStrip} array. + * + *

May be a dimension value, which is a floating point number appended with a + * unit such as "14.5sp". + * Available units are: px (pixels), dp (density-independent pixels), + * sp (scaled pixels based on preferred font size), in (inches), and + * mm (millimeters). + * + * @attr name net.micode.notes:pstsTabPaddingLeftRight + */ + public static final int PagerSlidingTabStrip_pstsTabPaddingLeftRight=7; + /** + *

This symbol is the offset where the {@link net.micode.notes.R.attr#pstsTextAllCaps} + * attribute's value can be found in the {@link #PagerSlidingTabStrip} array. + * + *

May be a boolean value, such as "true" or + * "false". + * + * @attr name net.micode.notes:pstsTextAllCaps + */ + public static final int PagerSlidingTabStrip_pstsTextAllCaps=8; + /** + *

This symbol is the offset where the {@link net.micode.notes.R.attr#pstsUnderlineColor} + * attribute's value can be found in the {@link #PagerSlidingTabStrip} array. + * + *

May be a color value, in the form of "#rgb", + * "#argb", "#rrggbb", or + * "#aarrggbb". + * + * @attr name net.micode.notes:pstsUnderlineColor + */ + public static final int PagerSlidingTabStrip_pstsUnderlineColor=9; + /** + *

This symbol is the offset where the {@link net.micode.notes.R.attr#pstsUnderlineHeight} + * attribute's value can be found in the {@link #PagerSlidingTabStrip} array. + * + *

May be a dimension value, which is a floating point number appended with a + * unit such as "14.5sp". + * Available units are: px (pixels), dp (density-independent pixels), + * sp (scaled pixels based on preferred font size), in (inches), and + * mm (millimeters). + * + * @attr name net.micode.notes:pstsUnderlineHeight + */ + public static final int PagerSlidingTabStrip_pstsUnderlineHeight=10; } public static final class xml { - public static final int preferences=0x7f0c0000; - public static final int searchable=0x7f0c0001; - public static final int widget_2x_info=0x7f0c0002; - public static final int widget_4x_info=0x7f0c0003; + public static final int preferences=0x7f0e0000; + public static final int searchable=0x7f0e0001; + public static final int widget_2x_info=0x7f0e0002; + public static final int widget_4x_info=0x7f0e0003; } } \ No newline at end of file diff --git a/src/app/build/intermediates/blame/res/debug/multi-v2/debug.json b/src/app/build/intermediates/blame/res/debug/multi-v2/debug.json index 1147d7b..5d6cf4e 100644 --- a/src/app/build/intermediates/blame/res/debug/multi-v2/debug.json +++ b/src/app/build/intermediates/blame/res/debug/multi-v2/debug.json @@ -9,16 +9,16 @@ "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,38,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1838,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,43,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1877,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1876,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,688,736,784,829,886,940,990,1052,1120,1197,1256,1321,1384,1439,1499,1562,1616,1676,1729,1791,1876,1957,2007,2066,2109,2162,2205,2256,2306,2366,2419,2470,2516,2564,2612,2658,2705,2755,2800,2859,2911,2963,3006,3053,3109,3164,3219,3263,3305,3346,3396,3455,3506,3550,3599,3648,3695,3742,3789,3834,3885,3938,4013,4072,4129,4203,4267,4336,4414,4524,4628,4701,4767,4822,4887,4952,5001,5084,5162,5200,5245,5293,5355,5412,5467,5526,5593,5651,5713,5761,5806,5854,5905,5971", + "startOffsets": "215,384,457,523,596,646,688,736,784,829,886,940,990,1052,1120,1197,1256,1321,1384,1439,1499,1562,1616,1676,1729,1791,1876,1957,2007,2066,2109,2162,2205,2256,2306,2366,2419,2470,2516,2564,2612,2658,2705,2755,2800,2859,2911,2963,3006,3053,3109,3164,3219,3263,3305,3346,3396,3455,3506,3549,3598,3647,3694,3741,3788,3833,3884,3937,4012,4071,4128,4202,4266,4335,4413,4523,4627,4700,4766,4821,4886,4951,5000,5083,5161,5199,5244,5292,5354,5411,5466,5525,5592,5650,5712,5760,5805,5853,5904,5970", "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107", - "endColumns": "14,72,65,72,49,41,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,43,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,683,731,779,824,881,935,985,1047,1115,1192,1251,1316,1379,1434,1494,1557,1611,1671,1724,1786,1871,1952,2002,2061,2104,2157,2200,2251,2301,2361,2414,2465,2511,2559,2607,2653,2700,2750,2795,2854,2906,2958,3001,3048,3104,3159,3214,3258,3300,3341,3391,3450,3501,3545,3594,3643,3690,3737,3784,3829,3880,3933,4008,4067,4124,4198,4262,4331,4409,4519,4623,4696,4762,4817,4882,4947,4996,5079,5157,5195,5240,5288,5350,5407,5462,5521,5588,5646,5708,5756,5801,5849,5900,5966,6032" + "endColumns": "14,72,65,72,49,41,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,42,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,683,731,779,824,881,935,985,1047,1115,1192,1251,1316,1379,1434,1494,1557,1611,1671,1724,1786,1871,1952,2002,2061,2104,2157,2200,2251,2301,2361,2414,2465,2511,2559,2607,2653,2700,2750,2795,2854,2906,2958,3001,3048,3104,3159,3214,3258,3300,3341,3391,3450,3501,3544,3593,3642,3689,3736,3783,3828,3879,3932,4007,4066,4123,4197,4261,4330,4408,4518,4622,4695,4761,4816,4881,4946,4995,5078,5156,5194,5239,5287,5349,5406,5461,5520,5587,5645,5707,5755,5800,5848,5899,5965,6031" } }, { @@ -43,84 +43,113 @@ "outputFile": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\values_values.arsc.flat", "map": [ { - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\values\\dimens.xml", + "source": "C:\\Users\\21931\\.gradle\\gradle-5.4.1-all\\gradle-5.4.1\\caches\\transforms-2\\files-2.1\\e1d9da03002cb11f79e842a285800b3f\\pagerslidingtabstrip-1.0.1\\res\\values\\values.xml", "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" + "startLines": "6,10", + "startColumns": "4,4", + "startOffsets": "185,371", + "endLines": "6,22", + "endColumns": "58,24", + "endOffsets": "239,1118" }, "to": { - "startLines": "13,14,15,16,17", + "startLines": "12,169", + "startColumns": "4,4", + "startOffsets": "532,10466", + "endLines": "12,181", + "endColumns": "58,24", + "endOffsets": "586,11190" + } + }, + { + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", + "startOffsets": "783,836,890,944,730", "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" + "endOffsets": "830,884,938,991,777" + }, + "to": { + "startLines": "14,15,16,17,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "648,700,753,806,858", + "endColumns": "51,52,52,51,51", + "endOffsets": "695,748,801,853,905" } }, { "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "128,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "8139,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8553,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "132,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,46,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "8547,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8595,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,133,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8139,3973,4237,4140,4070,846,893,946,7627,7677,8080,8028,1311,4697,4792,4625,4540,4456,5671,5587,5484,4970,2046,1994,3464,1518,1572,5032,2141,4321,7741,3901,3652,2201,2522,2828,2260,3392,3330,3272,3046,2993,2888,2942,3097,3148,2570,3834,3209,3702,2474,2772,2683,2624,3589,2423,3543,2318,2362,3766,1462,8553,1787,1897,1739,1843,1682,1633,1255,1201,6134,6066,6378,7528,6747,6665,6822,6912,7156,7076,6219,6295,6605,6443,6524,6010,7301,7424,7986,7857,7799,7911,1396,4901,5397,5808,5738,5889,5337,5281,5218,5157,999,1110", + "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,133,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,45,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8547,4064,4315,4231,4134,887,940,993,7671,7735,8133,8074,1390,4786,4895,4691,4619,4534,5732,5665,5581,5026,2103,2040,3537,1566,1627,5132,2195,4418,7791,3967,3696,2254,2564,2882,2312,3458,3386,3324,3091,3040,2936,2987,3142,3203,2618,3895,3266,3760,2516,2822,2766,2677,3646,2468,3583,2356,2417,3828,1512,8595,1837,1945,1781,1891,1733,1676,1305,1249,6213,6128,6437,7619,6816,6741,6906,7070,7295,7150,6289,6372,6659,6518,6599,6060,7418,7522,8022,7905,7851,7980,1456,4964,5478,5883,5802,5978,5391,5331,5275,5212,1104,1195" }, "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125", + "startLines": "19,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1132,1228,1311,1407,1476,1522,1574,1626,1675,1738,1796,1847,1931,2025,2133,2204,2288,2371,2437,2520,2622,2683,2745,2796,2874,2927,2987,3092,3151,3253,3308,3379,3428,3486,3533,3592,3649,3720,3781,3838,3888,3940,3993,4043,4093,4153,4206,4272,4334,4397,4444,4499,4587,4645,4707,4757,4802,4845,4905,4972,5027,5074,5129,5182,5229,5282,5338,5386,5441,5494,5578,5645,5709,5805,5879,5960,6049,6212,6356,6435,6510,6592,6651,6731,6811,6866,6988,7091,7132,7185,7242,7316,7381,7449,7535,7615,7684,7778,7837,7892,7954,8014,8124", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125", + "startOffsets": "910,1303,1399,1482,1578,1647,1693,1745,1797,1846,1909,1967,2018,2102,2196,2304,2375,2459,2542,2608,2691,2793,2854,2916,2967,3045,3098,3158,3263,3322,3424,3479,3550,3599,3657,3704,3763,3820,3891,3952,4009,4059,4111,4164,4214,4264,4324,4377,4443,4505,4568,4615,4670,4758,4816,4878,4928,4973,5016,5076,5143,5198,5245,5300,5353,5400,5453,5509,5557,5612,5665,5749,5816,5880,5976,6050,6131,6220,6383,6527,6606,6681,6763,6822,6902,6982,7037,7159,7262,7303,7356,7413,7487,7552,7620,7706,7786,7855,7949,8008,8063,8125,8185,8295", + "endLines": "23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126", "endColumns": "14,95,82,95,68,45,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1127,1223,1306,1402,1471,1517,1569,1621,1670,1733,1791,1842,1926,2020,2128,2199,2283,2366,2432,2515,2617,2678,2740,2791,2869,2922,2982,3087,3146,3248,3303,3374,3423,3481,3528,3587,3644,3715,3776,3833,3883,3935,3988,4038,4088,4148,4201,4267,4329,4392,4439,4494,4582,4640,4702,4752,4797,4840,4900,4967,5022,5069,5124,5177,5224,5277,5333,5381,5436,5489,5573,5640,5704,5800,5874,5955,6044,6207,6351,6430,6505,6587,6646,6726,6806,6861,6983,7086,7127,7180,7237,7311,7376,7444,7530,7610,7679,7773,7832,7887,7949,8009,8119,8209" + "endOffsets": "1298,1394,1477,1573,1642,1688,1740,1792,1841,1904,1962,2013,2097,2191,2299,2370,2454,2537,2603,2686,2788,2849,2911,2962,3040,3093,3153,3258,3317,3419,3474,3545,3594,3652,3699,3758,3815,3886,3947,4004,4054,4106,4159,4209,4259,4319,4372,4438,4500,4563,4610,4665,4753,4811,4873,4923,4968,5011,5071,5138,5193,5240,5295,5348,5395,5448,5504,5552,5607,5660,5744,5811,5875,5971,6045,6126,6215,6378,6522,6601,6676,6758,6817,6897,6977,7032,7154,7257,7298,7351,7408,7482,7547,7615,7701,7781,7850,7944,8003,8058,8120,8180,8290,8380" } }, { "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", + "endLines": "53,58,66,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2314,2531,2861,2696,1098,1287,1476,1685,1897,911,2104" }, "to": { - "startLines": "126,130,134,138,141,145,149,153,157,161,165", + "startLines": "127,131,135,138,141,145,149,153,157,161,165", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8214,8418,8629,8820,8975,9158,9343,9528,9731,9937,10120", - "endLines": "129,133,137,140,144,148,152,156,160,164,168", + "startOffsets": "8385,8589,8800,8960,9120,9303,9488,9673,9876,10082,10265", + "endLines": "130,134,137,140,144,148,152,156,160,164,168", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8413,8624,8815,8970,9153,9338,9523,9726,9932,10115,10316" + "endOffsets": "8584,8795,8955,9115,9298,9483,9668,9871,10077,10260,10461" } }, { "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" }, "to": { "startLines": "2,8", "startColumns": "4,4", - "startOffsets": "105,300", + "startOffsets": "105,412", "endLines": "7,11", "endColumns": "19,19", - "endOffsets": "295,415" + "endOffsets": "407,527" } }, { "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endColumns": "56", + "endOffsets": "782" }, "to": { - "startLines": "12", + "startLines": "13", "startColumns": "4", - "startOffsets": "420", + "startOffsets": "591", "endColumns": "56", - "endOffsets": "472" + "endOffsets": "643" } } ] @@ -150,16 +179,16 @@ "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,125,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6811,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,43,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6850,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6849,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,687,735,783,828,885,939,989,1051,1119,1196,1255,1321,1384,1439,1499,1562,1616,1676,1729,1791,1875,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3548,3597,3646,3693,3740,3787,3832,3883,3936,4011,4070,4127,4201,4265,4334,4412,4522,4626,4699,4765,4820,4885,4950,4999,5082,5160,5198,5243,5291,5353,5410,5465,5524,5591,5649,5711,5759,5804,5852,5903,5969", + "startOffsets": "215,384,456,522,595,645,687,735,783,828,885,939,989,1051,1119,1196,1255,1321,1384,1439,1499,1562,1616,1676,1729,1791,1875,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3547,3596,3645,3692,3739,3786,3831,3882,3935,4010,4069,4126,4200,4264,4333,4411,4521,4625,4698,4764,4819,4884,4949,4998,5081,5159,5197,5242,5290,5352,5409,5464,5523,5590,5648,5710,5758,5803,5851,5902,5968", "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107", - "endColumns": "14,71,65,72,49,41,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,43,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,682,730,778,823,880,934,984,1046,1114,1191,1250,1316,1379,1434,1494,1557,1611,1671,1724,1786,1870,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3543,3592,3641,3688,3735,3782,3827,3878,3931,4006,4065,4122,4196,4260,4329,4407,4517,4621,4694,4760,4815,4880,4945,4994,5077,5155,5193,5238,5286,5348,5405,5460,5519,5586,5644,5706,5754,5799,5847,5898,5964,6030" + "endColumns": "14,71,65,72,49,41,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,42,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,682,730,778,823,880,934,984,1046,1114,1191,1250,1316,1379,1434,1494,1557,1611,1671,1724,1786,1870,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3542,3591,3640,3687,3734,3781,3826,3877,3930,4005,4064,4121,4195,4259,4328,4406,4516,4620,4693,4759,4814,4879,4944,4993,5076,5154,5192,5237,5285,5347,5404,5459,5518,5585,5643,5705,5753,5798,5846,5897,5963,6029" } } ] diff --git a/src/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json b/src/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json index bb71b07..e612669 100644 --- a/src/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json +++ b/src/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json @@ -9,16 +9,16 @@ "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,38,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1838,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,43,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1877,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1876,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,688,736,784,829,886,940,990,1052,1120,1197,1256,1321,1384,1439,1499,1562,1616,1676,1729,1791,1876,1957,2007,2066,2109,2162,2205,2256,2306,2366,2419,2470,2516,2564,2612,2658,2705,2755,2800,2859,2911,2963,3006,3053,3109,3164,3219,3263,3305,3346,3396,3455,3506,3550,3599,3648,3695,3742,3789,3834,3885,3938,4013,4072,4129,4203,4267,4336,4414,4524,4628,4701,4767,4822,4887,4952,5001,5084,5162,5200,5245,5293,5355,5412,5467,5526,5593,5651,5713,5761,5806,5854,5905,5971", + "startOffsets": "215,384,457,523,596,646,688,736,784,829,886,940,990,1052,1120,1197,1256,1321,1384,1439,1499,1562,1616,1676,1729,1791,1876,1957,2007,2066,2109,2162,2205,2256,2306,2366,2419,2470,2516,2564,2612,2658,2705,2755,2800,2859,2911,2963,3006,3053,3109,3164,3219,3263,3305,3346,3396,3455,3506,3549,3598,3647,3694,3741,3788,3833,3884,3937,4012,4071,4128,4202,4266,4335,4413,4523,4627,4700,4766,4821,4886,4951,5000,5083,5161,5199,5244,5292,5354,5411,5466,5525,5592,5650,5712,5760,5805,5853,5904,5970", "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107", - "endColumns": "14,72,65,72,49,41,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,43,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,683,731,779,824,881,935,985,1047,1115,1192,1251,1316,1379,1434,1494,1557,1611,1671,1724,1786,1871,1952,2002,2061,2104,2157,2200,2251,2301,2361,2414,2465,2511,2559,2607,2653,2700,2750,2795,2854,2906,2958,3001,3048,3104,3159,3214,3258,3300,3341,3391,3450,3501,3545,3594,3643,3690,3737,3784,3829,3880,3933,4008,4067,4124,4198,4262,4331,4409,4519,4623,4696,4762,4817,4882,4947,4996,5079,5157,5195,5240,5288,5350,5407,5462,5521,5588,5646,5708,5756,5801,5849,5900,5966,6032" + "endColumns": "14,72,65,72,49,41,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,42,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,683,731,779,824,881,935,985,1047,1115,1192,1251,1316,1379,1434,1494,1557,1611,1671,1724,1786,1871,1952,2002,2061,2104,2157,2200,2251,2301,2361,2414,2465,2511,2559,2607,2653,2700,2750,2795,2854,2906,2958,3001,3048,3104,3159,3214,3258,3300,3341,3391,3450,3501,3544,3593,3642,3689,3736,3783,3828,3879,3932,4007,4066,4123,4197,4261,4330,4408,4518,4622,4695,4761,4816,4881,4946,4995,5078,5156,5194,5239,5287,5349,5406,5461,5520,5587,5645,5707,5755,5800,5848,5899,5965,6031" } }, { diff --git a/src/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json b/src/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json index 60dbfb8..723dc91 100644 --- a/src/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json +++ b/src/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json @@ -25,16 +25,16 @@ "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,125,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6811,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,43,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6850,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6849,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,687,735,783,828,885,939,989,1051,1119,1196,1255,1321,1384,1439,1499,1562,1616,1676,1729,1791,1875,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3548,3597,3646,3693,3740,3787,3832,3883,3936,4011,4070,4127,4201,4265,4334,4412,4522,4626,4699,4765,4820,4885,4950,4999,5082,5160,5198,5243,5291,5353,5410,5465,5524,5591,5649,5711,5759,5804,5852,5903,5969", + "startOffsets": "215,384,456,522,595,645,687,735,783,828,885,939,989,1051,1119,1196,1255,1321,1384,1439,1499,1562,1616,1676,1729,1791,1875,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3547,3596,3645,3692,3739,3786,3831,3882,3935,4010,4069,4126,4200,4264,4333,4411,4521,4625,4698,4764,4819,4884,4949,4998,5081,5159,5197,5242,5290,5352,5409,5464,5523,5590,5648,5710,5758,5803,5851,5902,5968", "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107", - "endColumns": "14,71,65,72,49,41,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,43,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,682,730,778,823,880,934,984,1046,1114,1191,1250,1316,1379,1434,1494,1557,1611,1671,1724,1786,1870,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3543,3592,3641,3688,3735,3782,3827,3878,3931,4006,4065,4122,4196,4260,4329,4407,4517,4621,4694,4760,4815,4880,4945,4994,5077,5155,5193,5238,5286,5348,5405,5460,5519,5586,5644,5706,5754,5799,5847,5898,5964,6030" + "endColumns": "14,71,65,72,49,41,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,42,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,682,730,778,823,880,934,984,1046,1114,1191,1250,1316,1379,1434,1494,1557,1611,1671,1724,1786,1870,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3542,3591,3640,3687,3734,3781,3826,3877,3930,4005,4064,4121,4195,4259,4328,4406,4516,4620,4693,4759,4814,4879,4944,4993,5076,5154,5192,5237,5285,5347,5404,5459,5518,5585,5643,5705,5753,5798,5846,5897,5963,6029" } } ] diff --git a/src/app/build/intermediates/blame/res/debug/multi-v2/values.json b/src/app/build/intermediates/blame/res/debug/multi-v2/values.json index 82c5676..179547c 100644 --- a/src/app/build/intermediates/blame/res/debug/multi-v2/values.json +++ b/src/app/build/intermediates/blame/res/debug/multi-v2/values.json @@ -4,84 +4,113 @@ "outputFile": "C:\\Project\\minote\\src\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml", "map": [ { - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\values\\dimens.xml", + "source": "C:\\Users\\21931\\.gradle\\gradle-5.4.1-all\\gradle-5.4.1\\caches\\transforms-2\\files-2.1\\e1d9da03002cb11f79e842a285800b3f\\pagerslidingtabstrip-1.0.1\\res\\values\\values.xml", "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" + "startLines": "6,10", + "startColumns": "4,4", + "startOffsets": "185,371", + "endLines": "6,22", + "endColumns": "58,24", + "endOffsets": "239,1118" }, "to": { - "startLines": "13,14,15,16,17", + "startLines": "12,169", + "startColumns": "4,4", + "startOffsets": "532,10466", + "endLines": "12,181", + "endColumns": "58,24", + "endOffsets": "586,11190" + } + }, + { + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", + "startOffsets": "783,836,890,944,730", "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" + "endOffsets": "830,884,938,991,777" + }, + "to": { + "startLines": "14,15,16,17,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "648,700,753,806,858", + "endColumns": "51,52,52,51,51", + "endOffsets": "695,748,801,853,905" } }, { "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "128,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "8139,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8553,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "132,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,46,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "8547,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8595,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,133,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8139,3973,4237,4140,4070,846,893,946,7627,7677,8080,8028,1311,4697,4792,4625,4540,4456,5671,5587,5484,4970,2046,1994,3464,1518,1572,5032,2141,4321,7741,3901,3652,2201,2522,2828,2260,3392,3330,3272,3046,2993,2888,2942,3097,3148,2570,3834,3209,3702,2474,2772,2683,2624,3589,2423,3543,2318,2362,3766,1462,8553,1787,1897,1739,1843,1682,1633,1255,1201,6134,6066,6378,7528,6747,6665,6822,6912,7156,7076,6219,6295,6605,6443,6524,6010,7301,7424,7986,7857,7799,7911,1396,4901,5397,5808,5738,5889,5337,5281,5218,5157,999,1110", + "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,133,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,45,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8547,4064,4315,4231,4134,887,940,993,7671,7735,8133,8074,1390,4786,4895,4691,4619,4534,5732,5665,5581,5026,2103,2040,3537,1566,1627,5132,2195,4418,7791,3967,3696,2254,2564,2882,2312,3458,3386,3324,3091,3040,2936,2987,3142,3203,2618,3895,3266,3760,2516,2822,2766,2677,3646,2468,3583,2356,2417,3828,1512,8595,1837,1945,1781,1891,1733,1676,1305,1249,6213,6128,6437,7619,6816,6741,6906,7070,7295,7150,6289,6372,6659,6518,6599,6060,7418,7522,8022,7905,7851,7980,1456,4964,5478,5883,5802,5978,5391,5331,5275,5212,1104,1195" }, "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125", + "startLines": "19,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1132,1228,1311,1407,1476,1522,1574,1626,1675,1738,1796,1847,1931,2025,2133,2204,2288,2371,2437,2520,2622,2683,2745,2796,2874,2927,2987,3092,3151,3253,3308,3379,3428,3486,3533,3592,3649,3720,3781,3838,3888,3940,3993,4043,4093,4153,4206,4272,4334,4397,4444,4499,4587,4645,4707,4757,4802,4845,4905,4972,5027,5074,5129,5182,5229,5282,5338,5386,5441,5494,5578,5645,5709,5805,5879,5960,6049,6212,6356,6435,6510,6592,6651,6731,6811,6866,6988,7091,7132,7185,7242,7316,7381,7449,7535,7615,7684,7778,7837,7892,7954,8014,8124", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125", + "startOffsets": "910,1303,1399,1482,1578,1647,1693,1745,1797,1846,1909,1967,2018,2102,2196,2304,2375,2459,2542,2608,2691,2793,2854,2916,2967,3045,3098,3158,3263,3322,3424,3479,3550,3599,3657,3704,3763,3820,3891,3952,4009,4059,4111,4164,4214,4264,4324,4377,4443,4505,4568,4615,4670,4758,4816,4878,4928,4973,5016,5076,5143,5198,5245,5300,5353,5400,5453,5509,5557,5612,5665,5749,5816,5880,5976,6050,6131,6220,6383,6527,6606,6681,6763,6822,6902,6982,7037,7159,7262,7303,7356,7413,7487,7552,7620,7706,7786,7855,7949,8008,8063,8125,8185,8295", + "endLines": "23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126", "endColumns": "14,95,82,95,68,45,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1127,1223,1306,1402,1471,1517,1569,1621,1670,1733,1791,1842,1926,2020,2128,2199,2283,2366,2432,2515,2617,2678,2740,2791,2869,2922,2982,3087,3146,3248,3303,3374,3423,3481,3528,3587,3644,3715,3776,3833,3883,3935,3988,4038,4088,4148,4201,4267,4329,4392,4439,4494,4582,4640,4702,4752,4797,4840,4900,4967,5022,5069,5124,5177,5224,5277,5333,5381,5436,5489,5573,5640,5704,5800,5874,5955,6044,6207,6351,6430,6505,6587,6646,6726,6806,6861,6983,7086,7127,7180,7237,7311,7376,7444,7530,7610,7679,7773,7832,7887,7949,8009,8119,8209" + "endOffsets": "1298,1394,1477,1573,1642,1688,1740,1792,1841,1904,1962,2013,2097,2191,2299,2370,2454,2537,2603,2686,2788,2849,2911,2962,3040,3093,3153,3258,3317,3419,3474,3545,3594,3652,3699,3758,3815,3886,3947,4004,4054,4106,4159,4209,4259,4319,4372,4438,4500,4563,4610,4665,4753,4811,4873,4923,4968,5011,5071,5138,5193,5240,5295,5348,5395,5448,5504,5552,5607,5660,5744,5811,5875,5971,6045,6126,6215,6378,6522,6601,6676,6758,6817,6897,6977,7032,7154,7257,7298,7351,7408,7482,7547,7615,7701,7781,7850,7944,8003,8058,8120,8180,8290,8380" } }, { "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", + "endLines": "53,58,66,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2314,2531,2861,2696,1098,1287,1476,1685,1897,911,2104" }, "to": { - "startLines": "126,130,134,138,141,145,149,153,157,161,165", + "startLines": "127,131,135,138,141,145,149,153,157,161,165", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8214,8418,8629,8820,8975,9158,9343,9528,9731,9937,10120", - "endLines": "129,133,137,140,144,148,152,156,160,164,168", + "startOffsets": "8385,8589,8800,8960,9120,9303,9488,9673,9876,10082,10265", + "endLines": "130,134,137,140,144,148,152,156,160,164,168", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8413,8624,8815,8970,9153,9338,9523,9726,9932,10115,10316" + "endOffsets": "8584,8795,8955,9115,9298,9483,9668,9871,10077,10260,10461" } }, { "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" }, "to": { "startLines": "2,8", "startColumns": "4,4", - "startOffsets": "105,300", + "startOffsets": "105,412", "endLines": "7,11", "endColumns": "19,19", - "endOffsets": "295,415" + "endOffsets": "407,527" } }, { "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endColumns": "56", + "endOffsets": "782" }, "to": { - "startLines": "12", + "startLines": "13", "startColumns": "4", - "startOffsets": "420", + "startOffsets": "591", "endColumns": "56", - "endOffsets": "472" + "endOffsets": "643" } } ] diff --git a/src/app/build/intermediates/blame/res/debug/single/debug.json b/src/app/build/intermediates/blame/res/debug/single/debug.json index 0cd6d41..665b0ec 100644 --- a/src/app/build/intermediates/blame/res/debug/single/debug.json +++ b/src/app/build/intermediates/blame/res/debug/single/debug.json @@ -1,16 +1,12 @@ [ + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable_background_tab.xml.flat", + "source": "C:\\Users\\21931\\.gradle\\gradle-5.4.1-all\\gradle-5.4.1\\caches\\transforms-2\\files-2.1\\e1d9da03002cb11f79e842a285800b3f\\pagerslidingtabstrip-1.0.1\\res\\drawable\\background_tab.xml" + }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\widget_4x.xml" - }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\color\\primary_text_dark.xml" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\call_record.png" @@ -19,46 +15,22 @@ "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\xml\\preferences.xml" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\raw-zh-rCN\\introduction" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\datetime_picker.xml" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\xml\\searchable.xml" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\note_edit.xml" - }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\selected.png" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\menu\\note_list.xml" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\color\\secondary_text_dark.xml" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\menu\\note_list_dropdown.xml" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\font_super.png" @@ -75,18 +47,6 @@ "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png" - }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\font_small.png" - }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\menu\\call_record_folder.xml" @@ -99,6 +59,198 @@ "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png" }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\account_dialog_title.xml" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\raw\\introduction" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\search_result.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\notification.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\add_account_text.xml" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\widget_2x.xml" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\font_large.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_actionbar.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\icon_actionbar.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\xml\\widget_4x_info.xml" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\note_list_footer.xml" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\clock.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_folder.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\new_folder.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\widget_4x.xml" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\color\\primary_text_dark.xml" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\raw-zh-rCN\\introduction" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\note_edit.xml" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\menu\\note_list.xml" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\menu\\note_list_dropdown.xml" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\font_small.png" + }, + { + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png" + }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\dialog_edit_text.xml" @@ -111,38 +263,22 @@ "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\account_dialog_title.xml" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\note_edit_list_item.xml" }, { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png" + "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_todo_icon.png.flat", + "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\todo_icon.png" }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\raw\\introduction" - }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\folder_list_item.xml" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\note_list.xml" @@ -151,22 +287,10 @@ "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\search_result.png" - }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png" @@ -179,22 +303,10 @@ "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\notification.png" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\add_account_text.xml" - }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png" @@ -215,26 +327,10 @@ "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\xml\\widget_2x_info.xml" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png" - }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\delete.png" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png" - }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png" @@ -251,50 +347,14 @@ "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png" - }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png" - }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png" - }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable\\new_note.xml" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\widget_2x.xml" - }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png" - }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\font_large.png" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png" - }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\xml\\widget_4x_info.xml" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png" @@ -307,10 +367,6 @@ "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png" @@ -319,38 +375,10 @@ "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\menu\\sub_folder.xml" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png" - }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png" - }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png" - }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\note_list_footer.xml" - }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png" - }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\clock.png" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png" @@ -363,20 +391,8 @@ "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png" }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png" - }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png" - }, { "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat", "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\settings_header.xml" - }, - { - "merged": "C:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat", - "source": "C:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png" } ] \ No newline at end of file diff --git a/src/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml b/src/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml index a966206..57f24f3 100644 --- a/src/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml +++ b/src/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml @@ -20,8 +20,8 @@ android:versionName="0.1" > + android:minSdkVersion="17" + android:targetSdkVersion="17" /> @@ -43,6 +43,7 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:label="@string/app_name" android:launchMode="singleTop" + android:logo="@drawable/icon_actionbar" android:theme="@android:style/Theme.Holo.Light" android:windowSoftInputMode="adjustPan" > @@ -55,6 +56,7 @@ android:name="net.micode.notes.ui.NoteEditActivity" android:configChanges="keyboardHidden|orientation|screenSize" android:launchMode="singleTop" + android:logo="@drawable/icon_actionbar" android:theme="@style/NoteTheme" > diff --git a/src/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/output.json b/src/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/output.json index b81025e..9219be4 100644 --- a/src/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/output.json +++ b/src/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/output.json @@ -1 +1 @@ -[{"outputType":{"type":"BUNDLE_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.1","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"net.micode.notes","split":"","minSdkVersion":"14"}}] \ No newline at end of file +[{"outputType":{"type":"BUNDLE_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.1","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"net.micode.notes","split":"","minSdkVersion":"17"}}] \ No newline at end of file diff --git a/src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex b/src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex index 576accc..5ba3156 100644 Binary files a/src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex and b/src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex differ diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state index 7bf81f6..1b7f8b8 100644 Binary files a/src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and b/src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ diff --git a/src/app/build/intermediates/incremental/debug-mergeNativeLibs/merge-state b/src/app/build/intermediates/incremental/debug-mergeNativeLibs/merge-state index d7dff0d..aed7fc9 100644 Binary files a/src/app/build/intermediates/incremental/debug-mergeNativeLibs/merge-state and b/src/app/build/intermediates/incremental/debug-mergeNativeLibs/merge-state differ diff --git a/src/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/src/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties index e9fdcd0..d868c3d 100644 --- a/src/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties +++ b/src/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties @@ -1,6 +1,7 @@ -#Thu Oct 17 20:36:02 CST 2019 +#Sat Oct 26 08:55:57 CST 2019 C\:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat C\:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\add_account_text.xml=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat +C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\todo_icon.png=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_todo_icon.png.flat C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat C\:\\Project\\minote\\src\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat @@ -14,6 +15,7 @@ C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.p C\:\\Project\\minote\\src\\app\\src\\main\\res\\color\\primary_text_dark.xml=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat C\:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\datetime_picker.xml=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat +C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\icon_actionbar.png=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_actionbar.png.flat C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat @@ -48,6 +50,7 @@ C\:\\Project\\minote\\src\\app\\src\\main\\res\\raw\\introduction=C\:\\Project\\ C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\delete.png=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat +C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\new_folder.png=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_folder.png.flat C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat @@ -67,9 +70,10 @@ C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.pn C\:\\Project\\minote\\src\\app\\src\\main\\res\\layout\\folder_list_item.xml=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable\\new_note.xml=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat -C\:\\Project\\minote\\src\\app\\src\\main\\res\\menu\\call_note_edit.xml=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat +C\:\\Project\\minote\\src\\app\\src\\main\\res\\menu\\call_note_edit.xml=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat +C\:\\Users\\21931\\.gradle\\gradle-5.4.1-all\\gradle-5.4.1\\caches\\transforms-2\\files-2.1\\e1d9da03002cb11f79e842a285800b3f\\pagerslidingtabstrip-1.0.1\\res\\drawable\\background_tab.xml=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable_background_tab.xml.flat C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat C\:\\Project\\minote\\src\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=C\:\\Project\\minote\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat diff --git a/src/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/src/app/build/intermediates/incremental/mergeDebugResources/merger.xml index 11bb6dd..e43accf 100644 --- a/src/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/src/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -1,5 +1,17 @@ - +#6633B5E5 + + + + + + + + + + + + -%s --%s --%s @@ -38,19 +50,30 @@ 短信 邮件 - 小米便签便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小正常超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 小米便签便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图字数新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小正常超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 %1$s 条符合“%2$s”的搜索结果 - 字符数 + 短信 郵件 小米便簽便簽2x2便簽4x4沒有關聯內容,點擊新建便簽。訪客模式下,便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項,操作無效全選取消全選文字大小正常超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在,請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎?SD卡被佔用,不能操作導出TXT時發生錯誤,請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗,請檢查網絡和帳號設置同步失敗,發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復同步便簽請選擇google帳號,便簽將與該帳號的google task內容同步。正在同步中,不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 %1$s 條符合”%2$s“的搜尋結果 - 字符數 \ No newline at end of file + 字數 + + + + + + + + + + + + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 42652d4..bfcd952 100644 --- a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Fri Oct 18 00:06:03 CST 2019 +#Sat Oct 26 08:55:59 CST 2019 base.0=C\:\\Project\\minote\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\out\\classes.dex path.0=classes.dex renamed.0=classes.dex diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M= b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M= index 5508ba8..1f8470e 100644 Binary files a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M= and b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M= differ diff --git a/src/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml b/src/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml index ddde164..2cbf148 100644 --- a/src/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml +++ b/src/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml @@ -21,8 +21,8 @@ android:versionName="0.1" > + android:minSdkVersion="17" + android:targetSdkVersion="17" /> @@ -44,6 +44,7 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:label="@string/app_name" android:launchMode="singleTop" + android:logo="@drawable/icon_actionbar" android:theme="@android:style/Theme.Holo.Light" android:windowSoftInputMode="adjustPan" > @@ -56,6 +57,7 @@ android:name="net.micode.notes.ui.NoteEditActivity" android:configChanges="keyboardHidden|orientation|screenSize" android:launchMode="singleTop" + android:logo="@drawable/icon_actionbar" android:theme="@style/NoteTheme" > diff --git a/src/app/build/intermediates/instant_app_manifest/debug/output.json b/src/app/build/intermediates/instant_app_manifest/debug/output.json index f52417e..eb6cdfa 100644 --- a/src/app/build/intermediates/instant_app_manifest/debug/output.json +++ b/src/app/build/intermediates/instant_app_manifest/debug/output.json @@ -1 +1 @@ -[{"outputType":{"type":"INSTANT_APP_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.1","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"net.micode.notes","split":"","minSdkVersion":"14"}}] \ No newline at end of file +[{"outputType":{"type":"INSTANT_APP_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.1","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"net.micode.notes","split":"","minSdkVersion":"17"}}] \ No newline at end of file diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$color.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$color.class index 312cdc8..2b8a572 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$color.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$color.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$dimen.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$dimen.class index 1e7308a..fe0ec9d 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$dimen.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$dimen.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$drawable.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$drawable.class index 046a632..9684bfa 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$drawable.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$drawable.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$id.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$id.class index fbfac9b..4e78d37 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$id.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$id.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$layout.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$layout.class index 0ee603a..4e14e93 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$layout.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$layout.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$menu.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$menu.class index 435d64f..bc68465 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$menu.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$menu.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$plurals.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$plurals.class index 7ce0e76..9f75e6f 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$plurals.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$plurals.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$raw.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$raw.class index 8d47686..6d33381 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$raw.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$raw.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$string.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$string.class index 468b7a7..71482d2 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$string.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$string.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$style.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$style.class index 1dd3f49..71503b7 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$style.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$style.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$xml.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$xml.class index e46c439..76ae64d 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$xml.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R$xml.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R.class index 56fbbd6..95bb995 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/R.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class index fedb071..2bb05a2 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class index eea9008..61256af 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class index 6a5b3fc..6d996e2 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class index f16539e..f49caff 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class index aef80c3..c3e5320 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class index 4aa43e7..d32f06c 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class index 86e58b4..ee78230 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class index 803ce4a..412e9b6 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class index 62b413b..029c0a2 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class index d099a09..5150231 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index 8c369b7..a2f5196 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class index 3da8eb1..b0371c2 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class index 5eed195..07e85c7 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index c166e99..c7ef43b 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class index 51e6b34..49bdd30 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index 23e3bce..0639c49 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index ebfea90..8786dcb 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index bcd194f..a6f2ed8 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class index f9b113f..31522f8 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index 622a07c..21e0abd 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index c21a589..9715b48 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index 6aae154..f9c0bf3 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index 2da1fdf..d12814b 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index 510c16a..ad58ef7 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index 95971e4..604f8ce 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index eca34ca..7cfa547 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index 7c38c7d..e9e717c 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index d9093e1..cb51709 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index ec4c8a2..0e08a92 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class index 80a10fc..0d25b06 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class index 311ffbd..4237d35 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class index b622fad..d230a06 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index 1d54799..8380c9c 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class index eaf03dd..66e306b 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index 801a1f5..d1dca32 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 479f375..96ba0c4 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index d361bc6..133da87 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class index 46b3d34..fb3dd64 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index 9a8fb0c..7576e71 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index 045b09e..8c34307 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index fa92a8a..471d51d 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class index 29097c7..7ada688 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class index a445e4e..077c23a 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class differ diff --git a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index d557da1..3bda38d 100644 --- a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,9 +20,9 @@ 20 android:versionName="0.1" > 21 22 C:\Project\minote\src\app\src\main\AndroidManifest.xml -24 android:targetSdkVersion="14" /> +24 android:targetSdkVersion="17" /> 24-->C:\Project\minote\src\app\src\main\AndroidManifest.xml 25 26 @@ -54,7 +54,7 @@ 34-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:31:22-78 35 36 C:\Project\minote\src\app\src\main\AndroidManifest.xml:33:5-146:19 +36-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:33:5-148:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" 38-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:34:9-42 @@ -62,209 +62,213 @@ 39-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:35:9-41 40 android:testOnly="true" > 41 C:\Project\minote\src\app\src\main\AndroidManifest.xml:36:9-48:20 +41-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:36:9-49:20 42 android:name="net.micode.notes.ui.NotesListActivity" 42-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:37:13-49 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:38:13-74 +43-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:39:13-74 44 android:label="@string/app_name" -44-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:39:13-45 +44-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:40:13-45 45 android:launchMode="singleTop" -45-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:40:13-43 -46 android:theme="@android:style/Theme.Holo.Light" -46-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:41:13-60 -47 android:windowSoftInputMode="adjustPan" > -47-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:42:13-52 -48 -48-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:44:13-47:29 -49 -49-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:45:17-69 -49-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:45:25-66 -50 -51 -51-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:17-77 -51-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:27-74 -52 -53 -54 C:\Project\minote\src\app\src\main\AndroidManifest.xml:50:9-78:20 -55 android:name="net.micode.notes.ui.NoteEditActivity" -55-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:51:13-48 -56 android:configChanges="keyboardHidden|orientation|screenSize" -56-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:52:13-74 -57 android:launchMode="singleTop" -57-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:53:13-43 -58 android:theme="@style/NoteTheme" > -58-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:54:13-45 -59 -59-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:56:13-61:29 -60 -60-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:57:17-69 -60-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:57:25-66 -61 -62 -62-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:17-76 -62-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:27-73 +45-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:41:13-43 +46 android:logo="@drawable/icon_actionbar" +46-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:38:13-52 +47 android:theme="@android:style/Theme.Holo.Light" +47-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:42:13-60 +48 android:windowSoftInputMode="adjustPan" > +48-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:43:13-52 +49 +49-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:45:13-48:29 +50 +50-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:17-69 +50-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:25-66 +51 +52 +52-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:47:17-77 +52-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:47:27-74 +53 +54 +55 C:\Project\minote\src\app\src\main\AndroidManifest.xml:51:9-80:20 +56 android:name="net.micode.notes.ui.NoteEditActivity" +56-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:52:13-48 +57 android:configChanges="keyboardHidden|orientation|screenSize" +57-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:54:13-74 +58 android:launchMode="singleTop" +58-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:55:13-43 +59 android:logo="@drawable/icon_actionbar" +59-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:53:13-52 +60 android:theme="@style/NoteTheme" > +60-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:56:13-45 +61 +61-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:13-63:29 +62 +62-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-69 +62-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:25-66 63 -64 -64-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-78 -64-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:23-75 -65 -65-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-78 -65-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:23-75 -66 -67 -67-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:63:13-68:29 -68 -68-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:64:17-79 -68-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:64:25-76 -69 -70 -70-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:17-76 -70-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:27-73 +64 +64-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:17-76 +64-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:27-73 +65 +66 +66-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:61:17-78 +66-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:61:23-75 +67 +67-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:61:17-78 +67-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:61:23-75 +68 +69 +69-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:65:13-70:29 +70 +70-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:66:17-79 +70-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:66:25-76 71 -72 -72-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-78 -72-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:23-75 -73 -73-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-78 -73-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:23-75 -74 -75 -75-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:70:13-73:29 -76 -76-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:71:17-71 -76-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:71:25-68 -77 -78 -78-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:17-76 -78-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:27-73 -79 -80 -81 C:\Project\minote\src\app\src\main\AndroidManifest.xml:75:13-77:54 -82 android:name="android.app.searchable" -82-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:76:17-54 -83 android:resource="@xml/searchable" /> -83-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:77:17-51 -84 -85 -86 C:\Project\minote\src\app\src\main\AndroidManifest.xml:80:9-83:43 -87 android:name="net.micode.notes.data.NotesProvider" -87-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:81:13-63 -88 android:authorities="micode_notes" -88-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:82:13-47 -89 android:multiprocess="true" /> -89-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:83:13-40 -90 -91 C:\Project\minote\src\app\src\main\AndroidManifest.xml:85:9-97:20 -92 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -92-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:86:13-57 -93 android:label="@string/app_widget2x2" > -93-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:87:13-50 -94 -94-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:88:13-92:29 -95 -95-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:17-84 -95-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:25-81 -96 -96-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:17-85 -96-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:25-82 -97 -97-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:17-85 -97-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:25-82 -98 -99 -100 C:\Project\minote\src\app\src\main\AndroidManifest.xml:94:13-96:58 -101 android:name="android.appwidget.provider" -101-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:95:17-58 -102 android:resource="@xml/widget_2x_info" /> -102-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:96:17-55 -103 -104 C:\Project\minote\src\app\src\main\AndroidManifest.xml:98:9-111:20 -105 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -105-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:99:13-57 -106 android:label="@string/app_widget4x4" > -106-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:100:13-50 -107 -107-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:88:13-92:29 -108 -108-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:17-84 -108-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:25-81 -109 -109-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:17-85 -109-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:25-82 -110 -110-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:17-85 -110-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:25-82 -111 -112 -113 C:\Project\minote\src\app\src\main\AndroidManifest.xml:94:13-96:58 -114 android:name="android.appwidget.provider" -114-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:95:17-58 -115 android:resource="@xml/widget_4x_info" /> -115-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:96:17-55 -116 -117 -117-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:113:9-117:20 -117-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:113:19-55 -118 -118-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:114:13-116:29 -119 -119-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:115:17-79 -119-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:115:25-76 -120 -121 -122 C:\Project\minote\src\app\src\main\AndroidManifest.xml:119:9-122:20 -123 android:name="net.micode.notes.ui.AlarmReceiver" -123-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:120:13-61 -124 android:process=":remote" > -124-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:121:13-38 -125 -126 -127 C:\Project\minote\src\app\src\main\AndroidManifest.xml:124:9-129:20 -128 android:name="net.micode.notes.ui.AlarmAlertActivity" -128-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:125:13-50 -129 android:label="@string/app_name" -129-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:126:13-45 -130 android:launchMode="singleInstance" -130-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:127:13-48 -131 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -131-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:128:13-75 -132 -133 C:\Project\minote\src\app\src\main\AndroidManifest.xml:131:9-136:20 -134 android:name="net.micode.notes.ui.NotesPreferenceActivity" -134-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:132:13-71 -135 android:label="@string/preferences_title" -135-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:133:13-54 -136 android:launchMode="singleTop" -136-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:134:13-43 -137 android:theme="@android:style/Theme.Holo.Light" > -137-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:135:13-60 -138 -139 -140 C:\Project\minote\src\app\src\main\AndroidManifest.xml:138:9-141:19 -141 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -141-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:139:13-74 -142 android:exported="false" > -142-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:140:13-37 -143 -144 -145 C:\Project\minote\src\app\src\main\AndroidManifest.xml:143:9-145:52 -146 android:name="android.app.default_searchable" -146-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:144:13-58 -147 android:value=".ui.NoteEditActivity" /> -147-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:145:13-49 -148 -149 -150 +72 +72-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:17-76 +72-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:27-73 +73 +74 +74-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:61:17-78 +74-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:61:23-75 +75 +75-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:61:17-78 +75-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:61:23-75 +76 +77 +77-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:72:13-75:29 +78 +78-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:73:17-71 +78-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:73:25-68 +79 +80 +80-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:17-76 +80-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:27-73 +81 +82 +83 C:\Project\minote\src\app\src\main\AndroidManifest.xml:77:13-79:54 +84 android:name="android.app.searchable" +84-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:78:17-54 +85 android:resource="@xml/searchable" /> +85-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:79:17-51 +86 +87 +88 C:\Project\minote\src\app\src\main\AndroidManifest.xml:82:9-85:43 +89 android:name="net.micode.notes.data.NotesProvider" +89-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:83:13-63 +90 android:authorities="micode_notes" +90-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:84:13-47 +91 android:multiprocess="true" /> +91-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:85:13-40 +92 +93 C:\Project\minote\src\app\src\main\AndroidManifest.xml:87:9-99:20 +94 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +94-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:88:13-57 +95 android:label="@string/app_widget2x2" > +95-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:13-50 +96 +96-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:13-94:29 +97 +97-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:17-84 +97-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:25-81 +98 +98-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:17-85 +98-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:25-82 +99 +99-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:93:17-85 +99-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:93:25-82 +100 +101 +102 C:\Project\minote\src\app\src\main\AndroidManifest.xml:96:13-98:58 +103 android:name="android.appwidget.provider" +103-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:97:17-58 +104 android:resource="@xml/widget_2x_info" /> +104-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:98:17-55 +105 +106 C:\Project\minote\src\app\src\main\AndroidManifest.xml:100:9-113:20 +107 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +107-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:101:13-57 +108 android:label="@string/app_widget4x4" > +108-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:102:13-50 +109 +109-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:13-94:29 +110 +110-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:17-84 +110-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:25-81 +111 +111-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:17-85 +111-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:25-82 +112 +112-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:93:17-85 +112-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:93:25-82 +113 +114 +115 C:\Project\minote\src\app\src\main\AndroidManifest.xml:96:13-98:58 +116 android:name="android.appwidget.provider" +116-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:97:17-58 +117 android:resource="@xml/widget_4x_info" /> +117-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:98:17-55 +118 +119 +119-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:115:9-119:20 +119-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:115:19-55 +120 +120-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:116:13-118:29 +121 +121-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:117:17-79 +121-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:117:25-76 +122 +123 +124 C:\Project\minote\src\app\src\main\AndroidManifest.xml:121:9-124:20 +125 android:name="net.micode.notes.ui.AlarmReceiver" +125-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:122:13-61 +126 android:process=":remote" > +126-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:123:13-38 +127 +128 +129 C:\Project\minote\src\app\src\main\AndroidManifest.xml:126:9-131:20 +130 android:name="net.micode.notes.ui.AlarmAlertActivity" +130-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:127:13-50 +131 android:label="@string/app_name" +131-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:128:13-45 +132 android:launchMode="singleInstance" +132-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:129:13-48 +133 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +133-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:130:13-75 +134 +135 C:\Project\minote\src\app\src\main\AndroidManifest.xml:133:9-138:20 +136 android:name="net.micode.notes.ui.NotesPreferenceActivity" +136-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:134:13-71 +137 android:label="@string/preferences_title" +137-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:135:13-54 +138 android:launchMode="singleTop" +138-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:136:13-43 +139 android:theme="@android:style/Theme.Holo.Light" > +139-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:137:13-60 +140 +141 +142 C:\Project\minote\src\app\src\main\AndroidManifest.xml:140:9-143:19 +143 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +143-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:141:13-74 +144 android:exported="false" > +144-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:142:13-37 +145 +146 +147 C:\Project\minote\src\app\src\main\AndroidManifest.xml:145:9-147:52 +148 android:name="android.app.default_searchable" +148-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:146:13-58 +149 android:value=".ui.NoteEditActivity" /> +149-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:147:13-49 +150 +151 +152 diff --git a/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index a966206..57f24f3 100644 --- a/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -20,8 +20,8 @@ android:versionName="0.1" > + android:minSdkVersion="17" + android:targetSdkVersion="17" /> @@ -43,6 +43,7 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:label="@string/app_name" android:launchMode="singleTop" + android:logo="@drawable/icon_actionbar" android:theme="@android:style/Theme.Holo.Light" android:windowSoftInputMode="adjustPan" > @@ -55,6 +56,7 @@ android:name="net.micode.notes.ui.NoteEditActivity" android:configChanges="keyboardHidden|orientation|screenSize" android:launchMode="singleTop" + android:logo="@drawable/icon_actionbar" android:theme="@style/NoteTheme" > diff --git a/src/app/build/intermediates/merged_manifests/debug/output.json b/src/app/build/intermediates/merged_manifests/debug/output.json index 1e67bfd..647d425 100644 --- a/src/app/build/intermediates/merged_manifests/debug/output.json +++ b/src/app/build/intermediates/merged_manifests/debug/output.json @@ -1 +1 @@ -[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.1","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"net.micode.notes","split":"","minSdkVersion":"14"}}] \ No newline at end of file +[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.1","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"net.micode.notes","split":"","minSdkVersion":"17"}}] \ No newline at end of file diff --git a/src/app/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml b/src/app/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml index 485ad0f..2688cd6 100644 --- a/src/app/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml +++ b/src/app/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml @@ -2,7 +2,7 @@ - + diff --git a/src/app/build/intermediates/processed_res/debug/processDebugResources/out/output.json b/src/app/build/intermediates/processed_res/debug/processDebugResources/out/output.json index ed540dd..c8dfe51 100644 --- a/src/app/build/intermediates/processed_res/debug/processDebugResources/out/output.json +++ b/src/app/build/intermediates/processed_res/debug/processDebugResources/out/output.json @@ -1 +1 @@ -[{"outputType":{"type":"PROCESSED_RES"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.1","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"resources-debug.ap_","properties":{"packageId":"net.micode.notes","split":"","minSdkVersion":"14"}}] \ No newline at end of file +[{"outputType":{"type":"PROCESSED_RES"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.1","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"resources-debug.ap_","properties":{"packageId":"net.micode.notes","split":"","minSdkVersion":"17"}}] \ No newline at end of file diff --git a/src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_ b/src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_ index 25962be..1ad30dc 100644 Binary files a/src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_ and b/src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_ differ diff --git a/src/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat b/src/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat index 7711ce1..e3bae7b 100644 Binary files a/src/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat and b/src/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat differ diff --git a/src/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat b/src/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat index 2b61810..1f6a468 100644 Binary files a/src/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat and b/src/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat differ diff --git a/src/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat b/src/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat index 5c66311..d95ad7a 100644 Binary files a/src/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat and b/src/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat differ diff --git a/src/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat b/src/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat index 91d2782..77274ed 100644 Binary files a/src/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat and b/src/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat differ diff --git a/src/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat index c9073c3..71f7fa6 100644 Binary files a/src/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/src/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ diff --git a/src/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/src/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat index 3654751..5c21e4b 100644 Binary files a/src/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat and b/src/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ diff --git a/src/app/build/intermediates/res/merged/debug/values_values.arsc.flat b/src/app/build/intermediates/res/merged/debug/values_values.arsc.flat index ab4073a..c5e843e 100644 Binary files a/src/app/build/intermediates/res/merged/debug/values_values.arsc.flat and b/src/app/build/intermediates/res/merged/debug/values_values.arsc.flat differ diff --git a/src/app/build/intermediates/symbols/debug/R.txt b/src/app/build/intermediates/symbols/debug/R.txt index 8e186d2..5834890 100644 --- a/src/app/build/intermediates/symbols/debug/R.txt +++ b/src/app/build/intermediates/symbols/debug/R.txt @@ -1,284 +1,312 @@ int array format_for_exported_note 0x7f010000 int array menu_share_ways 0x7f010001 -int color primary_text_dark 0x7f020000 -int color secondary_text_dark 0x7f020001 -int color user_query_highlight 0x7f020002 -int dimen text_font_size_large 0x7f030000 -int dimen text_font_size_medium 0x7f030001 -int dimen text_font_size_normal 0x7f030002 -int dimen text_font_size_small 0x7f030003 -int dimen text_font_size_super 0x7f030004 -int drawable bg_btn_set_color 0x7f040000 -int drawable bg_color_btn_mask 0x7f040001 -int drawable call_record 0x7f040002 -int drawable clock 0x7f040003 -int drawable delete 0x7f040004 -int drawable dropdown_icon 0x7f040005 -int drawable edit_blue 0x7f040006 -int drawable edit_green 0x7f040007 -int drawable edit_red 0x7f040008 -int drawable edit_title_blue 0x7f040009 -int drawable edit_title_green 0x7f04000a -int drawable edit_title_red 0x7f04000b -int drawable edit_title_white 0x7f04000c -int drawable edit_title_yellow 0x7f04000d -int drawable edit_white 0x7f04000e -int drawable edit_yellow 0x7f04000f -int drawable font_large 0x7f040010 -int drawable font_normal 0x7f040011 -int drawable font_size_selector_bg 0x7f040012 -int drawable font_small 0x7f040013 -int drawable font_super 0x7f040014 -int drawable icon_app 0x7f040015 -int drawable list_background 0x7f040016 -int drawable list_blue_down 0x7f040017 -int drawable list_blue_middle 0x7f040018 -int drawable list_blue_single 0x7f040019 -int drawable list_blue_up 0x7f04001a -int drawable list_folder 0x7f04001b -int drawable list_footer_bg 0x7f04001c -int drawable list_green_down 0x7f04001d -int drawable list_green_middle 0x7f04001e -int drawable list_green_single 0x7f04001f -int drawable list_green_up 0x7f040020 -int drawable list_red_down 0x7f040021 -int drawable list_red_middle 0x7f040022 -int drawable list_red_single 0x7f040023 -int drawable list_red_up 0x7f040024 -int drawable list_white_down 0x7f040025 -int drawable list_white_middle 0x7f040026 -int drawable list_white_single 0x7f040027 -int drawable list_white_up 0x7f040028 -int drawable list_yellow_down 0x7f040029 -int drawable list_yellow_middle 0x7f04002a -int drawable list_yellow_single 0x7f04002b -int drawable list_yellow_up 0x7f04002c -int drawable menu_delete 0x7f04002d -int drawable menu_move 0x7f04002e -int drawable new_note 0x7f04002f -int drawable new_note_normal 0x7f040030 -int drawable new_note_pressed 0x7f040031 -int drawable note_edit_color_selector_panel 0x7f040032 -int drawable notification 0x7f040033 -int drawable search_result 0x7f040034 -int drawable selected 0x7f040035 -int drawable title_alert 0x7f040036 -int drawable title_bar_bg 0x7f040037 -int drawable widget_2x_blue 0x7f040038 -int drawable widget_2x_green 0x7f040039 -int drawable widget_2x_red 0x7f04003a -int drawable widget_2x_white 0x7f04003b -int drawable widget_2x_yellow 0x7f04003c -int drawable widget_4x_blue 0x7f04003d -int drawable widget_4x_green 0x7f04003e -int drawable widget_4x_red 0x7f04003f -int drawable widget_4x_white 0x7f040040 -int drawable widget_4x_yellow 0x7f040041 -int id account_dialog_subtitle 0x7f050000 -int id account_dialog_title 0x7f050001 -int id action_select_all 0x7f050002 -int id amPm 0x7f050003 -int id btn_new_note 0x7f050004 -int id btn_set_bg_color 0x7f050005 -int id cb_edit_item 0x7f050006 -int id date 0x7f050007 -int id delete 0x7f050008 -int id et_edit_text 0x7f050009 -int id et_foler_name 0x7f05000a -int id font_size_selector 0x7f05000b -int id hour 0x7f05000c -int id iv_alert_icon 0x7f05000d -int id iv_bg_blue 0x7f05000e -int id iv_bg_blue_select 0x7f05000f -int id iv_bg_green 0x7f050010 -int id iv_bg_green_select 0x7f050011 -int id iv_bg_red 0x7f050012 -int id iv_bg_red_select 0x7f050013 -int id iv_bg_white 0x7f050014 -int id iv_bg_white_select 0x7f050015 -int id iv_bg_yellow 0x7f050016 -int id iv_bg_yellow_select 0x7f050017 -int id iv_large_select 0x7f050018 -int id iv_medium_select 0x7f050019 -int id iv_small_select 0x7f05001a -int id iv_super_select 0x7f05001b -int id ll_font_large 0x7f05001c -int id ll_font_normal 0x7f05001d -int id ll_font_small 0x7f05001e -int id ll_font_super 0x7f05001f -int id menu_alert 0x7f050020 -int id menu_delete 0x7f050021 -int id menu_delete_remind 0x7f050022 -int id menu_export_text 0x7f050023 -int id menu_font_size 0x7f050024 -int id menu_list_mode 0x7f050025 -int id menu_new_folder 0x7f050026 -int id menu_new_note 0x7f050027 -int id menu_search 0x7f050028 -int id menu_send_to_desktop 0x7f050029 -int id menu_setting 0x7f05002a -int id menu_share 0x7f05002b -int id menu_sync 0x7f05002c -int id minute 0x7f05002d -int id move 0x7f05002e -int id navigation_bar 0x7f05002f -int id note_bg_color_selector 0x7f050030 -int id note_edit_list 0x7f050031 -int id note_edit_view 0x7f050032 -int id note_item 0x7f050033 -int id note_title 0x7f050034 -int id notes_list 0x7f050035 -int id prefenerece_sync_status_textview 0x7f050036 -int id preference_sync_button 0x7f050037 -int id selection_menu 0x7f050038 -int id sv_note_edit 0x7f050039 -int id tv_alert_date 0x7f05003a -int id tv_folder_name 0x7f05003b -int id tv_modified_date 0x7f05003c -int id tv_name 0x7f05003d -int id tv_time 0x7f05003e -int id tv_title 0x7f05003f -int id tv_title_bar 0x7f050040 -int id widget_bg_image 0x7f050041 -int id widget_text 0x7f050042 -int layout account_dialog_title 0x7f060000 -int layout add_account_text 0x7f060001 -int layout datetime_picker 0x7f060002 -int layout dialog_edit_text 0x7f060003 -int layout folder_list_item 0x7f060004 -int layout note_edit 0x7f060005 -int layout note_edit_list_item 0x7f060006 -int layout note_item 0x7f060007 -int layout note_list 0x7f060008 -int layout note_list_dropdown_menu 0x7f060009 -int layout note_list_footer 0x7f06000a -int layout settings_header 0x7f06000b -int layout widget_2x 0x7f06000c -int layout widget_4x 0x7f06000d -int menu call_note_edit 0x7f070000 -int menu call_record_folder 0x7f070001 -int menu note_edit 0x7f070002 -int menu note_list 0x7f070003 -int menu note_list_dropdown 0x7f070004 -int menu note_list_options 0x7f070005 -int menu sub_folder 0x7f070006 -int plurals search_results_title 0x7f080000 -int raw introduction 0x7f090000 -int string alert_message_delete_folder 0x7f0a0000 -int string alert_message_delete_note 0x7f0a0001 -int string alert_message_delete_notes 0x7f0a0002 -int string alert_title_delete 0x7f0a0003 -int string app_name 0x7f0a0004 -int string app_widget2x2 0x7f0a0005 -int string app_widget4x4 0x7f0a0006 -int string button_delete 0x7f0a0007 -int string call_record_folder_name 0x7f0a0008 -int string datetime_dialog_cancel 0x7f0a0009 -int string datetime_dialog_ok 0x7f0a000a -int string delete_remind_time_message 0x7f0a000b -int string error_note_empty_for_clock 0x7f0a000c -int string error_note_empty_for_send_to_desktop 0x7f0a000d -int string error_note_not_exist 0x7f0a000e -int string error_sdcard_export 0x7f0a000f -int string error_sdcard_unmounted 0x7f0a0010 -int string error_sync_cancelled 0x7f0a0011 -int string error_sync_internal 0x7f0a0012 -int string error_sync_network 0x7f0a0013 -int string failed_sdcard_export 0x7f0a0014 -int string file_name_txt_format 0x7f0a0015 -int string file_path 0x7f0a0016 -int string folder_exist 0x7f0a0017 -int string format_date_ymd 0x7f0a0018 -int string format_datetime_mdhm 0x7f0a0019 -int string format_exported_file_location 0x7f0a001a -int string format_folder_files_count 0x7f0a001b -int string format_move_notes_to_folder 0x7f0a001c -int string hint_foler_name 0x7f0a001d -int string info_note_enter_desktop 0x7f0a001e -int string menu_alert 0x7f0a001f -int string menu_create_folder 0x7f0a0020 -int string menu_delete 0x7f0a0021 -int string menu_deselect_all 0x7f0a0022 -int string menu_export_text 0x7f0a0023 -int string menu_folder_change_name 0x7f0a0024 -int string menu_folder_delete 0x7f0a0025 -int string menu_folder_view 0x7f0a0026 -int string menu_font_large 0x7f0a0027 -int string menu_font_normal 0x7f0a0028 -int string menu_font_size 0x7f0a0029 -int string menu_font_small 0x7f0a002a -int string menu_font_super 0x7f0a002b -int string menu_list_mode 0x7f0a002c -int string menu_move 0x7f0a002d -int string menu_move_parent_folder 0x7f0a002e -int string menu_normal_mode 0x7f0a002f -int string menu_remove_remind 0x7f0a0030 -int string menu_search 0x7f0a0031 -int string menu_select_all 0x7f0a0032 -int string menu_select_none 0x7f0a0033 -int string menu_select_title 0x7f0a0034 -int string menu_send_to_desktop 0x7f0a0035 -int string menu_setting 0x7f0a0036 -int string menu_share 0x7f0a0037 -int string menu_sync 0x7f0a0038 -int string menu_sync_cancel 0x7f0a0039 -int string menu_title_select_folder 0x7f0a003a -int string note_alert_expired 0x7f0a003b -int string note_length 0x7f0a003c -int string note_link_email 0x7f0a003d -int string note_link_other 0x7f0a003e -int string note_link_tel 0x7f0a003f -int string note_link_web 0x7f0a0040 -int string notealert_enter 0x7f0a0041 -int string notealert_ok 0x7f0a0042 -int string notelist_menu_new 0x7f0a0043 -int string notelist_string_info 0x7f0a0044 -int string preferences_account_summary 0x7f0a0045 -int string preferences_account_title 0x7f0a0046 -int string preferences_add_account 0x7f0a0047 -int string preferences_bg_random_appear_title 0x7f0a0048 -int string preferences_button_sync_cancel 0x7f0a0049 -int string preferences_button_sync_immediately 0x7f0a004a -int string preferences_dialog_change_account_title 0x7f0a004b -int string preferences_dialog_change_account_warn_msg 0x7f0a004c -int string preferences_dialog_select_account_tips 0x7f0a004d -int string preferences_dialog_select_account_title 0x7f0a004e -int string preferences_last_sync_time 0x7f0a004f -int string preferences_last_sync_time_format 0x7f0a0050 -int string preferences_menu_cancel 0x7f0a0051 -int string preferences_menu_change_account 0x7f0a0052 -int string preferences_menu_remove_account 0x7f0a0053 -int string preferences_title 0x7f0a0054 -int string preferences_toast_cannot_change_account 0x7f0a0055 -int string preferences_toast_success_set_accout 0x7f0a0056 -int string search 0x7f0a0057 -int string search_hint 0x7f0a0058 -int string search_label 0x7f0a0059 -int string search_setting_description 0x7f0a005a -int string set_remind_time_message 0x7f0a005b -int string success_sdcard_export 0x7f0a005c -int string success_sync_account 0x7f0a005d -int string sync_progress_init_list 0x7f0a005e -int string sync_progress_login 0x7f0a005f -int string sync_progress_syncing 0x7f0a0060 -int string ticker_cancel 0x7f0a0061 -int string ticker_fail 0x7f0a0062 -int string ticker_success 0x7f0a0063 -int string ticker_syncing 0x7f0a0064 -int string widget_havenot_content 0x7f0a0065 -int string widget_under_visit_mode 0x7f0a0066 -int style HighlightTextAppearancePrimary 0x7f0b0000 -int style HighlightTextAppearanceSecondary 0x7f0b0001 -int style NoteActionBarStyle 0x7f0b0002 -int style NoteTheme 0x7f0b0003 -int style TextAppearanceLarge 0x7f0b0004 -int style TextAppearanceMedium 0x7f0b0005 -int style TextAppearanceNormal 0x7f0b0006 -int style TextAppearancePrimaryItem 0x7f0b0007 -int style TextAppearanceSecondaryItem 0x7f0b0008 -int style TextAppearanceSuper 0x7f0b0009 -int style TextAppearanceUnderMenuIcon 0x7f0b000a -int xml preferences 0x7f0c0000 -int xml searchable 0x7f0c0001 -int xml widget_2x_info 0x7f0c0002 -int xml widget_4x_info 0x7f0c0003 +int attr pstsDividerColor 0x7f020000 +int attr pstsDividerPadding 0x7f020001 +int attr pstsIndicatorColor 0x7f020002 +int attr pstsIndicatorHeight 0x7f020003 +int attr pstsScrollOffset 0x7f020004 +int attr pstsShouldExpand 0x7f020005 +int attr pstsTabBackground 0x7f020006 +int attr pstsTabPaddingLeftRight 0x7f020007 +int attr pstsTextAllCaps 0x7f020008 +int attr pstsUnderlineColor 0x7f020009 +int attr pstsUnderlineHeight 0x7f02000a +int color background_tab_pressed 0x7f030000 +int color primary_text_dark 0x7f030001 +int color secondary_text_dark 0x7f030002 +int color user_query_highlight 0x7f030003 +int dimen text_font_size_large 0x7f040000 +int dimen text_font_size_medium 0x7f040001 +int dimen text_font_size_normal 0x7f040002 +int dimen text_font_size_small 0x7f040003 +int dimen text_font_size_super 0x7f040004 +int drawable background_tab 0x7f050000 +int drawable bg_btn_set_color 0x7f050001 +int drawable bg_color_btn_mask 0x7f050002 +int drawable call_record 0x7f050003 +int drawable clock 0x7f050004 +int drawable delete 0x7f050005 +int drawable dropdown_icon 0x7f050006 +int drawable edit_blue 0x7f050007 +int drawable edit_green 0x7f050008 +int drawable edit_red 0x7f050009 +int drawable edit_title_blue 0x7f05000a +int drawable edit_title_green 0x7f05000b +int drawable edit_title_red 0x7f05000c +int drawable edit_title_white 0x7f05000d +int drawable edit_title_yellow 0x7f05000e +int drawable edit_white 0x7f05000f +int drawable edit_yellow 0x7f050010 +int drawable font_large 0x7f050011 +int drawable font_normal 0x7f050012 +int drawable font_size_selector_bg 0x7f050013 +int drawable font_small 0x7f050014 +int drawable font_super 0x7f050015 +int drawable icon_actionbar 0x7f050016 +int drawable icon_app 0x7f050017 +int drawable list_background 0x7f050018 +int drawable list_blue_down 0x7f050019 +int drawable list_blue_middle 0x7f05001a +int drawable list_blue_single 0x7f05001b +int drawable list_blue_up 0x7f05001c +int drawable list_folder 0x7f05001d +int drawable list_footer_bg 0x7f05001e +int drawable list_green_down 0x7f05001f +int drawable list_green_middle 0x7f050020 +int drawable list_green_single 0x7f050021 +int drawable list_green_up 0x7f050022 +int drawable list_red_down 0x7f050023 +int drawable list_red_middle 0x7f050024 +int drawable list_red_single 0x7f050025 +int drawable list_red_up 0x7f050026 +int drawable list_white_down 0x7f050027 +int drawable list_white_middle 0x7f050028 +int drawable list_white_single 0x7f050029 +int drawable list_white_up 0x7f05002a +int drawable list_yellow_down 0x7f05002b +int drawable list_yellow_middle 0x7f05002c +int drawable list_yellow_single 0x7f05002d +int drawable list_yellow_up 0x7f05002e +int drawable menu_delete 0x7f05002f +int drawable menu_move 0x7f050030 +int drawable new_folder 0x7f050031 +int drawable new_note 0x7f050032 +int drawable new_note_normal 0x7f050033 +int drawable new_note_pressed 0x7f050034 +int drawable note_edit_color_selector_panel 0x7f050035 +int drawable notification 0x7f050036 +int drawable search_result 0x7f050037 +int drawable selected 0x7f050038 +int drawable title_alert 0x7f050039 +int drawable title_bar_bg 0x7f05003a +int drawable todo_icon 0x7f05003b +int drawable widget_2x_blue 0x7f05003c +int drawable widget_2x_green 0x7f05003d +int drawable widget_2x_red 0x7f05003e +int drawable widget_2x_white 0x7f05003f +int drawable widget_2x_yellow 0x7f050040 +int drawable widget_4x_blue 0x7f050041 +int drawable widget_4x_green 0x7f050042 +int drawable widget_4x_red 0x7f050043 +int drawable widget_4x_white 0x7f050044 +int drawable widget_4x_yellow 0x7f050045 +int id account_dialog_subtitle 0x7f060000 +int id account_dialog_title 0x7f060001 +int id action_select_all 0x7f060002 +int id amPm 0x7f060003 +int id btn_new_note 0x7f060004 +int id btn_set_bg_color 0x7f060005 +int id cb_edit_item 0x7f060006 +int id date 0x7f060007 +int id delete 0x7f060008 +int id et_edit_text 0x7f060009 +int id et_foler_name 0x7f06000a +int id font_size_selector 0x7f06000b +int id hour 0x7f06000c +int id iv_alert_icon 0x7f06000d +int id iv_bg_blue 0x7f06000e +int id iv_bg_blue_select 0x7f06000f +int id iv_bg_green 0x7f060010 +int id iv_bg_green_select 0x7f060011 +int id iv_bg_red 0x7f060012 +int id iv_bg_red_select 0x7f060013 +int id iv_bg_white 0x7f060014 +int id iv_bg_white_select 0x7f060015 +int id iv_bg_yellow 0x7f060016 +int id iv_bg_yellow_select 0x7f060017 +int id iv_large_select 0x7f060018 +int id iv_medium_select 0x7f060019 +int id iv_small_select 0x7f06001a +int id iv_super_select 0x7f06001b +int id ll_font_large 0x7f06001c +int id ll_font_normal 0x7f06001d +int id ll_font_small 0x7f06001e +int id ll_font_super 0x7f06001f +int id menu_alert 0x7f060020 +int id menu_delete 0x7f060021 +int id menu_delete_remind 0x7f060022 +int id menu_export_text 0x7f060023 +int id menu_font_size 0x7f060024 +int id menu_list_mode 0x7f060025 +int id menu_new_folder 0x7f060026 +int id menu_new_note 0x7f060027 +int id menu_search 0x7f060028 +int id menu_send_to_desktop 0x7f060029 +int id menu_setting 0x7f06002a +int id menu_share 0x7f06002b +int id menu_sync 0x7f06002c +int id minute 0x7f06002d +int id move 0x7f06002e +int id navigation_bar 0x7f06002f +int id note_bg_color_selector 0x7f060030 +int id note_edit_list 0x7f060031 +int id note_edit_view 0x7f060032 +int id note_item 0x7f060033 +int id note_title 0x7f060034 +int id notes_list 0x7f060035 +int id prefenerece_sync_status_textview 0x7f060036 +int id preference_sync_button 0x7f060037 +int id selection_menu 0x7f060038 +int id sv_note_edit 0x7f060039 +int id tv_alert_date 0x7f06003a +int id tv_folder_name 0x7f06003b +int id tv_modified_date 0x7f06003c +int id tv_name 0x7f06003d +int id tv_time 0x7f06003e +int id tv_title 0x7f06003f +int id tv_title_bar 0x7f060040 +int id widget_bg_image 0x7f060041 +int id widget_text 0x7f060042 +int layout account_dialog_title 0x7f070000 +int layout add_account_text 0x7f070001 +int layout datetime_picker 0x7f070002 +int layout dialog_edit_text 0x7f070003 +int layout folder_list_item 0x7f070004 +int layout note_edit 0x7f070005 +int layout note_edit_list_item 0x7f070006 +int layout note_item 0x7f070007 +int layout note_list 0x7f070008 +int layout note_list_dropdown_menu 0x7f070009 +int layout note_list_footer 0x7f07000a +int layout settings_header 0x7f07000b +int layout widget_2x 0x7f07000c +int layout widget_4x 0x7f07000d +int menu call_note_edit 0x7f080000 +int menu call_record_folder 0x7f080001 +int menu note_edit 0x7f080002 +int menu note_list 0x7f080003 +int menu note_list_dropdown 0x7f080004 +int menu note_list_options 0x7f080005 +int menu sub_folder 0x7f080006 +int plurals search_results_title 0x7f090000 +int raw introduction 0x7f0a0000 +int string alert_message_delete_folder 0x7f0b0000 +int string alert_message_delete_note 0x7f0b0001 +int string alert_message_delete_notes 0x7f0b0002 +int string alert_title_delete 0x7f0b0003 +int string app_name 0x7f0b0004 +int string app_widget2x2 0x7f0b0005 +int string app_widget4x4 0x7f0b0006 +int string button_delete 0x7f0b0007 +int string call_record_folder_name 0x7f0b0008 +int string datetime_dialog_cancel 0x7f0b0009 +int string datetime_dialog_ok 0x7f0b000a +int string delete_remind_time_message 0x7f0b000b +int string error_note_empty_for_clock 0x7f0b000c +int string error_note_empty_for_send_to_desktop 0x7f0b000d +int string error_note_not_exist 0x7f0b000e +int string error_sdcard_export 0x7f0b000f +int string error_sdcard_unmounted 0x7f0b0010 +int string error_sync_cancelled 0x7f0b0011 +int string error_sync_internal 0x7f0b0012 +int string error_sync_network 0x7f0b0013 +int string failed_sdcard_export 0x7f0b0014 +int string file_name_txt_format 0x7f0b0015 +int string file_path 0x7f0b0016 +int string folder_exist 0x7f0b0017 +int string format_date_ymd 0x7f0b0018 +int string format_datetime_mdhm 0x7f0b0019 +int string format_exported_file_location 0x7f0b001a +int string format_folder_files_count 0x7f0b001b +int string format_move_notes_to_folder 0x7f0b001c +int string hint_foler_name 0x7f0b001d +int string info_note_enter_desktop 0x7f0b001e +int string menu_alert 0x7f0b001f +int string menu_create_folder 0x7f0b0020 +int string menu_delete 0x7f0b0021 +int string menu_deselect_all 0x7f0b0022 +int string menu_export_text 0x7f0b0023 +int string menu_folder_change_name 0x7f0b0024 +int string menu_folder_delete 0x7f0b0025 +int string menu_folder_view 0x7f0b0026 +int string menu_font_large 0x7f0b0027 +int string menu_font_normal 0x7f0b0028 +int string menu_font_size 0x7f0b0029 +int string menu_font_small 0x7f0b002a +int string menu_font_super 0x7f0b002b +int string menu_list_mode 0x7f0b002c +int string menu_move 0x7f0b002d +int string menu_move_parent_folder 0x7f0b002e +int string menu_normal_mode 0x7f0b002f +int string menu_remove_remind 0x7f0b0030 +int string menu_search 0x7f0b0031 +int string menu_select_all 0x7f0b0032 +int string menu_select_none 0x7f0b0033 +int string menu_select_title 0x7f0b0034 +int string menu_send_to_desktop 0x7f0b0035 +int string menu_setting 0x7f0b0036 +int string menu_share 0x7f0b0037 +int string menu_sync 0x7f0b0038 +int string menu_sync_cancel 0x7f0b0039 +int string menu_title_select_folder 0x7f0b003a +int string note_alert_expired 0x7f0b003b +int string note_length 0x7f0b003c +int string note_link_email 0x7f0b003d +int string note_link_other 0x7f0b003e +int string note_link_tel 0x7f0b003f +int string note_link_web 0x7f0b0040 +int string notealert_enter 0x7f0b0041 +int string notealert_ok 0x7f0b0042 +int string notelist_menu_new 0x7f0b0043 +int string notelist_string_info 0x7f0b0044 +int string preferences_account_summary 0x7f0b0045 +int string preferences_account_title 0x7f0b0046 +int string preferences_add_account 0x7f0b0047 +int string preferences_bg_random_appear_title 0x7f0b0048 +int string preferences_button_sync_cancel 0x7f0b0049 +int string preferences_button_sync_immediately 0x7f0b004a +int string preferences_dialog_change_account_title 0x7f0b004b +int string preferences_dialog_change_account_warn_msg 0x7f0b004c +int string preferences_dialog_select_account_tips 0x7f0b004d +int string preferences_dialog_select_account_title 0x7f0b004e +int string preferences_last_sync_time 0x7f0b004f +int string preferences_last_sync_time_format 0x7f0b0050 +int string preferences_menu_cancel 0x7f0b0051 +int string preferences_menu_change_account 0x7f0b0052 +int string preferences_menu_remove_account 0x7f0b0053 +int string preferences_title 0x7f0b0054 +int string preferences_toast_cannot_change_account 0x7f0b0055 +int string preferences_toast_success_set_accout 0x7f0b0056 +int string search 0x7f0b0057 +int string search_hint 0x7f0b0058 +int string search_label 0x7f0b0059 +int string search_setting_description 0x7f0b005a +int string set_remind_time_message 0x7f0b005b +int string success_sdcard_export 0x7f0b005c +int string success_sync_account 0x7f0b005d +int string sync_progress_init_list 0x7f0b005e +int string sync_progress_login 0x7f0b005f +int string sync_progress_syncing 0x7f0b0060 +int string ticker_cancel 0x7f0b0061 +int string ticker_fail 0x7f0b0062 +int string ticker_success 0x7f0b0063 +int string ticker_syncing 0x7f0b0064 +int string widget_havenot_content 0x7f0b0065 +int string widget_under_visit_mode 0x7f0b0066 +int style HighlightTextAppearancePrimary 0x7f0c0000 +int style HighlightTextAppearanceSecondary 0x7f0c0001 +int style NoteActionBarStyle 0x7f0c0002 +int style NoteTheme 0x7f0c0003 +int style TextAppearanceLarge 0x7f0c0004 +int style TextAppearanceMedium 0x7f0c0005 +int style TextAppearanceNormal 0x7f0c0006 +int style TextAppearancePrimaryItem 0x7f0c0007 +int style TextAppearanceSecondaryItem 0x7f0c0008 +int style TextAppearanceSuper 0x7f0c0009 +int style TextAppearanceUnderMenuIcon 0x7f0c000a +int[] styleable PagerSlidingTabStrip { 0x7f020000, 0x7f020001, 0x7f020002, 0x7f020003, 0x7f020004, 0x7f020005, 0x7f020006, 0x7f020007, 0x7f020008, 0x7f020009, 0x7f02000a } +int styleable PagerSlidingTabStrip_pstsDividerColor 0 +int styleable PagerSlidingTabStrip_pstsDividerPadding 1 +int styleable PagerSlidingTabStrip_pstsIndicatorColor 2 +int styleable PagerSlidingTabStrip_pstsIndicatorHeight 3 +int styleable PagerSlidingTabStrip_pstsScrollOffset 4 +int styleable PagerSlidingTabStrip_pstsShouldExpand 5 +int styleable PagerSlidingTabStrip_pstsTabBackground 6 +int styleable PagerSlidingTabStrip_pstsTabPaddingLeftRight 7 +int styleable PagerSlidingTabStrip_pstsTextAllCaps 8 +int styleable PagerSlidingTabStrip_pstsUnderlineColor 9 +int styleable PagerSlidingTabStrip_pstsUnderlineHeight 10 +int xml preferences 0x7f0e0000 +int xml searchable 0x7f0e0001 +int xml widget_2x_info 0x7f0e0002 +int xml widget_4x_info 0x7f0e0003 diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/BuildConfig.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/BuildConfig.dex index 137bc6f..b31dba9 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/BuildConfig.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/BuildConfig.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$array.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$array.dex index 72cfb2c..86f25c1 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$array.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$array.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$color.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$color.dex index 8b267e0..14cf163 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$color.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$color.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$dimen.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$dimen.dex index c2a324d..a371322 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$dimen.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$dimen.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$drawable.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$drawable.dex index 23230d4..d56b81e 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$drawable.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$drawable.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$id.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$id.dex index 2e0dd35..2f372de 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$id.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$id.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$layout.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$layout.dex index d98689a..891c647 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$layout.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$layout.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$menu.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$menu.dex index e5e7b04..06aa439 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$menu.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$menu.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$plurals.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$plurals.dex index 538a89c..8cc496f 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$plurals.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$plurals.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$raw.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$raw.dex index a6b853b..b6d2e88 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$raw.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$raw.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$string.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$string.dex index 811ca20..ac5b0fe 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$string.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$string.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$style.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$style.dex index 8d2f6f3..7dbb812 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$style.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$style.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$xml.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$xml.dex index 9594440..51b86b9 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$xml.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R$xml.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R.dex index 10d07b2..ddc503e 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/R.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Contact.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Contact.dex index 58172bf..64c44e2 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Contact.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Contact.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$CallNote.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$CallNote.dex index 170a777..02d3ca9 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$CallNote.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$CallNote.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$DataColumns.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$DataColumns.dex index d187917..ab099ac 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$DataColumns.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$DataColumns.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$DataConstants.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$DataConstants.dex index 2b9bc03..bd12833 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$DataConstants.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$DataConstants.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$NoteColumns.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$NoteColumns.dex index 1d64089..ac39b20 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$NoteColumns.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$NoteColumns.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$TextNote.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$TextNote.dex index a4d121f..a6dabfa 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$TextNote.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$TextNote.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes.dex index 7796712..bd61cc1 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex index d321c25..26ec9ff 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex index 0fb38e7..5eef087 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex index 4b9b84e..3cdcf63 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/MetaData.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/MetaData.dex index db456c7..f52d2f6 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/MetaData.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/MetaData.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/Node.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/Node.dex index 38ae9c7..294a0cb 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/Node.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/Node.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/SqlData.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/SqlData.dex index 6d16977..40c9310 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/SqlData.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/SqlData.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/SqlNote.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/SqlNote.dex index 22f889f..1f80565 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/SqlNote.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/SqlNote.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/Task.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/Task.dex index 238983e..a8ca476 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/Task.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/Task.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/TaskList.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/TaskList.dex index 99c6a2c..0746cc3 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/TaskList.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/data/TaskList.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/exception/ActionFailureException.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/exception/ActionFailureException.dex index 557147e..74ccc42 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/exception/ActionFailureException.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/exception/ActionFailureException.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/exception/NetworkFailureException.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/exception/NetworkFailureException.dex index 8ac9eaa..a8ae7a8 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/exception/NetworkFailureException.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/exception/NetworkFailureException.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex index b5f9784..f5805e8 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex index 5266a05..c82fe19 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskASyncTask.dex index c44267c..50e95a3 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskClient.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskClient.dex index d1947e5..a48a7d2 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskClient.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskClient.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskManager.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskManager.dex index 31aa3ab..12bccca 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskManager.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskManager.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskSyncService$1.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskSyncService$1.dex index d2aff96..7700cfa 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskSyncService$1.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskSyncService$1.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskSyncService.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskSyncService.dex index c2b2ae8..9e28441 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskSyncService.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/gtask/remote/GTaskSyncService.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note$NoteData.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note$NoteData.dex index 5091dfa..e94f4b1 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note$NoteData.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note$NoteData.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note.dex index 78a0d6e..3863b36 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex index 3d2def9..7b1d48b 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/WorkingNote.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/WorkingNote.dex index ab2d80e..e204e2c 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/WorkingNote.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/WorkingNote.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/BackupUtils$TextExport.dex index 70a2787..89aa123 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/BackupUtils$TextExport.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/BackupUtils$TextExport.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/BackupUtils.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/BackupUtils.dex index 63af2e2..311b890 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/BackupUtils.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/BackupUtils.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/DataUtils.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/DataUtils.dex index 551d7ff..f39496e 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/DataUtils.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/DataUtils.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/GTaskStringUtils.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/GTaskStringUtils.dex index 4bf3cd1..a9ac62a 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/GTaskStringUtils.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/GTaskStringUtils.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/ResourceParser$NoteBgResources.dex index bdfd1e7..369bbcf 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/ResourceParser$NoteBgResources.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/ResourceParser$NoteBgResources.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex index 368155f..f83ec2c 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex index 587cc67..c18e626 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex index 1e41c6d..e7a9321 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/ResourceParser.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/ResourceParser.dex index 1f570dd..dcfc913 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/ResourceParser.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/tool/ResourceParser.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/AlarmAlertActivity.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/AlarmAlertActivity.dex index 07e4d79..842f86c 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/AlarmAlertActivity.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/AlarmInitReceiver.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/AlarmInitReceiver.dex index 9c10c7d..0e6e827 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/AlarmInitReceiver.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/AlarmInitReceiver.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/AlarmReceiver.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/AlarmReceiver.dex index 390be47..9efbef0 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/AlarmReceiver.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/AlarmReceiver.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker$1.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker$1.dex index c3ab146..7969780 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker$1.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker$1.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker$2.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker$2.dex index 1f4125f..d42e3cc 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker$2.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker$2.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker$3.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker$3.dex index c8fc2fb..8010940 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker$3.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker$3.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker$4.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker$4.dex index 092e0b1..b717593 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker$4.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker$4.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex index 7402c2e..7624a01 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker.dex index 249c398..9513c6a 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePicker.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePickerDialog$1.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePickerDialog$1.dex index 5f5520e..62fbbf4 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePickerDialog$1.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePickerDialog$1.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex index 72401da..239852e 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePickerDialog.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePickerDialog.dex index 7cafa9d..6416ba1 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePickerDialog.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DateTimePickerDialog.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DropdownMenu$1.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DropdownMenu$1.dex index def5d26..67199d7 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DropdownMenu$1.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DropdownMenu$1.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DropdownMenu.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DropdownMenu.dex index 1d31454..a61d5eb 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DropdownMenu.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/DropdownMenu.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index cb8eeb1..68cca5f 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/FoldersListAdapter.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/FoldersListAdapter.dex index 3d2a3a8..b45d21c 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/FoldersListAdapter.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/FoldersListAdapter.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$1.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$1.dex index b38de1f..7e26499 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$1.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$2.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$2.dex index c85078a..833912b 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$3.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$3.dex index 26ac155..833c941 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex index c7b2b05..953d7e8 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity.dex index 58c923f..2aff617 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditText$1.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditText$1.dex index 5b3637a..8f68b9b 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditText$1.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditText$1.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex index f5b7add..8bf55e0 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditText.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditText.dex index 09b9ff0..d15366a 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditText.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditText.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteItemData.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteItemData.dex index dd2e79a..2054951 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteItemData.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteItemData.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$1.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$1.dex index 0f3b72c..b45434f 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$1.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$1.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$2.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$2.dex index 029b1ec..1fa1bcc 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$2.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$3.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$3.dex index 142c1f5..2810a37 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$3.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$3.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$4.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$4.dex index 23579a4..71053a6 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$4.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$5.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$5.dex index 1c1c175..1eee4e2 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$5.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$5.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$6.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$6.dex index 29f4acb..b2ba138 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$6.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$7.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$7.dex index e218877..6be957a 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$7.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$7.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$8.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$8.dex index 60173ff..5f64727 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$8.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$9.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$9.dex index 1de3fd5..f70ea2a 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$9.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$9.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex index 61e13a4..7685d87 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$ListEditState.dex index f013473..4e23075 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$ListEditState.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$ListEditState.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex index 9b2dd51..f87ba81 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex index cf1659d..6d58302 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index 98cec69..a436d8f 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex index 83e641e..f942784 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex index 50e4c75..d4fa6d5 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity.dex index 637ab14..12d9143 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex index 9c9633b..ffb2ac6 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListAdapter.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListAdapter.dex index cff6853..a6ee5ee 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListAdapter.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListAdapter.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListItem.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListItem.dex index 903b1c3..21c487c 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListItem.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesListItem.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$1.dex index 580fbf0..92a507a 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$2.dex index 49a1276..206be74 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$2.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$2.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$3.dex index 55c3c78..7d8653c 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$3.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$3.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$4.dex index 6c2425d..df9e7fb 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$4.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$4.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$5.dex index 2a8724b..66cd24a 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$5.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$5.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$6.dex index 1db6419..258145b 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$6.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$6.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$7.dex index cdcfce3..51133e5 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$7.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$7.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$8.dex index c680a51..6f6bbc2 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$8.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$8.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex index cdf2e93..a9d1682 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity.dex index 18f2c04..afebcf2 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/widget/NoteWidgetProvider.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/widget/NoteWidgetProvider.dex index fa67234..6dab917 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/widget/NoteWidgetProvider_2x.dex index ff7afa1..d0a619a 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/widget/NoteWidgetProvider_2x.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/widget/NoteWidgetProvider_2x.dex differ diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/widget/NoteWidgetProvider_4x.dex index d631607..c739dc3 100644 Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/widget/NoteWidgetProvider_4x.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/widget/NoteWidgetProvider_4x.dex differ diff --git a/src/app/build/outputs/apk/debug/app-debug.apk b/src/app/build/outputs/apk/debug/app-debug.apk index f475852..e7d3d73 100644 Binary files a/src/app/build/outputs/apk/debug/app-debug.apk and b/src/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/src/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/app/build/outputs/logs/manifest-merger-debug-report.txt index 44c6bb1..2fec8a5 100644 --- a/src/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,12 +1,13 @@ -- Merging decision tree log --- manifest -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-147:12 -INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-147:12 -INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-147:12 -INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-147:12 -INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-147:12 -INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-147:12 -INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-147:12 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-149:12 +INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-149:12 +INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-149:12 +INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-149:12 +MERGED from [com.astuetz:pagerslidingtabstrip:1.0.1] C:\Users\21931\.gradle\gradle-5.4.1-all\gradle-5.4.1\caches\transforms-2\files-2.1\e1d9da03002cb11f79e842a285800b3f\pagerslidingtabstrip-1.0.1\AndroidManifest.xml:1:1-5:12 +INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-149:12 +INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-149:12 +INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:18:1-149:12 package ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:19:5-31 INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml @@ -58,169 +59,177 @@ ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:31:5-81 android:name ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:31:22-78 application -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:33:5-146:19 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:33:5-148:19 +MERGED from [com.astuetz:pagerslidingtabstrip:1.0.1] C:\Users\21931\.gradle\gradle-5.4.1-all\gradle-5.4.1\caches\transforms-2\files-2.1\e1d9da03002cb11f79e842a285800b3f\pagerslidingtabstrip-1.0.1\AndroidManifest.xml:4:5-19 +MERGED from [com.astuetz:pagerslidingtabstrip:1.0.1] C:\Users\21931\.gradle\gradle-5.4.1-all\gradle-5.4.1\caches\transforms-2\files-2.1\e1d9da03002cb11f79e842a285800b3f\pagerslidingtabstrip-1.0.1\AndroidManifest.xml:4:5-19 android:label ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:35:9-41 android:icon ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:34:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:36:9-48:20 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:36:9-49:20 android:label - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:39:13-45 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:40:13-45 android:launchMode - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:40:13-43 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:41:13-43 android:windowSoftInputMode - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:42:13-52 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:43:13-52 android:configChanges - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:38:13-74 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:39:13-74 android:theme - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:41:13-60 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:42:13-60 + android:logo + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:38:13-52 android:name ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:37:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:44:13-47:29 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:45:13-48:29 action#android.intent.action.MAIN -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:45:17-69 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:17-69 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:45:25-66 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:25-66 category#android.intent.category.LAUNCHER -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:17-77 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:47:17-77 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:27-74 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:47:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:50:9-78:20 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:51:9-80:20 android:launchMode - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:53:13-43 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:55:13-43 android:configChanges - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:52:13-74 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:54:13-74 android:theme - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:54:13-45 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:56:13-45 + android:logo + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:53:13-52 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:51:13-48 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:52:13-48 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:56:13-61:29 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:13-63:29 action#android.intent.action.VIEW -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:57:17-69 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-69 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:57:25-66 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:25-66 category#android.intent.category.DEFAULT -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:17-76 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:17-76 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:27-73 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:27-73 data -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-78 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:61:17-78 android:mimeType - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:23-75 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:61:23-75 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:63:13-68:29 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:65:13-70:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:64:17-79 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:66:17-79 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:64:25-76 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:66:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:70:13-73:29 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:72:13-75:29 action#android.intent.action.SEARCH -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:71:17-71 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:73:17-71 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:71:25-68 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:73:25-68 meta-data#android.app.searchable -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:75:13-77:54 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:77:13-79:54 android:resource - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:77:17-51 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:79:17-51 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:76:17-54 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:78:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:80:9-83:43 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:82:9-85:43 android:authorities - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:82:13-47 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:84:13-47 android:multiprocess - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:83:13-40 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:85:13-40 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:81:13-63 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:83:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:85:9-97:20 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:87:9-99:20 android:label - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:87:13-50 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:13-50 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:86:13-57 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:88:13-57 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:88:13-92:29 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:13-94:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:17-84 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:17-84 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:25-81 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:17-85 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:17-85 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:25-82 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:17-85 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:93:17-85 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:25-82 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:93:25-82 meta-data#android.appwidget.provider -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:94:13-96:58 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:96:13-98:58 android:resource - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:96:17-55 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:98:17-55 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:95:17-58 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:97:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:98:9-111:20 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:100:9-113:20 android:label - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:100:13-50 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:102:13-50 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:99:13-57 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:101:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:113:9-117:20 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:115:9-119:20 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:113:19-55 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:115:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:114:13-116:29 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:116:13-118:29 action#android.intent.action.BOOT_COMPLETED -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:115:17-79 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:117:17-79 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:115:25-76 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:117:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:119:9-122:20 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:121:9-124:20 android:process - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:121:13-38 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:123:13-38 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:120:13-61 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:122:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:124:9-129:20 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:126:9-131:20 android:label - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:126:13-45 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:128:13-45 android:launchMode - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:127:13-48 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:129:13-48 android:theme - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:128:13-75 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:130:13-75 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:125:13-50 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:127:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:131:9-136:20 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:133:9-138:20 android:label - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:133:13-54 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:135:13-54 android:launchMode - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:134:13-43 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:136:13-43 android:theme - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:135:13-60 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:137:13-60 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:132:13-71 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:134:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:138:9-141:19 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:140:9-143:19 android:exported - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:140:13-37 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:142:13-37 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:139:13-74 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:141:13-74 meta-data#android.app.default_searchable -ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:143:9-145:52 +ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:145:9-147:52 android:value - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:145:13-49 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:147:13-49 android:name - ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:144:13-58 + ADDED from C:\Project\minote\src\app\src\main\AndroidManifest.xml:146:13-58 uses-sdk INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml reason: use-sdk injection requested INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml +MERGED from [com.astuetz:pagerslidingtabstrip:1.0.1] C:\Users\21931\.gradle\gradle-5.4.1-all\gradle-5.4.1\caches\transforms-2\files-2.1\e1d9da03002cb11f79e842a285800b3f\pagerslidingtabstrip-1.0.1\AndroidManifest.xml:2:5-72 +MERGED from [com.astuetz:pagerslidingtabstrip:1.0.1] C:\Users\21931\.gradle\gradle-5.4.1-all\gradle-5.4.1\caches\transforms-2\files-2.1\e1d9da03002cb11f79e842a285800b3f\pagerslidingtabstrip-1.0.1\AndroidManifest.xml:2:5-72 INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml INJECTED from C:\Project\minote\src\app\src\main\AndroidManifest.xml android:targetSdkVersion diff --git a/src/app/src/main/AndroidManifest.xml b/src/app/src/main/AndroidManifest.xml index ae0cf92..8ba2de8 100644 --- a/src/app/src/main/AndroidManifest.xml +++ b/src/app/src/main/AndroidManifest.xml @@ -35,6 +35,7 @@ android:label="@string/app_name" > diff --git a/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index a8bc334..8d25522 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -158,7 +158,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, private int mFontSizeId; //定义title时间后与字符数的空格 - private static final String space_after_title_time = " "; + private static final String space_after_title_time = " "; //保存便签字符数量 private int mNoteLength; diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index 2f96fa4..a7a08a8 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -31,6 +31,7 @@ import android.database.Cursor; import android.os.AsyncTask; import android.os.Bundle; import android.preference.PreferenceManager; +import android.support.v4.view.ViewPager; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; @@ -60,6 +61,8 @@ import android.widget.PopupMenu; import android.widget.TextView; import android.widget.Toast; +import com.astuetz.PagerSlidingTabStrip; + import net.micode.notes.R; import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.NoteColumns; @@ -159,8 +162,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setContentView(R.layout.note_list); //初始化资源 + initResources(); /** diff --git a/src/app/src/main/res/drawable-hdpi/new_note_normal.png b/src/app/src/main/res/drawable-hdpi/new_note_normal.png index 55fca48..658206a 100644 Binary files a/src/app/src/main/res/drawable-hdpi/new_note_normal.png and b/src/app/src/main/res/drawable-hdpi/new_note_normal.png differ diff --git a/src/app/src/main/res/drawable-hdpi/new_note_pressed.png b/src/app/src/main/res/drawable-hdpi/new_note_pressed.png index 55fca48..658206a 100644 Binary files a/src/app/src/main/res/drawable-hdpi/new_note_pressed.png and b/src/app/src/main/res/drawable-hdpi/new_note_pressed.png differ diff --git a/src/app/src/main/res/drawable-hdpi/title_alert.png b/src/app/src/main/res/drawable-hdpi/title_alert.png index 544ee9c..1fd059d 100644 Binary files a/src/app/src/main/res/drawable-hdpi/title_alert.png and b/src/app/src/main/res/drawable-hdpi/title_alert.png differ diff --git a/src/app/src/main/res/menu/note_list.xml b/src/app/src/main/res/menu/note_list.xml index 464826b..9e26d73 100644 --- a/src/app/src/main/res/menu/note_list.xml +++ b/src/app/src/main/res/menu/note_list.xml @@ -17,9 +17,10 @@

+ + android:title="@string/menu_create_folder"/> 浏览网页 打开地图 - 字符数 + 字数 新建文件夹 导出文本 同步 diff --git a/src/app/src/main/res/values-zh-rTW/strings.xml b/src/app/src/main/res/values-zh-rTW/strings.xml index 3212d8f..7649aa4 100644 --- a/src/app/src/main/res/values-zh-rTW/strings.xml +++ b/src/app/src/main/res/values-zh-rTW/strings.xml @@ -123,6 +123,6 @@ %1$s 條符合”%2$s“的搜尋結果 - 字符數 + 字數 diff --git a/src/app/src/main/res/values/styles.xml b/src/app/src/main/res/values/styles.xml index 3ac6b62..24af939 100644 --- a/src/app/src/main/res/values/styles.xml +++ b/src/app/src/main/res/values/styles.xml @@ -58,12 +58,11 @@ @color/secondary_text_dark - - \ No newline at end of file