diff --git a/.idea/misc.xml b/.idea/misc.xml index 5157fcf..b92d576 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -55,7 +55,7 @@ - + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8a028f6..ffe80a4 100755 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -110,10 +110,20 @@ android:name=".loaderexample.LoaderExampleActivity" android:label="@string/title_activity_loader_example" android:theme="@style/AppTheme.NoActionBar"> +<<<<<<< HEAD + + + + + +======= +>>>>>>> master +<<<<<<< HEAD +======= +>>>>>>> master - - diff --git a/bottom-bar/build/generated/source/r/debug/android/support/design/R.java b/bottom-bar/build/generated/source/r/debug/android/support/design/R.java index 76d56e3..18311ed 100644 --- a/bottom-bar/build/generated/source/r/debug/android/support/design/R.java +++ b/bottom-bar/build/generated/source/r/debug/android/support/design/R.java @@ -1,9 +1,15 @@ <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD ======= /* * Copyright (c) 2016. Pritesh Patel, Toronto, Canada */ +>>>>>>> master +>>>>>>> master +======= >>>>>>> master /* AUTO-GENERATED FILE. DO NOT MODIFY. * diff --git a/bottom-bar/build/generated/source/r/debug/android/support/v7/appcompat/R.java b/bottom-bar/build/generated/source/r/debug/android/support/v7/appcompat/R.java index c6e4043..247b29f 100644 --- a/bottom-bar/build/generated/source/r/debug/android/support/v7/appcompat/R.java +++ b/bottom-bar/build/generated/source/r/debug/android/support/v7/appcompat/R.java @@ -1,9 +1,15 @@ <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD ======= /* * Copyright (c) 2016. Pritesh Patel, Toronto, Canada */ +>>>>>>> master +>>>>>>> master +======= >>>>>>> master /* AUTO-GENERATED FILE. DO NOT MODIFY. * diff --git a/bottom-bar/build/generated/source/r/debug/android/support/v7/recyclerview/R.java b/bottom-bar/build/generated/source/r/debug/android/support/v7/recyclerview/R.java index 510d16c..b258b9b 100644 --- a/bottom-bar/build/generated/source/r/debug/android/support/v7/recyclerview/R.java +++ b/bottom-bar/build/generated/source/r/debug/android/support/v7/recyclerview/R.java @@ -1,9 +1,15 @@ <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD ======= /* * Copyright (c) 2016. Pritesh Patel, Toronto, Canada */ +>>>>>>> master +>>>>>>> master +======= >>>>>>> master /* AUTO-GENERATED FILE. DO NOT MODIFY. * diff --git a/bottom-bar/build/generated/source/r/release/android/support/design/R.java b/bottom-bar/build/generated/source/r/release/android/support/design/R.java index aa86371..f0bdddf 100644 --- a/bottom-bar/build/generated/source/r/release/android/support/design/R.java +++ b/bottom-bar/build/generated/source/r/release/android/support/design/R.java @@ -1,7 +1,3 @@ -/* - * Copyright (c) 2016. Pritesh Patel, Toronto, Canada - */ - /* AUTO-GENERATED FILE. DO NOT MODIFY. * * This class was automatically generated by the diff --git a/bottom-bar/build/generated/source/r/release/android/support/v7/appcompat/R.java b/bottom-bar/build/generated/source/r/release/android/support/v7/appcompat/R.java index 583c7bf..ff6bb7d 100644 --- a/bottom-bar/build/generated/source/r/release/android/support/v7/appcompat/R.java +++ b/bottom-bar/build/generated/source/r/release/android/support/v7/appcompat/R.java @@ -1,7 +1,3 @@ -/* - * Copyright (c) 2016. Pritesh Patel, Toronto, Canada - */ - /* AUTO-GENERATED FILE. DO NOT MODIFY. * * This class was automatically generated by the diff --git a/bottom-bar/build/generated/source/r/release/android/support/v7/recyclerview/R.java b/bottom-bar/build/generated/source/r/release/android/support/v7/recyclerview/R.java index 92501ba..af962a8 100644 --- a/bottom-bar/build/generated/source/r/release/android/support/v7/recyclerview/R.java +++ b/bottom-bar/build/generated/source/r/release/android/support/v7/recyclerview/R.java @@ -1,7 +1,3 @@ -/* - * Copyright (c) 2016. Pritesh Patel, Toronto, Canada - */ - /* AUTO-GENERATED FILE. DO NOT MODIFY. * * This class was automatically generated by the diff --git a/bottom-bar/build/intermediates/blame/res/androidTest/debug/single/drawable-mdpi-v4.json b/bottom-bar/build/intermediates/blame/res/androidTest/debug/single/drawable-mdpi-v4.json index 36fc25b..ac23d2c 100644 --- a/bottom-bar/build/intermediates/blame/res/androidTest/debug/single/drawable-mdpi-v4.json +++ b/bottom-bar/build/intermediates/blame/res/androidTest/debug/single/drawable-mdpi-v4.json @@ -8,14 +8,42 @@ "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/drawable-mdpi-v4/abc_list_selector_disabled_holo_dark.9.png" }, { +<<<<<<< HEAD +<<<<<<< HEAD + "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/abc_btn_switch_to_on_mtrl_00012.9.png", + "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/drawable-mdpi-v4/abc_btn_switch_to_on_mtrl_00012.9.png" + }, + { +======= +>>>>>>> master +======= +>>>>>>> master "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/abc_scrubber_track_mtrl_alpha.9.png", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/drawable-mdpi-v4/abc_scrubber_track_mtrl_alpha.9.png" }, { +<<<<<<< HEAD +<<<<<<< HEAD +======= +======= +======= +>>>>>>> NewMaster +>>>>>>> master "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/abc_btn_switch_to_on_mtrl_00012.9.png", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/drawable-mdpi-v4/abc_btn_switch_to_on_mtrl_00012.9.png" }, { +<<<<<<< HEAD +>>>>>>> master +======= +<<<<<<< HEAD +======= + "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/abc_scrubber_track_mtrl_alpha.9.png", + "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/drawable-mdpi-v4/abc_scrubber_track_mtrl_alpha.9.png" + }, + { +>>>>>>> NewMaster +>>>>>>> master "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/abc_menu_hardkey_panel_mtrl_mult.9.png", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/drawable-mdpi-v4/abc_menu_hardkey_panel_mtrl_mult.9.png" }, @@ -28,14 +56,50 @@ "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/drawable-mdpi-v4/abc_textfield_search_activated_mtrl_alpha.9.png" }, { +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD + "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/abc_textfield_search_default_mtrl_alpha.9.png", + "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/drawable-mdpi-v4/abc_textfield_search_default_mtrl_alpha.9.png" + }, + { +======= +>>>>>>> master +======= +>>>>>>> master +======= +>>>>>>> master "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/abc_btn_switch_to_on_mtrl_00001.9.png", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/drawable-mdpi-v4/abc_btn_switch_to_on_mtrl_00001.9.png" }, { +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +======= +>>>>>>> master +======= +======= +>>>>>>> NewMaster +>>>>>>> master "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/abc_textfield_search_default_mtrl_alpha.9.png", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/drawable-mdpi-v4/abc_textfield_search_default_mtrl_alpha.9.png" }, { +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> master +======= +>>>>>>> master +======= +======= + "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/abc_btn_switch_to_on_mtrl_00001.9.png", + "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/drawable-mdpi-v4/abc_btn_switch_to_on_mtrl_00001.9.png" + }, + { +>>>>>>> NewMaster +>>>>>>> master "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/abc_list_pressed_holo_light.9.png", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/drawable-mdpi-v4/abc_list_pressed_holo_light.9.png" }, diff --git a/bottom-bar/build/intermediates/blame/res/androidTest/debug/single/layout.json b/bottom-bar/build/intermediates/blame/res/androidTest/debug/single/layout.json index 6e6a9a0..646b453 100644 --- a/bottom-bar/build/intermediates/blame/res/androidTest/debug/single/layout.json +++ b/bottom-bar/build/intermediates/blame/res/androidTest/debug/single/layout.json @@ -8,22 +8,60 @@ "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/layout/abc_screen_simple.xml" }, { +<<<<<<< HEAD +<<<<<<< HEAD + "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/notification_template_media.xml", + "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/layout/notification_template_media.xml" + }, + { +======= +>>>>>>> master +======= +>>>>>>> master "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/abc_activity_chooser_view_list_item.xml", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/layout/abc_activity_chooser_view_list_item.xml" }, { +<<<<<<< HEAD +<<<<<<< HEAD + "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/abc_screen_simple_overlay_action_mode.xml", + "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/layout/abc_screen_simple_overlay_action_mode.xml" +======= +======= +======= +>>>>>>> NewMaster +>>>>>>> master "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/notification_template_media.xml", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/layout/notification_template_media.xml" +>>>>>>> master }, { +<<<<<<< HEAD "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/abc_search_view.xml", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/layout/abc_search_view.xml" +======= + "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/abc_activity_chooser_view_list_item.xml", + "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/layout/abc_activity_chooser_view_list_item.xml" +>>>>>>> NewMaster }, { +<<<<<<< HEAD +======= "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/abc_screen_simple_overlay_action_mode.xml", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/layout/abc_screen_simple_overlay_action_mode.xml" }, { +<<<<<<< HEAD +>>>>>>> master +======= +<<<<<<< HEAD +======= + "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/abc_search_view.xml", + "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/layout/abc_search_view.xml" + }, + { +>>>>>>> NewMaster +>>>>>>> master "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/design_navigation_item.xml", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/design/24.1.1/res/layout/design_navigation_item.xml" }, @@ -44,16 +82,44 @@ "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/layout/abc_screen_toolbar.xml" }, { +<<<<<<< HEAD +<<<<<<< HEAD + "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/bb_bottom_bar_item_shifting.xml", + "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/bundles/debug/res/layout/bb_bottom_bar_item_shifting.xml" +======= + "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/bb_bottom_bar_item_fixed_tablet.xml", + "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/bundles/debug/res/layout/bb_bottom_bar_item_fixed_tablet.xml" +>>>>>>> master +======= "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/bb_bottom_bar_item_fixed_tablet.xml", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/bundles/debug/res/layout/bb_bottom_bar_item_fixed_tablet.xml" +======= + "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/bb_bottom_bar_item_shifting.xml", + "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/bundles/debug/res/layout/bb_bottom_bar_item_shifting.xml" +>>>>>>> NewMaster +>>>>>>> master }, { "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/abc_dialog_title_material.xml", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/res/layout/abc_dialog_title_material.xml" }, { +<<<<<<< HEAD +<<<<<<< HEAD + "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/bb_bottom_bar_item_fixed_tablet.xml", + "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/bundles/debug/res/layout/bb_bottom_bar_item_fixed_tablet.xml" +======= + "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/bb_bottom_bar_item_shifting.xml", + "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/bundles/debug/res/layout/bb_bottom_bar_item_shifting.xml" +>>>>>>> master +======= "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/bb_bottom_bar_item_shifting.xml", "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/bundles/debug/res/layout/bb_bottom_bar_item_shifting.xml" +======= + "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/bb_bottom_bar_item_fixed_tablet.xml", + "source": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/bundles/debug/res/layout/bb_bottom_bar_item_fixed_tablet.xml" +>>>>>>> NewMaster +>>>>>>> master }, { "merged": "/Users/pritesh.patel/Documents/AdesaProjects/PriteshWorkspace/TabViewPagerExample/bottom-bar/build/intermediates/res/merged/androidTest/debug/layout/design_navigation_menu.xml", diff --git a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/abc_btn_radio_to_on_mtrl_000.png b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/abc_btn_radio_to_on_mtrl_000.png index 9218981..09ce056 100644 Binary files a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/abc_btn_radio_to_on_mtrl_000.png and b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-hdpi-v4/abc_btn_radio_to_on_mtrl_000.png differ diff --git a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-ldrtl-xxxhdpi-v17/abc_ic_menu_cut_mtrl_alpha.png b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-ldrtl-xxxhdpi-v17/abc_ic_menu_cut_mtrl_alpha.png index 90fe333..000039a 100644 Binary files a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-ldrtl-xxxhdpi-v17/abc_ic_menu_cut_mtrl_alpha.png and b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-ldrtl-xxxhdpi-v17/abc_ic_menu_cut_mtrl_alpha.png differ diff --git a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/abc_ic_menu_paste_mtrl_am_alpha.png b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/abc_ic_menu_paste_mtrl_am_alpha.png index f7dea19..1492ab6 100644 Binary files a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/abc_ic_menu_paste_mtrl_am_alpha.png and b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-mdpi-v4/abc_ic_menu_paste_mtrl_am_alpha.png differ diff --git a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/abc_ic_menu_share_mtrl_alpha.png b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/abc_ic_menu_share_mtrl_alpha.png index 6be7e09..af81540 100644 Binary files a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/abc_ic_menu_share_mtrl_alpha.png and b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/abc_ic_menu_share_mtrl_alpha.png differ diff --git a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/abc_ic_star_black_16dp.png b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/abc_ic_star_black_16dp.png index e51e2a4..35fe965 100644 Binary files a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/abc_ic_star_black_16dp.png and b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/abc_ic_star_black_16dp.png differ diff --git a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/abc_ic_star_half_black_36dp.png b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/abc_ic_star_half_black_36dp.png index 2f4818b..9d3afc8 100644 Binary files a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/abc_ic_star_half_black_36dp.png and b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xhdpi-v4/abc_ic_star_half_black_36dp.png differ diff --git a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_btn_check_to_on_mtrl_000.png b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_btn_check_to_on_mtrl_000.png index a2a6f5f..accf80e 100644 Binary files a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_btn_check_to_on_mtrl_000.png and b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_btn_check_to_on_mtrl_000.png differ diff --git a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_btn_radio_to_on_mtrl_000.png b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_btn_radio_to_on_mtrl_000.png index 5422f20..8fc0a9b 100644 Binary files a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_btn_radio_to_on_mtrl_000.png and b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_btn_radio_to_on_mtrl_000.png differ diff --git a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_btn_radio_to_on_mtrl_015.png b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_btn_radio_to_on_mtrl_015.png index d019641..3038d70 100644 Binary files a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_btn_radio_to_on_mtrl_015.png and b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_btn_radio_to_on_mtrl_015.png differ diff --git a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_ic_menu_cut_mtrl_alpha.png b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_ic_menu_cut_mtrl_alpha.png index dfa72ab..63e541f 100644 Binary files a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_ic_menu_cut_mtrl_alpha.png and b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_ic_menu_cut_mtrl_alpha.png differ diff --git a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_ic_menu_share_mtrl_alpha.png b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_ic_menu_share_mtrl_alpha.png index d95a377..a220572 100644 Binary files a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_ic_menu_share_mtrl_alpha.png and b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_ic_menu_share_mtrl_alpha.png differ diff --git a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_ic_star_black_48dp.png b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_ic_star_black_48dp.png index 5141095..918a395 100644 Binary files a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_ic_star_black_48dp.png and b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_ic_star_black_48dp.png differ diff --git a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_ic_star_half_black_48dp.png b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_ic_star_half_black_48dp.png index 05a606c..25c5bf2 100644 Binary files a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_ic_star_half_black_48dp.png and b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxhdpi-v4/abc_ic_star_half_black_48dp.png differ diff --git a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxxhdpi-v4/abc_ic_menu_paste_mtrl_am_alpha.png b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxxhdpi-v4/abc_ic_menu_paste_mtrl_am_alpha.png index e429928..1891b3d 100644 Binary files a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxxhdpi-v4/abc_ic_menu_paste_mtrl_am_alpha.png and b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxxhdpi-v4/abc_ic_menu_paste_mtrl_am_alpha.png differ diff --git a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxxhdpi-v4/abc_ic_menu_share_mtrl_alpha.png b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxxhdpi-v4/abc_ic_menu_share_mtrl_alpha.png index ba16aac..213f509 100644 Binary files a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxxhdpi-v4/abc_ic_menu_share_mtrl_alpha.png and b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxxhdpi-v4/abc_ic_menu_share_mtrl_alpha.png differ diff --git a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxxhdpi-v4/abc_ic_star_black_36dp.png b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxxhdpi-v4/abc_ic_star_black_36dp.png index 5141095..dc312c1 100644 Binary files a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxxhdpi-v4/abc_ic_star_black_36dp.png and b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxxhdpi-v4/abc_ic_star_black_36dp.png differ diff --git a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxxhdpi-v4/abc_ic_star_black_48dp.png b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxxhdpi-v4/abc_ic_star_black_48dp.png index 936c18b..67e25d5 100644 Binary files a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxxhdpi-v4/abc_ic_star_black_48dp.png and b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxxhdpi-v4/abc_ic_star_black_48dp.png differ diff --git a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxxhdpi-v4/abc_ic_star_half_black_16dp.png b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxxhdpi-v4/abc_ic_star_half_black_16dp.png index 1c7f66e..03509a3 100644 Binary files a/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxxhdpi-v4/abc_ic_star_half_black_16dp.png and b/bottom-bar/build/intermediates/res/merged/androidTest/debug/drawable-xxxhdpi-v4/abc_ic_star_half_black_16dp.png differ diff --git a/bottom-bar/build/intermediates/res/resources-debug-androidTest.ap_ b/bottom-bar/build/intermediates/res/resources-debug-androidTest.ap_ index 66e2890..05446f4 100644 Binary files a/bottom-bar/build/intermediates/res/resources-debug-androidTest.ap_ and b/bottom-bar/build/intermediates/res/resources-debug-androidTest.ap_ differ