From 8f0465b0f67a7db8d80efbee1e18eb8c320bace7 Mon Sep 17 00:00:00 2001
From: msmannan00 <msmannan00@gmail.com>
Date: Fri, 27 Nov 2020 16:40:46 +0500
Subject: [PATCH] Bug fixes

---
 .idea/inspectionProfiles/Project_Default.xml  |    9 +
 .idea/jarRepositories.xml                     |    5 +
 .idea/misc.xml                                |   43 +
 app/build.gradle                              |    5 +
 app/src/main/AndroidManifest.xml              |    6 +
 .../bookmarkManager/bookmarkAdapter.java      | 1137 +++---
 .../bookmarkManager/bookmarkController.java   |   40 +-
 .../bookmarkManager/bookmarkEnums.java        |    4 +-
 .../bookmarkViewController.java               |   42 +-
 .../bridgeManager/bridgeController.java       |    2 +-
 .../databaseManager/databaseController.java   |    4 -
 .../historyManager/historyAdapter.java        |   58 +-
 .../historyManager/historyController.java     |   33 +-
 .../historyManager/historyEnums.java          |    4 +-
 .../historyManager/historyViewController.java |   41 +
 .../appManager/homeManager/geckoClients.java  |   11 +-
 .../appManager/homeManager/geckoSession.java  |   43 +-
 .../homeManager/homeController.java           |  142 +-
 .../appManager/homeManager/homeModel.java     |   10 +-
 .../homeManager/homeViewController.java       |  122 +-
 .../languageManager/languageController.java   |    4 +-
 .../orbotLogManager/orbotAdapter.java         |   83 +
 .../orbotLogManager/orbotLogController.java   |  106 +-
 .../orbotLogManager/orbotLogEnums.java        |    2 +-
 .../orbotLogManager/orbotLogModel.java        |   39 +-
 .../orbotLogViewController.java               |   27 +-
 .../orbotManager/orbotController.java         |    3 +-
 .../settingAccessibilityController.java       |    4 +-
 .../settingAdvanceController.java             |    5 +-
 .../settingAdvanceViewController.java         |    2 -
 .../clearManager/settingClearController.java  |    4 +-
 .../settingGeneralController.java             |    8 +-
 .../generalManager/settingGeneralEnums.java   |    3 +
 .../settingGeneralViewController.java         |   10 +-
 .../logManager/settingLogController.java      |   88 +
 .../logManager/settingLogEnums.java           |   14 +
 .../logManager/settingLogModel.java           |   38 +
 .../logManager/settingLogViewController.java  |   63 +
 .../settingNotificationController.java        |    4 +-
 .../settingNotificationModel.java             |    1 -
 .../settingPrivacyController.java             |   15 +-
 .../privacyManager/settingPrivacyEnums.java   |    4 +-
 .../privacyManager/settingPrivacyModel.java   |    8 +-
 .../settingPrivacyViewController.java         |    2 +-
 .../settingSearchController.java              |    4 +-
 .../settingHomePage/settingController.java    |    9 +-
 .../settingHomePage/settingModel.java         |    2 -
 .../settingViewController.java                |    4 -
 .../appManager/tabManager/tabAdapter.java     |  165 +-
 .../appManager/tabManager/tabController.java  |  187 +-
 .../appManager/tabManager/tabEnums.java       |    8 +-
 .../appManager/tabManager/tabModel.java       |   27 +-
 .../appManager/tabManager/tabRowModel.java    |   29 +-
 .../tabManager/tabViewController.java         |  107 +-
 .../constants/constants.java                  |   12 +-
 .../genesissearchengine/constants/enums.java  |   12 +-
 .../genesissearchengine/constants/keys.java   |    1 +
 .../genesissearchengine/constants/status.java |   19 +-
 .../dataManager/dataEnums.java                |    2 +-
 .../dataManager/tabDataModel.java             |   28 +
 .../helperManager/TopCropImageView.java       |   70 +
 .../helperManager/eventObserver.java          |    2 +-
 .../helperManager/helperMethod.java           |   24 +
 .../pluginManager/messageManager.java         |   95 +-
 .../pluginManager/pluginController.java       |   28 +-
 app/src/main/res/anim/fade_in.xml             |    7 +-
 app/src/main/res/anim/fade_out.xml            |    2 +-
 app/src/main/res/anim/left_to_right.xml       |   15 +
 .../main/res/anim/list_layout_controller.xml  |    5 +
 .../main/res/anim/log_layout_controller.xml   |    5 +
 app/src/main/res/anim/popup_anim_in.xml       |    4 +-
 app/src/main/res/anim/popup_anim_out.xml      |    4 +-
 .../alert/xml/ax_background_inverted.xml      |   21 +
 .../generic/xml/gx_ripple_light.xml           |    9 +
 .../custom-xml/generic/xml/gx_side_menu.xml   |   12 +-
 .../home/xml/gx_ripple_gray_bottom.xml        |   11 +
 .../home/xml/gx_ripple_gray_top_left.xml      |    9 +
 .../home/xml/gx_ripple_gray_top_right.xml     |    9 +
 .../images/xml/ic_baseline_arrow_upward.xml   |   10 +
 .../images/xml/ic_baseline_clock.xml          |   10 +
 .../images/xml/ic_baseline_info.xml           |   10 +
 .../xml/ic_baseline_keyboard_arrow_down.xml   |   10 +
 .../xml/ic_baseline_keyboard_arrow_right.xml  |   10 +
 .../xml/ic_baseline_keyboard_arrow_up.xml     |   10 +
 .../{ic_gateway_splash.xml => ic_gear.xml}    |    0
 .../custom-xml/setting/xml/sx_border_left.xml |    2 +-
 app/src/main/res/drawable-hdpi/dustbin.png    |  Bin 0 -> 11425 bytes
 app/src/main/res/drawable-hdpi/dustbin.webp   |  Bin 638 -> 0 bytes
 .../alert/layout/popup_download_full.xml      |    2 +-
 .../res/layouts/alert/layout/popup_find.xml   |   90 +
 .../res/layouts/alert/layout/popup_undo.xml   |   61 +
 .../layouts/bookmark/layout/bookmark_view.xml |    1 +
 .../bridge/layout/bridge_settings_view.xml    |   30 +-
 .../res/layouts/history/layout/empty_view.xml |    6 +
 .../layouts/history/layout/history_view.xml   |  157 +-
 .../layouts/language/layout/language_view.xml |   25 +-
 .../orbot/layout/orbot_settings_view.xml      |   29 +-
 .../orbotLog/layout/orbot_log_view.xml        |  241 +-
 .../res/layouts/other/layout/home_view.xml    |  318 +-
 .../res/layouts/other/layout/popup_menu.xml   |  331 +-
 .../res/layouts/setting/layout/setting.xml    |   85 +-
 .../layout/setting_accessibility_view.xml     |   44 +-
 .../setting/layout/setting_advance_view.xml   |   47 +-
 .../setting/layout/setting_clear_view.xml     |   61 +-
 .../setting/layout/setting_general_view.xml   |   54 +-
 .../setting/layout/setting_log_view.xml       |  120 +
 .../layout/setting_notification_view.xml      |   33 +-
 .../setting/layout/setting_privacy_view.xml   |   47 +-
 .../setting/layout/setting_search_view.xml    |   56 +-
 .../shared/listviews/layout/orbotview_row.xml |  116 +
 .../shared/listviews/layout/tabview_row.xml   |  260 +-
 .../main/res/layouts/tab/layout/tab_view.xml  |   38 +-
 app/src/main/res/values-night/attrs.xml       |    1 +
 app/src/main/res/values-night/colors.xml      |   27 +-
 app/src/main/res/values-night/strings.xml     |   28 +-
 app/src/main/res/values/attrs.xml             |    1 +
 app/src/main/res/values/colors.xml            |   17 +-
 app/src/main/res/values/strings.xml           |   20 +-
 build.gradle                                  |    2 +-
 chromiumTabs/.gitignore                       |    1 -
 chromiumTabs/build.gradle                     |   27 -
 chromiumTabs/gradle.properties                |    3 -
 chromiumTabs/src/main/AndroidManifest.xml     |   16 -
 .../android/tabswitcher/AbstractState.java    |   71 -
 .../tabswitcher/AddTabButtonListener.java     |   38 -
 .../mrapp/android/tabswitcher/Animation.java  |  162 -
 .../android/tabswitcher/DragGesture.java      |  199 -
 .../de/mrapp/android/tabswitcher/Layout.java  |   39 -
 .../android/tabswitcher/LayoutPolicy.java     |   83 -
 .../android/tabswitcher/PeekAnimation.java    |  141 -
 .../android/tabswitcher/PullDownGesture.java  |   59 -
 .../android/tabswitcher/RevealAnimation.java  |  139 -
 .../StatefulTabSwitcherDecorator.java         |  293 --
 .../android/tabswitcher/SwipeAnimation.java   |  182 -
 .../android/tabswitcher/SwipeGesture.java     |  109 -
 .../de/mrapp/android/tabswitcher/Tab.java     |  863 ----
 .../android/tabswitcher/TabCloseListener.java |   40 -
 .../tabswitcher/TabPreviewListener.java       |   41 -
 .../android/tabswitcher/TabSwitcher.java      | 2054 ----------
 .../tabswitcher/TabSwitcherDecorator.java     |  283 --
 .../tabswitcher/TabSwitcherListener.java      |  114 -
 .../drawable/TabSwitcherDrawable.java         |  209 -
 .../AbstractDragGestureEventHandler.java      |   64 -
 .../gesture/AbstractTouchEventHandler.java    |  358 --
 .../DragGestureEventHandlerFactory.java       |   82 -
 .../gesture/PullDownGestureEventHandler.java  |  139 -
 .../gesture/SwipeGestureEventHandler.java     |  254 --
 .../gesture/TouchEventDispatcher.java         |  341 --
 .../iterator/AbstractItemIterator.java        |  235 --
 .../iterator/ArrayItemIterator.java           |  173 -
 .../tabswitcher/iterator/ItemIterator.java    |  135 -
 .../layout/AbstractArithmetics.java           |   78 -
 .../layout/AbstractDragTabsEventHandler.java  |  768 ----
 .../layout/AbstractTabRecyclerAdapter.java    |  820 ----
 .../layout/AbstractTabSwitcherLayout.java     | 1690 --------
 .../layout/AbstractTabViewHolder.java         |   58 -
 .../tabswitcher/layout/Arithmetics.java       |  301 --
 .../layout/ContentRecyclerAdapter.java        |  244 --
 .../tabswitcher/layout/TabSwitcherLayout.java |   71 -
 .../layout/phone/PhoneArithmetics.java        |  446 ---
 .../phone/PhoneDragTabsEventHandler.java      |  288 --
 .../layout/phone/PhoneTabRecyclerAdapter.java |  448 ---
 .../layout/phone/PhoneTabSwitcherLayout.java  | 3494 -----------------
 .../layout/phone/PhoneTabViewHolder.java      |   52 -
 .../layout/phone/PreviewDataBinder.java       |  151 -
 .../layout/tablet/TabletArithmetics.java      |  232 --
 .../TabletContentRecyclerAdapterWrapper.java  |  363 --
 .../tablet/TabletDragTabsEventHandler.java    |  179 -
 .../tablet/TabletTabRecyclerAdapter.java      |  220 --
 .../tablet/TabletTabSwitcherLayout.java       | 1381 -------
 .../layout/tablet/TabletTabViewHolder.java    |   28 -
 .../tabswitcher/model/AbstractItem.java       |  133 -
 .../android/tabswitcher/model/AddTabItem.java |   96 -
 .../tabswitcher/model/ItemComparator.java     |   89 -
 .../android/tabswitcher/model/Model.java      | 1351 -------
 .../android/tabswitcher/model/Restorable.java |   47 -
 .../android/tabswitcher/model/State.java      |   49 -
 .../android/tabswitcher/model/TabItem.java    |  199 -
 .../tabswitcher/model/TabSwitcherModel.java   | 1859 ---------
 .../tabswitcher/model/TabSwitcherStyle.java   |  476 ---
 .../mrapp/android/tabswitcher/model/Tag.java  |  129 -
 .../android/tabswitcher/util/ThemeHelper.java |  327 --
 .../tabswitcher/view/TabSwitcherButton.java   |  159 -
 .../res/color/tablet_add_tab_button_dark.xml  |   21 -
 .../res/color/tablet_add_tab_button_light.xml |   21 -
 .../res/color/tablet_tab_background_dark.xml  |   21 -
 .../res/color/tablet_tab_background_light.xml |   21 -
 .../drawable-hdpi/phone_tab_background.9.png  |  Bin 2409 -> 0 bytes
 .../res/drawable-hdpi/phone_tab_border.9.png  |  Bin 465 -> 0 bytes
 .../phone_tab_close_button_icon_dark.png      |  Bin 266 -> 0 bytes
 .../phone_tab_close_button_icon_light.png     |  Bin 395 -> 0 bytes
 .../tab_switcher_drawable_background.png      |  Bin 496 -> 0 bytes
 .../drawable-hdpi/tablet_add_tab_button.9.png |  Bin 508 -> 0 bytes
 .../drawable-hdpi/tablet_tab_background.9.png |  Bin 1055 -> 0 bytes
 .../tablet_tab_background_selected.9.png      |  Bin 1049 -> 0 bytes
 .../tablet_tab_close_button_icon_dark.png     |  Bin 404 -> 0 bytes
 .../tablet_tab_close_button_icon_light.png    |  Bin 440 -> 0 bytes
 .../drawable-mdpi/phone_tab_background.9.png  |  Bin 1055 -> 0 bytes
 .../res/drawable-mdpi/phone_tab_border.9.png  |  Bin 315 -> 0 bytes
 .../phone_tab_close_button_icon_dark.png      |  Bin 226 -> 0 bytes
 .../phone_tab_close_button_icon_light.png     |  Bin 292 -> 0 bytes
 .../tab_switcher_drawable_background.png      |  Bin 351 -> 0 bytes
 .../drawable-mdpi/tablet_add_tab_button.9.png |  Bin 366 -> 0 bytes
 .../drawable-mdpi/tablet_tab_background.9.png |  Bin 739 -> 0 bytes
 .../tablet_tab_background_selected.9.png      |  Bin 738 -> 0 bytes
 .../tablet_tab_close_button_icon_dark.png     |  Bin 280 -> 0 bytes
 .../tablet_tab_close_button_icon_light.png    |  Bin 341 -> 0 bytes
 .../drawable-xhdpi/phone_tab_background.9.png |  Bin 3516 -> 0 bytes
 .../res/drawable-xhdpi/phone_tab_border.9.png |  Bin 651 -> 0 bytes
 .../phone_tab_close_button_icon_dark.png      |  Bin 348 -> 0 bytes
 .../phone_tab_close_button_icon_light.png     |  Bin 467 -> 0 bytes
 .../tab_switcher_drawable_background.png      |  Bin 585 -> 0 bytes
 .../tablet_add_tab_button.9.png               |  Bin 672 -> 0 bytes
 .../tablet_tab_background.9.png               |  Bin 1834 -> 0 bytes
 .../tablet_tab_background_selected.9.png      |  Bin 1823 -> 0 bytes
 .../tablet_tab_close_button_icon_dark.png     |  Bin 533 -> 0 bytes
 .../tablet_tab_close_button_icon_light.png    |  Bin 542 -> 0 bytes
 .../phone_tab_background.9.png                |  Bin 5969 -> 0 bytes
 .../drawable-xxhdpi/phone_tab_border.9.png    |  Bin 966 -> 0 bytes
 .../phone_tab_close_button_icon_dark.png      |  Bin 442 -> 0 bytes
 .../phone_tab_close_button_icon_light.png     |  Bin 597 -> 0 bytes
 .../tab_switcher_drawable_background.png      |  Bin 853 -> 0 bytes
 .../tablet_add_tab_button.9.png               |  Bin 991 -> 0 bytes
 .../tablet_tab_background.9.png               |  Bin 2259 -> 0 bytes
 .../tablet_tab_background_selected.9.png      |  Bin 2280 -> 0 bytes
 .../tablet_tab_close_button_icon_dark.png     |  Bin 695 -> 0 bytes
 .../tablet_tab_close_button_icon_light.png    |  Bin 652 -> 0 bytes
 .../phone_tab_background.9.png                |  Bin 8467 -> 0 bytes
 .../drawable-xxxhdpi/phone_tab_border.9.png   |  Bin 1352 -> 0 bytes
 .../phone_tab_close_button_icon_dark.png      |  Bin 575 -> 0 bytes
 .../phone_tab_close_button_icon_light.png     |  Bin 763 -> 0 bytes
 .../tab_switcher_drawable_background.png      |  Bin 1246 -> 0 bytes
 .../tablet_add_tab_button.9.png               |  Bin 1318 -> 0 bytes
 .../tablet_tab_background.9.png               |  Bin 4223 -> 0 bytes
 .../tablet_tab_background_selected.9.png      |  Bin 4277 -> 0 bytes
 .../tablet_tab_close_button_icon_dark.png     |  Bin 881 -> 0 bytes
 .../tablet_tab_close_button_icon_light.png    |  Bin 832 -> 0 bytes
 .../src/main/res/layout-land/phone_tab.xml    |   97 -
 .../src/main/res/layout/phone_tab.xml         |   97 -
 .../src/main/res/layout/phone_toolbar.xml     |   25 -
 .../res/layout/tab_switcher_menu_item.xml     |   19 -
 .../main/res/layout/tablet_add_tab_button.xml |   19 -
 .../src/main/res/layout/tablet_layout.xml     |   67 -
 .../src/main/res/layout/tablet_tab.xml        |   75 -
 .../src/main/res/values-v21/styles.xml        |   22 -
 chromiumTabs/src/main/res/values/attrs.xml    |   77 -
 chromiumTabs/src/main/res/values/colors.xml   |   43 -
 chromiumTabs/src/main/res/values/dimens.xml   |   58 -
 chromiumTabs/src/main/res/values/ids.xml      |   28 -
 chromiumTabs/src/main/res/values/integers.xml |   44 -
 chromiumTabs/src/main/res/values/styles.xml   |   87 -
 chromiumTabs/variables.gradle                 |   41 -
 .../android/service/OrbotService.java         |   11 +-
 .../service/wrapper/localHelperMethod.java    |   22 +
 .../android/service/wrapper/logRowModel.java  |   33 +
 .../service/wrapper/orbotLocalConstants.java  |    2 +-
 256 files changed, 3968 insertions(+), 25812 deletions(-)
 mode change 100755 => 100644 app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkAdapter.java
 create mode 100644 app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotAdapter.java
 create mode 100644 app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/logManager/settingLogController.java
 create mode 100644 app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/logManager/settingLogEnums.java
 create mode 100644 app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/logManager/settingLogModel.java
 create mode 100644 app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/logManager/settingLogViewController.java
 create mode 100644 app/src/main/java/com/darkweb/genesissearchengine/helperManager/TopCropImageView.java
 create mode 100644 app/src/main/res/anim/left_to_right.xml
 create mode 100644 app/src/main/res/anim/list_layout_controller.xml
 create mode 100644 app/src/main/res/anim/log_layout_controller.xml
 create mode 100644 app/src/main/res/custom-xml/alert/xml/ax_background_inverted.xml
 create mode 100644 app/src/main/res/custom-xml/generic/xml/gx_ripple_light.xml
 create mode 100644 app/src/main/res/custom-xml/home/xml/gx_ripple_gray_bottom.xml
 create mode 100644 app/src/main/res/custom-xml/home/xml/gx_ripple_gray_top_left.xml
 create mode 100644 app/src/main/res/custom-xml/home/xml/gx_ripple_gray_top_right.xml
 create mode 100644 app/src/main/res/custom-xml/images/xml/ic_baseline_arrow_upward.xml
 create mode 100644 app/src/main/res/custom-xml/images/xml/ic_baseline_clock.xml
 create mode 100644 app/src/main/res/custom-xml/images/xml/ic_baseline_info.xml
 create mode 100644 app/src/main/res/custom-xml/images/xml/ic_baseline_keyboard_arrow_down.xml
 create mode 100644 app/src/main/res/custom-xml/images/xml/ic_baseline_keyboard_arrow_right.xml
 create mode 100644 app/src/main/res/custom-xml/images/xml/ic_baseline_keyboard_arrow_up.xml
 rename app/src/main/res/custom-xml/images/xml/{ic_gateway_splash.xml => ic_gear.xml} (100%)
 create mode 100644 app/src/main/res/drawable-hdpi/dustbin.png
 delete mode 100755 app/src/main/res/drawable-hdpi/dustbin.webp
 create mode 100644 app/src/main/res/layouts/alert/layout/popup_find.xml
 create mode 100644 app/src/main/res/layouts/alert/layout/popup_undo.xml
 create mode 100644 app/src/main/res/layouts/history/layout/empty_view.xml
 create mode 100644 app/src/main/res/layouts/setting/layout/setting_log_view.xml
 create mode 100644 app/src/main/res/layouts/shared/listviews/layout/orbotview_row.xml
 delete mode 100644 chromiumTabs/.gitignore
 delete mode 100644 chromiumTabs/build.gradle
 delete mode 100644 chromiumTabs/gradle.properties
 delete mode 100644 chromiumTabs/src/main/AndroidManifest.xml
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/AbstractState.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/AddTabButtonListener.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/Animation.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/DragGesture.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/Layout.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/LayoutPolicy.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/PeekAnimation.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/PullDownGesture.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/RevealAnimation.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/StatefulTabSwitcherDecorator.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/SwipeAnimation.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/SwipeGesture.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/Tab.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/TabCloseListener.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/TabPreviewListener.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/TabSwitcher.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/TabSwitcherDecorator.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/TabSwitcherListener.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/drawable/TabSwitcherDrawable.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/AbstractDragGestureEventHandler.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/AbstractTouchEventHandler.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/DragGestureEventHandlerFactory.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/PullDownGestureEventHandler.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/SwipeGestureEventHandler.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/TouchEventDispatcher.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/iterator/AbstractItemIterator.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/iterator/ArrayItemIterator.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/iterator/ItemIterator.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/AbstractArithmetics.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/AbstractDragTabsEventHandler.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/AbstractTabRecyclerAdapter.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/AbstractTabSwitcherLayout.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/AbstractTabViewHolder.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/Arithmetics.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/ContentRecyclerAdapter.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/TabSwitcherLayout.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PhoneArithmetics.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PhoneDragTabsEventHandler.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PhoneTabRecyclerAdapter.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PhoneTabSwitcherLayout.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PhoneTabViewHolder.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PreviewDataBinder.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletArithmetics.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletContentRecyclerAdapterWrapper.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletDragTabsEventHandler.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletTabRecyclerAdapter.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletTabSwitcherLayout.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletTabViewHolder.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/AbstractItem.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/AddTabItem.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/ItemComparator.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/Model.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/Restorable.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/State.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/TabItem.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/TabSwitcherModel.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/TabSwitcherStyle.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/Tag.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/util/ThemeHelper.java
 delete mode 100644 chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/view/TabSwitcherButton.java
 delete mode 100644 chromiumTabs/src/main/res/color/tablet_add_tab_button_dark.xml
 delete mode 100644 chromiumTabs/src/main/res/color/tablet_add_tab_button_light.xml
 delete mode 100644 chromiumTabs/src/main/res/color/tablet_tab_background_dark.xml
 delete mode 100644 chromiumTabs/src/main/res/color/tablet_tab_background_light.xml
 delete mode 100644 chromiumTabs/src/main/res/drawable-hdpi/phone_tab_background.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-hdpi/phone_tab_border.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-hdpi/phone_tab_close_button_icon_dark.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-hdpi/phone_tab_close_button_icon_light.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-hdpi/tab_switcher_drawable_background.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-hdpi/tablet_add_tab_button.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-hdpi/tablet_tab_background.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-hdpi/tablet_tab_background_selected.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-hdpi/tablet_tab_close_button_icon_dark.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-hdpi/tablet_tab_close_button_icon_light.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-mdpi/phone_tab_background.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-mdpi/phone_tab_border.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-mdpi/phone_tab_close_button_icon_dark.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-mdpi/phone_tab_close_button_icon_light.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-mdpi/tab_switcher_drawable_background.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-mdpi/tablet_add_tab_button.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-mdpi/tablet_tab_background.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-mdpi/tablet_tab_background_selected.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-mdpi/tablet_tab_close_button_icon_dark.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-mdpi/tablet_tab_close_button_icon_light.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xhdpi/phone_tab_background.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xhdpi/phone_tab_border.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xhdpi/phone_tab_close_button_icon_dark.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xhdpi/phone_tab_close_button_icon_light.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xhdpi/tab_switcher_drawable_background.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xhdpi/tablet_add_tab_button.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xhdpi/tablet_tab_background.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xhdpi/tablet_tab_background_selected.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xhdpi/tablet_tab_close_button_icon_dark.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xhdpi/tablet_tab_close_button_icon_light.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xxhdpi/phone_tab_background.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xxhdpi/phone_tab_border.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xxhdpi/phone_tab_close_button_icon_dark.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xxhdpi/phone_tab_close_button_icon_light.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xxhdpi/tab_switcher_drawable_background.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xxhdpi/tablet_add_tab_button.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xxhdpi/tablet_tab_background.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xxhdpi/tablet_tab_background_selected.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xxhdpi/tablet_tab_close_button_icon_dark.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xxhdpi/tablet_tab_close_button_icon_light.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xxxhdpi/phone_tab_background.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xxxhdpi/phone_tab_border.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xxxhdpi/phone_tab_close_button_icon_dark.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xxxhdpi/phone_tab_close_button_icon_light.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xxxhdpi/tab_switcher_drawable_background.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xxxhdpi/tablet_add_tab_button.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xxxhdpi/tablet_tab_background.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xxxhdpi/tablet_tab_background_selected.9.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xxxhdpi/tablet_tab_close_button_icon_dark.png
 delete mode 100644 chromiumTabs/src/main/res/drawable-xxxhdpi/tablet_tab_close_button_icon_light.png
 delete mode 100644 chromiumTabs/src/main/res/layout-land/phone_tab.xml
 delete mode 100644 chromiumTabs/src/main/res/layout/phone_tab.xml
 delete mode 100644 chromiumTabs/src/main/res/layout/phone_toolbar.xml
 delete mode 100644 chromiumTabs/src/main/res/layout/tab_switcher_menu_item.xml
 delete mode 100644 chromiumTabs/src/main/res/layout/tablet_add_tab_button.xml
 delete mode 100644 chromiumTabs/src/main/res/layout/tablet_layout.xml
 delete mode 100644 chromiumTabs/src/main/res/layout/tablet_tab.xml
 delete mode 100644 chromiumTabs/src/main/res/values-v21/styles.xml
 delete mode 100644 chromiumTabs/src/main/res/values/attrs.xml
 delete mode 100644 chromiumTabs/src/main/res/values/colors.xml
 delete mode 100644 chromiumTabs/src/main/res/values/dimens.xml
 delete mode 100644 chromiumTabs/src/main/res/values/ids.xml
 delete mode 100644 chromiumTabs/src/main/res/values/integers.xml
 delete mode 100644 chromiumTabs/src/main/res/values/styles.xml
 delete mode 100644 chromiumTabs/variables.gradle
 create mode 100644 orbotservice/src/main/java/org/torproject/android/service/wrapper/localHelperMethod.java
 create mode 100644 orbotservice/src/main/java/org/torproject/android/service/wrapper/logRowModel.java

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index e6a117f0..c1506234 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -5,6 +5,10 @@
     <inspection_tool class="AndroidLintSuspiciousImport" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="BooleanMethodIsAlwaysInverted" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="BusyWait" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ConstantConditions" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="SUGGEST_NULLABLE_ANNOTATIONS" value="false" />
+      <option name="DONT_REPORT_TRUE_ASSERT_STATEMENTS" value="false" />
+    </inspection_tool>
     <inspection_tool class="EmptyStatementBody" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="m_reportEmptyBlocks" value="true" />
     </inspection_tool>
@@ -17,6 +21,7 @@
     </inspection_tool>
     <inspection_tool class="InfiniteLoopStatement" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="InnerClassMayBeStatic" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="LambdaParameterTypeCanBeSpecified" enabled="false" level="INFORMATION" enabled_by_default="false" />
     <inspection_tool class="SameParameterValue" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
       <option name="processCode" value="true" />
@@ -26,6 +31,10 @@
     <inspection_tool class="SuspiciousListRemoveInLoop" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="TrivialIf" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="UNCHECKED_WARNING" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryLocalVariable" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="m_ignoreImmediatelyReturnedVariables" value="false" />
+      <option name="m_ignoreAnnotatedVariables" value="false" />
+    </inspection_tool>
     <inspection_tool class="UnusedReturnValue" enabled="false" level="WARNING" enabled_by_default="false" />
   </profile>
 </component>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index fdef11c9..8517d80a 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -51,5 +51,10 @@
       <option name="name" value="MavenRepo" />
       <option name="url" value="https://repo.maven.apache.org/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven5" />
+      <option name="name" value="maven5" />
+      <option name="url" value="https://oss.sonatype.org/content/repositories/snapshots/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 58918f50..e9a01197 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
+    <option name="myDefaultNotNull" value="androidx.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="14">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="3" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="5" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="7" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
+          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
+          <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
+          <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="13">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="2" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="5" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
+          <item index="6" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+          <item index="10" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
+          <item index="11" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
+          <item index="12" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 0cb47f43..48eaabe4 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,6 +11,7 @@ ext {
 
 repositories {
     maven {
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
         url "https://maven.mozilla.org/maven2/"
         mavenLocal()
         mavenCentral()
@@ -81,6 +82,7 @@ android {
                             'src/main/res/layouts/orbotLog',
                             'src/main/res/layouts/setting',
                             'src/main/res/layouts/bridge',
+                            'src/main/res/layouts/log',
                             'src/main/res/layouts/alert',
                             'src/main/res/layouts/bookmark',
                             'src/main/res/layouts/shared',
@@ -130,6 +132,7 @@ dependencies {
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
 
     // Testing-only dependencies
     androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0') {
@@ -174,6 +177,8 @@ dependencies {
     /*Helper Libraries*/
     implementation 'com.chauthai.overscroll:overscroll-bouncy:0.1.1'
     androidTestImplementation "junit:junit:4.13.1"
+    implementation 'jp.wasabeef:recyclerview-animators:2.2.7'
+    compile 'com.android.support:design:24.0.0'
 }
 
 apply plugin: 'com.android.application'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1696b865..1aa0466c 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -76,6 +76,12 @@
             android:launchMode="singleTop"
             android:windowSoftInputMode="adjustResize" />
 
+        <activity
+            android:name="com.darkweb.genesissearchengine.appManager.settingManager.logManager.settingLogController"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
+            android:launchMode="singleTop"
+            android:windowSoftInputMode="adjustResize" />
+
         <activity
             android:name="com.darkweb.genesissearchengine.appManager.settingManager.advanceManager.settingAdvanceController"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkAdapter.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkAdapter.java
old mode 100755
new mode 100644
index 8553886b..1eef30b3
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkAdapter.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkAdapter.java
@@ -1,585 +1,552 @@
-package com.darkweb.genesissearchengine.appManager.bookmarkManager;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.os.Handler;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.view.ViewGroup;
-import android.widget.*;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.darkweb.genesissearchengine.constants.enums;
-import com.darkweb.genesissearchengine.constants.strings;
-import com.darkweb.genesissearchengine.helperManager.eventObserver;
-import com.darkweb.genesissearchengine.helperManager.helperMethod;
-import com.example.myapplication.R;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
-import static android.content.Context.LAYOUT_INFLATER_SERVICE;
-import static com.darkweb.genesissearchengine.constants.constants.HISTORY_LOAD_MORE;
-
-public class bookmarkAdapter extends RecyclerView.Adapter<bookmarkAdapter.listViewHolder>
-{
-    /*Private Variables*/
-
-    private ArrayList<bookmarkRowModel> mModelList = new ArrayList<>();
-    private ArrayList<bookmarkRowModel> mCurrentList;
-    private ArrayList<bookmarkRowModel> mPassedList;
-    private ArrayList<Integer> mRealID = new ArrayList<>();
-    private ArrayList<Integer> mRealIndex = new ArrayList<>();
-    private ArrayList<Date> mLongSelectedDate = new ArrayList<>();
-    private ArrayList<String> mLongSelectedIndex = new ArrayList<>();
-    private ArrayList<Integer> mLongSelectedID = new ArrayList<>();
-
-    private AppCompatActivity mContext;
-    private bookmarkAdapterView mHistroyAdapterView;
-    private Context mListHolderContext;
-    private PopupWindow mPopupWindow = null;
-    private eventObserver.eventListener mEvent;
-    boolean mLongPressedMenuActive = false;
-    private String mFilter = strings.GENERIC_EMPTY_STR;
-
-    /*Local Variables*/
-
-    private float mRecyclerPositionX1, mRecyclerPositionX2;
-    private boolean mDisableCallable = false;
-    private boolean mSearchEnabled = false;
-
-    bookmarkAdapter(ArrayList<bookmarkRowModel> pModelList, eventObserver.eventListener mEvent, AppCompatActivity pMainContext) {
-        this.mEvent = mEvent;
-        this.mCurrentList = new ArrayList<>();
-        this.mPassedList = pModelList;
-        this.mContext = pMainContext;
-        this.mHistroyAdapterView = new bookmarkAdapterView(mContext);
-
-        initializeModelWithDate(false);
-    }
-
-
-    private void onLoading(){
-        mContext.runOnUiThread(() -> {
-            mCurrentList.add(new bookmarkRowModel(HISTORY_LOAD_MORE,null,-2));
-            notifyItemInserted(mCurrentList.size());
-        });
-    }
-
-    private void onLoadingClear(){
-        for(int mCounter = 0; mCounter< mCurrentList.size(); mCounter++){
-            if(mCurrentList.get(mCounter).getHeader().equals(HISTORY_LOAD_MORE)){
-                int finalM_counter = mCounter;
-                mContext.runOnUiThread(() -> {
-                    mCurrentList.remove(finalM_counter);
-                    notifyItemRemoved(finalM_counter);
-                });
-                break;
-            }
-        }
-    }
-
-
-    private void initializeModelWithDate(boolean pFilterEnabled){
-        int m_real_counter=0;
-
-        mRealID.clear();
-        mRealIndex.clear();
-        mCurrentList.clear();
-        this.mModelList.clear();
-        onVerifyLongSelectedURL();
-
-        ArrayList<bookmarkRowModel> p_model_list = mPassedList;
-        int m_date_state = -1;
-        int m_last_day = -1;
-        for(int counter = 0; counter< p_model_list.size(); counter++){
-
-            if(pFilterEnabled){
-                if(!p_model_list.get(counter).getHeader().toLowerCase().contains(this.mFilter.toLowerCase()) && !p_model_list.get(counter).getDescription().toLowerCase().contains(this.mFilter)){
-                    continue;
-                }
-            }
-
-            Calendar cal = Calendar.getInstance();
-            cal.setTime(p_model_list.get(counter).getDate());
-
-            int m_date_1 = cal.get(Calendar.DAY_OF_YEAR);
-            cal.setTime(Calendar.getInstance().getTime());
-            int m_date_2 = cal.get(Calendar.DAY_OF_YEAR);
-
-            float diff = m_date_2-m_date_1;
-
-            if(diff==0){
-                if(m_date_state!=1){
-                    this.mModelList.add(new bookmarkRowModel("Today ",null,-1));
-                    mRealID.add(m_real_counter);
-                    mRealIndex.add(m_real_counter);
-                    m_date_state = 1;
-                }
-            }else if (diff>=1){
-
-                if(m_date_state!=2 || m_last_day!=(int)(Math.ceil(diff/7)*7)){
-                    m_last_day = (int)(Math.ceil(diff/7)*7);
-                    this.mModelList.add(new bookmarkRowModel("Last " + m_last_day + " Days",null,-1));
-                    mRealID.add(m_real_counter);
-                    mRealIndex.add(m_real_counter);
-                    m_date_state = 2;
-                }
-            }else {
-                if(m_date_state!=3){
-                    this.mModelList.add(new bookmarkRowModel("Older ",null,-1));
-                    mRealID.add(m_real_counter);
-                    mRealIndex.add(m_real_counter);
-                    m_date_state = 3;
-                }
-            }
-
-            mRealID.add(p_model_list.get(counter).getID());
-            mRealIndex.add(m_real_counter);
-            this.mModelList.add(p_model_list.get(counter));
-            m_real_counter+=1;
-        }
-        mCurrentList.addAll(this.mModelList);
-    }
-
-    /*Initializations*/
-
-    private ArrayList<String> getLongSelectedleURL(){
-        return mLongSelectedIndex;
-    }
-
-    public void onDeleteSelected(){
-        for(int m_counter = 0; m_counter< mLongSelectedIndex.size(); m_counter++){
-            for(int m_counter_inner = 0; m_counter_inner< mCurrentList.size(); m_counter_inner++){
-                if(mCurrentList.get(m_counter_inner).getDate() == mLongSelectedDate.get(m_counter) && mLongSelectedIndex.get(m_counter).equals("https://"+ mCurrentList.get(m_counter_inner).getDescription())){
-                    mEvent.invokeObserver(Collections.singletonList(mRealIndex.get(m_counter_inner)),enums.etype.url_clear);
-                    mEvent.invokeObserver(Collections.singletonList(mLongSelectedID.get(m_counter)),enums.etype.url_clear_at);
-                    invokeFilter(false);
-                    mEvent.invokeObserver(Collections.singletonList(m_counter_inner),enums.etype.is_empty);
-
-                    boolean mDateVerify = false;
-                    if(mCurrentList.size()>0 && mCurrentList.get(m_counter_inner-1).getDescription()==null && (mCurrentList.size()>m_counter_inner+1 && mCurrentList.get(m_counter_inner+1).getDescription()==null || mCurrentList.size()==m_counter_inner+1)){
-                        mDateVerify = true;
-                    }
-
-                    if(m_counter_inner==0){
-                        notifyDataSetChanged();
-                    }else {
-
-                        if(mDateVerify){
-                            notifyItemRemoved(m_counter_inner-1);
-                            mCurrentList.remove(m_counter_inner-1);
-                            notifyItemRemoved(m_counter_inner-1);
-                            mCurrentList.remove(m_counter_inner-1);
-                            notifyItemRangeChanged(m_counter_inner-1, mCurrentList.size());
-                        }else {
-                            notifyItemRemoved(m_counter_inner);
-                            mCurrentList.remove(m_counter_inner);
-                            notifyItemRangeChanged(m_counter_inner, mCurrentList.size());
-                        }
-                    }
-                    break;
-                }
-            }
-        }
-        clearLongSelectedURL();
-    }
-
-    private void clearLongSelectedURL(){
-        mLongSelectedDate.clear();
-        mLongSelectedIndex.clear();
-        mLongSelectedID.clear();
-        notifyDataSetChanged();
-    }
-
-    private String getSelectedURL(){
-        String m_joined_url = "\n";
-        for(int m_counter = 0; m_counter< mLongSelectedIndex.size(); m_counter++){
-            m_joined_url = m_joined_url.concat("\n"+ mLongSelectedIndex.get(m_counter));
-        }
-        return m_joined_url;
-    }
-
-    @NonNull
-    @Override
-    public listViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        mListHolderContext = parent.getContext();
-        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.recyclerview_row, parent, false);
-        return new listViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull bookmarkAdapter.listViewHolder holder, int position)
-    {
-        holder.bindListView(mCurrentList.get(position), position);
-    }
-
-    public int getItem(){
-        return mCurrentList.size();
-    }
-
-    @Override
-    public int getItemCount() {
-        return mCurrentList.size();
-    }
-
-    /*Listeners*/
-    public void onUpdateSearchStatus(boolean p_is_searched){
-        mSearchEnabled = p_is_searched;
-    }
-
-    public void onSelectView(View pItemView, String pUrl, View pMenuItem, ImageView pLogoImage, boolean pIsForced, int pId, Date pDate){
-        if(!mSearchEnabled){
-            try {
-                mPopupWindow = (PopupWindow) mHistroyAdapterView.onTrigger(bookmarkEnums.eBookmarkViewAdapterCommands.M_SELECT_VIEW, Arrays.asList(pItemView, pMenuItem, pLogoImage, pIsForced, true));
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            if(!pIsForced){
-                if(mLongSelectedID.size()==0){
-                    notifyDataSetChanged();
-                }
-                mLongSelectedDate.add(pDate);
-                mLongSelectedIndex.add(pUrl);
-                mLongSelectedID.add(pId);
-
-            }
-            onVerifyLongSelectedURL();
-        }
-    }
-
-    public void onVerifyLongSelectedURL(){
-        if(mLongSelectedIndex.size()>0){
-            mEvent.invokeObserver(Collections.singletonList(false),enums.etype.on_verify_selected_url_menu);
-        }else {
-            mEvent.invokeObserver(Collections.singletonList(true),enums.etype.on_verify_selected_url_menu);
-        }
-    }
-
-    public void onClearHighlight(View pItemView, String pUrl, View pMenuItem, ImageView pLogoImage, boolean pIsForced, int pId, Date pDate)
-    {
-        try {
-            mPopupWindow = (PopupWindow) mHistroyAdapterView.onTrigger(bookmarkEnums.eBookmarkViewAdapterCommands.M_CLEAR_HIGHLIGHT, Arrays.asList(pItemView, pMenuItem, pLogoImage, pIsForced));
-            mLongSelectedDate.remove(pDate);
-            mLongSelectedIndex.remove(pUrl);
-            mLongSelectedID.remove((Integer) pId);
-            if(mLongSelectedID.size()==0){
-                notifyDataSetChanged();
-            }
-            onVerifyLongSelectedURL();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private float mPointerPosition = 0;
-    @SuppressLint("ClickableViewAccessibility")
-    public void onSwipe(View pItemView, int pPosition, String pUrl, View pMenuItem, ImageView pLogoImage, int pId, Date pDate){
-
-        Handler handler = new Handler();
-
-        Runnable mLongPressed = () -> {
-            if(!mDisableCallable && Math.abs(mRecyclerPositionX1-mPointerPosition) <= 20){
-                if(!mLongSelectedIndex.contains(pUrl) || !mLongSelectedID.contains(pId)) {
-                    mLongPressedMenuActive = true;
-                    onSelectView(pItemView, pUrl,pMenuItem, pLogoImage, false, pId, pDate);
-                }else {
-                    Log.i("I AM HERE 22","I AM HERE");
-                    onClearHighlight(pItemView, pUrl,pMenuItem, pLogoImage, false, pId, pDate);
-                    mLongPressedMenuActive = true;
-                }
-            }else {
-                pItemView.setPressed(false);
-                pItemView.clearFocus();
-            }
-        };
-
-        pItemView.setOnTouchListener((v, event) -> {
-
-            if (mRecyclerPositionX1!=0 && Math.abs(event.getX() - mRecyclerPositionX1) > 400 && !mLongPressedMenuActive) {
-                v.setPressed(false);
-                pItemView.clearFocus();
-                handler.removeCallbacks(mLongPressed);
-                pItemView.setOnTouchListener(null);
-                pItemView.clearFocus();
-                if(mPassedList.size()<=1){
-                    mPassedList.clear();
-                    initializeModelWithDate(false);
-                    notifyItemRemoved(0);
-                    notifyItemRangeChanged(0, 1);
-                    mEvent.invokeObserver(Collections.singletonList(0),enums.etype.is_empty);
-                }else {
-                    initializeModelWithDate(false);
-                    bookmarkAdapter.this.onClose(pPosition);
-                }
-                return true;
-            }
-
-            mPointerPosition = event.getX();
-            if (event.getAction() == MotionEvent.ACTION_UP) {
-                mRecyclerPositionX2 = event.getX();
-                float deltaX = mRecyclerPositionX2 - mRecyclerPositionX1;
-
-                Log.i("FCK2","FCK2 : " + mLongSelectedIndex.size());
-                if (mLongSelectedIndex.size() > 0) {
-                    if (Math.abs(deltaX) <= 20 && !mLongPressedMenuActive) {
-                        if (mLongSelectedIndex.contains(pUrl) && mLongSelectedID.contains(pId)) {
-                            handler.removeCallbacks(mLongPressed);
-                            bookmarkAdapter.this.onClearHighlight(pItemView, pUrl, pMenuItem, pLogoImage, false, pId, pDate);
-                        } else{
-                            handler.removeCallbacks(mLongPressed);
-                            bookmarkAdapter.this.onSelectView(pItemView, pUrl, pMenuItem, pLogoImage, false, pId, pDate);
-                        }
-                    }
-                    return false;
-                }
-
-                if (Math.abs(deltaX) > 100) {
-                    v.setPressed(false);
-                    handler.removeCallbacks(mLongPressed);
-                    bookmarkAdapter.this.onClose(pPosition);
-                } else {
-                    v.setPressed(false);
-                    handler.removeCallbacks(mLongPressed);
-                    mEvent.invokeObserver(Collections.singletonList(pUrl), enums.etype.url_triggered);
-                }
-
-                return true;
-
-            } else if (event.getAction() == MotionEvent.ACTION_DOWN) {
-                mDisableCallable = false;
-                mLongPressedMenuActive = false;
-                v.setPressed(true);
-                mRecyclerPositionX1 = event.getX();
-                Log.i("1WOW : ","WOW : " + event.getX() + " -- " + mRecyclerPositionX1);
-                handler.postDelayed(mLongPressed, ViewConfiguration.getLongPressTimeout());
-                return true;
-            } else if (event.getAction() == MotionEvent.ACTION_CANCEL) {
-                handler.removeCallbacks(mLongPressed);
-                mDisableCallable = true;
-                if (!mLongSelectedIndex.contains(pUrl) || !mLongSelectedID.contains(pId)) {
-                    v.setPressed(false);
-                }
-                handler.removeCallbacks(mLongPressed);
-
-                return true;
-            }
-            return false;
-        });
-    }
-
-    void onOpenMenu(View pView, String pUrl, int pPosition, String pTitle){
-        LayoutInflater layoutInflater = (LayoutInflater) pView.getContext().getSystemService(LAYOUT_INFLATER_SERVICE);
-        @SuppressLint("InflateParams") final View mPopupView = layoutInflater.inflate(R.layout.recyclerview__row_menu, null);
-        mPopupWindow = (PopupWindow) mHistroyAdapterView.onTrigger(bookmarkEnums.eBookmarkViewAdapterCommands.M_OPEN_MENU, Arrays.asList(mPopupWindow, pView, mPopupView));
-
-        setPopupWindowEvents(mPopupView.findViewById(R.id.pMenuCopy), pUrl, pPosition, pTitle);
-        setPopupWindowEvents(mPopupView.findViewById(R.id.pMenuShare), pUrl, pPosition, pTitle);
-        setPopupWindowEvents(mPopupView.findViewById(R.id.pMenuOpenCurrentTab), pUrl, pPosition, pTitle);
-        setPopupWindowEvents(mPopupView.findViewById(R.id.pMenuOpenNewTab), pUrl, pPosition, pTitle);
-        setPopupWindowEvents(mPopupView.findViewById(R.id.pMenuDelete), pUrl, pPosition, pTitle);
-    }
-
-    public void setPopupWindowEvents(View pView, String pUrl, int pPosition, String pTitle){
-        pView.setOnClickListener(v -> {
-            if(v.getId() == R.id.pMenuCopy){
-                helperMethod.copyURL(pUrl, mListHolderContext);
-                mPopupWindow.dismiss();
-            }
-            else if(v.getId() == R.id.pMenuShare){
-                helperMethod.shareApp((AppCompatActivity)mListHolderContext, pUrl, pTitle);
-                mPopupWindow.dismiss();
-            }
-            else if(v.getId() == R.id.pMenuOpenCurrentTab){
-                mEvent.invokeObserver(Collections.singletonList(pUrl),enums.etype.url_triggered);
-                mPopupWindow.dismiss();
-            }
-            else if(v.getId() == R.id.pMenuOpenNewTab){
-                mEvent.invokeObserver(Collections.singletonList(pUrl),enums.etype.url_triggered_new_tab);
-                mPopupWindow.dismiss();
-            }
-            else if(v.getId() == R.id.pMenuDelete){
-                initializeModelWithDate(false);
-                onClose(pPosition);
-                mPopupWindow.dismiss();
-            }
-        });
-    }
-
-    private void setItemViewOnClickListener(View pItemView, View pItemMenu, String pUrl, int pPosition, String pTitle, View pMenuItem, ImageView pLogoImage, int pId, Date pDate)
-    {
-        pItemMenu.setOnClickListener((View v) -> onOpenMenu(v, pUrl, pPosition, pTitle));
-        onSwipe(pItemView, pPosition, pUrl,pMenuItem, pLogoImage, pId, pDate);
-    }
-
-    private void onClose(int pIndex){
-        mEvent.invokeObserver(Collections.singletonList(mRealIndex.get(pIndex)),enums.etype.url_clear);
-        mEvent.invokeObserver(Collections.singletonList(mRealID.get(pIndex)),enums.etype.url_clear_at);
-        invokeFilter(false);
-        mEvent.invokeObserver(Collections.singletonList(mRealID.get(pIndex)),enums.etype.is_empty);
-        boolean mDateVerify = false;
-        if(mPassedList.size()>0){
-            if(mCurrentList.size()>0 && mCurrentList.get(pIndex-1).getDescription()==null && (mCurrentList.size()>pIndex+1 && mCurrentList.get(pIndex+1).getDescription()==null || mCurrentList.size()==pIndex+1)){
-                mDateVerify = true;
-            }
-        }else {
-            mCurrentList.clear();
-            notifyDataSetChanged();
-            return;
-        }
-        int size = mCurrentList.size();
-
-        if(mDateVerify){
-            notifyItemRemoved(pIndex-1);
-            mCurrentList.remove(pIndex-1);
-            notifyItemRemoved(pIndex-1);
-            mCurrentList.remove(pIndex-1);
-            notifyItemRangeChanged(pIndex-1, mCurrentList.size());
-        }else {
-            notifyItemRemoved(pIndex);
-            mCurrentList.remove(pIndex);
-            notifyItemRangeChanged(pIndex, mCurrentList.size());
-        }
-
-        if(size>1){
-            new Thread(){
-                public void run(){
-                    try
-                    {
-                        sleep(500);
-                    }
-                    catch (InterruptedException e)
-                    {
-                        e.printStackTrace();
-                    }
-                }
-            }.start();
-        }
-    }
-
-    /*View Holder Extensions*/
-    class listViewHolder extends RecyclerView.ViewHolder
-    {
-        TextView mHeader;
-        TextView mDescription;
-        TextView mDate;
-        TextView mWebLogo;
-        ImageButton mRowMenu;
-        ImageView mLogoImage;
-        LinearLayout mRowContainer;
-        LinearLayout mDateContainer;
-        LinearLayout mLoadingContainer;
-
-        listViewHolder(View itemView) {
-            super(itemView);
-        }
-
-        void bindListView(bookmarkRowModel model, int p_position) {
-            mDateContainer = itemView.findViewById(R.id.pDateContainer);
-            mHeader = itemView.findViewById(R.id.pHeader);
-            mDescription = itemView.findViewById(R.id.pDescription);
-            mRowContainer = itemView.findViewById(R.id.pRowContainer);
-            mRowMenu = itemView.findViewById(R.id.pRowMenu);
-            mDate = itemView.findViewById(R.id.pDate);
-            mLogoImage = itemView.findViewById(R.id.pLogoImage);
-            mWebLogo = itemView.findViewById(R.id.pWebLogo);
-            mLoadingContainer = itemView.findViewById(R.id.pLoadingContainer);
-
-
-            if(model.getID() == -1){
-                mDate.setText(model.getHeader());
-                mDateContainer.setVisibility(View.VISIBLE);
-                mRowContainer.setVisibility(View.GONE);
-                mRowMenu.setVisibility(View.INVISIBLE);
-                mRowMenu.setClickable(false);
-                mWebLogo.setVisibility(View.GONE);
-                mLoadingContainer.setVisibility(View.GONE);
-            }
-            else if(model.getID() == -2){
-                mDate.setText(model.getHeader());
-                mDateContainer.setVisibility(View.GONE);
-                mRowContainer.setVisibility(View.GONE);
-                mRowMenu.setVisibility(View.INVISIBLE);
-                mRowMenu.setClickable(false);
-                mWebLogo.setVisibility(View.GONE);
-                mLoadingContainer.setVisibility(View.VISIBLE);
-            }
-            else {
-                mDateContainer.setVisibility(View.GONE);
-                mLoadingContainer.setVisibility(View.GONE);
-                mRowContainer.setVisibility(View.VISIBLE);
-                mRowMenu.setVisibility(View.VISIBLE);
-                mRowMenu.setClickable(true);
-                mWebLogo.setVisibility(View.VISIBLE);
-
-                mWebLogo.setText((helperMethod.getDomainName(model.getHeader()).toUpperCase().charAt(0)+""));
-                String header = model.getHeader();
-                mDescription.setText(("https://"+model.getDescription()));
-                mHeader.setText(model.getHeader());
-
-                setItemViewOnClickListener(mRowContainer, mRowMenu, mDescription.getText().toString(), p_position, header, mRowMenu, mLogoImage, model.getID(), model.getDate());
-            }
-
-            if(mLongSelectedID.size()>0){
-                mRowMenu.setVisibility(View.INVISIBLE);
-                mRowMenu.setClickable(false);
-            }else {
-                mRowMenu.setVisibility(View.VISIBLE);
-                mRowMenu.setClickable(true);
-            }
-
-            if(mLongSelectedIndex.contains("https://" + model.getDescription()) && mLongSelectedID.contains(model.getID())){
-                mPopupWindow = (PopupWindow) mHistroyAdapterView.onTrigger(bookmarkEnums.eBookmarkViewAdapterCommands.M_SELECT_VIEW, Arrays.asList(mRowContainer, mRowMenu, mLogoImage, true, false));
-            }else if(mLogoImage.getAlpha()>0){
-                mPopupWindow = (PopupWindow) mHistroyAdapterView.onTrigger(bookmarkEnums.eBookmarkViewAdapterCommands.M_CLEAR_HIGHLIGHT, Arrays.asList(mRowContainer, mRowMenu, mLogoImage, true, false));
-            }
-        }
-    }
-
-    void setFilter(String pFilter){
-        this.mFilter = pFilter.toLowerCase();
-    }
-
-    void invokeFilter(boolean notify){
-        if(notify){
-            if(mFilter.length()>0){
-                initializeModelWithDate(true);
-            }else {
-                initializeModelWithDate(false);
-            }
-            notifyDataSetChanged();
-        }
-    }
-
-    public boolean isLongPressMenuActive(){
-        return mLongSelectedIndex.size()>0;
-    }
-
-    public Object onTrigger(bookmarkEnums.eBookmarkAdapterCommands pCommands, List<Object> pData){
-        if(pCommands == bookmarkEnums.eBookmarkAdapterCommands.GET_SELECTED_URL){
-            return getSelectedURL();
-        }
-        else if(pCommands == bookmarkEnums.eBookmarkAdapterCommands.M_ON_LOADING){
-            onLoading();
-        }
-        else if(pCommands == bookmarkEnums.eBookmarkAdapterCommands.M_LOADING_CLEAR){
-            onLoadingClear();
-        }
-        else if(pCommands == bookmarkEnums.eBookmarkAdapterCommands.M_CLEAR_LONG_SELECTED_URL){
-            clearLongSelectedURL();
-        }
-        else if(pCommands == bookmarkEnums.eBookmarkAdapterCommands.GET_LONG_SELECTED_URL){
-            return getLongSelectedleURL();
-        }
-        return null;
-    }
-
-}
+package com.darkweb.genesissearchengine.appManager.bookmarkManager;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.os.Handler;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.widget.*;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.darkweb.genesissearchengine.appManager.historyManager.historyEnums;
+import com.darkweb.genesissearchengine.constants.enums;
+import com.darkweb.genesissearchengine.constants.strings;
+import com.darkweb.genesissearchengine.helperManager.eventObserver;
+import com.darkweb.genesissearchengine.helperManager.helperMethod;
+import com.example.myapplication.R;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+import static android.content.Context.LAYOUT_INFLATER_SERVICE;
+import static com.darkweb.genesissearchengine.constants.constants.BOOKMARK_LOAD_MORE;
+
+public class bookmarkAdapter extends RecyclerView.Adapter<bookmarkAdapter.listViewHolder>
+{
+    /*Private Variables*/
+
+    private ArrayList<bookmarkRowModel> mModelList = new ArrayList<>();
+    private ArrayList<bookmarkRowModel> mCurrentList;
+    private ArrayList<bookmarkRowModel> mPassedList;
+    private ArrayList<Integer> mRealID = new ArrayList<>();
+    private ArrayList<Integer> mRealIndex = new ArrayList<>();
+    private ArrayList<Date> mLongSelectedDate = new ArrayList<>();
+    private ArrayList<String> mLongSelectedIndex = new ArrayList<>();
+    private ArrayList<Integer> mLongSelectedID = new ArrayList<>();
+
+    private AppCompatActivity mContext;
+    private bookmarkAdapterView mBookmarkAdapterView;
+    private Context mListHolderContext;
+    private PopupWindow mPopupWindow = null;
+    private eventObserver.eventListener mEvent;
+    boolean mLongPressedMenuActive = false;
+    private String mFilter = strings.GENERIC_EMPTY_STR;
+
+    /*Local Variables*/
+
+    private boolean mDisableCallable = false;
+    private boolean mSearchEnabled = false;
+
+    bookmarkAdapter(ArrayList<bookmarkRowModel> pModelList, eventObserver.eventListener mEvent, AppCompatActivity pMainContext) {
+        this.mEvent = mEvent;
+        this.mCurrentList = new ArrayList<>();
+        this.mPassedList = pModelList;
+        this.mContext = pMainContext;
+        this.mBookmarkAdapterView = new bookmarkAdapterView(mContext);
+
+        initializeModelWithDate(false);
+    }
+
+
+    private void onLoading(){
+        mContext.runOnUiThread(() -> {
+            mCurrentList.add(new bookmarkRowModel(BOOKMARK_LOAD_MORE,null,-2));
+            notifyItemInserted(mCurrentList.size());
+        });
+    }
+
+    private void onLoadingClear(){
+        for(int mCounter = 0; mCounter< mCurrentList.size(); mCounter++){
+            if(mCurrentList.get(mCounter).getHeader().equals(BOOKMARK_LOAD_MORE)){
+                int finalM_counter = mCounter;
+                mContext.runOnUiThread(() -> {
+                    mCurrentList.remove(finalM_counter);
+                    notifyItemRemoved(finalM_counter);
+                });
+                break;
+            }
+        }
+    }
+
+
+    private void initializeModelWithDate(boolean pFilterEnabled){
+        int m_real_counter=0;
+
+        mRealID.clear();
+        mRealIndex.clear();
+        mCurrentList.clear();
+        this.mModelList.clear();
+        onVerifyLongSelectedURL();
+
+        ArrayList<bookmarkRowModel> p_model_list = mPassedList;
+        int m_date_state = -1;
+        int m_last_day = -1;
+        for(int counter = 0; counter< p_model_list.size(); counter++){
+
+            if(pFilterEnabled){
+                if(!p_model_list.get(counter).getHeader().toLowerCase().contains(this.mFilter.toLowerCase()) && !p_model_list.get(counter).getDescription().toLowerCase().contains(this.mFilter)){
+                    continue;
+                }
+            }
+
+            Calendar cal = Calendar.getInstance();
+            cal.setTime(p_model_list.get(counter).getDate());
+
+            int m_date_1 = cal.get(Calendar.DAY_OF_YEAR);
+            cal.setTime(Calendar.getInstance().getTime());
+            int m_date_2 = cal.get(Calendar.DAY_OF_YEAR);
+
+            float diff = m_date_2-m_date_1;
+
+            if(diff==0){
+                if(m_date_state!=1){
+                    this.mModelList.add(new bookmarkRowModel("Today ",null,-1));
+                    mRealID.add(m_real_counter);
+                    mRealIndex.add(m_real_counter);
+                    m_date_state = 1;
+                }
+            }else if (diff>=1){
+
+                if(m_date_state!=2 || m_last_day!=(int)(Math.ceil(diff/7)*7)){
+                    m_last_day = (int)(Math.ceil(diff/7)*7);
+                    this.mModelList.add(new bookmarkRowModel("Last " + m_last_day + " Days",null,-1));
+                    mRealID.add(m_real_counter);
+                    mRealIndex.add(m_real_counter);
+                    m_date_state = 2;
+                }
+            }else {
+                if(m_date_state!=3){
+                    this.mModelList.add(new bookmarkRowModel("Older ",null,-1));
+                    mRealID.add(m_real_counter);
+                    mRealIndex.add(m_real_counter);
+                    m_date_state = 3;
+                }
+            }
+
+            mRealID.add(p_model_list.get(counter).getID());
+            mRealIndex.add(m_real_counter);
+            this.mModelList.add(p_model_list.get(counter));
+            m_real_counter+=1;
+        }
+        mCurrentList.addAll(this.mModelList);
+    }
+
+    /*Initializations*/
+
+    private ArrayList<String> getLongSelectedleURL(){
+        return mLongSelectedIndex;
+    }
+
+    public void onDeleteSelected(){
+        for(int m_counter = 0; m_counter< mLongSelectedIndex.size(); m_counter++){
+            for(int m_counter_inner = 0; m_counter_inner< mCurrentList.size(); m_counter_inner++){
+                if(mCurrentList.get(m_counter_inner).getDate() == mLongSelectedDate.get(m_counter) && mLongSelectedIndex.get(m_counter).equals(mCurrentList.get(m_counter_inner).getDescription())){
+                    mEvent.invokeObserver(Collections.singletonList(mRealIndex.get(m_counter_inner)),enums.etype.url_clear);
+                    mEvent.invokeObserver(Collections.singletonList(mLongSelectedID.get(m_counter)),enums.etype.url_clear_at);
+                    invokeFilter(false);
+                    mEvent.invokeObserver(Collections.singletonList(m_counter_inner),enums.etype.is_empty);
+
+                    boolean mDateVerify = false;
+                    if(mCurrentList.size()>0 && mCurrentList.get(m_counter_inner-1).getDescription()==null && (mCurrentList.size()>m_counter_inner+1 && mCurrentList.get(m_counter_inner+1).getDescription()==null || mCurrentList.size()==m_counter_inner+1)){
+                        mDateVerify = true;
+                    }
+
+                    if(m_counter_inner==0){
+                        notifyDataSetChanged();
+                    }else {
+
+                        if(mDateVerify){
+                            notifyItemRemoved(m_counter_inner-1);
+                            mCurrentList.remove(m_counter_inner-1);
+                            notifyItemRemoved(m_counter_inner-1);
+                            mCurrentList.remove(m_counter_inner-1);
+                            notifyItemRangeChanged(m_counter_inner-1, mCurrentList.size());
+                        }else {
+                            notifyItemRemoved(m_counter_inner);
+                            mCurrentList.remove(m_counter_inner);
+                            notifyItemRangeChanged(m_counter_inner, mCurrentList.size());
+                        }
+                    }
+                    break;
+                }
+            }
+        }
+        clearLongSelectedURL();
+    }
+
+    private void clearLongSelectedURL(){
+        mLongSelectedDate.clear();
+        mLongSelectedIndex.clear();
+        mLongSelectedID.clear();
+        notifyDataSetChanged();
+    }
+
+    private String getSelectedURL(){
+        String m_joined_url = "\n";
+        for(int m_counter = 0; m_counter< mLongSelectedIndex.size(); m_counter++){
+            m_joined_url = m_joined_url.concat("\n"+ mLongSelectedIndex.get(m_counter));
+        }
+        return m_joined_url;
+    }
+
+    @NonNull
+    @Override
+    public listViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        mListHolderContext = parent.getContext();
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.recyclerview_row, parent, false);
+        return new listViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull listViewHolder holder, int position) {
+        holder.bindListView(mCurrentList.get(position), position);
+    }
+
+    public int getItem(){
+        return mCurrentList.size();
+    }
+
+    @Override
+    public int getItemCount() {
+        return mCurrentList.size();
+    }
+
+    /*Listeners*/
+    public void onUpdateSearchStatus(boolean p_is_searched){
+        mSearchEnabled = p_is_searched;
+    }
+
+    public void onSelectView(View pItemView, String pUrl, View pMenuItem, ImageView pLogoImage, boolean pIsForced, int pId, Date pDate){
+        if(!mSearchEnabled){
+            try {
+                mPopupWindow = (PopupWindow) mBookmarkAdapterView.onTrigger(bookmarkEnums.eBookmarkViewAdapterCommands.M_SELECT_VIEW, Arrays.asList(pItemView, pMenuItem, pLogoImage, pIsForced, true));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            if(!pIsForced){
+                if(mLongSelectedID.size()==0){
+                    notifyDataSetChanged();
+                }
+                mLongSelectedDate.add(pDate);
+                mLongSelectedIndex.add(pUrl);
+                mLongSelectedID.add(pId);
+
+            }
+            onVerifyLongSelectedURL();
+        }
+    }
+
+    public void onVerifyLongSelectedURL(){
+        if(mLongSelectedIndex.size()>0){
+            mEvent.invokeObserver(Collections.singletonList(false),enums.etype.on_verify_selected_url_menu);
+        }else {
+            mEvent.invokeObserver(Collections.singletonList(true),enums.etype.on_verify_selected_url_menu);
+        }
+    }
+
+    public void onClearHighlight(View pItemView, String pUrl, View pMenuItem, ImageView pLogoImage, boolean pIsForced, int pId, Date pDate)
+    {
+        try {
+            mPopupWindow = (PopupWindow) mBookmarkAdapterView.onTrigger(bookmarkEnums.eBookmarkViewAdapterCommands.M_CLEAR_HIGHLIGHT, Arrays.asList(pItemView, pMenuItem, pLogoImage, pIsForced));
+            mLongSelectedDate.remove(pDate);
+            mLongSelectedIndex.remove(pUrl);
+            mLongSelectedID.remove((Integer) pId);
+            if(mLongSelectedID.size()==0){
+                notifyDataSetChanged();
+            }
+            onVerifyLongSelectedURL();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    public void onSwipe(View pItemView, String pUrl, View pMenuItem, ImageView pLogoImage, int pId, Date pDate){
+
+        Handler handler = new Handler();
+
+        Runnable mLongPressed = () -> {
+            if(!mDisableCallable){
+                if(!mLongSelectedIndex.contains(pUrl) || !mLongSelectedID.contains(pId)) {
+                    mLongPressedMenuActive = true;
+                    onSelectView(pItemView, pUrl,pMenuItem, pLogoImage, false, pId, pDate);
+                }else {
+                    onClearHighlight(pItemView, pUrl,pMenuItem, pLogoImage, false, pId, pDate);
+                    mLongPressedMenuActive = true;
+                }
+            }else {
+                pItemView.setPressed(false);
+                pItemView.clearFocus();
+            }
+        };
+
+        pItemView.setOnTouchListener((v, event) -> {
+
+            if (event.getAction() == MotionEvent.ACTION_UP) {
+
+                if (mLongSelectedIndex.size() > 0) {
+                    if (!mLongPressedMenuActive) {
+                        if (mLongSelectedIndex.contains(pUrl) && mLongSelectedID.contains(pId)) {
+                            handler.removeCallbacks(mLongPressed);
+                            bookmarkAdapter.this.onClearHighlight(pItemView, pUrl, pMenuItem, pLogoImage, false, pId, pDate);
+                        } else{
+                            handler.removeCallbacks(mLongPressed);
+                            bookmarkAdapter.this.onSelectView(pItemView, pUrl, pMenuItem, pLogoImage, false, pId, pDate);
+                        }
+                    }
+                    return false;
+                }
+
+                v.setPressed(false);
+                handler.removeCallbacks(mLongPressed);
+                mEvent.invokeObserver(Collections.singletonList(pUrl), enums.etype.url_triggered);
+                return true;
+
+            } else if (event.getAction() == MotionEvent.ACTION_DOWN) {
+                mDisableCallable = false;
+                mLongPressedMenuActive = false;
+                v.setPressed(true);
+                handler.postDelayed(mLongPressed, ViewConfiguration.getLongPressTimeout());
+                return true;
+            } else if (event.getAction() == MotionEvent.ACTION_CANCEL) {
+                handler.removeCallbacks(mLongPressed);
+                mDisableCallable = true;
+                if (!mLongSelectedIndex.contains(pUrl) || !mLongSelectedID.contains(pId)) {
+                    v.setPressed(false);
+                }
+                handler.removeCallbacks(mLongPressed);
+
+                return true;
+            }
+            return false;
+        });
+    }
+
+    void onOpenMenu(View pView, String pUrl, int pPosition, String pTitle){
+        LayoutInflater layoutInflater = (LayoutInflater) pView.getContext().getSystemService(LAYOUT_INFLATER_SERVICE);
+        @SuppressLint("InflateParams") final View mPopupView = layoutInflater.inflate(R.layout.recyclerview__row_menu, null);
+        mPopupWindow = (PopupWindow) mBookmarkAdapterView.onTrigger(bookmarkEnums.eBookmarkViewAdapterCommands.M_OPEN_MENU, Arrays.asList(mPopupWindow, pView, mPopupView));
+
+        setPopupWindowEvents(mPopupView.findViewById(R.id.pMenuCopy), pUrl, pPosition, pTitle);
+        setPopupWindowEvents(mPopupView.findViewById(R.id.pMenuShare), pUrl, pPosition, pTitle);
+        setPopupWindowEvents(mPopupView.findViewById(R.id.pMenuOpenCurrentTab), pUrl, pPosition, pTitle);
+        setPopupWindowEvents(mPopupView.findViewById(R.id.pMenuOpenNewTab), pUrl, pPosition, pTitle);
+        setPopupWindowEvents(mPopupView.findViewById(R.id.pMenuDelete), pUrl, pPosition, pTitle);
+    }
+
+    public void setPopupWindowEvents(View pView, String pUrl, int pPosition, String pTitle){
+        pView.setOnClickListener(v -> {
+            if(v.getId() == R.id.pMenuCopy){
+                helperMethod.copyURL(pUrl, mListHolderContext);
+                mPopupWindow.dismiss();
+            }
+            else if(v.getId() == R.id.pMenuShare){
+                helperMethod.shareApp((AppCompatActivity)mListHolderContext, pUrl, pTitle);
+                mPopupWindow.dismiss();
+            }
+            else if(v.getId() == R.id.pMenuOpenCurrentTab){
+                mEvent.invokeObserver(Collections.singletonList(pUrl),enums.etype.url_triggered);
+                mPopupWindow.dismiss();
+            }
+            else if(v.getId() == R.id.pMenuOpenNewTab){
+                mEvent.invokeObserver(Collections.singletonList(pUrl),enums.etype.url_triggered_new_tab);
+                mPopupWindow.dismiss();
+            }
+            else if(v.getId() == R.id.pMenuDelete){
+                initializeModelWithDate(false);
+                onClose(pPosition);
+                mPopupWindow.dismiss();
+            }
+        });
+    }
+
+    private void setItemViewOnClickListener(View pItemView, View pItemMenu, String pUrl, int pPosition, String pTitle, View pMenuItem, ImageView pLogoImage, int pId, Date pDate)
+    {
+        pItemMenu.setOnClickListener((View v) -> onOpenMenu(v, pUrl, pPosition, pTitle));
+        onSwipe(pItemView, pUrl,pMenuItem, pLogoImage, pId, pDate);
+    }
+
+    private void onClose(int pIndex){
+        mEvent.invokeObserver(Collections.singletonList(mRealIndex.get(pIndex)),enums.etype.url_clear);
+        mEvent.invokeObserver(Collections.singletonList(mRealID.get(pIndex)),enums.etype.url_clear_at);
+        invokeFilter(false);
+        mEvent.invokeObserver(Collections.singletonList(mRealID.get(pIndex)),enums.etype.is_empty);
+        boolean mDateVerify = false;
+        if(mPassedList.size()>0){
+            if(mCurrentList.size()>0 && mCurrentList.get(pIndex-1).getDescription()==null && (mCurrentList.size()>pIndex+1 && mCurrentList.get(pIndex+1).getDescription()==null || mCurrentList.size()==pIndex+1)){
+                mDateVerify = true;
+            }
+        }else {
+            mCurrentList.clear();
+            notifyDataSetChanged();
+            return;
+        }
+        int size = mCurrentList.size();
+
+        if(mDateVerify){
+            notifyItemRemoved(pIndex-1);
+            mCurrentList.remove(pIndex-1);
+            notifyItemRemoved(pIndex-1);
+            mCurrentList.remove(pIndex-1);
+            notifyItemRangeChanged(pIndex-1, mCurrentList.size());
+        }else {
+            notifyItemRemoved(pIndex);
+            mCurrentList.remove(pIndex);
+            notifyItemRangeChanged(pIndex, mCurrentList.size());
+        }
+
+        if(size>1){
+            new Thread(){
+                public void run(){
+                    try
+                    {
+                        sleep(500);
+                    }
+                    catch (InterruptedException e)
+                    {
+                        e.printStackTrace();
+                    }
+                }
+            }.start();
+        }
+    }
+
+    /*View Holder Extensions*/
+    class listViewHolder extends RecyclerView.ViewHolder
+    {
+        TextView mHeader;
+        TextView mDescription;
+        TextView mDate;
+        TextView mWebLogo;
+        ImageButton mRowMenu;
+        ImageView mLogoImage;
+        LinearLayout mRowContainer;
+        LinearLayout mDateContainer;
+        LinearLayout mLoadingContainer;
+
+        listViewHolder(View itemView) {
+            super(itemView);
+        }
+
+        void bindListView(bookmarkRowModel model, int p_position) {
+            mDateContainer = itemView.findViewById(R.id.pDateContainer);
+            mHeader = itemView.findViewById(R.id.pHeader);
+            mDescription = itemView.findViewById(R.id.pDescription);
+            mRowContainer = itemView.findViewById(R.id.pRowContainer);
+            mRowMenu = itemView.findViewById(R.id.pRowMenu);
+            mDate = itemView.findViewById(R.id.pDate);
+            mLogoImage = itemView.findViewById(R.id.pLogoImage);
+            mWebLogo = itemView.findViewById(R.id.pWebLogo);
+            mLoadingContainer = itemView.findViewById(R.id.pLoadingContainer);
+
+
+            if(model.getID() == -1){
+                mDate.setText(model.getHeader());
+                mDateContainer.setVisibility(View.VISIBLE);
+                mRowContainer.setVisibility(View.GONE);
+                mRowMenu.setVisibility(View.INVISIBLE);
+                mRowMenu.setClickable(false);
+                mWebLogo.setVisibility(View.GONE);
+                mLoadingContainer.setVisibility(View.GONE);
+            }
+            else if(model.getID() == -2){
+                mDate.setText(model.getHeader());
+                mDateContainer.setVisibility(View.GONE);
+                mRowContainer.setVisibility(View.GONE);
+                mRowMenu.setVisibility(View.INVISIBLE);
+                mRowMenu.setClickable(false);
+                mWebLogo.setVisibility(View.GONE);
+                mLoadingContainer.setVisibility(View.VISIBLE);
+            }
+            else {
+                mDateContainer.setVisibility(View.GONE);
+                mLoadingContainer.setVisibility(View.GONE);
+                mRowContainer.setVisibility(View.VISIBLE);
+                mRowMenu.setVisibility(View.VISIBLE);
+                mRowMenu.setClickable(true);
+                mWebLogo.setVisibility(View.VISIBLE);
+
+                mWebLogo.setText((helperMethod.getDomainName(model.getHeader()).toUpperCase().charAt(0)+""));
+                String header = model.getHeader();
+                mDescription.setText((model.getDescription()));
+                mHeader.setText(model.getHeader());
+
+                setItemViewOnClickListener(mRowContainer, mRowMenu, mDescription.getText().toString(), p_position, header, mRowMenu, mLogoImage, model.getID(), model.getDate());
+            }
+
+            if(mLongSelectedID.size()>0){
+                mRowMenu.setVisibility(View.INVISIBLE);
+                mRowMenu.setClickable(false);
+            }else {
+                mRowMenu.setVisibility(View.VISIBLE);
+                mRowMenu.setClickable(true);
+            }
+
+            if(mLongSelectedIndex.contains(model.getDescription()) && mLongSelectedID.contains(model.getID())){
+                mPopupWindow = (PopupWindow) mBookmarkAdapterView.onTrigger(bookmarkEnums.eBookmarkViewAdapterCommands.M_SELECT_VIEW, Arrays.asList(mRowContainer, mRowMenu, mLogoImage, true, false));
+            }else if(mLogoImage.getAlpha()>0){
+                mPopupWindow = (PopupWindow) mBookmarkAdapterView.onTrigger(bookmarkEnums.eBookmarkViewAdapterCommands.M_CLEAR_HIGHLIGHT, Arrays.asList(mRowContainer, mRowMenu, mLogoImage, true, false));
+            }
+        }
+    }
+
+    void setFilter(String pFilter){
+        this.mFilter = pFilter.toLowerCase();
+    }
+
+    void invokeFilter(boolean notify){
+        if(notify){
+            if(mFilter.length()>0){
+                initializeModelWithDate(true);
+            }else {
+                initializeModelWithDate(false);
+            }
+            notifyDataSetChanged();
+        }
+    }
+
+    public boolean isLongPressMenuActive(){
+        return mLongSelectedIndex.size()>0;
+    }
+
+    public Object onTrigger(bookmarkEnums.eBookmarkAdapterCommands pCommands, List<Object> pData){
+        if(pCommands == bookmarkEnums.eBookmarkAdapterCommands.GET_SELECTED_URL){
+            return getSelectedURL();
+        }
+        else if(pCommands == bookmarkEnums.eBookmarkAdapterCommands.M_ON_LOADING){
+            onLoading();
+        }
+        else if(pCommands == bookmarkEnums.eBookmarkAdapterCommands.M_LOADING_CLEAR){
+            onLoadingClear();
+        }
+        else if(pCommands == bookmarkEnums.eBookmarkAdapterCommands.M_CLEAR_LONG_SELECTED_URL){
+            clearLongSelectedURL();
+        }
+        else if(pCommands == bookmarkEnums.eBookmarkAdapterCommands.GET_LONG_SELECTED_URL){
+            return getLongSelectedleURL();
+        }
+        else if(pCommands == bookmarkEnums.eBookmarkAdapterCommands.GET_LONG_SELECTED_STATUS){
+            return isLongPressMenuActive();
+        }
+        return null;
+    }
+
+}
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkController.java
index d0739ce8..7f971109 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkController.java
@@ -1,6 +1,7 @@
 package com.darkweb.genesissearchengine.appManager.bookmarkManager;
 
 import android.content.Context;
+import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -12,12 +13,15 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.darkweb.genesissearchengine.appManager.activityContextManager;
 import com.darkweb.genesissearchengine.appManager.databaseManager.databaseController;
+import com.darkweb.genesissearchengine.appManager.historyManager.historyEnums;
 import com.darkweb.genesissearchengine.appManager.homeManager.homeController;
 import com.darkweb.genesissearchengine.constants.enums;
 import com.darkweb.genesissearchengine.constants.keys;
@@ -35,7 +39,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-
+import jp.wasabeef.recyclerview.animators.FadeInRightAnimator;
 import static com.darkweb.genesissearchengine.appManager.bookmarkManager.bookmarkEnums.eBookmarkViewCommands.M_VERTIFY_SELECTION_MENU;
 
 
@@ -70,6 +74,7 @@ public class bookmarkController extends AppCompatActivity
         initializeViews();
         initializeList();
         initCustomListeners();
+        initSwipe();
     }
 
     public void initializeListModel(){
@@ -98,6 +103,12 @@ public class bookmarkController extends AppCompatActivity
         mRecycleView.setNestedScrollingEnabled(false);
         mRecycleView.setHasFixedSize(true);
 
+        mRecycleView.setItemAnimator(new FadeInRightAnimator());
+        Objects.requireNonNull(mRecycleView.getItemAnimator()).setAddDuration(200);
+        mRecycleView.getItemAnimator().setRemoveDuration(200);
+        mRecycleView.getItemAnimator().setMoveDuration(200);
+        mRecycleView.getItemAnimator().setChangeDuration(450);
+
         mRecycleView.setAdapter(adapter);
         mRecycleView.setItemViewCacheSize(100);
         mRecycleView.setDrawingCacheEnabled(true);
@@ -150,6 +161,29 @@ public class bookmarkController extends AppCompatActivity
         });
     }
 
+    private void initSwipe(){
+        ItemTouchHelper.SimpleCallback simpleItemTouchCallback = new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) {
+
+            @Override
+            public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
+                return false;
+            }
+
+            public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
+                int position = viewHolder.getAdapterPosition();
+                mbookmarkAdapter.onTrigger(bookmarkEnums.eBookmarkAdapterCommands.ON_CLOSE,Collections.singletonList(position));
+            }
+
+            @Override
+            public void onChildDraw(@NonNull Canvas c, @NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) {
+                Canvas mCanvas = (Canvas) mbookmarkViewController.onTrigger(bookmarkEnums.eBookmarkViewCommands.ON_GENERATE_SWIPABLE_BACKGROUND, Arrays.asList(c, viewHolder, dX, actionState));
+                super.onChildDraw(mCanvas, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
+            }
+        };
+        ItemTouchHelper itemTouchHelper = new ItemTouchHelper(simpleItemTouchCallback);
+        itemTouchHelper.attachToRecyclerView(mRecycleView);
+    }
+
     /*View Custom Overrides*/
 
     @Override
@@ -198,7 +232,7 @@ public class bookmarkController extends AppCompatActivity
     public void onBackPressed() {
         if(mSearchInput.getVisibility() == View.VISIBLE){
             onHideSearch(null);
-        }else if(mbookmarkAdapter.isLongPressMenuActive()){
+        }else if((Boolean) mbookmarkAdapter.onTrigger(bookmarkEnums.eBookmarkAdapterCommands.GET_LONG_SELECTED_STATUS,null)){
             onClearMultipleSelection(null);
         }else {
             onBackPressed(null);
@@ -262,7 +296,7 @@ public class bookmarkController extends AppCompatActivity
 
     public class adapterCallback implements eventObserver.eventListener{
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
             if(e_type.equals(enums.etype.url_triggered)){
                 String url_temp = helperMethod.completeURL(data.get(0).toString());
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkEnums.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkEnums.java
index 4bcd7b38..c291101a 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkEnums.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkEnums.java
@@ -4,11 +4,11 @@ public class bookmarkEnums
 {
     /*History Manager*/
     public enum eBookmarkViewCommands {
-        M_UPDATE_LIST_IF_EMPTY, M_UPDATE_LIST, M_REMOVE_FROM_LIST, M_CLEAR_LIST,M_VERTIFY_SELECTION_MENU, M_CLOSE_MENU, M_HIDE_SEARCH, M_LONG_PRESS_MENU
+        M_UPDATE_LIST_IF_EMPTY, M_UPDATE_LIST, M_REMOVE_FROM_LIST, M_CLEAR_LIST,M_VERTIFY_SELECTION_MENU, M_CLOSE_MENU, M_HIDE_SEARCH, M_LONG_PRESS_MENU, ON_GENERATE_SWIPABLE_BACKGROUND
     }
 
     public enum eBookmarkAdapterCommands {
-        M_ON_LOADING, M_LOADING_CLEAR, M_CLEAR_LONG_SELECTED_URL, GET_SELECTED_URL, GET_LONG_SELECTED_URL
+        M_ON_LOADING, M_LOADING_CLEAR, M_CLEAR_LONG_SELECTED_URL, GET_SELECTED_URL, GET_LONG_SELECTED_URL, GET_LONG_SELECTED_STATUS, ON_CLOSE
     }
 
     public enum eBookmarkViewAdapterCommands {
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkViewController.java
index b46fd3ac..e244fd1d 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkViewController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkViewController.java
@@ -1,6 +1,11 @@
 package com.darkweb.genesissearchengine.appManager.bookmarkManager;
 
 import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
 import android.os.Build;
 import android.view.View;
 import android.view.Window;
@@ -14,9 +19,8 @@ import android.widget.PopupWindow;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
-
-import com.darkweb.genesissearchengine.constants.status;
 import com.darkweb.genesissearchengine.constants.strings;
 import com.darkweb.genesissearchengine.helperManager.helperMethod;
 import com.example.myapplication.R;
@@ -35,6 +39,8 @@ class bookmarkViewController
     private ImageButton mMenuButton;
     private ImageButton mSearchButton;
 
+    /*Private Local Variables*/
+    private Paint mPainter = new Paint();
     private PopupWindow mPopupWindow = null;
 
     /*Initializations*/
@@ -183,6 +189,36 @@ class bookmarkViewController
         mPopupWindow = helperMethod.onCreateMenu(pView, R.layout.recyclerview__menu);
     }
 
+    private void onDrawSwipableBackground(Canvas pCanvas, RecyclerView.ViewHolder pViewHolder, float pDX, int pActionState) {
+
+        Bitmap icon;
+        if(pActionState == ItemTouchHelper.ANIMATION_TYPE_SWIPE_SUCCESS){
+            View itemView = pViewHolder.itemView;
+            itemView.animate().alpha(0f);
+        }
+        else if(pActionState == ItemTouchHelper.ACTION_STATE_SWIPE){
+            View itemView = pViewHolder.itemView;
+            float height = (float) itemView.getBottom() - (float) itemView.getTop();
+            float width = height / 3;
+
+            if(pDX > 0){
+                mPainter.setColor(ContextCompat.getColor(mContext, R.color.c_list_item_current));
+                RectF background = new RectF((float) itemView.getLeft(), (float) itemView.getTop(), pDX,(float) itemView.getBottom());
+                pCanvas.drawRect(background, mPainter);
+                icon = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.dustbin);
+                RectF icon_dest = new RectF((float) itemView.getLeft() + width ,(float) itemView.getTop() + width,(float) itemView.getLeft()+ 2*width,(float)itemView.getBottom() - width);
+                pCanvas.drawBitmap(icon,null,icon_dest, mPainter);
+            } else {
+                mPainter.setColor(ContextCompat.getColor(mContext, R.color.c_list_item_current));
+                RectF background = new RectF((float) itemView.getRight() + pDX, (float) itemView.getTop(),(float) itemView.getRight(), (float) itemView.getBottom());
+                pCanvas.drawRect(background, mPainter);
+                icon = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.dustbin);
+                RectF icon_dest = new RectF((float) itemView.getRight() - 2*width ,(float) itemView.getTop() + width,(float) itemView.getRight() - width,(float)itemView.getBottom() - width);
+                pCanvas.drawBitmap(icon,null,icon_dest, mPainter);
+            }
+        }
+    }
+
     public Object onTrigger(bookmarkEnums.eBookmarkViewCommands pCommands, List<Object> pData){
         if(pCommands == bookmarkEnums.eBookmarkViewCommands.M_UPDATE_LIST_IF_EMPTY){
             updateIfListEmpty((int)pData.get(0), (int)pData.get(1));
@@ -207,6 +243,8 @@ class bookmarkViewController
         }
         else if(pCommands == bookmarkEnums.eBookmarkViewCommands.M_LONG_PRESS_MENU){
             onLongPressMenu((View) pData.get(0));
+        }else if(pCommands.equals(bookmarkEnums.eBookmarkViewCommands.ON_GENERATE_SWIPABLE_BACKGROUND)){
+            onDrawSwipableBackground((Canvas)pData.get(0), (RecyclerView.ViewHolder)pData.get(1), (float)pData.get(2), (int)pData.get(3));
         }
         return null;
     }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bridgeManager/bridgeController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bridgeManager/bridgeController.java
index f16ba3ea..eb999c08 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bridgeManager/bridgeController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bridgeManager/bridgeController.java
@@ -106,7 +106,7 @@ public class bridgeController extends AppCompatActivity {
 
     public class bridgeModelCallback implements eventObserver.eventListener{
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
             return null;
         }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/databaseManager/databaseController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/databaseManager/databaseController.java
index 57d529e9..9a3200b5 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/databaseManager/databaseController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/databaseManager/databaseController.java
@@ -42,10 +42,6 @@ public class databaseController
             mDatabaseInstance = app_context.openOrCreateDatabase(constants.CONST_DATABASE_NAME, MODE_PRIVATE, null);
 
             mDatabaseInstance.execSQL("CREATE TABLE IF NOT EXISTS " + "history" + " (id  INT(4) PRIMARY KEY,date DATETIME,url VARCHAR,title VARCHAR);");
-            try {
-                mDatabaseInstance.execSQL("ALTER TABLE history ADD COLUMN title VARCHAR default ''");
-            } catch (SQLiteException ignored) {
-            }
             mDatabaseInstance.execSQL("CREATE TABLE IF NOT EXISTS " + "bookmark" + " (id INT(4) PRIMARY KEY,title VARCHAR,url VARCHAR);");
 
         }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyAdapter.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyAdapter.java
index b728112d..02eff8f9 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyAdapter.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyAdapter.java
@@ -3,7 +3,6 @@ package com.darkweb.genesissearchengine.appManager.historyManager;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Handler;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -52,7 +51,6 @@ public class historyAdapter extends RecyclerView.Adapter<historyAdapter.listView
 
     /*Local Variables*/
 
-    private float mRecyclerPositionX1, mRecyclerPositionX2;
     private boolean mDisableCallable = false;
     private boolean mSearchEnabled = false;
 
@@ -280,19 +278,17 @@ public class historyAdapter extends RecyclerView.Adapter<historyAdapter.listView
         }
     }
 
-    private float mPointerPosition = 0;
     @SuppressLint("ClickableViewAccessibility")
-    public void onSwipe(View pItemView, int pPosition, String pUrl, View pMenuItem, ImageView pLogoImage, int pId, Date pDate){
+    public void onSwipe(View pItemView, String pUrl, View pMenuItem, ImageView pLogoImage, int pId, Date pDate){
 
         Handler handler = new Handler();
 
         Runnable mLongPressed = () -> {
-            if(!mDisableCallable && Math.abs(mRecyclerPositionX1-mPointerPosition) <= 20){
+            if(!mDisableCallable){
                 if(!mLongSelectedIndex.contains(pUrl) || !mLongSelectedID.contains(pId)) {
                     mLongPressedMenuActive = true;
                     onSelectView(pItemView, pUrl,pMenuItem, pLogoImage, false, pId, pDate);
                 }else {
-                    Log.i("I AM HERE 22","I AM HERE");
                     onClearHighlight(pItemView, pUrl,pMenuItem, pLogoImage, false, pId, pDate);
                     mLongPressedMenuActive = true;
                 }
@@ -304,33 +300,10 @@ public class historyAdapter extends RecyclerView.Adapter<historyAdapter.listView
 
          pItemView.setOnTouchListener((v, event) -> {
 
-             if (mRecyclerPositionX1!=0 && Math.abs(event.getX() - mRecyclerPositionX1) > 400 && !mLongPressedMenuActive) {
-                 v.setPressed(false);
-                 pItemView.clearFocus();
-                 handler.removeCallbacks(mLongPressed);
-                 pItemView.setOnTouchListener(null);
-                 pItemView.clearFocus();
-                 if(mPassedList.size()<=1){
-                     mPassedList.clear();
-                     initializeModelWithDate(false);
-                     notifyItemRemoved(0);
-                     notifyItemRangeChanged(0, 1);
-                     mEvent.invokeObserver(Collections.singletonList(0),enums.etype.is_empty);
-                 }else {
-                     initializeModelWithDate(false);
-                     historyAdapter.this.onClose(pPosition);
-                 }
-                 return true;
-             }
-
-             mPointerPosition = event.getX();
              if (event.getAction() == MotionEvent.ACTION_UP) {
-                 mRecyclerPositionX2 = event.getX();
-                 float deltaX = mRecyclerPositionX2 - mRecyclerPositionX1;
 
-                 Log.i("FCK2","FCK2 : " + mLongSelectedIndex.size());
                  if (mLongSelectedIndex.size() > 0) {
-                     if (Math.abs(deltaX) <= 20 && !mLongPressedMenuActive) {
+                     if (!mLongPressedMenuActive) {
                          if (mLongSelectedIndex.contains(pUrl) && mLongSelectedID.contains(pId)) {
                              handler.removeCallbacks(mLongPressed);
                              historyAdapter.this.onClearHighlight(pItemView, pUrl, pMenuItem, pLogoImage, false, pId, pDate);
@@ -342,24 +315,15 @@ public class historyAdapter extends RecyclerView.Adapter<historyAdapter.listView
                      return false;
                  }
 
-                 if (Math.abs(deltaX) > 100) {
-                     v.setPressed(false);
-                     handler.removeCallbacks(mLongPressed);
-                     historyAdapter.this.onClose(pPosition);
-                 } else {
-                     v.setPressed(false);
-                     handler.removeCallbacks(mLongPressed);
-                     mEvent.invokeObserver(Collections.singletonList(pUrl), enums.etype.url_triggered);
-                 }
-
+                 v.setPressed(false);
+                 handler.removeCallbacks(mLongPressed);
+                 mEvent.invokeObserver(Collections.singletonList(pUrl), enums.etype.url_triggered);
                  return true;
 
              } else if (event.getAction() == MotionEvent.ACTION_DOWN) {
                  mDisableCallable = false;
                  mLongPressedMenuActive = false;
                  v.setPressed(true);
-                 mRecyclerPositionX1 = event.getX();
-                 Log.i("1WOW : ","WOW : " + event.getX() + " -- " + mRecyclerPositionX1);
                  handler.postDelayed(mLongPressed, ViewConfiguration.getLongPressTimeout());
                  return true;
              } else if (event.getAction() == MotionEvent.ACTION_CANCEL) {
@@ -417,7 +381,7 @@ public class historyAdapter extends RecyclerView.Adapter<historyAdapter.listView
     private void setItemViewOnClickListener(View pItemView, View pItemMenu, String pUrl, int pPosition, String pTitle, View pMenuItem, ImageView pLogoImage, int pId, Date pDate)
     {
         pItemMenu.setOnClickListener((View v) -> onOpenMenu(v, pUrl, pPosition, pTitle));
-        onSwipe(pItemView, pPosition, pUrl,pMenuItem, pLogoImage, pId, pDate);
+        onSwipe(pItemView, pUrl,pMenuItem, pLogoImage, pId, pDate);
     }
 
     private void onClose(int pIndex){
@@ -559,7 +523,7 @@ public class historyAdapter extends RecyclerView.Adapter<historyAdapter.listView
         }
    }
 
-    public boolean isLongPressMenuActive(){
+    private boolean isLongPressMenuActive(){
         return mLongSelectedIndex.size()>0;
     }
 
@@ -579,6 +543,12 @@ public class historyAdapter extends RecyclerView.Adapter<historyAdapter.listView
         else if(pCommands == historyEnums.eHistoryAdapterCommands.GET_LONG_SELECTED_URL){
             return getLongSelectedleURL();
         }
+        else if(pCommands == historyEnums.eHistoryAdapterCommands.GET_LONG_SELECTED_STATUS){
+            return isLongPressMenuActive();
+        }
+        else if(pCommands == historyEnums.eHistoryAdapterCommands.ON_CLOSE){
+            onClose((int)pData.get(0));
+        }
         return null;
     }
 
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyController.java
index 3fd501eb..3b53fdc8 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyController.java
@@ -1,6 +1,7 @@
 package com.darkweb.genesissearchengine.appManager.historyManager;
 
 import android.content.Context;
+import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -15,6 +16,7 @@ import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.darkweb.genesissearchengine.appManager.activityContextManager;
@@ -35,6 +37,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
+import jp.wasabeef.recyclerview.animators.FadeInRightAnimator;
 import static com.darkweb.genesissearchengine.appManager.historyManager.historyEnums.eHistoryViewCommands.M_VERTIFY_SELECTION_MENU;
 
 public class historyController extends AppCompatActivity
@@ -69,6 +73,7 @@ public class historyController extends AppCompatActivity
         initializeViews();
         initializeList();
         initCustomListeners();
+        initSwipe();
     }
 
     public void initializeListModel(){
@@ -175,6 +180,30 @@ public class historyController extends AppCompatActivity
         });
     }
 
+
+    private void initSwipe(){
+        ItemTouchHelper.SimpleCallback simpleItemTouchCallback = new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) {
+
+            @Override
+            public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
+                return false;
+            }
+
+            public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
+                int position = viewHolder.getAdapterPosition();
+                mHistoryAdapter.onTrigger(historyEnums.eHistoryAdapterCommands.ON_CLOSE,Collections.singletonList(position));
+            }
+
+            @Override
+            public void onChildDraw(@NonNull Canvas c, @NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) {
+                Canvas mCanvas = (Canvas) mHistoryViewController.onTrigger(historyEnums.eHistoryViewCommands.ON_GENERATE_SWIPABLE_BACKGROUND, Arrays.asList(c, viewHolder, dX, actionState));
+                super.onChildDraw(mCanvas, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
+            }
+        };
+        ItemTouchHelper itemTouchHelper = new ItemTouchHelper(simpleItemTouchCallback);
+        itemTouchHelper.attachToRecyclerView(mRecycleView);
+    }
+
     /*View Custom Overrides*/
 
     @Override
@@ -223,7 +252,7 @@ public class historyController extends AppCompatActivity
     public void onBackPressed() {
         if(mSearchInput.getVisibility() == View.VISIBLE){
             onHideSearch(null);
-        }else if(mHistoryAdapter.isLongPressMenuActive()){
+        }else if((Boolean) mHistoryAdapter.onTrigger(historyEnums.eHistoryAdapterCommands.GET_LONG_SELECTED_STATUS,null)){
             onClearMultipleSelection(null);
         }else {
             onBackPressed(null);
@@ -308,7 +337,7 @@ public class historyController extends AppCompatActivity
 
     public class adapterCallback implements eventObserver.eventListener{
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
             if(e_type.equals(enums.etype.url_triggered)){
                 String url_temp = helperMethod.completeURL(data.get(0).toString());
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyEnums.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyEnums.java
index cbb99a1d..3dc9d439 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyEnums.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyEnums.java
@@ -4,11 +4,11 @@ public class historyEnums
 {
     /*History Manager*/
     public enum eHistoryViewCommands {
-        M_UPDATE_LIST_IF_EMPTY, M_UPDATE_LIST, M_REMOVE_FROM_LIST, M_CLEAR_LIST,M_VERTIFY_SELECTION_MENU, M_CLOSE_MENU, M_HIDE_SEARCH, M_LONG_PRESS_MENU
+        M_UPDATE_LIST_IF_EMPTY, M_UPDATE_LIST, M_REMOVE_FROM_LIST, M_CLEAR_LIST,M_VERTIFY_SELECTION_MENU, M_CLOSE_MENU, M_HIDE_SEARCH, M_LONG_PRESS_MENU, ON_GENERATE_SWIPABLE_BACKGROUND
     }
 
     public enum eHistoryAdapterCommands {
-        M_ON_LOADING, M_LOADING_CLEAR, M_CLEAR_LONG_SELECTED_URL, GET_SELECTED_URL, GET_LONG_SELECTED_URL
+        M_ON_LOADING, M_LOADING_CLEAR, M_CLEAR_LONG_SELECTED_URL, GET_SELECTED_URL, GET_LONG_SELECTED_URL, GET_LONG_SELECTED_STATUS, ON_CLOSE
     }
 
     public enum eHistoryViewAdapterCommands {
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyViewController.java
index c0b9d7c9..a101e963 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyViewController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyViewController.java
@@ -1,6 +1,11 @@
 package com.darkweb.genesissearchengine.appManager.historyManager;
 
 import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
 import android.os.Build;
 import android.view.View;
 import android.view.Window;
@@ -14,6 +19,7 @@ import android.widget.PopupWindow;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 import com.darkweb.genesissearchengine.constants.strings;
 import com.darkweb.genesissearchengine.helperManager.helperMethod;
@@ -33,6 +39,9 @@ class historyViewController
     private ImageButton mSearchButton;
     private PopupWindow mPopupWindow = null;
 
+    /*Private Local Variables*/
+    private Paint mPainter = new Paint();
+
     /*Initializations*/
 
     historyViewController(ImageView pEmptyListNotification, EditText pSearchInput, RecyclerView pRecycleView, Button pClearButton,AppCompatActivity pContext,ImageButton pMenuButton,ImageButton pSearchButton)
@@ -178,6 +187,36 @@ class historyViewController
         mPopupWindow = helperMethod.onCreateMenu(pView, R.layout.recyclerview__menu);
     }
 
+    private void onDrawSwipableBackground(Canvas pCanvas, RecyclerView.ViewHolder pViewHolder, float pDX, int pActionState) {
+
+        Bitmap icon;
+        if(pActionState == ItemTouchHelper.ANIMATION_TYPE_SWIPE_SUCCESS){
+            View itemView = pViewHolder.itemView;
+            itemView.animate().alpha(0f);
+        }
+        else if(pActionState == ItemTouchHelper.ACTION_STATE_SWIPE){
+            View itemView = pViewHolder.itemView;
+            float height = (float) itemView.getBottom() - (float) itemView.getTop();
+            float width = height / 3;
+
+            if(pDX > 0){
+                mPainter.setColor(ContextCompat.getColor(mContext, R.color.c_list_item_current));
+                RectF background = new RectF((float) itemView.getLeft(), (float) itemView.getTop(), pDX,(float) itemView.getBottom());
+                pCanvas.drawRect(background, mPainter);
+                icon = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.dustbin);
+                RectF icon_dest = new RectF((float) itemView.getLeft() + width ,(float) itemView.getTop() + width,(float) itemView.getLeft()+ 2*width,(float)itemView.getBottom() - width);
+                pCanvas.drawBitmap(icon,null,icon_dest, mPainter);
+            } else {
+                mPainter.setColor(ContextCompat.getColor(mContext, R.color.c_list_item_current));
+                RectF background = new RectF((float) itemView.getRight() + pDX, (float) itemView.getTop(),(float) itemView.getRight(), (float) itemView.getBottom());
+                pCanvas.drawRect(background, mPainter);
+                icon = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.dustbin);
+                RectF icon_dest = new RectF((float) itemView.getRight() - 2*width ,(float) itemView.getTop() + width,(float) itemView.getRight() - width,(float)itemView.getBottom() - width);
+                pCanvas.drawBitmap(icon,null,icon_dest, mPainter);
+            }
+        }
+    }
+
     public Object onTrigger(historyEnums.eHistoryViewCommands pCommands, List<Object> pData){
         if(pCommands == historyEnums.eHistoryViewCommands.M_UPDATE_LIST_IF_EMPTY){
             updateIfListEmpty((int)pData.get(0), (int)pData.get(1));
@@ -202,6 +241,8 @@ class historyViewController
         }
         else if(pCommands == historyEnums.eHistoryViewCommands.M_LONG_PRESS_MENU){
             onLongPressMenu((View) pData.get(0));
+        }else if(pCommands.equals(historyEnums.eHistoryViewCommands.ON_GENERATE_SWIPABLE_BACKGROUND)){
+            onDrawSwipableBackground((Canvas)pData.get(0), (RecyclerView.ViewHolder)pData.get(1), (float)pData.get(2), (int)pData.get(3));
         }
         return null;
     }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoClients.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoClients.java
index 6841615f..cc600392 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoClients.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoClients.java
@@ -5,10 +5,13 @@ import android.net.Uri;
 
 import androidx.appcompat.app.AppCompatActivity;
 import com.darkweb.genesissearchengine.constants.*;
+import com.darkweb.genesissearchengine.dataManager.dataController;
+import com.darkweb.genesissearchengine.dataManager.dataEnums;
 import com.darkweb.genesissearchengine.helperManager.eventObserver;
 import com.darkweb.genesissearchengine.helperManager.helperMethod;
 import java.io.File;
 import java.net.URI;
+import java.util.Arrays;
 import java.util.List;
 import static com.darkweb.genesissearchengine.constants.enums.etype.on_handle_external_intent;
 import static org.mozilla.geckoview.GeckoSessionSettings.USER_AGENT_MODE_MOBILE;
@@ -146,6 +149,10 @@ class geckoClients
         mSession.loadUri(url);
     }
 
+    public void onRedrawPixel(){
+        mSession.onRedrawPixel();
+    }
+
     void onClearSiteData(){
         mRuntime.getStorageController().clearData(SITE_SETTINGS);
         mRuntime.getStorageController().clearData(SITE_DATA);
@@ -249,9 +256,9 @@ class geckoClients
 
     public class geckoViewClientCallback implements eventObserver.eventListener{
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
-            if (mSessionID == (int)data.get(1) || e_type.equals(enums.etype.on_update_favicon) ||e_type.equals(enums.etype.on_update_history) || e_type.equals(enums.etype.on_request_completed) || e_type.equals(enums.etype.on_update_suggestion) || e_type.equals(enums.etype.on_update_suggestion_url))
+            if (mSessionID == (int)data.get(1) || e_type.equals(enums.etype.FINDER_RESULT_CALLBACK) || e_type.equals(enums.etype.ON_UPDATE_TAB_TITLE) || e_type.equals(enums.etype.on_update_favicon) ||e_type.equals(enums.etype.on_update_history) || e_type.equals(enums.etype.on_request_completed) || e_type.equals(enums.etype.on_update_suggestion) || e_type.equals(enums.etype.on_update_suggestion_url))
             {
                 if (e_type.equals(on_handle_external_intent))
                 {
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoSession.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoSession.java
index 88001423..dc373656 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoSession.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoSession.java
@@ -21,6 +21,8 @@ import android.util.Log;
 import android.view.autofill.AutofillManager;
 import android.view.autofill.AutofillValue;
 import android.widget.Toast;
+import org.mozilla.gecko.EventDispatcher;
+import androidx.annotation.AnyThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
@@ -30,6 +32,7 @@ import androidx.core.content.FileProvider;
 import com.darkweb.genesissearchengine.constants.enums;
 import com.darkweb.genesissearchengine.constants.status;
 import com.darkweb.genesissearchengine.constants.strings;
+import com.darkweb.genesissearchengine.dataManager.dataEnums;
 import com.darkweb.genesissearchengine.helperManager.JavaScriptInterface;
 import com.darkweb.genesissearchengine.helperManager.downloadFileService;
 import com.darkweb.genesissearchengine.helperManager.errorHandler;
@@ -41,18 +44,20 @@ import org.mozilla.geckoview.Autofill;
 import org.mozilla.geckoview.GeckoResult;
 import org.mozilla.geckoview.GeckoSession;
 import org.mozilla.geckoview.GeckoView;
+import org.mozilla.geckoview.SessionFinder;
 import org.mozilla.geckoview.WebRequestError;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import static org.mozilla.geckoview.GeckoSessionSettings.USER_AGENT_MODE_DESKTOP;
 import static org.mozilla.geckoview.GeckoSessionSettings.USER_AGENT_MODE_MOBILE;
 
-public class geckoSession extends GeckoSession implements GeckoSession.PermissionDelegate,GeckoSession.ProgressDelegate, GeckoSession.HistoryDelegate,GeckoSession.NavigationDelegate,GeckoSession.ContentDelegate
+public class geckoSession extends GeckoSession implements GeckoSession.ScrollDelegate,GeckoSession.PermissionDelegate,GeckoSession.ProgressDelegate, GeckoSession.HistoryDelegate,GeckoSession.NavigationDelegate,GeckoSession.ContentDelegate
 {
     private eventObserver.eventListener event;
 
@@ -85,6 +90,7 @@ public class geckoSession extends GeckoSession implements GeckoSession.Permissio
         setContentDelegate(this);
         setAutoFillDelegate();
         setPermissionDelegate(this);
+        setScrollDelegate(this);
         mDownloadManager = new geckoDownloadManager();
         setPromptDelegate(new geckoPromptView(mContext));
         this.event = event;
@@ -110,6 +116,14 @@ public class geckoSession extends GeckoSession implements GeckoSession.Permissio
         m_current_url_id = -1;
     }
 
+    /*Scroll Delegate*/
+
+    @Override
+    public void onScrollChanged(GeckoSession session, int scrollX, int scrollY){
+        Log.i("SUPERMAN",scrollX + " - " + scrollY);
+        event.invokeObserver(Collections.singletonList(true), enums.etype.ON_UPDATE_TITLE_BAR);
+    }
+
     /*Autofill Delegate*/
 
     public void setAutoFillDelegate(){
@@ -190,7 +204,9 @@ public class geckoSession extends GeckoSession implements GeckoSession.Permissio
 
     @UiThread
     public void onPageStop(@NonNull GeckoSession var1, boolean var2) {
-
+        if(var2){
+            event.invokeObserver(Arrays.asList("",mSessionID,mCurrentTitle, m_current_url_id), dataEnums.eTabCommands.M_UPDATE_PIXEL);
+        }
     }
 
     @Override
@@ -206,12 +222,17 @@ public class geckoSession extends GeckoSession implements GeckoSession.Permissio
         }
     }
 
+    public void onRedrawPixel(){
+        event.invokeObserver(Arrays.asList("",mSessionID,mCurrentTitle, m_current_url_id), dataEnums.eTabCommands.M_UPDATE_PIXEL);
+    }
+
     /*History Delegate*/
     @Override
     public GeckoResult<Boolean> onVisited(@NonNull GeckoSession var1, @NonNull String var2, @Nullable String var3, int var4) {
         if(var4==3 || var4==5 || var4==1){
             event.invokeObserver(Arrays.asList(var2,mSessionID), enums.etype.on_url_load);
             m_current_url_id = (int)event.invokeObserver(Arrays.asList(var2,mSessionID,mCurrentTitle, m_current_url_id), enums.etype.on_update_history);
+            event.invokeObserver(Arrays.asList(var2,mSessionID,mCurrentTitle, m_current_url_id), dataEnums.eTabCommands.M_UPDATE_PIXEL);
             isPageLoading = false;
         }
         return null;
@@ -228,6 +249,7 @@ public class geckoSession extends GeckoSession implements GeckoSession.Permissio
         String newUrl = Objects.requireNonNull(var2).split("#")[0];
         if(!mCurrentTitle.equals("loading")){
             m_current_url_id = (int)event.invokeObserver(Arrays.asList(mCurrentURL,mSessionID,mCurrentTitle, m_current_url_id), enums.etype.on_update_history);
+            event.invokeObserver(Arrays.asList(var2,mSessionID,mCurrentTitle, m_current_url_id), dataEnums.eTabCommands.M_UPDATE_PIXEL);
         }
         mCurrentURL = newUrl;
 
@@ -298,6 +320,8 @@ public class geckoSession extends GeckoSession implements GeckoSession.Permissio
         if(var2!=null && !var2.equals(strings.GENERIC_EMPTY_STR) && var2.length()>2 && !var2.equals("about:blank")){
             mCurrentTitle = var2;
             m_current_url_id = (int)event.invokeObserver(Arrays.asList(mCurrentURL,mSessionID,mCurrentTitle, m_current_url_id), enums.etype.on_update_history);
+            event.invokeObserver(Arrays.asList(var2,mSessionID,mCurrentTitle, m_current_url_id), dataEnums.eTabCommands.M_UPDATE_PIXEL);
+            event.invokeObserver(Arrays.asList(mCurrentURL,mSessionID,mCurrentTitle), enums.etype.ON_UPDATE_TAB_TITLE);
         }
     }
 
@@ -526,6 +550,21 @@ public class geckoSession extends GeckoSession implements GeckoSession.Permissio
         event.invokeObserver(Arrays.asList(null,mSessionID), enums.etype.on_close_sesson);
     }
 
+    public void findInPage(String pQuery, int pDirection){
+        new Thread(){
+            public void run(){
+                try {
+                    FinderResult mFinder = getFinder().find(pQuery, pDirection).poll(600);
+                    if(mFinder!=null){
+                        event.invokeObserver(Arrays.asList(mFinder.total, mFinder.current), enums.etype.FINDER_RESULT_CALLBACK);
+                    }
+                } catch (Throwable throwable) {
+                    throwable.printStackTrace();
+                }
+            }
+        }.start();
+    }
+
     void goBackSession(){
 
         if(mHistoryList!=null){
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController.java
index 166c8946..e2f5b7e5 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController.java
@@ -52,6 +52,7 @@ import com.darkweb.genesissearchengine.pluginManager.pluginController;
 import com.example.myapplication.R;
 import com.google.android.gms.ads.AdView;
 
+import org.mozilla.geckoview.GeckoSession;
 import org.mozilla.geckoview.GeckoView;
 import org.torproject.android.service.util.Prefs;
 import org.torproject.android.service.wrapper.LocaleHelper;
@@ -91,6 +92,9 @@ public class homeController extends AppCompatActivity implements ComponentCallba
     private ImageView mBackSplash;
     private Button mConnectButton;
     private Button mNewTab;
+    private View mFindBar;
+    private EditText mFindText;
+    private TextView mFindCount;
 
     /*Redirection Objects*/
     private boolean mPageClosed = false;
@@ -103,7 +107,6 @@ public class homeController extends AppCompatActivity implements ComponentCallba
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
-
             pluginController.getInstance().preInitialize(this);
             databaseController.getInstance().initialize(this);
             dataController.getInstance().initialize(this);
@@ -186,6 +189,13 @@ public class homeController extends AppCompatActivity implements ComponentCallba
             status.sSettingFirstStart = false;
             dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_FIRST_INSTALLED,false));
         }
+
+        if(status.sSettingIsAppStarted){
+            mHomeViewController.onPageFinished();
+            mSplashScreen.setAlpha(0);
+            onLoadURL(status.mCurrentReloadURL);
+            mHomeViewController.onProgressBarUpdate(100);
+        }
     }
 
     public void initializeAppModel()
@@ -210,12 +220,15 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         mBackSplash = findViewById(R.id.backsplash);
         mConnectButton = findViewById(R.id.Connect);
         mNewTab = findViewById(R.id.newButtonInvoke);
+        mFindBar = findViewById(R.id.pFindBar);
+        mFindText = findViewById(R.id.pFindText);
+        mFindCount = findViewById(R.id.pFindCount);
 
         mGeckoView.setSaveEnabled(false);
         mGeckoView.setSaveFromParentEnabled(false);
 
         mGeckoClient = new geckoClients();
-        mHomeViewController.initialization(new homeViewCallback(),this,mNewTab, mWebViewContainer, mLoadingText, mProgressBar, mSearchbar, mSplashScreen, mLoadingIcon, mBannerAds,(ArrayList<historyRowModel>)dataController.getInstance().invokeSuggestion(dataEnums.eSuggestionCommands.M_GET_SUGGESTION, null), mGatewaySplash, mTopBar, mGeckoView, mBackSplash, mConnectButton);
+        mHomeViewController.initialization(new homeViewCallback(),this,mNewTab, mWebViewContainer, mLoadingText, mProgressBar, mSearchbar, mSplashScreen, mLoadingIcon, mBannerAds,(ArrayList<historyRowModel>)dataController.getInstance().invokeSuggestion(dataEnums.eSuggestionCommands.M_GET_SUGGESTION, null), mGatewaySplash, mTopBar, mGeckoView, mBackSplash, mConnectButton, mFindBar, mFindText, mFindCount);
     }
 
     public void onChangeTheme(){
@@ -243,7 +256,6 @@ public class homeController extends AppCompatActivity implements ComponentCallba
 
     public void initializeGeckoView(boolean isForced){
         mGeckoClient.initialize(mGeckoView, new geckoViewCallback(), this,isForced);
-        //mGeckoClient.loadURL("about:blank");
         onSaveCurrentTab(mGeckoClient.getSession(),false);
         mHomeViewController.initTab((int)dataController.getInstance().invokeTab(dataEnums.eTabCommands.GET_TOTAL_TAB, null));
     }
@@ -295,9 +307,10 @@ public class homeController extends AppCompatActivity implements ComponentCallba
             dataController.getInstance().invokeTab(dataEnums.eTabCommands.MOVE_TAB_TO_TOP, Collections.singletonList(mTempSession));
         }
 
-        mGeckoView.releaseSession();
         mGeckoClient.initSession(mTempSession);
+        mGeckoView.releaseSession();
         mGeckoView.setSession(mTempSession);
+        mGeckoClient.onRedrawPixel();
 
         mHomeViewController.onClearSelections(false);
         mHomeViewController.onUpdateSearchBar(mTempSession.getCurrentURL(),false);
@@ -306,6 +319,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         }else {
             mHomeViewController.progressBarReset();
         }
+        mGeckoClient.onRedrawPixel();
     }
 
     /*-------------------------------------------------------USER EVENTS-------------------------------------------------------*/
@@ -340,6 +354,27 @@ public class homeController extends AppCompatActivity implements ComponentCallba
 
         registerReceiver(downloadStatus,new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
 
+        mFindText.addTextChangedListener(new TextWatcher() {
+
+            @Override
+            public void afterTextChanged(Editable s) {
+            }
+
+            @Override
+            public void beforeTextChanged(CharSequence s, int start,int count, int after) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start,int before, int count) {
+                if(mFindText.getText().length()==0){
+                        mGeckoClient.getSession().getFinder().clear();
+                        mHomeViewController.onUpdateFindBarCount(0,0);
+                    }else {
+                        mGeckoClient.getSession().findInPage(mFindText.getText().toString(), GeckoSession.FINDER_FIND_MATCH_CASE & GeckoSession.FINDER_DISPLAY_HIGHLIGHT_ALL);
+                }
+            }
+        });
+
         mSearchbar.setOnEditorActionListener((v, actionId, event) ->
         {
             if (actionId == EditorInfo.IME_ACTION_NEXT || actionId == EditorInfo.IME_ACTION_GO || actionId == EditorInfo.IME_ACTION_DONE)
@@ -411,7 +446,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
 
     void onSearchBarInvoked(View view){
         String url = ((EditText)view).getText().toString();
-        String validated_url = mHomeModel.urlComplete(url);
+        String validated_url = mHomeModel.urlComplete(url, mHomeModel.getSearchEngine());
         if(validated_url!=null){
             url = validated_url;
         }
@@ -426,19 +461,24 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         onLoadURL(val);
     }
 
+    public void applyTheme(){
+        status.mCurrentReloadURL = mSearchbar.getText().toString();
+        recreate();
+    }
+
     public void onHomeButton(View view){
         pluginController.getInstance().logEvent(strings.EVENT_HOME_INVOKED);
-        onLoadURL(mHomeModel.getSearchEngine());
+        onLoadURL(helperMethod.getDomainName(mHomeModel.getSearchEngine()));
         mHomeViewController.onUpdateLogo();
     }
 
     public void onNewTab(boolean isKeyboardOpenedTemp, boolean isKeyboardOpened){
+        mGeckoClient.onRedrawPixel();
         initializeGeckoView(true);
         if(status.sOpenURLInNewTab){
             onLoadURL(helperMethod.getDomainName(status.sSettingSearchStatus));
             mHomeViewController. onUpdateSearchBar(helperMethod.getDomainName(status.sSettingSearchStatus),false);
         }else {
-            mGeckoView.releaseSession();
             onLoadURL("about:blank");
             mHomeViewController. onUpdateSearchBar(strings.HOME_BLANK_PAGE,false);
         }
@@ -448,10 +488,15 @@ public class homeController extends AppCompatActivity implements ComponentCallba
     }
 
     public void onOpenTabViewBoundary(View view){
+        mGeckoClient.onRedrawPixel();
+        final Handler handler = new Handler();
         mNewTab.setPressed(true);
         isTabMenuOpened = true;
-        helperMethod.openActivity(tabController.class, constants.CONST_LIST_HISTORY, homeController.this,true);
-        overridePendingTransition(R.anim.popup_anim_in, R.anim.popup_anim_out);
+        handler.postDelayed(() ->
+        {
+            helperMethod.openActivity(tabController.class, constants.CONST_LIST_HISTORY, homeController.this,true);
+            overridePendingTransition(R.anim.popup_anim_in, R.anim.popup_anim_out);
+        }, 100);
     }
 
     public void onNotificationInvoked(String message,enums.etype e_type){
@@ -459,7 +504,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
     }
 
     public void onOpenMenuItem(View view){
-        pluginController.getInstance().setLanguage(this);
+        pluginController.getInstance().setLanguage();
         pluginController.getInstance().logEvent(strings.EVENT_MENU_INVOKED);
         status.sSettingIsAppStarted = true;
         pluginController.getInstance().onResetMessage();
@@ -467,14 +512,17 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         pluginController.getInstance().onCreate(this);
 
 
-        mHomeViewController.onOpenMenu(view,mGeckoClient.canGoBack(),mGeckoClient.canGoForward(),!(mProgressBar.getAlpha()<=0 || mProgressBar.getVisibility() ==View.INVISIBLE),mGeckoClient.getUserAgent());
+        mHomeViewController.onOpenMenu(view,mGeckoClient.canGoBack(),!(mProgressBar.getAlpha()<=0 || mProgressBar.getVisibility() ==View.INVISIBLE),mGeckoClient.getUserAgent());
     }
 
     @Override
     public void onBackPressed(){
         pluginController.getInstance().logEvent(strings.EVENT_ON_BACK);
         mSearchbar.clearFocus();
-        if(mGeckoClient.getFullScreenStatus()){
+        if(mFindBar.getVisibility() == View.VISIBLE){
+            mHomeViewController.onUpdateFindBar(false);
+        }
+        else if(mGeckoClient.getFullScreenStatus()){
             mGeckoClient.onBackPressed(true);
             mHomeViewController.onClearSelections(true);
         }
@@ -551,18 +599,11 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         if(status.sSettingIsAppStarted){
             onStartApplication(null);
         }
-        super.onResume();
-    }
-
-    public void onAcquireDisplay(){
-        isTabMenuOpened = false;
-        tabRowModel model = (tabRowModel)dataController.getInstance().invokeTab(dataEnums.eTabCommands.GET_CURRENT_TAB, null);
-        if(model==null){
-            onLoadTab(model.getSession(),true);
-        }else {
-            mGeckoView.releaseSession();
-            mGeckoView.setSession(model.getSession());
+        if((int)dataController.getInstance().invokeTab(dataEnums.eTabCommands.GET_TOTAL_TAB, null)<=0){
+            onNewTab(false, false);
         }
+
+        super.onResume();
     }
 
     @Override
@@ -621,6 +662,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
     }
 
     public void onOpenLinkNewTab(String url){
+        mGeckoClient.onRedrawPixel();
         initializeGeckoView(true);
         mHomeViewController.progressBarReset();
         mHomeViewController.onNewTab(false,isKeyboardOpened);
@@ -659,10 +701,6 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         mHomeViewController.initTab((int)dataController.getInstance().invokeTab(dataEnums.eTabCommands.GET_TOTAL_TAB, null));
     }
 
-    public void releaseSession(){
-        mGeckoView.releaseSession();
-    }
-
     public void loadExistingTab(){
         tabRowModel model = (tabRowModel)dataController.getInstance().invokeTab(dataEnums.eTabCommands.GET_CURRENT_TAB, null);
         if (model != null)
@@ -673,6 +711,21 @@ public class homeController extends AppCompatActivity implements ComponentCallba
 
     /*-------------------------------------------------------CALLBACKS-------------------------------------------------------*/
 
+    public void onHideFindBar(View view){
+        mHomeViewController.onUpdateFindBar(false);
+        mGeckoClient.getSession().getFinder().clear();
+    }
+
+    public void onFindNext(View view){
+        mFindText.setText("0/0");
+        mGeckoClient.getSession().findInPage(mFindText.getText().toString(), GeckoSession.FINDER_FIND_MATCH_CASE & GeckoSession.FINDER_DISPLAY_HIGHLIGHT_ALL);
+    }
+
+    public void onFindPrev(View view){
+        mFindText.setText("0/0");
+        mGeckoClient.getSession().findInPage(mFindText.getText().toString(), GeckoSession.FINDER_FIND_BACKWARDS & GeckoSession.FINDER_DISPLAY_HIGHLIGHT_ALL);
+    }
+
     public void onOpenDownloadFolder(View view){
         helperMethod.openDownloadFolder(homeController.this);
     }
@@ -690,6 +743,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         else {
             mSearchbar.clearFocus();
             if (menuId == R.id.menu12) {
+                mHomeViewController.closeMenu();
                 helperMethod.hideKeyboard(this);
                 helperMethod.openActivity(orbotLogController.class, constants.CONST_LIST_HISTORY, homeController.this,true);
             }
@@ -736,6 +790,11 @@ public class homeController extends AppCompatActivity implements ComponentCallba
                 helperMethod.hideKeyboard(this);
                 helperMethod.shareApp(homeController.this);
             }
+            else if (menuId == R.id.pMenuFind)
+            {
+                helperMethod.hideKeyboard(this);
+                mHomeViewController.onUpdateFindBar(true);
+            }
             if (menuId == R.id.menu20) {
                 helperMethod.hideKeyboard(this);
                 mGeckoClient.onStop();
@@ -770,13 +829,14 @@ public class homeController extends AppCompatActivity implements ComponentCallba
     }
 
     public void onOrbotLog(View view) {
+        mHomeViewController.closeMenu();
         helperMethod.openActivity(orbotLogController.class, constants.CONST_LIST_HISTORY, homeController.this,true);
     }
 
     public class homeViewCallback implements eventObserver.eventListener{
 
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
            if(e_type.equals(enums.etype.download_folder))
            {
@@ -819,14 +879,17 @@ public class homeController extends AppCompatActivity implements ComponentCallba
     public class geckoViewCallback implements eventObserver.eventListener{
 
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
             if(e_type.equals(enums.etype.progress_update)){
                 mHomeViewController.onProgressBarUpdate((int)data.get(0));
             }
+            else if(e_type.equals(enums.etype.ON_UPDATE_TITLE_BAR)){
+                mHomeViewController.onUpdateTitleBar((boolean)data.get(0));
+            }
             else if(e_type.equals(enums.etype.on_url_load)){
                 mHomeViewController.onUpdateSearchBar(dataToStr(data.get(0),mGeckoClient.getSession().getCurrentURL()),false);
-        }
+            }
             else if(e_type.equals(enums.etype.back_list_empty)){
                 if((int)dataController.getInstance().invokeTab(dataEnums.eTabCommands.GET_TOTAL_TAB, null)>1){
                     if(!onCloseCurrentTab(mGeckoClient.getSession())){
@@ -841,7 +904,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
             }
             else if(e_type.equals(enums.etype.on_update_history)){
                 if(activityContextManager.getInstance().getTabController()!=null && !activityContextManager.getInstance().getTabController().isDestroyed() && !activityContextManager.getInstance().getTabController().isFinishing()){
-                    activityContextManager.getInstance().getTabController().onTabRowChanged((int)data.get(1));
+                    dataController.getInstance().invokeTab(dataEnums.eTabCommands.M_UPDATE_PIXEL, Arrays.asList(data.get(1), mGeckoView.capturePixels()));
                 }
                 return dataController.getInstance().invokeHistory(dataEnums.eHistoryCommands.M_ADD_HISTORY ,data);
             }
@@ -876,7 +939,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
                 }
             }
             else if(e_type.equals(enums.etype.on_load_error)){
-                pluginController.getInstance().setLanguage(homeController.this);
+                pluginController.getInstance().setLanguage();
                 initLocalLanguage();
                 mHomeViewController.onPageFinished();
                 mHomeViewController.onUpdateSearchBar(dataToStr(data.get(0),mGeckoClient.getSession().getCurrentURL()),false);
@@ -917,6 +980,21 @@ public class homeController extends AppCompatActivity implements ComponentCallba
             else if(e_type.equals(enums.etype.on_update_suggestion_url)){
                 dataController.getInstance().invokeSuggestion(dataEnums.eSuggestionCommands.M_UPDATE_SUGGESTION, Arrays.asList(dataToStr(data.get(0)),dataToStr(data.get(2))));
             }
+            else if(e_type.equals(enums.etype.ON_UPDATE_TAB_TITLE)){
+                if(activityContextManager.getInstance().getTabController()!=null && !activityContextManager.getInstance().getTabController().isDestroyed())
+                activityContextManager.getInstance().getTabController().onTabRowChanged((int)data.get(1));
+            }
+            else if(e_type.equals(dataEnums.eTabCommands.M_UPDATE_PIXEL)){
+                try{
+                    dataController.getInstance().invokeTab(dataEnums.eTabCommands.M_UPDATE_PIXEL, Arrays.asList(data.get(1), mGeckoView.capturePixels()));
+                }catch (Exception ex){
+
+                }
+            }
+            else if(e_type.equals(enums.etype.FINDER_RESULT_CALLBACK)){
+                mHomeViewController.onUpdateFindBarCount((int)data.get(0),(int)data.get(1));
+            }
+
             return null;
         }
     }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeModel.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeModel.java
index 4e48f70b..f89dd058 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeModel.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeModel.java
@@ -15,13 +15,13 @@ class homeModel
         return status.sSettingSearchStatus;
     }
 
-    String urlComplete(String url){
-        if(url.equals("about:config")){
-            return url;
+    String urlComplete(String pURL, String pSearchEngine){
+        if(pURL.equals("about:config")){
+            return pURL;
         }else {
             try
             {
-                String updateUrl = helperMethod.completeURL(url);
+                String updateUrl = helperMethod.completeURL(pURL);
                 URL host = new URL(updateUrl);
                 boolean isUrlValid = Patterns.WEB_URL.matcher(updateUrl).matches();
                 if(isUrlValid && host.getHost().replace("www.","").contains("."))
@@ -34,7 +34,7 @@ class homeModel
                 ex.printStackTrace();
             }
 
-            return constants.CONST_BACKEND_GOOGLE_URL.replace("$s",url.replaceAll(" ","+"));
+            return pSearchEngine.replace("$s",pURL.replaceAll(" ","+"));
         }
     }
 
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeViewController.java
index 63fb0f7c..b0e51cf8 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeViewController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeViewController.java
@@ -21,6 +21,8 @@ import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
 import android.view.Window;
 import android.view.WindowManager;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.view.animation.DecelerateInterpolator;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
@@ -73,12 +75,15 @@ class homeViewController
     private Button mConnectButton;
     private Button mNewTab;
     private PopupWindow popupWindow = null;
+    private View mFindBar;
+    private EditText mFindText;
+    private TextView mFindCount;
 
     /*Local Variables*/
     private Callable<String> mLogs = null;
     private boolean isLandscape = false;
 
-    void initialization(eventObserver.eventListener event, AppCompatActivity context, Button mNewTab, FrameLayout webviewContainer, TextView loadingText, com.darkweb.genesissearchengine.widget.AnimatedProgressBar progressBar, AutoCompleteTextView searchbar, ConstraintLayout splashScreen, ImageView loading, AdView banner_ads, ArrayList<historyRowModel> suggestions, ImageButton gateway_splash, LinearLayout top_bar, GeckoView gecko_view, ImageView backsplash, Button connect_button){
+    void initialization(eventObserver.eventListener event, AppCompatActivity context, Button mNewTab, FrameLayout webviewContainer, TextView loadingText, com.darkweb.genesissearchengine.widget.AnimatedProgressBar progressBar, AutoCompleteTextView searchbar, ConstraintLayout splashScreen, ImageView loading, AdView banner_ads, ArrayList<historyRowModel> suggestions, ImageButton gateway_splash, LinearLayout top_bar, GeckoView gecko_view, ImageView backsplash, Button connect_button, View pFindBar, EditText pFindText, TextView pFindCount){
         this.mContext = context;
         this.mProgressBar = progressBar;
         this.mSearchbar = searchbar;
@@ -95,12 +100,16 @@ class homeViewController
         this.mConnectButton = connect_button;
         this.mNewTab = mNewTab;
         this.popupWindow = null;
+        this.mFindBar = pFindBar;
+        this.mFindText = pFindText;
+        this.mFindCount = pFindCount;
 
         initSplashScreen();
         initializeSuggestionView(suggestions);
         initLock();
         initSearchImage();
         createUpdateUiHandler();
+        recreateStatusBar();
     }
 
     private void initSearchImage(){
@@ -108,11 +117,6 @@ class homeViewController
 
     void initTab(int count){
         mNewTab.setText((count+strings.GENERIC_EMPTY_STR));
-
-        YoYo.with(Techniques.FlipInX)
-                .duration(450)
-                .repeat(0)
-                .playOn(mNewTab);
     }
 
     private void initPostUI(boolean isSplash){
@@ -138,12 +142,34 @@ class homeViewController
         }
     }
 
+    public void recreateStatusBar(){
+        if(status.sSettingIsAppStarted){
+            Window window = mContext.getWindow();
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
+                window.setStatusBarColor(mContext.getResources().getColor(R.color.blue_dark));
+            }
+            else {
+                if(AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_NO){
+                    mContext.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+                }else {
+                    mContext.getWindow().setStatusBarColor(ContextCompat.getColor(mContext, R.color.black));
+                    View decorView = mContext.getWindow().getDecorView();
+                    decorView.setSystemUiVisibility(decorView.getSystemUiVisibility() & ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+                }
+                mContext.getWindow().setStatusBarColor(ContextCompat.getColor(mContext, R.color.c_background));
+            }
+        }else {
+            onProgressBarUpdate(100);
+        }
+    }
 
     @RequiresApi(api = Build.VERSION_CODES.M)
     private void initStatusBarColor() {
-        animatedColor oneToTwo = new animatedColor(ContextCompat.getColor(mContext, R.color.landing_ease_blue), ContextCompat.getColor(mContext, R.color.landing_ease_blue_light_1));
-        animatedColor twoToThree = new animatedColor(ContextCompat.getColor(mContext, R.color.landing_ease_blue_light_1), ContextCompat.getColor(mContext, R.color.white));
-        animatedColor ThreeToFour = new animatedColor(ContextCompat.getColor(mContext, R.color.white), ContextCompat.getColor(mContext, R.color.white));
+        animatedColor oneToTwo = new animatedColor(ContextCompat.getColor(mContext, R.color.landing_ease_blue), ContextCompat.getColor(mContext, R.color.landing_ease_blue));
+        animatedColor twoToThree = new animatedColor(ContextCompat.getColor(mContext, R.color.landing_ease_blue), ContextCompat.getColor(mContext, R.color.c_background));
+        animatedColor ThreeToFour = new animatedColor(ContextCompat.getColor(mContext, R.color.c_background), ContextCompat.getColor(mContext, R.color.c_background));
 
         ValueAnimator animator = ObjectAnimator.ofFloat(0f, 1f).setDuration(0);
         animator.setStartDelay(600);
@@ -164,6 +190,14 @@ class homeViewController
                 {
                     float v = (float) animation1.getAnimatedValue();
                     mContext.getWindow().setStatusBarColor(twoToThree.with(v));
+                    if(AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_NO){
+                        mContext.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+                    }else {
+                        mContext.getWindow().setStatusBarColor(ContextCompat.getColor(mContext, R.color.black));
+                        View decorView = mContext.getWindow().getDecorView();
+                        decorView.setSystemUiVisibility(decorView.getSystemUiVisibility() & ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+                    }
+                    mContext.getWindow().setStatusBarColor(ContextCompat.getColor(mContext, R.color.c_background));
                 });
                 animator2.start();
 
@@ -174,8 +208,6 @@ class homeViewController
                         animator3.addUpdateListener(animation1 ->
                         {
                             float v = (float) animation1.getAnimatedValue();
-                            mContext.getWindow().setStatusBarColor(ThreeToFour.with(v));
-
                         });
                         animator3.start();
                     }
@@ -188,7 +220,7 @@ class homeViewController
     }
 
     private void initLock(){
-        Drawable img = mContext.getResources().getDrawable( R.drawable.icon_lock);
+        @SuppressLint("UseCompatLoadingForDrawables") Drawable img = mContext.getResources().getDrawable( R.drawable.icon_lock);
         mSearchbar.measure(0, 0);
         img.setBounds( -10, (int)(mSearchbar.getMeasuredHeight()*0.00), (int)(mSearchbar.getMeasuredHeight()*1.10)-10, (int)(mSearchbar.getMeasuredHeight()*0.69) );
         mSearchbar.setCompoundDrawables( img, null, null, null );
@@ -246,7 +278,7 @@ class homeViewController
     private void initSplashScreen(){
         mSearchbar.setEnabled(false);
         helperMethod.hideKeyboard(mContext);
-        initPostUI(true);
+        //initPostUI(true);
 
         mBackSplash.getLayoutParams().height = helperMethod.getScreenHeight(mContext) - helperMethod.getStatusBarHeight(mContext)*2;
         mSearchbar.setEnabled(false);
@@ -301,7 +333,9 @@ class homeViewController
         if(mSplashScreen.getAlpha()>=1)
         {
             mSplashScreen.animate().setDuration(300).setStartDelay(500).alpha(0).withEndAction((this::triggerPostUI));
-            initPostUI(false);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                initStatusBarColor();
+            }
         }
     }
 
@@ -315,7 +349,7 @@ class homeViewController
 
     /*-------------------------------------------------------Helper Methods-------------------------------------------------------*/
 
-    void onOpenMenu(View view,boolean canGoForward,boolean canGoBack,boolean isLoading,int userAgent){
+    void onOpenMenu(View view, boolean canGoBack, boolean isLoading, int userAgent){
 
         if(popupWindow!=null){
             popupWindow.dismiss();
@@ -324,7 +358,7 @@ class homeViewController
         LayoutInflater layoutInflater
                 = (LayoutInflater) mContext
                 .getSystemService(LAYOUT_INFLATER_SERVICE);
-        final View popupView = layoutInflater.inflate(R.layout.popup_menu, null);
+        @SuppressLint("InflateParams") final View popupView = layoutInflater.inflate(R.layout.popup_menu, null);
 
 
         int height = helperMethod.getScreenHeight(mContext)*90 /100;
@@ -375,7 +409,7 @@ class homeViewController
                 = (LayoutInflater) mContext
                 .getSystemService(LAYOUT_INFLATER_SERVICE);
         assert layoutInflater != null;
-        final View popupView = layoutInflater.inflate(R.layout.notification_menu, null);
+        @SuppressLint("InflateParams") final View popupView = layoutInflater.inflate(R.layout.notification_menu, null);
         popupWindow = new PopupWindow(
                 popupView,
                 ActionMenuView.LayoutParams.MATCH_PARENT,
@@ -454,6 +488,35 @@ class homeViewController
         }, delay);
     }
 
+    public void onUpdateFindBarCount(int index, int total)
+    {
+        if(total==0){
+            mFindCount.setText(strings.GENERIC_EMPTY_STR);
+        }else {
+            mFindCount.setText((total + "/" + index));
+        }
+    }
+
+    public void onUpdateFindBar(boolean pStatus)
+    {
+        mFindBar.animate().cancel();
+        if(pStatus){
+            mFindBar.setVisibility(View.VISIBLE);
+            mFindBar.setAlpha(1);
+            mFindBar.startAnimation(AnimationUtils.loadAnimation(mContext, R.anim.popup_anim_in));
+            mFindText.requestFocus();
+            InputMethodManager imm = (InputMethodManager) mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.toggleSoftInput(InputMethodManager.SHOW_FORCED,0);
+        }else {
+            mFindText.clearFocus();
+            mFindCount.setText(strings.GENERIC_EMPTY_STR);
+            mFindBar.startAnimation(AnimationUtils.loadAnimation(mContext, R.anim.popup_anim_out));
+            helperMethod.hideKeyboard(mContext);
+            mFindBar.animate().alpha(0).withEndAction(() -> mFindBar.setVisibility(View.GONE));
+            mFindText.setText(strings.GENERIC_EMPTY_STR);
+        }
+    }
+
     private void triggerUpdateSearchBar(String url, boolean showProtocol){
         if (mSearchbar == null || url==null)
         {
@@ -514,6 +577,8 @@ class homeViewController
             mSearchbar.selectAll();
         }
     }
+    Handler mProgressHandler = new Handler();
+    Runnable mProgressBarRunnable = null;
     void onUpdateLogs(String log){
         mLoadingText.setText(log);
     }
@@ -522,16 +587,32 @@ class homeViewController
         mProgressBar.setVisibility(View.INVISIBLE);
     }
     void onProgressBarUpdate(int value){
+        if(mProgressBarRunnable!=null){
+            mProgressHandler.removeCallbacks(mProgressBarRunnable);
+        }
+
         if(mSplashScreen.getAlpha()>0){
             mProgressBar.setProgress(value*100);
         }
         if(value==100){
             mProgressBar.setAlpha(1f);
-            mProgressBar.animate().setStartDelay(200).alpha(0);
+
             setProgressAnimate(mProgressBar,value);
+
+            mProgressBarRunnable = () -> {
+                animation.removeAllListeners();
+                animation.end();
+                animation.cancel();
+                mProgressBar.animate().cancel();
+                mProgressBar.animate().alpha(0);
+            };
+            mProgressHandler.postDelayed(mProgressBarRunnable, 250);
+
+            return;
         }
         else if(mSplashScreen.getAlpha()==0) {
             mProgressBar.setVisibility(View.VISIBLE);
+            mProgressBar.animate().cancel();
             mProgressBar.animate().setStartDelay(50).alpha(1);
         }
         setProgressAnimate(mProgressBar,value);
@@ -554,9 +635,14 @@ class homeViewController
         animation = ObjectAnimator.ofInt(pb, "progress", pb.getProgress(), progressTo * 100);
         animation.setDuration(progress);
         animation.setInterpolator(new DecelerateInterpolator());
+        animation.setAutoCancel(true);
         animation.start();
     }
 
+    void onUpdateTitleBar(boolean pStatus){
+
+    }
+
     void onClearSelections(boolean hideKeyboard){
         mSearchbar.clearFocus();
         if(hideKeyboard){
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/languageManager/languageController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/languageManager/languageController.java
index 0a09fac7..20bdcb3d 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/languageManager/languageController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/languageManager/languageController.java
@@ -48,7 +48,7 @@ public class languageController extends AppCompatActivity {
     public class languageViewCallback implements eventObserver.eventListener{
 
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
 
             return null;
@@ -58,7 +58,7 @@ public class languageController extends AppCompatActivity {
     public void changeLanguage(Locale language){
         status.sSettingLanguage = language.getLanguage();
         dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_STRING, Arrays.asList(keys.SETTING_LANGUAGE,language.getLanguage()));
-        pluginController.getInstance().setLanguage(this);
+        pluginController.getInstance().setLanguage();
     }
 
     /*-------------------------------------------------------CALLBACKS-------------------------------------------------------*/
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotAdapter.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotAdapter.java
new file mode 100644
index 00000000..d9bed779
--- /dev/null
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotAdapter.java
@@ -0,0 +1,83 @@
+package com.darkweb.genesissearchengine.appManager.orbotLogManager;
+
+import android.app.SearchManager;
+import android.content.Intent;
+import android.net.Uri;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.darkweb.genesissearchengine.appManager.activityContextManager;
+import com.darkweb.genesissearchengine.appManager.tabManager.tabEnums;
+import com.darkweb.genesissearchengine.helperManager.eventObserver;
+import com.example.myapplication.R;
+import org.torproject.android.service.wrapper.logRowModel;
+import java.util.ArrayList;
+import java.util.List;
+
+public class orbotAdapter extends RecyclerView.Adapter<orbotAdapter.listViewHolder>
+{
+    /*Private Variables*/
+
+    private ArrayList<logRowModel> mModelList;
+    private eventObserver.eventListener mEvent;
+
+    orbotAdapter(ArrayList<logRowModel> model_list, eventObserver.eventListener event) {
+        this.mModelList = model_list;
+        this.mEvent = event;
+    }
+
+    @NonNull @Override
+    public orbotAdapter.listViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.orbotview_row, parent, false);
+        return new orbotAdapter.listViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull orbotAdapter.listViewHolder holder, int position)
+    {
+        holder.bindListView(mModelList.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return mModelList.size();
+    }
+
+
+    /*View Holder Extensions*/
+    class listViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+        TextView mHeader;
+        TextView mDescription;
+        ConstraintLayout mRowContainerInner;
+
+        listViewHolder(View itemView) {
+            super(itemView);
+        }
+
+        void bindListView(logRowModel model) {
+            mHeader = itemView.findViewById(R.id.pHeader);
+            mDescription = itemView.findViewById(R.id.pDescription);
+            mRowContainerInner = itemView.findViewById(R.id.pRowContainerInner);
+
+            mHeader.setText((mModelList.size() - this.getLayoutPosition() + ". " + model.getLog()));
+            mDescription.setText(model.getDate());
+            mRowContainerInner.setOnClickListener(this);
+        }
+
+        @Override
+        public void onClick(View v) {
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://google.com/search?q=tor logs " + mHeader.getText()));
+            intent.putExtra(SearchManager.QUERY, mDescription.getText());
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            activityContextManager.getInstance().getHomeController().startActivity(intent);
+        }
+    }
+    public Object onTrigger(tabEnums.eTabModelCommands pCommands, List<Object> pData){
+        return null;
+    }
+}
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogController.java
index 468c5a79..6412c8b7 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogController.java
@@ -2,49 +2,116 @@ package com.darkweb.genesissearchengine.appManager.orbotLogManager;
 
 import android.os.Bundle;
 import android.view.View;
+import android.view.ViewTreeObserver;
+import android.view.animation.AnimationUtils;
+import android.view.animation.LayoutAnimationController;
 import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.widget.NestedScrollView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import com.darkweb.genesissearchengine.appManager.activityContextManager;
+import com.darkweb.genesissearchengine.appManager.settingManager.logManager.settingLogController;
+import com.darkweb.genesissearchengine.constants.constants;
 import com.darkweb.genesissearchengine.constants.enums;
+import com.darkweb.genesissearchengine.constants.status;
 import com.darkweb.genesissearchengine.helperManager.eventObserver;
-import com.darkweb.genesissearchengine.pluginManager.pluginController;
+import com.darkweb.genesissearchengine.helperManager.helperMethod;
 import com.example.myapplication.R;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
 import org.torproject.android.service.wrapper.orbotLocalConstants;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
+
+import jp.wasabeef.recyclerview.animators.FadeInDownAnimator;
+import jp.wasabeef.recyclerview.animators.FadeInRightAnimator;
+import jp.wasabeef.recyclerview.animators.FadeInUpAnimator;
+
+import static android.widget.NumberPicker.OnScrollListener.SCROLL_STATE_IDLE;
 
 public class orbotLogController extends AppCompatActivity {
 
     /* PRIVATE VARIABLES */
     private orbotLogModel mOrbotModel;
     private orbotLogViewController mOrbotViewController;
+    private RecyclerView mRecycleView;
+    private orbotAdapter mOrbotAdapter;
+    private NestedScrollView mMainScroll;
+    private FloatingActionButton mFloatingScroller;
 
     private TextView mLogs;
-    private int mLogCounter=0;
     private boolean mActivityClosed = false;
+    int mLogCounter = 0;
 
     /* INITIALIZATIONS */
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        pluginController.getInstance().onCreate(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.orbot_log_view);
 
         viewsInitializations();
         onUpdateLogs();
+        initializeLogs();
+        onScrollListener();
     }
 
     public void viewsInitializations() {
+        mRecycleView = findViewById(R.id.pLogRecycleView);
         mLogs = findViewById(R.id.pLogs);
+        mMainScroll = findViewById(R.id.mMainScroll);
+        mFloatingScroller = findViewById(R.id.pFloatingScroller);
 
         activityContextManager.getInstance().setOrbotLogController(this);
-        mOrbotViewController = new orbotLogViewController(this, mLogs);
-        mOrbotModel = new orbotLogModel(new orbotModelCallback());
+        mOrbotViewController = new orbotLogViewController(this, mLogs, mRecycleView);
+        mOrbotModel = new orbotLogModel();
+    }
+
+    public void initializeLogs(){
+        mLogCounter = 0;
+        if(status.sLogListView){
+            mLogCounter = orbotLocalConstants.mTorLogsHistory.size();
+            mOrbotModel.setList(orbotLocalConstants.mTorLogsHistory);
+            LinearLayoutManager layoutManager = new LinearLayoutManager(orbotLogController.this);
+            orbotAdapter adapter = new orbotAdapter(mOrbotModel.getList(),new orbotLogController.orbotModelCallback());
+            mOrbotAdapter = adapter;
+            layoutManager.setReverseLayout(true);
+
+            LayoutAnimationController controller = AnimationUtils.loadLayoutAnimation(this, R.anim.log_layout_controller);
+            mRecycleView.setLayoutAnimation(controller);
+
+            mRecycleView.setAdapter(adapter);
+            mRecycleView.setItemViewCacheSize(100);
+            mRecycleView.setNestedScrollingEnabled(false);
+            mRecycleView.setItemViewCacheSize(100);
+            mRecycleView.setDrawingCacheEnabled(true);
+            mRecycleView.setDrawingCacheQuality(View.DRAWING_CACHE_QUALITY_HIGH);
+            mRecycleView.setLayoutManager(new LinearLayoutManager(orbotLogController.this));
+            mOrbotAdapter.notifyDataSetChanged();
+        }
+        mOrbotViewController.onTrigger(orbotLogEnums.eOrbotLogViewCommands.M_INIT_VIEWS, null);
+        mRecycleView.smoothScrollToPosition(mOrbotModel.getList().size());
     }
 
     /* LISTENERS */
 
+    private void onScrollListener(){
+        mMainScroll.getViewTreeObserver().addOnScrollChangedListener(() -> {
+            int scrollY = mMainScroll.getScrollY();
+            if(scrollY>0){
+                if(mFloatingScroller.getAlpha()==0){
+                    mFloatingScroller.setVisibility(View.VISIBLE);
+                    mFloatingScroller.animate().alpha(1);
+                }
+            }else {
+                mFloatingScroller.animate().cancel();
+                mFloatingScroller.animate().alpha(0).withEndAction(() -> mFloatingScroller.setVisibility(View.GONE));
+            }
+        });
+    }
+
     public void onUpdateLogs(){
         new Thread(){
             public void run(){
@@ -54,15 +121,25 @@ public class orbotLogController extends AppCompatActivity {
                             break;
                         }
                         if(orbotLocalConstants.mTorLogsHistory.size()>mLogCounter){
-                            sleep(0);
+                            if(!status.sLogListView){
+                                sleep(0);
+                            }else {
+                                sleep(500);
+                            }
                         }else {
-                            sleep(400);
+                            sleep(500);
                         }
 
                         if(orbotLocalConstants.mTorLogsHistory.size()>0){
                             runOnUiThread(() -> {
                                 if(orbotLocalConstants.mTorLogsHistory.size()>mLogCounter){
-                                    mOrbotViewController.onTrigger(orbotLogEnums.eOrbotLogViewCommands.M_UPDATE_LOGS, Collections.singletonList(orbotLocalConstants.mTorLogsHistory.get(mLogCounter)));
+                                    mOrbotModel.getList().add(0,orbotLocalConstants.mTorLogsHistory.get(mLogCounter));
+                                    if(!status.sLogListView){
+                                        mOrbotViewController.onTrigger(orbotLogEnums.eOrbotLogViewCommands.M_UPDATE_LOGS, Collections.singletonList(orbotLocalConstants.mTorLogsHistory.get(mLogCounter).getLog()));
+                                    }else {
+                                        mOrbotAdapter.notifyItemInserted(0);
+                                        mOrbotAdapter.notifyItemChanged(0);
+                                    }
                                     mLogCounter+=1;
                                 }
                             });
@@ -75,9 +152,13 @@ public class orbotLogController extends AppCompatActivity {
         }.start();
     }
 
+    public void onScrollTop(View view) {
+        mMainScroll.smoothScrollTo(0,0);
+    }
+
     public class orbotModelCallback implements eventObserver.eventListener{
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
             return null;
         }
@@ -104,8 +185,15 @@ public class orbotLogController extends AppCompatActivity {
         mActivityClosed = true;
     }
 
+    /* Helper Methods */
+
+    public void openLogSettings(View view) {
+        helperMethod.openActivity(settingLogController.class, constants.CONST_LIST_HISTORY, this,true);
+    }
+
     public void onClose(View view){
         finish();
         mActivityClosed = true;
     }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogEnums.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogEnums.java
index 9396d95a..eef9c32f 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogEnums.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogEnums.java
@@ -4,7 +4,7 @@ public class orbotLogEnums
 {
     /*Settings Manager*/
     public enum eOrbotLogViewCommands {
-        M_UPDATE_LOGS
+        M_UPDATE_LOGS, M_INIT_VIEWS
     }
 
     public enum eOrbotLogModelCommands {
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogModel.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogModel.java
index 61e16565..36f14244 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogModel.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogModel.java
@@ -1,30 +1,33 @@
 package com.darkweb.genesissearchengine.appManager.orbotLogManager;
 
-import com.darkweb.genesissearchengine.constants.keys;
-import com.darkweb.genesissearchengine.constants.status;
-import com.darkweb.genesissearchengine.dataManager.dataController;
-import com.darkweb.genesissearchengine.dataManager.dataEnums;
-import com.darkweb.genesissearchengine.helperManager.eventObserver;
-import com.darkweb.genesissearchengine.pluginManager.pluginController;
-import java.util.Arrays;
-import java.util.List;
+import com.darkweb.genesissearchengine.constants.constants;
+import com.darkweb.genesissearchengine.helperManager.helperMethod;
+import org.torproject.android.service.wrapper.logRowModel;
+import java.util.ArrayList;
+import java.util.Collections;
 
 class orbotLogModel
 {
-    /*Variable Declaration*/
+    /*Private Variables*/
 
-    private eventObserver.eventListener mEvent;
-
-    /*Initializations*/
-
-    orbotLogModel(eventObserver.eventListener mEvent){
-        this.mEvent = mEvent;
-    }
+    private ArrayList<logRowModel> mModelList = new ArrayList<>();
 
     /*Helper Methods*/
 
-    public void onTrigger(orbotLogEnums.eOrbotLogModelCommands pCommands, List<Object> pData){
+    void setList(ArrayList<logRowModel> model)
+    {
+        if(model.size()>0){
+            mModelList.clear();
+            mModelList.addAll(model);
+            Collections.reverse(mModelList);
+        }
+        else {
+            mModelList.add(0, new logRowModel(constants.LOGS_DEFAULT_MESSAGE, helperMethod.getCurrentTime()));
+        }
     }
 
-
+    ArrayList<logRowModel> getList()
+    {
+        return mModelList;
+    }
 }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogViewController.java
index 7ed562ba..875c45cc 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogViewController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogViewController.java
@@ -1,6 +1,9 @@
 package com.darkweb.genesissearchengine.appManager.orbotLogManager;
 
+import android.annotation.SuppressLint;
 import android.os.Build;
+import android.text.Spannable;
+import android.text.TextUtils;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -10,7 +13,9 @@ import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
 
+import com.darkweb.genesissearchengine.constants.status;
 import com.darkweb.genesissearchengine.helperManager.helperMethod;
 import com.example.myapplication.R;
 import com.google.android.material.switchmaterial.SwitchMaterial;
@@ -22,17 +27,30 @@ class orbotLogViewController
 
     private AppCompatActivity mContext;
     private TextView mLogs;
+    private RecyclerView mRecycleView;
 
     /*Initializations*/
 
-    orbotLogViewController(AppCompatActivity pContext, TextView pLogs)
+    orbotLogViewController(AppCompatActivity pContext, TextView pLogs, RecyclerView pRecycleView)
     {
         this.mContext = pContext;
         this.mLogs = pLogs;
+        this.mRecycleView = pRecycleView;
 
+        initViews();
         initPostUI();
     }
 
+    private void initViews(){
+        if(status.sLogListView){
+            mRecycleView.setVisibility(View.VISIBLE);
+            mLogs.setVisibility(View.GONE);
+        }else {
+            mRecycleView.setVisibility(View.GONE);
+            mLogs.setVisibility(View.VISIBLE);
+        }
+    }
+
     private void initPostUI(){
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             Window window = mContext.getWindow();
@@ -52,13 +70,16 @@ class orbotLogViewController
 
 
     private void onUpdateLogs(String pLogs){
-        mLogs.append("\n\n~ " + (pLogs));
+        pLogs = "~ " + pLogs;
+        mLogs.setText(String.format("%s%s", pLogs + "\n\n", mLogs.getText()));
     }
 
     public void onTrigger(orbotLogEnums.eOrbotLogViewCommands pCommands, List<Object> pData){
         if(pCommands.equals(orbotLogEnums.eOrbotLogViewCommands.M_UPDATE_LOGS)){
             onUpdateLogs((String) pData.get(0));
         }
-
+        else if(pCommands.equals(orbotLogEnums.eOrbotLogViewCommands.M_INIT_VIEWS)){
+            initViews();
+        }
     }
 }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotManager/orbotController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotManager/orbotController.java
index 07f8946e..4e9175d8 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotManager/orbotController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotManager/orbotController.java
@@ -7,7 +7,6 @@ import androidx.appcompat.app.AppCompatActivity;
 import com.darkweb.genesissearchengine.appManager.activityContextManager;
 import com.darkweb.genesissearchengine.appManager.bridgeManager.bridgeController;
 import com.darkweb.genesissearchengine.constants.constants;
-import com.darkweb.genesissearchengine.constants.enums;
 import com.darkweb.genesissearchengine.constants.status;
 import com.darkweb.genesissearchengine.helperManager.eventObserver;
 import com.darkweb.genesissearchengine.helperManager.helperMethod;
@@ -53,7 +52,7 @@ public class orbotController extends AppCompatActivity {
 
     public class orbotModelCallback implements eventObserver.eventListener{
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
             return null;
         }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/accessibilityManager/settingAccessibilityController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/accessibilityManager/settingAccessibilityController.java
index 9cbc23b8..f0600aee 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/accessibilityManager/settingAccessibilityController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/accessibilityManager/settingAccessibilityController.java
@@ -56,7 +56,7 @@ public class settingAccessibilityController  extends AppCompatActivity {
     public class settingAccessibilityViewCallback implements eventObserver.eventListener{
 
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
             return null;
         }
@@ -66,7 +66,7 @@ public class settingAccessibilityController  extends AppCompatActivity {
     public class settingAccessibilityModelCallback implements eventObserver.eventListener{
 
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
             return null;
         }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/advanceManager/settingAdvanceController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/advanceManager/settingAdvanceController.java
index 8f2eace5..5d724d27 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/advanceManager/settingAdvanceController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/advanceManager/settingAdvanceController.java
@@ -5,7 +5,6 @@ import android.view.View;
 import android.widget.RadioButton;
 import androidx.appcompat.app.AppCompatActivity;
 import com.darkweb.genesissearchengine.appManager.activityContextManager;
-import com.darkweb.genesissearchengine.constants.enums;
 import com.darkweb.genesissearchengine.helperManager.eventObserver;
 import com.darkweb.genesissearchengine.pluginManager.pluginController;
 import com.example.myapplication.R;
@@ -49,7 +48,7 @@ public class settingAdvanceController extends AppCompatActivity {
     public class settingAdvanceViewCallback implements eventObserver.eventListener{
 
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
             return null;
         }
@@ -59,7 +58,7 @@ public class settingAdvanceController extends AppCompatActivity {
     public class settingAdvanceModelCallback implements eventObserver.eventListener{
 
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
             return null;
         }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/advanceManager/settingAdvanceViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/advanceManager/settingAdvanceViewController.java
index fb574357..984d3cf1 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/advanceManager/settingAdvanceViewController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/advanceManager/settingAdvanceViewController.java
@@ -120,6 +120,4 @@ class settingAdvanceViewController
         return null;
     }
 
-
-
 }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/clearManager/settingClearController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/clearManager/settingClearController.java
index a514a927..7c05ca2a 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/clearManager/settingClearController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/clearManager/settingClearController.java
@@ -56,7 +56,7 @@ public class settingClearController extends AppCompatActivity {
     public class settingClearViewCallback implements eventObserver.eventListener{
 
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
             return null;
         }
@@ -66,7 +66,7 @@ public class settingClearController extends AppCompatActivity {
     public class settingClearModelCallback implements eventObserver.eventListener{
 
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
             return null;
         }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/generalManager/settingGeneralController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/generalManager/settingGeneralController.java
index 8ebf93da..7c6a0e33 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/generalManager/settingGeneralController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/generalManager/settingGeneralController.java
@@ -1,6 +1,5 @@
 package com.darkweb.genesissearchengine.appManager.settingManager.generalManager;
 
-import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.Handler;
 import android.view.View;
@@ -76,14 +75,15 @@ public class settingGeneralController extends AppCompatActivity {
     public class settingGeneralViewCallback implements eventObserver.eventListener{
 
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
-            if(enums.etype.M_RESET_THEME_INVOKED_BACK.equals(e_type))
+            if(settingGeneralEnums.eGeneralViewCallback.M_RESET_THEME_INVOKED_BACK.equals(e_type))
             {
                 helperMethod.restartActivity(getIntent(), settingGeneralController.this);
                 new Handler().postDelayed(() -> {
                     overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
                     activityContextManager.getInstance().getSettingController().applyTheme();
+                    activityContextManager.getInstance().getHomeController().applyTheme();
                 }, 150);
             }
             return null;
@@ -94,7 +94,7 @@ public class settingGeneralController extends AppCompatActivity {
     public class settingGeneralModelCallback implements eventObserver.eventListener{
 
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
             return null;
         }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/generalManager/settingGeneralEnums.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/generalManager/settingGeneralEnums.java
index 55cb43b5..9d74e574 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/generalManager/settingGeneralEnums.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/generalManager/settingGeneralEnums.java
@@ -11,4 +11,7 @@ class settingGeneralEnums
         M_SET_THEME, M_RESET_THEME, M_UPDATE_THEME_BLOCKER
     }
 
+    public enum eGeneralViewCallback {
+        M_RESET_THEME_INVOKED_BACK
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/generalManager/settingGeneralViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/generalManager/settingGeneralViewController.java
index 6a8a0f72..3c55082d 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/generalManager/settingGeneralViewController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/generalManager/settingGeneralViewController.java
@@ -19,6 +19,8 @@ import com.google.android.material.switchmaterial.SwitchMaterial;
 import java.util.Collections;
 import java.util.List;
 
+import static com.darkweb.genesissearchengine.appManager.settingManager.generalManager.settingGeneralEnums.eGeneralViewCallback.M_RESET_THEME_INVOKED_BACK;
+
 class settingGeneralViewController
 {
     /*Private Variables*/
@@ -95,11 +97,11 @@ class settingGeneralViewController
             mOpenURLInNewTab.setChecked(false);
         }
 
-        mHomePageText.setText(helperMethod.getDomainName(status.sSettingSearchStatus));
+        mHomePageText.setText(helperMethod.getDomainName(status.sSettingSearchStatus.replace("boogle.store","genesis.onion")));
     }
 
-    private void updateThemeChanger(int pStatus){
-        mEvent.invokeObserver(Collections.singletonList(status.sTheme), enums.etype.M_RESET_THEME_INVOKED_BACK);
+    private void updateThemeChanger(){
+        mEvent.invokeObserver(Collections.singletonList(status.sTheme), M_RESET_THEME_INVOKED_BACK);
     }
 
     private void resetThemeSelection(){
@@ -132,7 +134,7 @@ class settingGeneralViewController
             resetThemeSelection();
         }
         else if(pCommands.equals(settingGeneralEnums.eGeneralViewController.M_UPDATE_THEME_BLOCKER)){
-            updateThemeChanger((int)pData.get(0));
+            updateThemeChanger();
         }
         return null;
     }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/logManager/settingLogController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/logManager/settingLogController.java
new file mode 100644
index 00000000..63fb1314
--- /dev/null
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/logManager/settingLogController.java
@@ -0,0 +1,88 @@
+package com.darkweb.genesissearchengine.appManager.settingManager.logManager;
+
+import android.os.Bundle;
+import android.view.View;
+import androidx.appcompat.app.AppCompatActivity;
+import com.darkweb.genesissearchengine.appManager.activityContextManager;
+import com.darkweb.genesissearchengine.helperManager.eventObserver;
+import com.darkweb.genesissearchengine.pluginManager.pluginController;
+import com.example.myapplication.R;
+import com.google.android.material.switchmaterial.SwitchMaterial;
+import java.util.Collections;
+import java.util.List;
+
+public class settingLogController extends AppCompatActivity {
+
+    /* PRIVATE VARIABLES */
+    private SwitchMaterial mListView;
+    private settingLogModel mSettingLogModel;
+    private settingLogViewController mSettingLogViewController;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        pluginController.getInstance().onCreate(this);
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.setting_log_view);
+
+        viewsInitializations();
+    }
+
+    public void viewsInitializations() {
+        mListView = findViewById(R.id.pListView);
+        mSettingLogViewController = new settingLogViewController(this, new settingLogViewCallback(), mListView);
+
+        mSettingLogModel = new settingLogModel(new settingLogModelCallback());
+    }
+
+    /* LISTENERS */
+    public class settingLogViewCallback implements eventObserver.eventListener{
+
+        @Override
+        public Object invokeObserver(List<Object> data, Object e_type)
+        {
+            return null;
+        }
+    }
+
+
+    public class settingLogModelCallback implements eventObserver.eventListener{
+
+        @Override
+        public Object invokeObserver(List<Object> data, Object e_type)
+        {
+            return null;
+        }
+    }
+
+    /* LOCAL OVERRIDES */
+
+    @Override
+    public void onResume()
+    {
+        activityContextManager.getInstance().setCurrentActivity(this);
+        super.onResume();
+    }
+
+    @Override
+    public void onPause()
+    {
+        super.onPause();
+    }
+
+    @Override
+    public void onBackPressed() {
+        finish();
+    }
+
+    /*UI Redirection*/
+
+    public void onClose(View view){
+        finish();
+    }
+
+    public void onSwitchLogUIMode(View view){
+        mSettingLogModel.onTrigger(settingLogEnums.eLogModel.M_SWITCH_LOG_VIEW, Collections.singletonList(!mListView.isChecked()));
+        mListView.toggle();
+        activityContextManager.getInstance().getOrbotLogController().initializeLogs();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/logManager/settingLogEnums.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/logManager/settingLogEnums.java
new file mode 100644
index 00000000..240162e5
--- /dev/null
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/logManager/settingLogEnums.java
@@ -0,0 +1,14 @@
+package com.darkweb.genesissearchengine.appManager.settingManager.logManager;
+
+class settingLogEnums
+{
+    /*History Manager*/
+    public enum eLogModel {
+        M_SWITCH_LOG_VIEW
+    }
+
+    public enum eLogViewController {
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/logManager/settingLogModel.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/logManager/settingLogModel.java
new file mode 100644
index 00000000..b8f453bc
--- /dev/null
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/logManager/settingLogModel.java
@@ -0,0 +1,38 @@
+package com.darkweb.genesissearchengine.appManager.settingManager.logManager;
+
+import com.darkweb.genesissearchengine.constants.keys;
+import com.darkweb.genesissearchengine.constants.status;
+import com.darkweb.genesissearchengine.dataManager.dataController;
+import com.darkweb.genesissearchengine.dataManager.dataEnums;
+import com.darkweb.genesissearchengine.helperManager.eventObserver;
+
+import java.util.Arrays;
+import java.util.List;
+
+class settingLogModel
+{
+    /*Variable Declaration*/
+
+    private eventObserver.eventListener mEvent;
+
+    /*Initializations*/
+
+    settingLogModel(eventObserver.eventListener mEvent){
+        this.mEvent = mEvent;
+    }
+
+    public void onUpdateLogView(boolean pIsListView){
+        status.sLogListView = pIsListView;
+        dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_LIST_VIEW, pIsListView));
+    }
+
+    /*Helper Methods*/
+
+    public Object onTrigger(settingLogEnums.eLogModel pCommands, List<Object> pData){
+        if(settingLogEnums.eLogModel.M_SWITCH_LOG_VIEW.equals(pCommands)){
+            onUpdateLogView((boolean)pData.get(0));
+        }
+        return null;
+    }
+
+}
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/logManager/settingLogViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/logManager/settingLogViewController.java
new file mode 100644
index 00000000..b7057ac6
--- /dev/null
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/logManager/settingLogViewController.java
@@ -0,0 +1,63 @@
+package com.darkweb.genesissearchengine.appManager.settingManager.logManager;
+
+import android.os.Build;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.content.ContextCompat;
+
+import com.darkweb.genesissearchengine.constants.status;
+import com.darkweb.genesissearchengine.helperManager.eventObserver;
+import com.example.myapplication.R;
+import com.google.android.material.switchmaterial.SwitchMaterial;
+
+class settingLogViewController
+{
+    /*Private Variables*/
+
+    private eventObserver.eventListener mEvent;
+    private AppCompatActivity mContext;
+
+    private SwitchMaterial mLogUI;
+
+    /*Initializations*/
+
+    settingLogViewController(settingLogController pContext, eventObserver.eventListener pEvent, SwitchMaterial pLogManual)
+    {
+        this.mLogUI = pLogManual;
+        this.mEvent = pEvent;
+        this.mContext = pContext;
+
+        initViews();
+        initPostUI();
+    }
+
+    private void initViews()
+    {
+        if(status.sLogListView){
+            mLogUI.setChecked(true);
+        }else {
+            mLogUI.setChecked(false);
+        }
+    }
+
+    private void initPostUI(){
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window window = mContext.getWindow();
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
+                window.setStatusBarColor(mContext.getResources().getColor(R.color.blue_dark));
+            }
+            else {
+                if(AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_NO){
+                    mContext.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+                }
+                mContext.getWindow().setStatusBarColor(ContextCompat.getColor(mContext, R.color.c_background));
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/notificationManager/settingNotificationController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/notificationManager/settingNotificationController.java
index 7b09b22f..004bf7d3 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/notificationManager/settingNotificationController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/notificationManager/settingNotificationController.java
@@ -40,7 +40,7 @@ public class settingNotificationController extends AppCompatActivity {
     public class settingNotificationViewCallback implements eventObserver.eventListener{
 
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
             return null;
         }
@@ -50,7 +50,7 @@ public class settingNotificationController extends AppCompatActivity {
     public class settingNotificationModelCallback implements eventObserver.eventListener{
 
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
             return null;
         }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/notificationManager/settingNotificationModel.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/notificationManager/settingNotificationModel.java
index 8f8a4d33..8a632fb3 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/notificationManager/settingNotificationModel.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/notificationManager/settingNotificationModel.java
@@ -28,7 +28,6 @@ class settingNotificationModel
 
         int mStatus = pStatus ? 1 : 0;
         status.sBridgeNotificationManual = mStatus;
-
         dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_INT, Arrays.asList(keys.SETTING_NOTIFICATION_STATUS, mStatus));
         pluginController.getInstance().setNotificationStatus(mStatus);
         int notificationStatus = pluginController.getInstance().getNotificationStatus();
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/privacyManager/settingPrivacyController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/privacyManager/settingPrivacyController.java
index 5b4732e8..8d9a541a 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/privacyManager/settingPrivacyController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/privacyManager/settingPrivacyController.java
@@ -5,7 +5,6 @@ import android.view.View;
 import android.widget.RadioButton;
 import androidx.appcompat.app.AppCompatActivity;
 import com.darkweb.genesissearchengine.appManager.activityContextManager;
-import com.darkweb.genesissearchengine.constants.enums;
 import com.darkweb.genesissearchengine.constants.status;
 import com.darkweb.genesissearchengine.helperManager.eventObserver;
 import com.darkweb.genesissearchengine.pluginManager.pluginController;
@@ -55,7 +54,7 @@ public class settingPrivacyController extends AppCompatActivity {
     public class settingAccessibilityViewCallback implements eventObserver.eventListener{
 
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
             return null;
         }
@@ -65,7 +64,7 @@ public class settingPrivacyController extends AppCompatActivity {
     public class settingAccessibilityModelCallback implements eventObserver.eventListener{
 
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
             return null;
         }
@@ -113,25 +112,25 @@ public class settingPrivacyController extends AppCompatActivity {
 
     public void onDoNotTrack(View view){
         mSettingChanged = true;
-        mSettingPrivacyModel.onTrigger(settingPrivacyEnums.ePrivacyModel.SET_DONOT_TRACK, Collections.singletonList(!status.sStatusDoNotTrack));
+        mSettingPrivacyModel.onTrigger(settingPrivacyEnums.ePrivacyModel.M_SET_DONOT_TRACK, Collections.singletonList(!status.sStatusDoNotTrack));
         mDoNotTrack.toggle();
     }
 
     public void onTrackingProtection(View view){
         mSettingChanged = true;
-        mSettingPrivacyModel.onTrigger(settingPrivacyEnums.ePrivacyModel.SET_TRACKING_PROTECTION, Collections.singletonList(!status.sSettingTrackingProtection));
+        mSettingPrivacyModel.onTrigger(settingPrivacyEnums.ePrivacyModel.M_SET_TRACKING_PROTECTION, Collections.singletonList(!status.sSettingTrackingProtection));
         mTrackingProtection.toggle();
     }
 
     public void onCookies(View view){
         mSettingChanged = true;
-        mSettingPrivacyViewController.onTrigger(settingPrivacyEnums.ePrivacyViewController.SET_COOKIE_STATUS, Collections.singletonList(view));
-        mSettingPrivacyModel.onTrigger(settingPrivacyEnums.ePrivacyModel.SET_COOKIES, Collections.singletonList(view));
+        mSettingPrivacyViewController.onTrigger(settingPrivacyEnums.ePrivacyViewController.M_SET_COOKIE_STATUS, Collections.singletonList(view));
+        mSettingPrivacyModel.onTrigger(settingPrivacyEnums.ePrivacyModel.M_SET_COOKIES, Collections.singletonList(view));
     }
 
     public void onClearPrivateData(View view){
         mSettingChanged = true;
-        mSettingPrivacyModel.onTrigger(settingPrivacyEnums.ePrivacyModel.SET_CLEAR_PRIVATE_DATA, Collections.singletonList(!status.sClearOnExit));
+        mSettingPrivacyModel.onTrigger(settingPrivacyEnums.ePrivacyModel.M_SET_CLEAR_PRIVATE_DATA, Collections.singletonList(!status.sClearOnExit));
         mClearDataOnExit.toggle();
     }
 
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/privacyManager/settingPrivacyEnums.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/privacyManager/settingPrivacyEnums.java
index f2983630..7ecfb18f 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/privacyManager/settingPrivacyEnums.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/privacyManager/settingPrivacyEnums.java
@@ -4,11 +4,11 @@ class settingPrivacyEnums
 {
     /*History Manager*/
     public enum ePrivacyModel {
-        M_SET_JAVASCRIPT, SET_DONOT_TRACK, SET_TRACKING_PROTECTION, SET_COOKIES, SET_CLEAR_PRIVATE_DATA
+        M_SET_JAVASCRIPT, M_SET_DONOT_TRACK, M_SET_TRACKING_PROTECTION, M_SET_COOKIES, M_SET_CLEAR_PRIVATE_DATA
     }
 
     public enum ePrivacyViewController {
-        SET_COOKIE_STATUS
+        M_SET_COOKIE_STATUS
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/privacyManager/settingPrivacyModel.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/privacyManager/settingPrivacyModel.java
index dc840433..91aa2444 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/privacyManager/settingPrivacyModel.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/privacyManager/settingPrivacyModel.java
@@ -69,16 +69,16 @@ class settingPrivacyModel
         if(pCommands.equals(settingPrivacyEnums.ePrivacyModel.M_SET_JAVASCRIPT)){
             onJavaScript((boolean)pData.get(0));
         }
-        else if(pCommands.equals(settingPrivacyEnums.ePrivacyModel.SET_DONOT_TRACK)){
+        else if(pCommands.equals(settingPrivacyEnums.ePrivacyModel.M_SET_DONOT_TRACK)){
             onDoNotTrack((boolean)pData.get(0));
         }
-        else if(pCommands.equals(settingPrivacyEnums.ePrivacyModel.SET_TRACKING_PROTECTION)){
+        else if(pCommands.equals(settingPrivacyEnums.ePrivacyModel.M_SET_TRACKING_PROTECTION)){
             onTrackingProtection((boolean)pData.get(0));
         }
-        else if(pCommands.equals(settingPrivacyEnums.ePrivacyModel.SET_COOKIES)){
+        else if(pCommands.equals(settingPrivacyEnums.ePrivacyModel.M_SET_COOKIES)){
             onCookies((View) pData.get(0));
         }
-        else if(pCommands.equals(settingPrivacyEnums.ePrivacyModel.SET_CLEAR_PRIVATE_DATA)){
+        else if(pCommands.equals(settingPrivacyEnums.ePrivacyModel.M_SET_CLEAR_PRIVATE_DATA)){
             onClearPrivateData((Boolean) pData.get(0));
         }
         return null;
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/privacyManager/settingPrivacyViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/privacyManager/settingPrivacyViewController.java
index 03ba26ed..d58d714e 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/privacyManager/settingPrivacyViewController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/privacyManager/settingPrivacyViewController.java
@@ -139,7 +139,7 @@ class settingPrivacyViewController
     }
 
     public Object onTrigger(settingPrivacyEnums.ePrivacyViewController pCommands, List<Object> pData){
-        if(pCommands.equals(settingPrivacyEnums.ePrivacyViewController.SET_COOKIE_STATUS)){
+        if(pCommands.equals(settingPrivacyEnums.ePrivacyViewController.M_SET_COOKIE_STATUS)){
             setCookieStatus((View)pData.get(0));
         }
         return null;
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/searchEngineManager/settingSearchController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/searchEngineManager/settingSearchController.java
index 1ed5b313..8d12764d 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/searchEngineManager/settingSearchController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/searchEngineManager/settingSearchController.java
@@ -81,7 +81,7 @@ public class settingSearchController extends AppCompatActivity {
     public class settingSearchViewCallback implements eventObserver.eventListener{
 
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
             return null;
         }
@@ -91,7 +91,7 @@ public class settingSearchController extends AppCompatActivity {
     public class settingSearchModelCallback implements eventObserver.eventListener{
 
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
             return null;
         }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingHomePage/settingController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingHomePage/settingController.java
index 3f832984..361f0d00 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingHomePage/settingController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingHomePage/settingController.java
@@ -7,7 +7,6 @@ import android.os.Bundle;
 import android.view.View;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
-
 import com.darkweb.genesissearchengine.appManager.activityContextManager;
 import com.darkweb.genesissearchengine.appManager.settingManager.accessibilityManager.settingAccessibilityController;
 import com.darkweb.genesissearchengine.appManager.settingManager.advanceManager.settingAdvanceController;
@@ -86,7 +85,7 @@ public class settingController extends AppCompatActivity
         pluginController.getInstance().logEvent(strings.EVENT_SETTINGS_OPENED);
     }
 
-    /*Event Handlers*/
+    /*Local Overrides*/
 
     @Override
     public void onTrimMemory(int level)
@@ -120,6 +119,8 @@ public class settingController extends AppCompatActivity
         finish();
     }
 
+    /*UI Redirection*/
+
     public void onNavigationBackPressed(View view){
         finish();
     }
@@ -165,7 +166,7 @@ public class settingController extends AppCompatActivity
     public class settingViewCallback implements eventObserver.eventListener{
 
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
             return null;
         }
@@ -174,7 +175,7 @@ public class settingController extends AppCompatActivity
     public class settingModelCallback implements eventObserver.eventListener{
 
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
             return null;
         }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingHomePage/settingModel.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingHomePage/settingModel.java
index 747f7993..c618c926 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingHomePage/settingModel.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingHomePage/settingModel.java
@@ -14,6 +14,4 @@ class settingModel
         this.mEvent = mEvent;
     }
 
-    /*Helper Methods*/
-
 }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingHomePage/settingViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingHomePage/settingViewController.java
index 387681e3..9c83b270 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingHomePage/settingViewController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingHomePage/settingViewController.java
@@ -1,6 +1,5 @@
 package com.darkweb.genesissearchengine.appManager.settingManager.settingHomePage;
 
-import android.graphics.Color;
 import android.os.Build;
 import android.view.View;
 import android.view.Window;
@@ -8,8 +7,6 @@ import android.view.WindowManager;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.content.ContextCompat;
-
-import com.darkweb.genesissearchengine.constants.status;
 import com.darkweb.genesissearchengine.helperManager.eventObserver;
 import com.example.myapplication.R;
 
@@ -46,5 +43,4 @@ class settingViewController
             }
         }
     }
-
 }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabAdapter.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabAdapter.java
index 431e5cbd..e63cf1b6 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabAdapter.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabAdapter.java
@@ -1,28 +1,26 @@
 package com.darkweb.genesissearchengine.appManager.tabManager;
 
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
+import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.darkweb.genesissearchengine.appManager.activityContextManager;
-import com.darkweb.genesissearchengine.constants.enums;
-import com.darkweb.genesissearchengine.constants.strings;
+import com.darkweb.genesissearchengine.helperManager.TopCropImageView;
 import com.darkweb.genesissearchengine.helperManager.eventObserver;
-import com.darkweb.genesissearchengine.helperManager.helperMethod;
 import com.example.myapplication.R;
-
-import org.mozilla.geckoview.GeckoView;
-
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
 
 public class tabAdapter extends RecyclerView.Adapter<tabAdapter.listViewHolder>
 {
@@ -30,22 +28,17 @@ public class tabAdapter extends RecyclerView.Adapter<tabAdapter.listViewHolder>
 
     private ArrayList<tabRowModel> mModelList;
     private eventObserver.eventListener mEvent;
+    private ArrayList<Integer> mSelectedList = new ArrayList<>();
 
-    private GeckoView mCurrentGeckoView = null;
-    private int mCurrentSession;
-
-    tabAdapter(ArrayList<tabRowModel> model_list, eventObserver.eventListener event, GeckoView pGeckoView, int pCurrentSession) {
+    tabAdapter(ArrayList<tabRowModel> model_list, eventObserver.eventListener event) {
         this.mModelList = model_list;
         this.mEvent = event;
 
-        pGeckoView.releaseSession();
-        this.mCurrentSession = pCurrentSession;
     }
 
     /*Initializations*/
 
-    @NonNull
-    @Override
+    @NonNull @Override
     public listViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.tabview_row, parent, false);
         return new listViewHolder(view);
@@ -55,6 +48,9 @@ public class tabAdapter extends RecyclerView.Adapter<tabAdapter.listViewHolder>
     public void onBindViewHolder(@NonNull tabAdapter.listViewHolder holder, int position)
     {
         holder.bindListView(mModelList.get(position));
+        holder.itemView.setTag(position);
+        holder.itemView.findViewById(R.id.pRemoveRow).setTag(position);
+        holder.itemView.findViewById(R.id.pLoadSession).setTag(position);
     }
 
     @Override
@@ -64,59 +60,142 @@ public class tabAdapter extends RecyclerView.Adapter<tabAdapter.listViewHolder>
 
     /*Listeners*/
 
-    public void onClose(){
-        if(mCurrentGeckoView!=null){
-            mCurrentGeckoView.releaseSession();
+    private int getSelectedListSize(){
+        return mSelectedList.size();
+    }
+
+    private void onRemoveAllSelection() {
+        mEvent.invokeObserver(null, tabEnums.eTabAdapterCallback.ON_CLEAR_TAB_BACKUP);
+        for(int mCounter=0;mCounter<mModelList.size();mCounter++){
+            if(mSelectedList.contains(mModelList.get(mCounter).getSession().getSessionID())){
+                mSelectedList.remove((Integer) mModelList.get(mCounter).getSession().getSessionID());
+                mEvent.invokeObserver(Collections.singletonList(mCounter), tabEnums.eTabAdapterCallback.ON_REMOVE_TAB);
+                notifyItemRemoved(mCounter);
+                mCounter-=1;
+            }
         }
     }
 
-    public void setOnClickListener(ImageView pLoadSession, tabRowModel model, GeckoView pGeckoView, ImageButton mRemoveRow){
-        pLoadSession.setOnClickListener(v -> {
-            pGeckoView.releaseSession();
-            activityContextManager.getInstance().getHomeController().onLoadTab(model.getSession(), false);
-            activityContextManager.getInstance().getTabController().onBackPressed(null);
-            activityContextManager.getInstance().getTabController().initTabCount();
-        });
+    private void onClearAllSelection(){
+        mSelectedList.clear();
+        notifyDataSetChanged();
+    }
 
-        mRemoveRow.setOnClickListener(v -> {
-            model.getSession().closeSession();
-            activityContextManager.getInstance().getTabController().onRemoveView(model.getSession().getSessionID());
-            notifyDataSetChanged();
-            activityContextManager.getInstance().getTabController().initTabCount();
-        });
+    private void onSelectionCreate(FrameLayout mSelectedView){
+        mSelectedView.setAlpha(0);
+        mSelectedView.setVisibility(View.VISIBLE);
+        mSelectedView.animate().alpha(1);
+        mEvent.invokeObserver(null, tabEnums.eTabAdapterCallback.ON_SHOW_SELECTION);
+    }
+
+    private void onSelectionClear(FrameLayout mSelectedView){
+        mSelectedView.animate().alpha(0).withEndAction(() -> mSelectedView.setVisibility(View.GONE));
+        if(mSelectedList.size()==0){
+            mEvent.invokeObserver(null, tabEnums.eTabAdapterCallback.ON_HIDE_SELECTION);
+        }
+    }
+
+    private void onTriggerURL(tabRowModel model){
+        mEvent.invokeObserver(Arrays.asList(model.getSession(), false), tabEnums.eTabAdapterCallback.ON_LOAD_TAB);
+        mEvent.invokeObserver(null, tabEnums.eTabAdapterCallback.ON_BACK_PRESSED);
+        mEvent.invokeObserver(null, tabEnums.eTabAdapterCallback.ON_INIT_TAB_COUNT);
     }
 
     /*View Holder Extensions*/
-    class listViewHolder extends RecyclerView.ViewHolder
+    class listViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener
     {
-        GeckoView mGeckoView;
         TextView mHeader;
         TextView mDescription;
+        TextView mDate;
         ImageView mLoadSession;
         ImageButton mRemoveRow;
+        TopCropImageView mWebThumbnail;
+        FrameLayout mSelectedView;
 
         listViewHolder(View itemView) {
             super(itemView);
         }
 
         void bindListView(tabRowModel model) {
-            mGeckoView = itemView.findViewById(R.id.pGeckoView);
             mHeader = itemView.findViewById(R.id.pHeader);
             mDescription = itemView.findViewById(R.id.pDescription);
             mLoadSession = itemView.findViewById(R.id.pLoadSession);
             mRemoveRow = itemView.findViewById(R.id.pRemoveRow);
+            mWebThumbnail = itemView.findViewById(R.id.pWebThumbnail);
+            mDate = itemView.findViewById(R.id.pDate);
+            mSelectedView = itemView.findViewById(R.id.pSelectedView);
 
-            mGeckoView.releaseSession();
-            mGeckoView.setSession(model.getSession());
-            if(model.getmId() == mCurrentSession){
-                mCurrentGeckoView = mGeckoView;
-            }
-            model.setGeckoView(mGeckoView);
             mHeader.setText(model.getSession().getTitle());
             mDescription.setText(model.getSession().getCurrentURL());
+            mDate.setText(model.getDate());
+            mWebThumbnail.setImageBitmap(model.getBitmap());
 
-            setOnClickListener(mLoadSession, model, mGeckoView, mRemoveRow);
+            if(mSelectedList.contains(model.getSession().getSessionID())){
+                onSelectionCreate(mSelectedView);
+            }else {
+                onSelectionClear(mSelectedView);
+            }
+
+            if(model.getSession().equals(mModelList.get(0).getSession())){
+                itemView.setBackgroundColor(ContextCompat.getColor(activityContextManager.getInstance().getTabController(), R.color.c_list_item_current));
+            }
+
+            mLoadSession.setOnLongClickListener(this);
+            mRemoveRow.setOnClickListener(this);
+            mLoadSession.setOnClickListener(this);
+        }
+
+
+        @Override
+        public void onClick(View v) {
+            if(v.getId() == R.id.pLoadSession){
+                if(mSelectedView.getVisibility() == View.GONE){
+                    if(mSelectedList.size()>0){
+                        mSelectedList.add(mModelList.get(this.getLayoutPosition()).getSession().getSessionID());
+                        onSelectionCreate(mSelectedView);
+                    }else {
+                        onTriggerURL(mModelList.get(this.getLayoutPosition()));
+                    }
+                }else {
+                    for(int mCounter=0;mCounter<mSelectedList.size();mCounter++){
+                        if(mSelectedList.get(mCounter) == mModelList.get(this.getLayoutPosition()).getSession().getSessionID()){
+                            mSelectedList.remove(mCounter);
+                        }
+                    }
+                    onSelectionClear(mSelectedView);
+                }
+            }else if(v.getId() == R.id.pRemoveRow){
+                mEvent.invokeObserver(null, tabEnums.eTabAdapterCallback.ON_CLEAR_TAB_BACKUP);
+                mEvent.invokeObserver(Collections.singletonList(this.getLayoutPosition()), tabEnums.eTabAdapterCallback.ON_REMOVE_TAB_VIEW);
+            }
+        }
+
+        @Override
+        public boolean onLongClick(View v) {
+            if(v.getId() == R.id.pLoadSession){
+                if(mSelectedView.getVisibility() == View.GONE){
+                    mSelectedList.add(mModelList.get(this.getLayoutPosition()).getSession().getSessionID());
+                    onSelectionCreate(mSelectedView);
+                }else {
+                    mSelectedList.remove(this.getLayoutPosition());
+                    onSelectionClear(mSelectedView);
+                }
+                mLoadSession.setPressed(false);
+            }
+            return true;
         }
     }
 
+    public Object onTrigger(tabEnums.eTabModelCommands pCommands, List<Object> pData){
+        if(pCommands.equals(tabEnums.eTabModelCommands.M_SELECTED_LIST_SIZE)){
+            return getSelectedListSize();
+        }else if(pCommands.equals(tabEnums.eTabModelCommands.M_REMOVE_ALL_SELECTION)){
+            onRemoveAllSelection();
+        }else if(pCommands.equals(tabEnums.eTabModelCommands.M_CLEAR_ALL_SELECTION)){
+            onClearAllSelection();
+        }
+        return null;
+    }
 }
+
+
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabController.java
index e7e21ee1..0cf71b6a 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabController.java
@@ -1,18 +1,22 @@
 package com.darkweb.genesissearchengine.appManager.tabManager;
 
+import android.graphics.Canvas;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
 import android.view.View;
 import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.darkweb.genesissearchengine.appManager.activityContextManager;
+import com.darkweb.genesissearchengine.appManager.homeManager.geckoSession;
 import com.darkweb.genesissearchengine.appManager.homeManager.homeController;
 import com.darkweb.genesissearchengine.appManager.settingManager.settingHomePage.settingController;
 import com.darkweb.genesissearchengine.constants.constants;
-import com.darkweb.genesissearchengine.constants.enums;
 import com.darkweb.genesissearchengine.constants.keys;
 import com.darkweb.genesissearchengine.constants.status;
 import com.darkweb.genesissearchengine.constants.strings;
@@ -26,11 +30,19 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
+
+import jp.wasabeef.recyclerview.animators.FadeInRightAnimator;
 
 public class tabController extends AppCompatActivity
 {
     /*Private Views*/
     private Button mTabs;
+    private ImageView mRemoveSelection;
+    private LinearLayout mTabsContainer;
+    private ImageButton mMenuButton;
+    private ImageButton mClearSelection;
+    private View mPopupUndo;
 
     /*Private Variables*/
 
@@ -51,7 +63,7 @@ public class tabController extends AppCompatActivity
         initializeListModel();
         initializeViews();
         initializeList();
-        onCustomeListeners();
+        initSwipe();
     }
 
     public void initializeListModel(){
@@ -62,82 +74,137 @@ public class tabController extends AppCompatActivity
         mContextManager.setTabController(this);
         pluginController.getInstance().logEvent(strings.EVENT_TAB_OPENED);
     }
+
     public void initializeViews(){
         mRecycleView = findViewById(R.id.pRecycleView);
         mTabs = findViewById(R.id.pTabs);
+        mRemoveSelection = findViewById(R.id.pRemoveSelection);
+        mTabsContainer = findViewById(R.id.pTabsContainer);
+        mMenuButton = findViewById(R.id.pMenuButton);
+        mClearSelection = findViewById(R.id.pClearSelection);
+        mPopupUndo = findViewById(R.id.pPopupUndo);
 
-        mtabViewController = new tabViewController(this, mTabs);
+        mtabViewController = new tabViewController(this, mTabs, mRemoveSelection, mTabsContainer, mMenuButton, mClearSelection, mPopupUndo);
     }
+
     public void initializeList(){
         LinearLayoutManager layoutManager = new LinearLayoutManager(tabController.this);
-        tabAdapter adapter = new tabAdapter(mListModel.getList(),new adapterCallback(), mHomeController.getmGeckoView(), ((tabRowModel)dataController.getInstance().invokeTab(dataEnums.eTabCommands.GET_CURRENT_TAB,null)).getmId());
+        tabAdapter adapter = new tabAdapter(mListModel.getList(),new adapterCallback());
         mTabAdapter = adapter;
         layoutManager.setReverseLayout(true);
 
+        mRecycleView.setItemAnimator(new FadeInRightAnimator());
+        Objects.requireNonNull(mRecycleView.getItemAnimator()).setAddDuration(200);
+        mRecycleView.getItemAnimator().setRemoveDuration(200);
+        mRecycleView.getItemAnimator().setMoveDuration(200);
+        mRecycleView.getItemAnimator().setChangeDuration(450);
+
         mRecycleView.setAdapter(adapter);
         mRecycleView.setItemViewCacheSize(100);
         mRecycleView.setNestedScrollingEnabled(false);
         mRecycleView.setHasFixedSize(true);
-        mRecycleView.setAdapter(adapter);
         mRecycleView.setItemViewCacheSize(100);
         mRecycleView.setDrawingCacheEnabled(true);
         mRecycleView.setDrawingCacheQuality(View.DRAWING_CACHE_QUALITY_HIGH);
         mRecycleView.setLayoutManager(new LinearLayoutManager(tabController.this));
+        mTabAdapter.notifyDataSetChanged();
     }
 
+    /*Listeners*/
+
+    private void initSwipe(){
+        ItemTouchHelper.SimpleCallback simpleItemTouchCallback = new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) {
+
+            @Override
+            public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
+                return false;
+            }
+
+            public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
+                int position = viewHolder.getAdapterPosition();
+
+                onClearTabBackup();
+                onRemoveTab(position);
+                mTabAdapter.notifyItemRemoved(position);
+                initTabCount();
+            }
+
+            @Override
+            public void onChildDraw(@NonNull Canvas c, @NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) {
+                Canvas mCanvas = (Canvas) mtabViewController.onTrigger(tabEnums.eTabViewCommands.ON_GENERATE_SWIPABLE_BACKGROUND, Arrays.asList(c, viewHolder, dX, actionState));
+                super.onChildDraw(mCanvas, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
+            }
+        };
+        ItemTouchHelper itemTouchHelper = new ItemTouchHelper(simpleItemTouchCallback);
+        itemTouchHelper.attachToRecyclerView(mRecycleView);
+    }
     /*View Handlers*/
 
-    public void onCustomeListeners(){
-
+    public void onBackPressedInvoked(View view) {
+        onBackPressed();
     }
 
-    public void onReleaseDisplay(){
-        mTabAdapter.onClose();
-        mHomeController.onAcquireDisplay();
+    public void onRemoveTab(int pIndex){
+        mListModel.onRemoveTab(pIndex);
+        initTabCount();
     }
 
-    @Override
-    public void onBackPressed() {
-        super.onBackPressed();
-        overridePendingTransition(R.anim.popup_anim_in, R.anim.popup_anim_out);
+    public void onClearTabBackup(){
+        mListModel.onClearBackup();
     }
 
-    public void onBackPressed(View view) {
-        onReleaseDisplay();
-        finish();
-        overridePendingTransition(R.anim.popup_anim_in, R.anim.popup_anim_out);
-    }
-
-    public void onRemoveView(int pId){
-        for(int mCounter=0; mCounter<mListModel.getList().size();mCounter++){
-            if(mListModel.getList().get(mCounter).getSession().getSessionID() == pId){
-                mListModel.getList().get(mCounter).releaseGeckoView();
-                mListModel.getList().remove(mCounter);
-                mTabAdapter.notifyDataSetChanged();
-                //mTabAdapter.notifyItemRemoved(mCounter);
-                //mTabAdapter.notifyItemRangeChanged(mCounter-1, mListModel.getList().size());
-            }
-        }
+    public void onRemoveView(int pIndex){
+        onClearTabBackup();
+        onRemoveTab(pIndex);
+        mTabAdapter.notifyItemRemoved(pIndex);
+        onShowUndoDialog();
     }
 
     public void initTabCount()
     {
         mtabViewController.onTrigger(tabEnums.eTabViewCommands.INIT_TAB_COUNT, null);
+        mHomeController.initTabCount();
     }
 
     public void onNewTabInvoked(){
         mHomeController.onNewTab(true,false);
-        onReleaseDisplay();
         finish();
         overridePendingTransition(R.anim.popup_anim_in, R.anim.popup_anim_out);
     }
 
+    public void onRestoreTab(View view){
+        int mSize = mListModel.onLoadBackup();
+        mTabAdapter.notifyItemRangeInserted(0, mSize);
+        initTabCount();
+    }
+
+    public void onShowUndoDialog(){
+        mtabViewController.onTrigger(tabEnums.eTabViewCommands.ON_SHOW_UNDO_DIALOG, null);
+    }
+
+    public void onTabRowChanged(int pId){
+        for(int mCounter=0; mCounter<mListModel.getList().size();mCounter++){
+            if(mListModel.getList().get(mCounter).getSession().getSessionID() == pId){
+                mTabAdapter.notifyItemChanged(mCounter);
+            }
+        }
+    }
+
     /*UI Triggers*/
 
     public void openTabMenu(View view) {
         mtabViewController.onTrigger(tabEnums.eTabViewCommands.M_SHOW_MENU, Collections.singletonList(view));
     }
 
+    public void onRemoveSelection(View view) {
+        mTabAdapter.onTrigger(tabEnums.eTabModelCommands.M_REMOVE_ALL_SELECTION, null);
+        onShowUndoDialog();
+    }
+
+    public void onClearSelection(View view) {
+        mTabAdapter.onTrigger(tabEnums.eTabModelCommands.M_CLEAR_ALL_SELECTION, null);
+    }
+
     /*Tab Menu*/
 
     public void onMenuTrigger(View pView){
@@ -145,7 +212,11 @@ public class tabController extends AppCompatActivity
             onNewTabInvoked();
         }
         else if(pView.getId() == R.id.pCloseTab){
-
+            mListModel.getList().clear();
+            mtabViewController.onTrigger(tabEnums.eTabViewCommands.M_DISMISS_MENU, null);
+            initTabCount();
+            mRecycleView.animate().setDuration(300).alpha(0).withEndAction(() -> mTabAdapter.notifyDataSetChanged());
+            onShowUndoDialog();
         }
         else if(pView.getId() == R.id.pOpenSetting){
             mtabViewController.onTrigger(tabEnums.eTabViewCommands.M_DISMISS_MENU, null);
@@ -153,22 +224,12 @@ public class tabController extends AppCompatActivity
         }
     }
 
-    public void onTabRowChanged(int pId){
-        for(int mCounter=0; mCounter<mListModel.getList().size();mCounter++){
-            if(mListModel.getList().get(mCounter).getSession().getSessionID() == pId){
-                mListModel.getList().get(mCounter).releaseGeckoView();
-                mTabAdapter.notifyItemChanged(mCounter);
-            }
-        }
-    }
-
     @Override
     public void onTrimMemory(int level)
     {
         if(status.sSettingIsAppPaused && (level==80 || level==15))
         {
             dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.HOME_LOW_MEMORY,true));
-            onReleaseDisplay();
             finish();
         }
     }
@@ -193,12 +254,48 @@ public class tabController extends AppCompatActivity
         super.onPause();
     }
 
+    @Override
+    public void onBackPressed() {
+        int mSize = (Integer) mTabAdapter.onTrigger(tabEnums.eTabModelCommands.M_SELECTED_LIST_SIZE, null);
+        if(mSize>0){
+            onClearSelection(null);
+        }else {
+            super.onBackPressed();
+            finish();
+            overridePendingTransition(R.anim.popup_anim_in, R.anim.popup_anim_out);
+        }
+    }
+
     /*Event Observer*/
 
     public class adapterCallback implements eventObserver.eventListener{
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype e_type)
+        public Object invokeObserver(List<Object> data, Object e_type)
         {
+            if(e_type.equals(tabEnums.eTabAdapterCallback.ON_HIDE_SELECTION)){
+                mtabViewController.onTrigger(tabEnums.eTabViewCommands.ON_HIDE_SELECTION, null);
+            }
+            else if(e_type.equals(tabEnums.eTabAdapterCallback.ON_SHOW_SELECTION)){
+                mtabViewController.onTrigger(tabEnums.eTabViewCommands.ON_SHOW_SELECTION, null);
+            }
+            else if(e_type.equals(tabEnums.eTabAdapterCallback.ON_CLEAR_TAB_BACKUP)){
+                onClearTabBackup();
+            }
+            else if(e_type.equals(tabEnums.eTabAdapterCallback.ON_REMOVE_TAB)){
+                onRemoveTab((Integer) data.get(0));
+            }
+            else if(e_type.equals(tabEnums.eTabAdapterCallback.ON_INIT_TAB_COUNT)){
+                initTabCount();
+            }
+            else if(e_type.equals(tabEnums.eTabAdapterCallback.ON_BACK_PRESSED)){
+                onBackPressed();
+            }
+            else if(e_type.equals(tabEnums.eTabAdapterCallback.ON_LOAD_TAB)){
+                mHomeController.onLoadTab((geckoSession)data.get(0),(boolean)data.get(1));
+            }
+            else if(e_type.equals(tabEnums.eTabAdapterCallback.ON_REMOVE_TAB_VIEW)){
+                onRemoveView((Integer) data.get(0));
+            }
             return null;
         }
     }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabEnums.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabEnums.java
index defcf614..cdef05f1 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabEnums.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabEnums.java
@@ -4,9 +4,15 @@ public class tabEnums
 {
     /*Settings Manager*/
     public enum eTabViewCommands {
-        M_DISMISS_MENU, M_SHOW_MENU, INIT_TAB_COUNT
+        M_DISMISS_MENU, M_SHOW_MENU, INIT_TAB_COUNT, ON_HIDE_SELECTION, ON_SHOW_SELECTION, ON_SHOW_UNDO_DIALOG, ON_HIDE_UNDO_DIALOG, ON_GENERATE_SWIPABLE_BACKGROUND
     }
 
     public enum eTabModelCommands {
+        M_SELECTED_LIST_SIZE, M_REMOVE_ALL_SELECTION, M_CLEAR_ALL_SELECTION
     }
+
+    public enum eTabAdapterCallback {
+        ON_HIDE_SELECTION, ON_SHOW_SELECTION, ON_CLEAR_TAB_BACKUP, ON_REMOVE_TAB, ON_INIT_TAB_COUNT, ON_BACK_PRESSED, ON_LOAD_TAB, ON_REMOVE_TAB_VIEW
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabModel.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabModel.java
index 145b69ff..4c5174f9 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabModel.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabModel.java
@@ -7,17 +7,34 @@ class tabModel
     /*Private Variables*/
 
     private ArrayList<tabRowModel> mModelList = new ArrayList<>();
+    private ArrayList<tabRowModel> mBackupIndex = new ArrayList<>();
 
     /*Initializations*/
 
-    void setList(ArrayList<tabRowModel> model)
-    {
-        mModelList = model;
-    }
-
     ArrayList<tabRowModel> getList()
     {
         return mModelList;
     }
+    void setList(ArrayList<tabRowModel> model)
+    {
+        mModelList = model;
+    }
+
+    public void onRemoveTab(int pIndex){
+        mBackupIndex.add(mModelList.remove(pIndex));
+    }
+
+    public void onClearBackup(){
+        mBackupIndex.clear();
+    }
+
+    public int onLoadBackup(){
+        int mSize = mBackupIndex.size();
+        for(int mCounter=0;mCounter<mBackupIndex.size();mCounter++){
+            mModelList.add(0,mBackupIndex.remove(mCounter));
+            mCounter-=1;
+        }
+        return mSize;
+    }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabRowModel.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabRowModel.java
index aeb2a497..7e0f4672 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabRowModel.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabRowModel.java
@@ -1,6 +1,9 @@
 package com.darkweb.genesissearchengine.appManager.tabManager;
 
+import android.graphics.Bitmap;
+
 import com.darkweb.genesissearchengine.appManager.homeManager.geckoSession;
+import com.darkweb.genesissearchengine.helperManager.helperMethod;
 
 import org.mozilla.geckoview.GeckoView;
 
@@ -11,29 +14,24 @@ public class tabRowModel
     private geckoSession mSession;
     private int mId;
     private GeckoView mGeckoView = null;
+    private Bitmap mBitmap = null;
+    private String mDate;
 
     /*Initializations*/
 
     public tabRowModel(geckoSession mSession,int mId) {
         this.mSession = mSession;
         this.mId = mId;
+        this.mDate = helperMethod.getCurrentDate();
     }
 
+    /*Helper Method*/
+
     public geckoSession getSession()
     {
         return mSession;
     }
 
-    public void setGeckoView(GeckoView pGeckoView){
-        mGeckoView = pGeckoView;
-    }
-
-    public void releaseGeckoView(){
-        if(mGeckoView!=null){
-            mGeckoView.releaseSession();
-        }
-    }
-
     public int getmId() {
         return mId;
     }
@@ -41,4 +39,15 @@ public class tabRowModel
         mId = id;
     }
 
+    public void setmBitmap(Bitmap pBitmap) {
+        mBitmap = null;
+        mBitmap = pBitmap;
+    }
+    public Bitmap getBitmap() {
+        return mBitmap;
+    }
+
+    public String getDate(){
+        return mDate;
+    }
 }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabViewController.java
index 7feb9569..e8604c1e 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabViewController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabViewController.java
@@ -1,20 +1,34 @@
 package com.darkweb.genesissearchengine.appManager.tabManager;
 
 import android.annotation.SuppressLint;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.RectF;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
+import android.os.Handler;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.widget.ActionMenuView;
 import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.content.ContextCompat;
-
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
+import com.daimajia.androidanimations.library.Techniques;
+import com.daimajia.androidanimations.library.YoYo;
 import com.darkweb.genesissearchengine.constants.strings;
 import com.darkweb.genesissearchengine.dataManager.dataController;
 import com.darkweb.genesissearchengine.dataManager.dataEnums;
@@ -25,17 +39,31 @@ import static android.content.Context.LAYOUT_INFLATER_SERVICE;
 
 class tabViewController
 {
-    /*Private Variables*/
+    /*Private Views*/
     private AppCompatActivity mContext;
     private PopupWindow mTabOptionMenu = null;
     private Button mTabs;
+    private ImageView mRemoveSelection;
+    private LinearLayout mTabsContainer;
+    private ImageButton mMenuButton;
+    private ImageButton mClearSelection;
+    private View mToastLayoutRoot;
+
+    /*Private Local Variables*/
+    private Handler mDelayHandler = new Handler();
+    private Paint mPainter = new Paint();
 
     /*Initializations*/
 
-    tabViewController(AppCompatActivity mContext, Button pTabs)
+    tabViewController(AppCompatActivity mContext, Button pTabs, ImageView pRemoveSelection, LinearLayout pTabsContainer, ImageButton pMenuButton, ImageButton pClearSelection, View pToastLayoutRoot)
     {
         this.mContext = mContext;
         this.mTabs = pTabs;
+        this.mRemoveSelection = pRemoveSelection;
+        this.mTabsContainer = pTabsContainer;
+        this.mMenuButton = pMenuButton;
+        this.mClearSelection = pClearSelection;
+        this.mToastLayoutRoot = pToastLayoutRoot;
 
         initPostUI();
         initUI();
@@ -86,14 +114,83 @@ class tabViewController
         }
     }
 
-    public void onTrigger(tabEnums.eTabViewCommands pCommands, List<Object> pData){
+    private void onShowSelectionMenu() {
+        mRemoveSelection.setVisibility(View.VISIBLE);
+        mClearSelection.setVisibility(View.VISIBLE);
+        mTabsContainer.setVisibility(View.GONE);
+        mMenuButton.setVisibility(View.GONE);
+    }
+
+    private void onHideSelectionMenu() {
+        mRemoveSelection.setVisibility(View.GONE);
+        mClearSelection.setVisibility(View.GONE);
+        mTabsContainer.setVisibility(View.VISIBLE);
+        mMenuButton.setVisibility(View.VISIBLE);
+    }
+
+    private void onShowUndoDialog() {
+        mToastLayoutRoot.animate().cancel();
+        mToastLayoutRoot.setVisibility(View.VISIBLE);
+        mToastLayoutRoot.setAlpha(0);
+        mToastLayoutRoot.animate().alpha(1);
+
+        mDelayHandler.removeCallbacksAndMessages(null);
+        mDelayHandler.postDelayed(() -> mToastLayoutRoot.animate().alpha(0).withEndAction(() -> mToastLayoutRoot.setVisibility(View.GONE)), 1500);
+    }
+
+    private void onHideUndoDialog() {
+        mToastLayoutRoot.animate().cancel();
+        mToastLayoutRoot.animate().alpha(0).withEndAction(() -> mToastLayoutRoot.setVisibility(View.GONE));
+    }
+
+    private void onDrawSwipableBackground(Canvas pCanvas, RecyclerView.ViewHolder pViewHolder, float pDX, int pActionState) {
+
+        Bitmap icon;
+        if(pActionState == ItemTouchHelper.ANIMATION_TYPE_SWIPE_SUCCESS){
+            View itemView = pViewHolder.itemView;
+            itemView.animate().alpha(0f);
+        }
+        else if(pActionState == ItemTouchHelper.ACTION_STATE_SWIPE){
+            View itemView = pViewHolder.itemView;
+            float height = (float) itemView.getBottom() - (float) itemView.getTop();
+            float width = height / 3;
+
+            if(pDX > 0){
+                mPainter.setColor(ContextCompat.getColor(mContext, R.color.c_list_item_current));
+                RectF background = new RectF((float) itemView.getLeft(), (float) itemView.getTop(), pDX,(float) itemView.getBottom());
+                pCanvas.drawRect(background, mPainter);
+                icon = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.dustbin);
+                RectF icon_dest = new RectF((float) itemView.getLeft() + width ,(float) itemView.getTop() + width,(float) itemView.getLeft()+ 2*width,(float)itemView.getBottom() - width);
+                pCanvas.drawBitmap(icon,null,icon_dest, mPainter);
+            } else {
+                mPainter.setColor(ContextCompat.getColor(mContext, R.color.c_list_item_current));
+                RectF background = new RectF((float) itemView.getRight() + pDX, (float) itemView.getTop(),(float) itemView.getRight(), (float) itemView.getBottom());
+                pCanvas.drawRect(background, mPainter);
+                icon = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.dustbin);
+                RectF icon_dest = new RectF((float) itemView.getRight() - 2*width ,(float) itemView.getTop() + width,(float) itemView.getRight() - width,(float)itemView.getBottom() - width);
+                pCanvas.drawBitmap(icon,null,icon_dest, mPainter);
+            }
+        }
+    }
+
+    public Object onTrigger(tabEnums.eTabViewCommands pCommands, List<Object> pData){
         if(pCommands.equals(tabEnums.eTabViewCommands.M_SHOW_MENU)){
             onOpenTabMenu((View) pData.get(0));
         }else if(pCommands.equals(tabEnums.eTabViewCommands.M_DISMISS_MENU)){
             onCloseTabMenu();
         }else if(pCommands.equals(tabEnums.eTabViewCommands.INIT_TAB_COUNT)){
             initTabCount();
+        }else if(pCommands.equals(tabEnums.eTabViewCommands.ON_HIDE_SELECTION)){
+            onHideSelectionMenu();
+        }else if(pCommands.equals(tabEnums.eTabViewCommands.ON_SHOW_SELECTION)){
+            onShowSelectionMenu();
+        }else if(pCommands.equals(tabEnums.eTabViewCommands.ON_SHOW_UNDO_DIALOG)){
+            onShowUndoDialog();
+        }else if(pCommands.equals(tabEnums.eTabViewCommands.ON_HIDE_UNDO_DIALOG)){
+            onHideUndoDialog();
+        }else if(pCommands.equals(tabEnums.eTabViewCommands.ON_GENERATE_SWIPABLE_BACKGROUND)){
+            onDrawSwipableBackground((Canvas)pData.get(0), (RecyclerView.ViewHolder)pData.get(1), (float)pData.get(2), (int)pData.get(3));
         }
+        return null;
     }
-
 }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/constants/constants.java b/app/src/main/java/com/darkweb/genesissearchengine/constants/constants.java
index 9fa0c59f..ae7672a1 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/constants/constants.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/constants/constants.java
@@ -15,21 +15,25 @@ public class constants
 
     public static final String CONST_GENESIS_UPDATE_URL = "https://boogle.store/manual?abi=";
     public static final String CONST_PLAYSTORE_URL = "https://play.google.com/store/apps/details?id=com.darkweb.genesissearchengine";
-    public static final String CONST_BACKEND_GENESIS_URL = "http://boogle.store/q=$s";
-    public static final String CONST_BACKEND_GOOGLE_URL = "https://www.google.com/q=$s";
+    public static final String CONST_BACKEND_GENESIS_URL = "https://boogle.store/search?q=$sa&p_num=1&s_type=all";
+    public static final String CONST_BACKEND_GOOGLE_URL = "https://www.google.com/search?q=$s";
     public static final String CONST_BACKEND_DUCK_DUCK_GO_URL = "https://duckduckgo.com/q=$s";
-    public static final String CONST_BACKEND_BING_URL = "https://bing.com/q=$s";
+    public static final String CONST_BACKEND_BING_URL = "https://bing.com/search?q=$s";
     public static final String CONST_BACKEND_WIKI_URL = "https://en.wikipedia.org/wiki/$s";
 
     /*PROXY CONSTANTS*/
 
     public static final String CONST_PROXY_SOCKS = "127.0.0.1";
-    public static final int CONST_PROXY_SOCKS_VERSION = 5;
     public static final boolean CONST_PROXY_SOCKS_REMOTE_DNS = true;
     public static final boolean CONST_PROXY_CACHE = true;
     public static final boolean CONST_PROXY_MEMORY = true;
     public static final boolean CONST_PROXY_DO_NOT_TRACK_HEADER_ENABLED = false;
     public static final int CONST_PROXY_DO_NOT_TRACK_HEADER_VALUE = 1;
+    public static final int CONST_PROXY_SOCKS_VERSION = 5;
+
+    /*LOG CONSTANTS*/
+
+    public static final String LOGS_DEFAULT_MESSAGE = "Genesis on standby at the moment";
 
     /*HISTORY CONSTANTS*/
 
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/constants/enums.java b/app/src/main/java/com/darkweb/genesissearchengine/constants/enums.java
index d57762a6..7431f83f 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/constants/enums.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/constants/enums.java
@@ -4,12 +4,12 @@ public class enums
 {
     /*Settings Manager*/
     public enum etype{
-        on_update_favicon,M_RESET_THEME_INVOKED_BACK,
-        onion,on_verify_selected_url_menu,
-        welcome,abi_error, rate_failure,reported_success,bookmark, clear_tab,clear_history,clear_bookmark,report_url,default_home,rate_app,version_warning,start_orbot,download_file,download_file_long_press,on_long_press_url,
-        cancel_welcome,ignore_abi,reload,connect_vpn,app_rated,download_file_manual,download_folder, update_searcn, update_javascript,update_notification, update_history,update_cookies, update_font_size,update_font_adjustable,close_view,open_link_new_tab,open_link_current_tab,copy_link,
-        url_triggered, url_triggered_new_tab,url_clear,clear_recycler,url_clear_at,remove_from_database,is_empty,
-        on_close_sesson,on_long_press,on_long_press_with_link,on_reset_app,on_bridge_mail,on_not_support, data_cleared,on_full_screen,on_handle_external_intent,on_update_suggestion_url,progress_update,recheck_orbot,on_url_load,on_playstore_load,back_list_empty,start_proxy,on_request_completed, on_update_history,on_update_suggestion,on_page_loaded,on_load_error,download_file_popup,on_init_ads,rate_application,search_update, open_new_tab
+        ON_UPDATE_VIEW_PIXEL,on_update_favicon,ON_UPDATE_TAB_TITLE,
+        on_verify_selected_url_menu,FINDER_RESULT_CALLBACK,
+        welcome,abi_error, rate_failure,reported_success,bookmark, clear_tab,clear_history,clear_bookmark,report_url,rate_app,start_orbot,download_file,download_file_long_press,on_long_press_url,
+        cancel_welcome,ignore_abi,reload,connect_vpn,app_rated,download_file_manual,download_folder, open_link_new_tab,open_link_current_tab,copy_link,
+        url_triggered, url_triggered_new_tab,url_clear,url_clear_at,remove_from_database,is_empty,
+        on_close_sesson,on_long_press,on_long_press_with_link,on_bridge_mail,on_not_support, data_cleared,on_full_screen,on_handle_external_intent,on_update_suggestion_url,progress_update,recheck_orbot,on_url_load,on_playstore_load,back_list_empty,start_proxy,on_request_completed, on_update_history,on_update_suggestion,ON_UPDATE_TITLE_BAR,on_page_loaded,on_load_error,download_file_popup,on_init_ads,rate_application,search_update, open_new_tab
     }
 
     public static class Theme {
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java b/app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java
index 6347d7a1..9aaba057 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java
@@ -51,6 +51,7 @@ public class keys
     public static final String SETTING_THEME = "SETTING_THEME_LIGHT";
     public static final String SETTING_FULL_SCREEN_BROWSIING = "SETTING_FULL_SCREEN_BROWSIING";
     public static final String SETTING_OPEN_URL_IN_NEW_TAB = "SETTING_OPEN_URL_IN_NEW_TAB";
+    public static final String SETTING_LIST_VIEW = "SETTING_LIST_VIEW";
 
     /*Bridge Settings*/
 
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/constants/status.java b/app/src/main/java/com/darkweb/genesissearchengine/constants/status.java
index bcbff0fb..61ab5fe4 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/constants/status.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/constants/status.java
@@ -1,7 +1,5 @@
 package com.darkweb.genesissearchengine.constants;
 
-import android.content.res.Configuration;
-
 import com.darkweb.genesissearchengine.dataManager.dataController;
 import com.darkweb.genesissearchengine.dataManager.dataEnums;
 
@@ -13,16 +11,16 @@ public class status
 {
     /*App Status*/
 
-    public static boolean sPaidStatus = false;
+    public static boolean sPaidStatus = true;
     public static String sAppCurrentABI = "7.0";
+    public static String mCurrentReloadURL = "";
 
     /*Settings Status*/
 
     public static String sSettingSearchStatus = constants.CONST_BACKEND_GENESIS_URL;
     public static String sSettingRedirectStatus = strings.GENERIC_EMPTY_STR;
+    public static String sSettingLanguage = "en";
 
-
-    public static boolean sThemeChanged = false;
     public static boolean sSettingEnableZoom = true;
     public static boolean sSettingEnableVoiceInput = true;
     public static boolean sSettingSearchHistory = false;
@@ -43,21 +41,23 @@ public class status
     public static boolean sAutoPlay = false;
     public static boolean sFullScreenBrowsing = false;
     public static boolean sOpenURLInNewTab = false;
+    public static boolean sDefaultNightMode;
+    public static boolean sLogListView;
+
+    public static float sSettingFontSize = 1;
+
     public static int sTheme = enums.Theme.THEME_DEFAULT;
     public static int sSettingCookieStatus = ACCEPT_FIRST_PARTY;
     public static int sShowImages = -1;
-    public static float sSettingFontSize = 1;
-    public static String sSettingLanguage = "en";
-    public static boolean sDefaultNightMode;
 
     /*Bridge Status*/
 
+    public static String sBridgeCustomBridge = strings.BRIDGE_CUSTOM_BRIDGE_OBFS4;
     public static boolean sBridgeGatewayAuto = false;
     public static boolean sBridgeGatewayManual = false;
     public static boolean sBridgeVPNStatus = false;
     public static boolean sBridgeStatus = false;
     public static int sBridgeNotificationManual = 0;
-    public static String sBridgeCustomBridge = strings.BRIDGE_CUSTOM_BRIDGE_OBFS4;
 
 
     public static void initStatus()
@@ -94,6 +94,7 @@ public class status
         status.sFullScreenBrowsing = (boolean)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_BOOL, Arrays.asList(keys.SETTING_FULL_SCREEN_BROWSIING,false));
         status.sTheme = (int)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_INT, Arrays.asList(keys.SETTING_THEME,enums.Theme.THEME_DEFAULT));
         status.sOpenURLInNewTab = (boolean)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_BOOL, Arrays.asList(keys.SETTING_OPEN_URL_IN_NEW_TAB,false));
+        status.sLogListView = (boolean)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_BOOL, Arrays.asList(keys.SETTING_LIST_VIEW,true));
     }
 
 }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/dataManager/dataEnums.java b/app/src/main/java/com/darkweb/genesissearchengine/dataManager/dataEnums.java
index 14505b0b..284cbd5e 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/dataManager/dataEnums.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/dataManager/dataEnums.java
@@ -24,6 +24,6 @@ public class dataEnums
     }
 
     public enum eTabCommands{
-        M_ADD_TAB, M_CLEAR_TAB, M_CLOSE_TAB_PARAMETERIZED, CLOSE_TAB, GET_TAB, GET_CURRENT_TAB, GET_TOTAL_TAB, MOVE_TAB_TO_TOP
+        M_ADD_TAB, M_CLEAR_TAB, M_CLOSE_TAB_PARAMETERIZED, CLOSE_TAB, GET_TAB, GET_CURRENT_TAB, GET_TOTAL_TAB, MOVE_TAB_TO_TOP, M_UPDATE_PIXEL
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/dataManager/tabDataModel.java b/app/src/main/java/com/darkweb/genesissearchengine/dataManager/tabDataModel.java
index e0bb93ea..687a40e0 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/dataManager/tabDataModel.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/dataManager/tabDataModel.java
@@ -1,9 +1,14 @@
 package com.darkweb.genesissearchengine.dataManager;
 
 import android.annotation.SuppressLint;
+import android.graphics.Bitmap;
+import android.os.Handler;
 
 import com.darkweb.genesissearchengine.appManager.homeManager.geckoSession;
 import com.darkweb.genesissearchengine.appManager.tabManager.tabRowModel;
+import com.google.android.gms.ads.AdSize;
+
+import org.mozilla.geckoview.GeckoResult;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -71,6 +76,26 @@ class tabDataModel
             return null;
         }
     }
+
+    public void updatePixels(int pSessionID, GeckoResult<Bitmap> pBitmapManager){
+        for(int counter = 0; counter< mTabs.size(); counter++){
+            if(mTabs.get(counter).getSession().getSessionID()==pSessionID)
+            {
+                final Handler handler = new Handler();
+                int finalCounter = counter;
+                handler.postDelayed(() ->
+                {
+                    try {
+                        Bitmap mBitmap = pBitmapManager.poll(0);
+                        mTabs.get(finalCounter).setmBitmap(mBitmap);
+                    } catch (Throwable throwable) {
+                        throwable.printStackTrace();
+                    }
+                }, 100);
+            }
+        }
+    }
+
     int getTotalTabs(){
         return mTabs.size();
     }
@@ -101,6 +126,9 @@ class tabDataModel
         else if(p_commands == dataEnums.eTabCommands.GET_TAB){
             return getTab();
         }
+        else if(p_commands == dataEnums.eTabCommands.M_UPDATE_PIXEL){
+            updatePixels((int)p_data.get(0), (GeckoResult<Bitmap>)p_data.get(1));
+        }
 
         return null;
     }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/helperManager/TopCropImageView.java b/app/src/main/java/com/darkweb/genesissearchengine/helperManager/TopCropImageView.java
new file mode 100644
index 00000000..2fed17a4
--- /dev/null
+++ b/app/src/main/java/com/darkweb/genesissearchengine/helperManager/TopCropImageView.java
@@ -0,0 +1,70 @@
+package com.darkweb.genesissearchengine.helperManager;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.graphics.Matrix;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.util.AttributeSet;
+
+/**
+ * Created by chris on 7/27/16.
+ */
+public class TopCropImageView extends androidx.appcompat.widget.AppCompatImageView {
+
+    public TopCropImageView(Context context) {
+        super(context);
+        init();
+    }
+
+    public TopCropImageView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public TopCropImageView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+        recomputeImgMatrix();
+    }
+
+    @Override
+    protected boolean setFrame(int l, int t, int r, int b) {
+        recomputeImgMatrix();
+        return super.setFrame(l, t, r, b);
+    }
+
+    private void init() {
+        setScaleType(ScaleType.MATRIX);
+    }
+
+    private void recomputeImgMatrix() {
+
+        final Drawable drawable = getDrawable();
+        if (drawable == null) {
+            return;
+        }
+
+        final Matrix matrix = getImageMatrix();
+
+        float scale;
+        final int viewWidth = getWidth() - getPaddingLeft() - getPaddingRight();
+        final int viewHeight = getHeight() - getPaddingTop() - getPaddingBottom();
+        final int drawableWidth = drawable.getIntrinsicWidth();
+        final int drawableHeight = drawable.getIntrinsicHeight();
+
+        if (drawableWidth * viewHeight > drawableHeight * viewWidth) {
+            scale = (float) viewHeight / (float) drawableHeight;
+        } else {
+            scale = (float) viewWidth / (float) drawableWidth;
+        }
+
+        matrix.setScale(scale, scale);
+        setImageMatrix(matrix);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/helperManager/eventObserver.java b/app/src/main/java/com/darkweb/genesissearchengine/helperManager/eventObserver.java
index 7311bf1b..7a8de7a0 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/helperManager/eventObserver.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/helperManager/eventObserver.java
@@ -8,6 +8,6 @@ public class eventObserver
 {
     public interface eventListener
     {
-        Object invokeObserver(List<Object> data, enums.etype event_type);
+        Object invokeObserver(List<Object> data, Object event_type);
     }
 }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/helperManager/helperMethod.java b/app/src/main/java/com/darkweb/genesissearchengine/helperManager/helperMethod.java
index 35f4f1ea..9f964f7f 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/helperManager/helperMethod.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/helperManager/helperMethod.java
@@ -47,8 +47,11 @@ import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 import javax.net.ssl.HttpsURLConnection;
@@ -404,6 +407,27 @@ public class helperMethod
         context.startActivity(intent);
     }
 
+    public static String getCurrentDate(){
+        SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy");
+        Date date = new Date();
+        sdf.applyPattern("E | MMM dd,yyyy");
+        return sdf.format(date);
+    }
+
+    public static String getCurrentTime(){
+        Calendar now = Calendar.getInstance();
+        int year = now.get(Calendar.YEAR);
+        int month = now.get(Calendar.MONTH) + 1; // Note: zero based!
+        int day = now.get(Calendar.DAY_OF_MONTH);
+        int hour = now.get(Calendar.HOUR_OF_DAY);
+        int minute = now.get(Calendar.MINUTE);
+        int second = now.get(Calendar.SECOND);
+        int millis = now.get(Calendar.MILLISECOND);
+
+        System.out.printf("%d-%02d-%02d %02d:%02d:%02d.%03d", year, month, day, hour, minute, second, millis);
+        return month + "/" + year + " | " + hour + ":" + minute + ":" + second;
+    }
+
     public static PopupWindow onCreateMenu(View p_view, int p_layout) {
         PopupWindow popupWindow = null;
         if(popupWindow!=null){
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/messageManager.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/messageManager.java
index 732b52d0..a8b7d03e 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/messageManager.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/messageManager.java
@@ -8,12 +8,14 @@ import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Handler;
 import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.RatingBar;
 import android.widget.TextView;
+import android.widget.Toast;
 import androidx.appcompat.app.AppCompatActivity;
-
 import com.darkweb.genesissearchengine.appManager.activityContextManager;
 import com.darkweb.genesissearchengine.constants.constants;
 import com.darkweb.genesissearchengine.constants.enums;
@@ -25,12 +27,13 @@ import com.example.myapplication.R;
 import java.io.File;
 import java.util.Collections;
 import java.util.List;
+import static android.view.WindowManager.LayoutParams.FLAG_DIM_BEHIND;
 
 class messageManager
 {
     /*Private Variables*/
 
-    private List<String> data;
+    private List<Object> data;
 
     private AppCompatActivity app_context;
     private eventObserver.eventListener event;
@@ -40,6 +43,21 @@ class messageManager
 
     /*Initializations*/
 
+    private void initializeDialog(int pLayout,int pGravity,int pFlag){
+        if(dialog!=null && dialog.isShowing()){
+            dialog.dismiss();
+        }
+
+        dialog = new Dialog(app_context);
+        dialog.getWindow().setGravity(pGravity);
+        dialog.getWindow().getAttributes().windowAnimations = R.style.dialiog_animation;
+        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
+        dialog.setCancelable(true);
+        dialog.setContentView(pLayout);
+        dialog.show();
+        dialog.getWindow().clearFlags(pFlag);
+    }
+
     messageManager(eventObserver.eventListener event)
     {
         this.event = event;
@@ -48,7 +66,7 @@ class messageManager
     /*Helper Methods*/
     private void welcomeMessage()
     {
-        initializeDialog(R.layout.popup_welcome, Gravity.CENTER);
+        initializeDialog(R.layout.popup_welcome, Gravity.CENTER, FLAG_DIM_BEHIND);
         dialog.findViewById(R.id.pOption1).setOnClickListener(v -> {
             event.invokeObserver(Collections.singletonList(constants.CONST_BLACK_MARKET_URL), enums.etype.welcome);
             dialog.dismiss();
@@ -82,7 +100,7 @@ class messageManager
     @SuppressLint("QueryPermissionsNeeded")
     private void abiError()
     {
-        initializeDialog(R.layout.popup_abi_error, Gravity.CENTER);
+        initializeDialog(R.layout.popup_abi_error, Gravity.CENTER, FLAG_DIM_BEHIND);
         dialog.findViewById(R.id.pOption1).setOnClickListener(v -> {
             dialog.dismiss();
             Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(constants.CONST_GENESIS_UPDATE_URL + status.sAppCurrentABI));
@@ -107,7 +125,7 @@ class messageManager
 
     private void rateFailure()
     {
-        initializeDialog(R.layout.popup_rate_failure, Gravity.CENTER);
+        initializeDialog(R.layout.popup_rate_failure, Gravity.CENTER, FLAG_DIM_BEHIND);
         dialog.findViewById(R.id.pDismiss).setOnClickListener(v -> dialog.dismiss());
         dialog.findViewById(R.id.pNext).setOnClickListener(v -> {
             dialog.dismiss();
@@ -126,26 +144,27 @@ class messageManager
 
     private void reportedSuccessfully()
     {
-        initializeDialog(R.layout.popup_reported_successfully, Gravity.CENTER);
+        initializeDialog(R.layout.popup_reported_successfully, Gravity.CENTER, FLAG_DIM_BEHIND);
         dialog.findViewById(R.id.pNext).setOnClickListener(v -> dialog.dismiss());
     }
 
     private void notSupportMessage()
     {
-        initializeDialog(R.layout.popup_not_supported, Gravity.BOTTOM);
+        initializeDialog(R.layout.popup_not_supported, Gravity.BOTTOM, FLAG_DIM_BEHIND);
         dialog.findViewById(R.id.pDismiss).setOnClickListener(v -> dialog.dismiss());
     }
 
     private void dataClearedSuccessfully()
     {
-        initializeDialog(R.layout.popup_data_cleared, Gravity.BOTTOM);
+        initializeDialog(R.layout.popup_data_cleared, Gravity.BOTTOM, FLAG_DIM_BEHIND);
         dialog.findViewById(R.id.pDismiss).setOnClickListener(v -> dialog.dismiss());
     }
 
+
     @SuppressLint("ResourceType")
     private void bookmark()
     {
-        initializeDialog(R.layout.popup_create_bookmark, Gravity.CENTER);
+        initializeDialog(R.layout.popup_create_bookmark, Gravity.CENTER, FLAG_DIM_BEHIND);
         EditText mBoomMarkTitle = dialog.findViewById(R.id.pBookmark);
         dialog.setOnDismissListener(dialog -> {
             final Handler handler = new Handler();
@@ -167,27 +186,13 @@ class messageManager
         dialog.findViewById(R.id.pNext).setOnClickListener(v -> {
             dialog.dismiss();
             helperMethod.hideKeyboard(app_context);
-            event.invokeObserver(Collections.singletonList(data.get(0).replace("genesis.onion","boogle.store")+"split"+((EditText)dialog.findViewById(R.id.pBookmark)).getText().toString()), enums.etype.bookmark);
+            event.invokeObserver(Collections.singletonList(data.get(0).toString().replace("genesis.onion","boogle.store")+"split"+((EditText)dialog.findViewById(R.id.pBookmark)).getText().toString()), enums.etype.bookmark);
         });
     }
 
-    private void initializeDialog(int pLayout,int pGravity){
-        if(dialog!=null && dialog.isShowing()){
-            dialog.dismiss();
-        }
-
-        dialog = new Dialog(app_context);
-        dialog.getWindow().setGravity(pGravity);
-        dialog.getWindow().getAttributes().windowAnimations = R.style.dialiog_animation;
-        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
-        dialog.setCancelable(true);
-        dialog.setContentView(pLayout);
-        dialog.show();
-    }
-
     private void clearHistory()
     {
-        initializeDialog(R.layout.popup_clear_history, Gravity.CENTER);
+        initializeDialog(R.layout.popup_clear_history, Gravity.CENTER, FLAG_DIM_BEHIND);
         dialog.findViewById(R.id.pDismiss).setOnClickListener(v -> dialog.dismiss());
         dialog.findViewById(R.id.pNext).setOnClickListener(v -> {
             dialog.dismiss();
@@ -197,7 +202,7 @@ class messageManager
 
     private void clearBookmark()
     {
-        initializeDialog(R.layout.popup_clear_bookmark, Gravity.CENTER);
+        initializeDialog(R.layout.popup_clear_bookmark, Gravity.CENTER, FLAG_DIM_BEHIND);
         dialog.findViewById(R.id.pDismiss).setOnClickListener(v -> dialog.dismiss());
         dialog.findViewById(R.id.pNext).setOnClickListener(v -> {
             dialog.dismiss();
@@ -207,7 +212,7 @@ class messageManager
 
     private void reportURL()
     {
-        initializeDialog(R.layout.popup_report_url, Gravity.CENTER);
+        initializeDialog(R.layout.popup_report_url, Gravity.CENTER, FLAG_DIM_BEHIND);
         dialog.findViewById(R.id.pDismiss).setOnClickListener(v -> dialog.dismiss());
         dialog.findViewById(R.id.pNext).setOnClickListener(v -> {
             dialog.dismiss();
@@ -220,7 +225,7 @@ class messageManager
     @SuppressLint("QueryPermissionsNeeded")
     private void rateApp()
     {
-        initializeDialog(R.layout.popup_rate_us, Gravity.CENTER);
+        initializeDialog(R.layout.popup_rate_us, Gravity.CENTER, FLAG_DIM_BEHIND);
         dialog.findViewById(R.id.pDismiss).setOnClickListener(v -> dialog.dismiss());
         dialog.findViewById(R.id.pNext).setOnClickListener(v -> {
             RatingBar mRatingBar = dialog.findViewById(R.id.pRating);
@@ -245,7 +250,7 @@ class messageManager
 
     private void downloadFile()
     {
-        initializeDialog(R.layout.popup_download_file, Gravity.BOTTOM);
+        initializeDialog(R.layout.popup_download_file, Gravity.BOTTOM, FLAG_DIM_BEHIND);
         ((TextView)dialog.findViewById(R.id.pDescription)).setText((app_context.getString(R.string.ALERT_DOWNLOAD_MESSAGE) + data.get(0)));
         dialog.findViewById(R.id.pDismiss).setOnClickListener(v -> dialog.dismiss());
     }
@@ -253,17 +258,17 @@ class messageManager
     @SuppressLint("ResourceAsColor")
     private void downloadFileLongPress()
     {
-        File f = new File(data.get(0));
+        File f = new File(data.get(0).toString());
         String name = f.getName();
-        String title = data.get(1);
+        String title = data.get(1).toString();
 
         int size = name.length();
         if(size>235){
             size = 235;
         }
 
-        initializeDialog(R.layout.popup_file_longpress, Gravity.CENTER);
-        ((TextView)dialog.findViewById(R.id.pDescription)).setText((title + " | " + data.get(0).substring(0,size)+"..."));
+        initializeDialog(R.layout.popup_file_longpress, Gravity.CENTER, FLAG_DIM_BEHIND);
+        ((TextView)dialog.findViewById(R.id.pDescription)).setText((title + " | " + data.get(0).toString().substring(0,size)+"..."));
         dialog.findViewById(R.id.pDismiss).setOnClickListener(v -> dialog.dismiss());
         dialog.findViewById(R.id.pOption1).setOnClickListener(v -> {
             event.invokeObserver(Collections.singletonList(data.get(0)), enums.etype.download_file_manual);
@@ -285,15 +290,15 @@ class messageManager
 
     private void openURLLongPress()
     {
-        int size = data.get(0).length()-1;
-        String title = data.get(1);
+        int size = data.get(0).toString().length()-1;
+        String title = data.get(1).toString();
 
         if(size>235){
             size = 235;
         }
 
-        initializeDialog(R.layout.popup_url_longpress, Gravity.CENTER);
-        ((TextView)dialog.findViewById(R.id.pDescription)).setText((title + data.get(0).substring(0,size)+"..."));
+        initializeDialog(R.layout.popup_url_longpress, Gravity.CENTER, FLAG_DIM_BEHIND);
+        ((TextView)dialog.findViewById(R.id.pDescription)).setText((title + data.get(0).toString().substring(0,size)+"..."));
         dialog.findViewById(R.id.pDismiss).setOnClickListener(v -> dialog.dismiss());
         dialog.findViewById(R.id.pOption1).setOnClickListener(v -> {
             event.invokeObserver(Collections.singletonList(data.get(0)), enums.etype.open_link_new_tab);
@@ -310,9 +315,9 @@ class messageManager
     }
 
     private void popupDownloadFull(){
-        String url = data.get(0);
-        String file = data.get(1);
-        String title = data.get(2);
+        String url = data.get(0).toString();
+        String file = data.get(1).toString();
+        String title = data.get(2).toString();
 
         String data_local = app_context.getString(R.string.ALERT_LONG_URL_MESSAGE);
 
@@ -334,10 +339,10 @@ class messageManager
         }
         String mTitle = title;
         if(mTitle.length()<=1){
-            mTitle = data.get(0).substring(0,size)+"...";
+            mTitle = data.get(0).toString().substring(0,size)+"...";
         }
 
-        initializeDialog(R.layout.popup_download_full, Gravity.CENTER);
+        initializeDialog(R.layout.popup_download_full, Gravity.CENTER, FLAG_DIM_BEHIND);
         ((TextView)dialog.findViewById(R.id.pHeader)).setText(mTitle);
         ((TextView)dialog.findViewById(R.id.pDescription)).setText((data_local));
         dialog.findViewById(R.id.pDismiss).setOnClickListener(v -> dialog.dismiss());
@@ -373,13 +378,13 @@ class messageManager
 
     private void startingOrbotInfo()
     {
-        initializeDialog(R.layout.popup_starting_orbot_info, Gravity.BOTTOM);
+        initializeDialog(R.layout.popup_starting_orbot_info, Gravity.BOTTOM, FLAG_DIM_BEHIND);
         dialog.findViewById(R.id.pDismiss).setOnClickListener(v -> dialog.dismiss());
     }
 
     private void sendBridgeMail()
     {
-        initializeDialog(R.layout.popup_bridge_mail, Gravity.CENTER);
+        initializeDialog(R.layout.popup_bridge_mail, Gravity.CENTER, FLAG_DIM_BEHIND);
         dialog.findViewById(R.id.pDismiss).setOnClickListener(v -> dialog.dismiss());
         dialog.findViewById(R.id.pNext).setOnClickListener(v -> {
             dialog.dismiss();
@@ -404,7 +409,7 @@ class messageManager
 
     /*External Helper Methods*/
 
-    void createMessage(AppCompatActivity app_context, List<String> data, enums.etype type)
+    void createMessage(AppCompatActivity app_context, List<Object> data, enums.etype type)
     {
         this.app_context = app_context;
         this.data = data;
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginController.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginController.java
index 32a1a0f9..b659914b 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginController.java
@@ -80,14 +80,11 @@ public class pluginController
     public boolean isInitialized(){
         return mIsInitialized;
     }
-    void proxyManagerExitInvoke(){
-
-    }
 
     /*---------------------------------------------- EXTERNAL REQUEST LISTENER-------------------------------------------------------*/
 
     /*Message Manager*/
-    public void MessageManagerHandler(AppCompatActivity app_context,List<String> data,enums.etype type){
+    public void MessageManagerHandler(AppCompatActivity app_context,List<Object> data,enums.etype type){
         mMessageManager.createMessage(app_context,data,type);
     }
     public void onResetMessage(){
@@ -142,8 +139,7 @@ public class pluginController
     public int getNotificationStatus(){
         return orbotManager.getInstance().getNotificationStatus();
     }
-    public void updateCookiesStatus(){
-    }
+
     public void updateBridges(boolean p_status){
         orbotManager.getInstance().updateBridges(p_status);
     }
@@ -156,7 +152,7 @@ public class pluginController
     /*Ad Manager*/
     private class admobCallback implements eventObserver.eventListener{
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype event_type)
+        public Object invokeObserver(List<Object> data, Object event_type)
         {
             mHomeController.onSetBannerAdMargin();
             return null;
@@ -166,7 +162,7 @@ public class pluginController
     /*Analytics Manager*/
     private class analyticCallback implements eventObserver.eventListener{
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype event_type)
+        public Object invokeObserver(List<Object> data, Object event_type)
         {
             mAnalyticManager.logUser();
             return null;
@@ -176,7 +172,7 @@ public class pluginController
     /*Fabric Manager*/
     private class fabricCallback implements eventObserver.eventListener{
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype event_type)
+        public Object invokeObserver(List<Object> data, Object event_type)
         {
             return null;
         }
@@ -185,7 +181,7 @@ public class pluginController
     /*Firebase Manager*/
     private class firebaseCallback implements eventObserver.eventListener{
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype event_type)
+        public Object invokeObserver(List<Object> data, Object event_type)
         {
             return null;
         }
@@ -194,7 +190,7 @@ public class pluginController
     /*Lang Manager*/
     private class langCallback implements eventObserver.eventListener{
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype event_type)
+        public Object invokeObserver(List<Object> data, Object event_type)
         {
             return null;
         }
@@ -203,18 +199,20 @@ public class pluginController
     /*Onion Proxy Manager*/
     private class orbotCallback implements eventObserver.eventListener{
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype event_type)
+        public Object invokeObserver(List<Object> data, Object event_type)
         {
             return null;
         }
     }
 
     /*Lang Manager*/
-    public void setLanguage(AppCompatActivity context){
+    public void setLanguage(){
         mLangManager.setDefaultLanguage(new Locale(status.sSettingLanguage));
     }
     public void onCreate(Activity activity) {
-        mLangManager.onCreate(activity);
+        if(activity==null || !activity.isDestroyed()){
+            mLangManager.onCreate(activity);
+        }
     }
     public void onResume(Activity activity) {
         mLangManager.onResume(activity);
@@ -223,7 +221,7 @@ public class pluginController
     /*Message Manager*/
     private class messageCallback implements eventObserver.eventListener{
         @Override
-        public Object invokeObserver(List<Object> data, enums.etype event_type)
+        public Object invokeObserver(List<Object> data, Object event_type)
         {
             if(event_type.equals(enums.etype.welcome))
             {
diff --git a/app/src/main/res/anim/fade_in.xml b/app/src/main/res/anim/fade_in.xml
index d35de463..8609456e 100755
--- a/app/src/main/res/anim/fade_in.xml
+++ b/app/src/main/res/anim/fade_in.xml
@@ -1,7 +1,8 @@
-<set xmlns:android="http://schemas.android.com/apk/res/android">
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:startOffset="250">
     <alpha
-        android:duration="100"
-        android:fromAlpha="0.5"
+        android:duration="350"
+        android:fromAlpha="0.2"
         android:interpolator="@android:anim/linear_interpolator"
         android:toAlpha="1.0" />
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/fade_out.xml b/app/src/main/res/anim/fade_out.xml
index cfc55613..31650b1d 100644
--- a/app/src/main/res/anim/fade_out.xml
+++ b/app/src/main/res/anim/fade_out.xml
@@ -1,6 +1,6 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android">
     <alpha
-        android:duration="100"
+        android:duration="0"
         android:fromAlpha="1.0"
         android:interpolator="@android:anim/linear_interpolator"
         android:toAlpha="0.5" />
diff --git a/app/src/main/res/anim/left_to_right.xml b/app/src/main/res/anim/left_to_right.xml
new file mode 100644
index 00000000..c238e872
--- /dev/null
+++ b/app/src/main/res/anim/left_to_right.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:startOffset="250"
+    android:duration="500">
+
+    <translate
+        android:fromXDelta="-100%p"
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:toXDelta="0" />
+
+    <alpha
+        android:fromAlpha="0.5"
+        android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+        android:toAlpha="1" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/list_layout_controller.xml b/app/src/main/res/anim/list_layout_controller.xml
new file mode 100644
index 00000000..a96205c2
--- /dev/null
+++ b/app/src/main/res/anim/list_layout_controller.xml
@@ -0,0 +1,5 @@
+<layoutAnimation xmlns:android="http://schemas.android.com/apk/res/android"
+    android:delay="5%"
+    android:animationOrder="normal"
+    android:animation="@anim/fade_in">
+</layoutAnimation>
\ No newline at end of file
diff --git a/app/src/main/res/anim/log_layout_controller.xml b/app/src/main/res/anim/log_layout_controller.xml
new file mode 100644
index 00000000..7390c29d
--- /dev/null
+++ b/app/src/main/res/anim/log_layout_controller.xml
@@ -0,0 +1,5 @@
+<layoutAnimation xmlns:android="http://schemas.android.com/apk/res/android"
+    android:delay="17%"
+    android:animationOrder="normal"
+    android:animation="@anim/fade_in">
+</layoutAnimation>
\ No newline at end of file
diff --git a/app/src/main/res/anim/popup_anim_in.xml b/app/src/main/res/anim/popup_anim_in.xml
index fb1189be..8b3058c8 100755
--- a/app/src/main/res/anim/popup_anim_in.xml
+++ b/app/src/main/res/anim/popup_anim_in.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android" >
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fillAfter="true"
+    android:fillEnabled="true">
 
     <translate
             android:duration="250"
diff --git a/app/src/main/res/anim/popup_anim_out.xml b/app/src/main/res/anim/popup_anim_out.xml
index fc1cbc32..6494babc 100755
--- a/app/src/main/res/anim/popup_anim_out.xml
+++ b/app/src/main/res/anim/popup_anim_out.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android" >
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fillAfter="true"
+    android:fillEnabled="true">
 
     <translate
             android:duration="250"
diff --git a/app/src/main/res/custom-xml/alert/xml/ax_background_inverted.xml b/app/src/main/res/custom-xml/alert/xml/ax_background_inverted.xml
new file mode 100644
index 00000000..654425ee
--- /dev/null
+++ b/app/src/main/res/custom-xml/alert/xml/ax_background_inverted.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/holo_gray">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/holo_gray" />
+            <corners android:radius="5.5dp" />
+        </shape>
+    </item>
+
+    <item android:id="@android:id/background">
+        <shape android:shape="rectangle">
+            <gradient
+                    android:angle="90"
+                    android:endColor="@color/c_background_inverted"
+                    android:startColor="@color/c_background_inverted"
+                    android:type="linear" />
+            <corners android:radius="5.5dp" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/custom-xml/generic/xml/gx_ripple_light.xml b/app/src/main/res/custom-xml/generic/xml/gx_ripple_light.xml
new file mode 100644
index 00000000..908ec465
--- /dev/null
+++ b/app/src/main/res/custom-xml/generic/xml/gx_ripple_light.xml
@@ -0,0 +1,9 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/c_ripple_v2">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/button_gray" />
+            <corners android:radius="00dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/custom-xml/generic/xml/gx_side_menu.xml b/app/src/main/res/custom-xml/generic/xml/gx_side_menu.xml
index 20206895..8156e937 100644
--- a/app/src/main/res/custom-xml/generic/xml/gx_side_menu.xml
+++ b/app/src/main/res/custom-xml/generic/xml/gx_side_menu.xml
@@ -4,11 +4,11 @@
     <item android:id="@android:id/mask" >
         <shape android:shape="rectangle">
 
-            <solid android:color="@color/c_background"/>
+            <solid android:color="@color/c_alert_background"/>
 
             <stroke
                 android:width="1dp"
-                android:color="@color/c_view_divier_background" />
+                android:color="@color/c_view_divier_background_v2" />
 
             <corners
                 android:bottomLeftRadius="4dp"
@@ -22,11 +22,11 @@
     <item android:id="@android:id/background">
         <shape android:shape="rectangle">
 
-            <solid android:color="@color/c_background"/>
+            <solid android:color="@color/c_view_divier_background_v1"/>
 
             <stroke
                 android:width="1dp"
-                android:color="@color/c_view_divier_background" />
+                android:color="@color/c_view_divier_background_v2" />
 
             <corners
                 android:bottomLeftRadius="4dp"
@@ -36,8 +36,8 @@
 
             <gradient
                 android:angle="90"
-                android:endColor="@color/c_background"
-                android:startColor="@color/c_background"
+                android:endColor="@color/c_alert_background"
+                android:startColor="@color/c_alert_background"
                 android:type="linear" />
         </shape>
     </item>
diff --git a/app/src/main/res/custom-xml/home/xml/gx_ripple_gray_bottom.xml b/app/src/main/res/custom-xml/home/xml/gx_ripple_gray_bottom.xml
new file mode 100644
index 00000000..90222cae
--- /dev/null
+++ b/app/src/main/res/custom-xml/home/xml/gx_ripple_gray_bottom.xml
@@ -0,0 +1,11 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/c_ripple">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/button_gray" />
+            <corners android:bottomLeftRadius="4dp"
+                     android:bottomRightRadius="4dp"
+                />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/custom-xml/home/xml/gx_ripple_gray_top_left.xml b/app/src/main/res/custom-xml/home/xml/gx_ripple_gray_top_left.xml
new file mode 100644
index 00000000..97d59405
--- /dev/null
+++ b/app/src/main/res/custom-xml/home/xml/gx_ripple_gray_top_left.xml
@@ -0,0 +1,9 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/c_ripple">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/button_gray" />
+            <corners android:topLeftRadius="4dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/custom-xml/home/xml/gx_ripple_gray_top_right.xml b/app/src/main/res/custom-xml/home/xml/gx_ripple_gray_top_right.xml
new file mode 100644
index 00000000..34ad1fd1
--- /dev/null
+++ b/app/src/main/res/custom-xml/home/xml/gx_ripple_gray_top_right.xml
@@ -0,0 +1,9 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/c_ripple">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/button_gray" />
+            <corners android:topRightRadius="4dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/custom-xml/images/xml/ic_baseline_arrow_upward.xml b/app/src/main/res/custom-xml/images/xml/ic_baseline_arrow_upward.xml
new file mode 100644
index 00000000..07b7a836
--- /dev/null
+++ b/app/src/main/res/custom-xml/images/xml/ic_baseline_arrow_upward.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M4,12l1.41,1.41L11,7.83V20h2V7.83l5.58,5.59L20,12l-8,-8 -8,8z"/>
+</vector>
diff --git a/app/src/main/res/custom-xml/images/xml/ic_baseline_clock.xml b/app/src/main/res/custom-xml/images/xml/ic_baseline_clock.xml
new file mode 100644
index 00000000..9dbafa7c
--- /dev/null
+++ b/app/src/main/res/custom-xml/images/xml/ic_baseline_clock.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10s10,-4.5 10,-10S17.5,2 12,2zM16.2,16.2L11,13V7h1.5v5.2l4.5,2.7L16.2,16.2z"/>
+</vector>
diff --git a/app/src/main/res/custom-xml/images/xml/ic_baseline_info.xml b/app/src/main/res/custom-xml/images/xml/ic_baseline_info.xml
new file mode 100644
index 00000000..17255b7a
--- /dev/null
+++ b/app/src/main/res/custom-xml/images/xml/ic_baseline_info.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>
diff --git a/app/src/main/res/custom-xml/images/xml/ic_baseline_keyboard_arrow_down.xml b/app/src/main/res/custom-xml/images/xml/ic_baseline_keyboard_arrow_down.xml
new file mode 100644
index 00000000..884bee14
--- /dev/null
+++ b/app/src/main/res/custom-xml/images/xml/ic_baseline_keyboard_arrow_down.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z"/>
+</vector>
diff --git a/app/src/main/res/custom-xml/images/xml/ic_baseline_keyboard_arrow_right.xml b/app/src/main/res/custom-xml/images/xml/ic_baseline_keyboard_arrow_right.xml
new file mode 100644
index 00000000..d3d62595
--- /dev/null
+++ b/app/src/main/res/custom-xml/images/xml/ic_baseline_keyboard_arrow_right.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M8.59,16.59L13.17,12 8.59,7.41 10,6l6,6 -6,6 -1.41,-1.41z"/>
+</vector>
diff --git a/app/src/main/res/custom-xml/images/xml/ic_baseline_keyboard_arrow_up.xml b/app/src/main/res/custom-xml/images/xml/ic_baseline_keyboard_arrow_up.xml
new file mode 100644
index 00000000..9b15755e
--- /dev/null
+++ b/app/src/main/res/custom-xml/images/xml/ic_baseline_keyboard_arrow_up.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>
+</vector>
diff --git a/app/src/main/res/custom-xml/images/xml/ic_gateway_splash.xml b/app/src/main/res/custom-xml/images/xml/ic_gear.xml
similarity index 100%
rename from app/src/main/res/custom-xml/images/xml/ic_gateway_splash.xml
rename to app/src/main/res/custom-xml/images/xml/ic_gear.xml
diff --git a/app/src/main/res/custom-xml/setting/xml/sx_border_left.xml b/app/src/main/res/custom-xml/setting/xml/sx_border_left.xml
index c2faa39f..caea498e 100644
--- a/app/src/main/res/custom-xml/setting/xml/sx_border_left.xml
+++ b/app/src/main/res/custom-xml/setting/xml/sx_border_left.xml
@@ -3,7 +3,7 @@
     <item android:left="0dp" android:right="-5dp" android:top="-5dp" android:bottom="-5dp">
         <shape
             android:shape="rectangle">
-            <stroke android:width="5dp" android:color="@color/c_border_left" />
+            <stroke android:width="4dp" android:color="@color/c_text_setting_heading" />
             <solid android:color="@color/c_border_background" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable-hdpi/dustbin.png b/app/src/main/res/drawable-hdpi/dustbin.png
new file mode 100644
index 0000000000000000000000000000000000000000..9740316f5a738885c9ae59d34fe9e33d880c5c94
GIT binary patch
literal 11425
zcmaia1zeQf)AoWZupph%AkqpbEz%((p&%jMxim;GtRP6LDBUWeurvrrrzjGllt`B#
z-Tj_>@%g{+^M2p&`+n$h?sMjzxn|~?nS=O5OGAa2ke(0*gAuFVQoIL);esVDjNlv$
zhEtwRWdfdXJnpH;!wS0@e}f0Ot(>|X3|10HbYy-WNET_`(NO~X$M*IoPELmo4u3x#
z9giIxPMw@i9UZ~Wse{9jg9F$(adZSbU~yz`e`;fMf<%J#A$S*v+1o=(fDAYSV*l))
z+S)?<c6LAvdJBbu9)Y}@8(08~;16UAtNd&YECK;YEm&AvL&87?=m#=b{Xh?-1ZV@F
zNF<PiRAE2=9)Z_^q=f}|7a%{=@K-t3+?nu+tu65J?;6+wl6H0g;Tir@Q`5gkzyv^u
z4Fv=Ys{v9AT=+kfLym(@Y-AwVSb@KKu$aLnfDLwlB;<vi9dP6fHWXX1@8SY!z#0PZ
zAPv}noOpNuqaf^mcm4_8nRjOzpd+k8$O;Vhzk&mlpNXBhaP|pI01anq0V>EAHr<eh
z`}d(8XJ-iKnJ?JIU$ns1Kac;(I3)Q`Mj&5MC}0JO)xXi6nFf+);K3sR0NKI{g9UgO
z_yVy4C^-Xg#vglo!F(q;pzN&YJq>NxTkn0#IrkVvo0}0GAMeQKwNPDpdCbZ4;g-Xi
z)FLJ8Yw^J^@CFx(f|I2;Sr3Pv%UjJ0T)gWMi(!%bRC|@3diC9CLhmEbAH?RJ8pgj8
zZ-@TLW#Ar;XXD_)>!KsrD#Tw7*7F^C(Txbv_S!D8ct6FPrul?^J)g-WkbF!qiC^to
z*l8KrM$oucvZ^Cd|M|zFeh1}Bwms-<8W9~F#+~Bn^vKq#-IAG%`>uphn>VD}Q0FEt
zr|?y)JADr~lQd{*yl_}SvXB#pJJ}p?RH<VB`<0Ne?f~hY!spq{dY^mD(K7AVx!?Yf
z1`Z=!Zy9*NU?eTjUz`q?JS!NCJ5p6qPRGY&IX$kyMk#RIrIh<to*Kds?PM9PXZDj*
z$+48<<RnZs!l1SN1p&^h7noeT5=Ejbsx(f=cLiP^z4z05^MWplqe}kXg~#%WiL&yk
zbg%92u<k2J%1C=;tac?!^aS)sT%VWf*$iwjdAM^UGkL%J;oSa;?_6@7|LTCN_lL?#
ze5w>C<Q9J=e(d<&X?0enn+Y^Lf%62H$CPNn_n-?Ee^j^oTes4$M0>W@<mFgW3iUo)
zOdM0Z03L_X1I~eS6W0l~&9W@}Tm^432PP_X@C{AB#1|X;sVF=*(SDd3(a!j(+={X{
zNx}1Ipu*0$+t;er;_gQ#rUY5#uEQb^8}i!^$9(7O7Ws@rr>QeS18+~qxwx>`yjgEo
z5hefiZEyPi<Y2<v>F4WTE)jI_Ng<%EC}d7)LAJ1Co-W<%GM=N9U#;;ktfQ;ATtZD-
zgt_>>&`FwsGe=0FmE^Ksf{<t9fEH$8t%FO{t)Vn}^2#szvAyq{EB6zG4xFcgtS>5v
z-X-6jiCc3leezx~-HLM1f^u5zgR;2Eq-y2hv!cnKO9CC4DzQ_VsDKi&1d^lm_iK*M
zl+X9l0XUtISe~P9hg$Zhz1KB{s_UM-mmQ~D?#8GKpRWloKS*Y0FNu7SVQBX}=3>~G
zVi}??ihN-$<E|5uX;9hy$wj5xJy(P~+oPv^I(%Mdvh^uZ^V|$5eSP5N#IB6Cqt$-x
zDW${IceSRsl|hI?@natQP^-dMCOIFJEdABBwBGfFR2-&;q1M$bkw>SubCJ<zgEef^
z)Op!gqHLsowVuYbGmh@LiMiQ2GAyh499o3(e%dn$;~Y-9>v`<e%_sjmz0?036=uE3
zbbhJ$t}52E8*g(=pAYz)f0-aj(EdTx%@;nlx5IhWtCwD;UtMZ0gQQ{Xi2CQR1IkTX
zLFtkwBc+c^qq7ZTCgU`bIhE1bB97c&=rHSj>faND%55(Eav=UTOcg|&ns>$0?kio*
z4{%1vYfk#Y`U2*n!Uy_GbONb)gv2kcD6J{I*ivtat_OqHqGdqZ9!yWW@SB#S7$r7l
zwarGoYL5F^iU=DjJsvM7<cfggEF`urF%Bz!>?Nt~1}UkL?SRYKibxN&rehd-MLuVq
zhZ5wu&h8o8yW&LfIvul{g=*Y=e5}(qrs(|an@7|qPIsc?AM3vZ?9F>`2pMFbyZfd0
zqmYuh<*g5T+>$8{RD^Yi&K(`M&U3ahS!<E=ZzLa5?NIRjVis7Vy`gNOsFFRw$u<`m
z&rBn5z`>Ra774tPDHP|S6^#JZAC6WXw{I;uN-7l1lXkVzLeJO}Lg_@VHZkVj;$Tyb
zR`+MWUk*1mYaA-)`quiK>|A^9&AZnSLKa3Al=f4a@)zji-i~<W<@Ch6&g8s$r<`pj
zgXrLw%m}R@RFXp69nuU?xaC{f_Kky)S@v@opJa-skW}ysTSM-ec(Tl7{HGgEk+Z7e
z&1z5AqUG6ClbpVV(Kb$EFen&ht-M#rZ>^RUv^`J|#x8@vc(XguZz-rhGS9OQK*=@T
zZa(hS`jN%rKz~6&y}v4wHgc3>l!*8~@j-TOli+vZn0&h?)ql&}readBVZ}+i@Gq(C
zPa6Lgi==)Y`aG0gRbI8(GyW<E;xhP}e-SD}_&;Cs$^N9?d}(!Hq(iGDDX9304V}}Y
zRRR74PV+q$y#3cwA9G%HQn~hLzP8l{&OWW5suREd+ko~<yz2tZ=(ovXs>p5*oi_8m
zMTKwg_!2m?c}^%+s%m*Bdq9xvp6#0oB3y1&ZxFUU=ioP-;V_?+FX2Z-(fF$Bmun?)
z=knUfU8|uFvoJ(mYSRfjkjy<DP0kaykzZKQs?jn{@eC&n(@V};<E5lpbi5qDru}Ty
z+;?J5alTMK(Eb}!P8-o$?D$mn_lUygd@Jfx!hWTy50?5lYrMYaIitP_@tfoccvDyu
zayO(h(_A^=m~2Vn`<y*f?2}zD{F~(2lyVpKtd_fe=^C#@TNpS(cACF~6seh@zZWZJ
z*H@`l@dvjS`v|Ra)LN})p4zSV11X*oa{PvJ8If?_+Rr&YY*MkxRwUX!FO}9UE-*Z!
zd`0=LNS`8z{*kg0%J!l7U0#Hcl@&YXI{|fW(^&FLn=*!!znk;3_N=4nQU?^@ukjYj
zp7z<Rzqs8@Y6;lMdHeEYrbXkYBVEUwnRv2G%AD7p@zzH2)km^TQzU;Pix;xe$pI$z
ze!7k4HwiCG==5!S-)S(g7W~jUzp&qAHQJniN6Y6Wf^fU-#O#_)-~1hM2dul)ghkin
zChxN=O{owGMgs2U6|HczKC*)G^yKPigsxo!eAdnrP_JnraOvXdDO}@S#x=ovx)I%+
zuSn=~5zzk1_e75Dlk3BB&$YmptBq=&us+F;S%ahr+7I3tX!|GPm%|P|Ys$a6iBJ7#
zIXrSQ@8aXgrd?X90*=tfDK<sR;VDfdHz-Bar+IZDL+89mh((AGZj#<_d(vs%*_>Za
z<kKe$DkF$A=e=v<k30u@y>+bhvt6#Ne|G!i1FgB(gue?fsCYLT>%Mw#Z`2kUq8bro
z0()n^j^#$_^QU-E858(xZ+{G?C5A+~RJs2@U*f(L&s}zWtljlNUY_Ba2-7|w7WsNw
zajbQH$UH7Pcl|gFIH)1N#8}zpxzEY__~TYFX^usNxG`{1%6+DfG=nIA^0)#1YSLG%
z1qv+0VSH3m-7R15Fg<%(Y>=r;F5hcZL)E8kI1z3CNDqB<I_~zZj3<F>a)RTQ|3KKm
zx7Rl=XrKq*+<djhTY{V6_uRFHyY_Z@@Y|pOzR7Z)?|Kg@-s9H$J@brYzl6AtV|#PK
z)q!aHjq1bV^P?rI`<sMC&v_@FcBtE<Ua#@~&e<37+<$GfA9nB{C6xP5PixQ2)QiNd
zPioC*tSKGt+Rt#P%Ct<YRrOy#<<JRZ-)CuYq>7wDMHk&=#cOl6bWX7r&pnaU7yWw8
z>0<-&#~Z2EV5+veZF1<YF%?u*AU9wY(j)_|*Ve)@QPvZrhO}SUN#zWuZ|J+_FDkh1
zimllT#qpVHw9`~xI5Ov7$}}@(JR$dp%}5B5iMBOYH8S~{{3_F$=a{V3Z_mesQ2!+}
zI=O*DvYG2iBCakb+-$xl|M!em-0&WFfq#7Q=!sl9<DwA5ATa1w(9M$A|73sXoDYws
z0ig{1&?Wd}2Y<zhG5?!_>kyu+t)>13S$P5*YUpH_y+&d~<>&B{YXaMc&6VRMyKX5Y
z`&Xl9mv`BQ4osdUZ{%KHvg4mqAY0K3sihWTL9f-(v(BwhH(ldjJz}adAr87`sWfnH
z#`E#~eKt!aqEcqGYb~!;!L24=f)hrmA_7hzjM-LLv!e?PxBj#+da8{K%;<X1hwkcL
zlSVOj8<T%J5&v@vi>uynR2!TukY))VuO#j7dNFTPs9<>i)ZD5axaefee-1TNqo45Y
zRPdT%{<riArz^e$556?AR9-zhRyz%6J;p?8H^n6Dx3HkM5;2<R#pc39niX70E>2iX
zs*nO<n}TE~7~fnYh*DEZ8=j!$4u6ys92v7J%Z%P2QzX;=78_}Oaj(U!Q-MtG4noYv
zqEn&w$edU0Mh7s*9>HU;(pCx*R$L=$)}tWSv^YUY`s*Cu*N_`GP<JWCY<fzmd<aae
zQ|>o31d~k;(xdd`pRCD?{WN4NUx;*ha{mw8o_6Jrokuhq1ltc;TA%j+cIuTMxjXxy
zjTwE4gIT~AY24k7(h6kWw0%TB@!%$k5es?`@6Ya`9I-2=l4XBbCv+n9O*UTDfRaoC
zVAi9TL$C&x@329Kn#-cBdp7oYILmo-3D$qYCrqIIah81?x3gEuUwy8;eG{&!%y%G1
zymox~gfNTxI13MKS47@~|F|B!1B@Q3A%n#jfWF23X??sCK}#qUd!H0~S0Qj*q;h%E
z8)RGm6COW^3;~NT!2!^<cQV69@I!?eed45b&M1FA&Jsj3`ZB2;eDV^h92QTe6g>L?
z=*uK_2zJ~)as!D?Dw$!6U=5gITiAsV#D}x$K>ErcmosEyftS}4q~PSCaZ>Q(Agyx&
zs135vMW7EQnuk;PW3!_Kq@?|MI4gSXS$NhssYCFpCNo+q5a{c{6KSmQI}ryQ=>nuz
zB!j?%P_7*Vx86hghO_XhbbDAj03|NwuPLnQ9YH()1eba|c-QYZgH&X~{AXm)_+$Es
zuL*mdFaC+}GnHEn9oZFolItoc^S9yl6~`uUp4UwGEAKC|<?U7a)h`5fuC5QH;Rw*a
zVxAT8t|Zbz#?#t&(ND7N5yOQpU!@7!Du%#EHUtj7VWR#5P)HET-TAaMETsMA+bLU>
z$Z^lhnrBR#&GaW^qt&?PciMj(B{4XLhEJ>vn8UA82U?Io0W1q*d3NU!B8=&J1yI*o
zgI97VBqo@}!_ojx3SQwwpYyK!ixHgj1@iy_shs06EBpH|+8k(;0d7(`eWugx60#mV
z@~scx)$IGbTt$bOm%~Bsi}SXf74=eB#LCvEqx2I(NaY-iy+zRcZM(h0j~~3c30GJu
zZAm{J|45p7bN5mjL1_W#5BW|Y;{$EL5zzQ9uCrA=&@Bm{h{SdrY#kGwCMFbto_PBC
zV7p8-<Cl$q=+{z4nV<lLD_=_HvWx8#to{A{6|Nl8P7Za)zC$9Hosz6i*%@7S9<7>J
zU@Yep8l5+HL!k9CG8MMs`)Rj$F~N5>b+<*DS@)+qYV%5<R6)4)WE^O^%`6|TCWOg2
z8}ok=^&hR#cc&13lLkjtgoppAe4h#54LS-b>ybXhQA_ly^W!d&+AV*d0dELH&2-JY
z{XHbF`y<|L>gVJQAC>C^THU2<9c~4!DDU5MHe-x|SBOA$Ha}0&@ukq;o7NvVZHY_@
zNVu+|`Q_dLN5uJ(>Mlw1?)H+!G`I|UyI3O3kH`GJBq9U7y_OC7d4&dAU!62BaUJ8p
zC0CG(|6L6ye?XNi|F>M`@W$W0KpRU#nv<#kBJ6Gz@FUjTT;%4$b%uTj3O{%)&}P~o
zq4}={^89W{1J3rn=J%cytqy*&byUSO9Nb)TVQFxjj+RxUwKujIzH<{zkKTXhFDXu8
zp6PL0o5)t{c3U@azoK?hg^He-`*ew=(=@z{e|WmPL#J$3#prc1U+K(FJxy6xvWoia
zYVZI;#NyG#xUIix($Q>@0T*ieV^A5}4puJVr^E67ncY%|4B}nB##E!ObiSz!_+-Fk
zSD}YR5f3S9nd|k?E+a`F^;)G6W3ci3keFe-hSpO4RpK5#`R+*Wi*=K}N<*n7?DER1
zFa7YCB{udpsL9<m(DBE4NkNQ8_3Xsc96lsqvakr2JS@D`B#CI=j9imq@SKlK;*#?*
zArI<m9j#-ZQzgsLgEM&SMtb{jHI1W}UQPtZRQoG+#ZSzx)lnQ}pV_tAk|yfb!=Ww9
z{#iP+Ws*%L&f}s)wBdJ3HrkWH(rx_g(yqoD+Z{oV9ezXL>lk8X6wPDvmH5lxB>!A`
zR%v%D$Mrdk#8UCr!QkYec}DWa0(J6|*4FXhWPA`!{MT5uo`Ln*!dDxobjjImQiwv#
z|0br|?^B^`rcwSBMq*JY3L}C1fn7xRkM}!)=(36#j$6N{&2RD(p#XOQ6}(FLkKC3l
z3=T5ktF@bB{;PHU*Pd-_ICp)g51?pOZ+&6Z0gXRRG=atK!s+(fVr6jzm|E4{ZOySk
z(ebS4r03ek{6`Ba*zFRA#)#^YcI;Y+q49}CIndrNPo|wC7EJA7X0SJ15XPFTh=d8)
zj03_offILLXvl5JKw2eUGF%4;?QTmTMjS{<-6_EQWapBjjoOd5>{NZ)%wo$ATAVw@
zO#2@|V{v_eX@=udO!9;O6d}F@q~}?DR#e+jX9;k2GVVGJI*CF8;cmGD)fYdUd^Z0f
zbMVW#44D&aeWuZ^US@qE8$XKLrKQ}u!w!;k+qzoZAL6^o!z8Z;Y%;i-K8(zzr)P$c
zO@40wqN>Gy6t<poV0=Eijb9UuvM}^&c=dFI3?&f!eM+L{$IcBr9;*Z{x$=~tw+ckQ
z4BNW|tz<tPJ|0t*2TNqYHRbb{@r7D9Kd@LdJ{fZ&J2&S;;fa~+!E|IDq^%x;N!8;m
zqmv0Fjq_(ywE{B~v2)cnN``M9l6;*0GwVPqLU#+2q&fA!))AjIUgUT#1&pwx;pYrw
z%56|Oi^&v&$5+X8SjupsuqXEzCcd_p^IK+uVfUMu6-?DC-Jb#_I44e0`Ms*WtBIqq
zMKI$WD~_ia1R<RQ6*w6(&?G!c9)<l}Jp57`nGP^5Ck}z>58VuWY2NoRYN88&>_oXV
zBI>cS#bvbbdyX{G?}&@B_m0df8919Vi1r>FF6^yfuk3OUj=7E$XrUmF<P#5w-6>wg
zgTX9;$ocVnJ1Auch7!%V%q6G&S+!T!-{;fk(N-}2A+S+t(1ced!_+r0s%fC9PQ)$Q
zA^?o1@mc?zBoyrS1M#wTehEa%Jq>i_NQ;8*9H(gGF1Te>Jec7Cmk15C-S+V;XxXpV
zIxZ5)!K-v1rNL+ao>W-XWdiZc7~4+O-WTo^<v*C2ORtHQ;GB5}c$g;*7@5B+(D6K;
zHB6>kpMbrwf*#uq&rU8c9SdWF3Lxgbh|j|8tUY~M{RCVMplb(>1VVoMSv>25K$Jv6
z8k`4P7$C%~Typ=MTrpUE3&d@w4gN#u@PaONr{Gm=c0d5$$ECshKtBFMZ30&eo&@6a
z-xG&UKN%n{!_f0QK8t6T!!G}(l$Eu!1-RfqmnS6+=nlgXp*wCG3*t<ON-F_WaTNKa
zs`bx_+Q6Z`1t60TfT+&HC1<!i$;RhF$uI%2^T8E&3UEyV{608w2XVf)Hys_uiffc_
zK2Mr;;MA+S_EIZQ<1c9s@8(H+NFhuXwja^0A<I)t3`rG;_YmOHvl_N|y(50&(5^uy
zoX)}!`2j<#a6#P65ZS=Tir2Ny;bYZ+6gg(C*dttjNK#G{x1_tJcJyZwltmolewO`@
z;}!I`xl|&Q7JEQJ^71b&c~C|=Mp=dry)_g>KDP~Y4t&j1@y$<P9{O<CMF{YDatn33
z!__a)F#E#PZ~w62!i~=T(^)3d04ncLpf!Jk7~5iA-azQiUZjl*a{-MCIF_rJ`OZKH
zA56*a2cXq-PyB5=MJiO3&9TE}{KuMTHI~U)^Nu^1Caxw!@;1*umK}ErCb^n^kK;GA
z##NVqZn<I<BhEQZ7}V8GKh2S}hasi@P3~bC<4Tcs6tku-Op`0puIlQz<P~AX?!?`d
z6bQ;=o?r1Aaf6GzS;rmFvy3c%q4hbN9yi7&gN`k3!Ir?Y_f`})s4K?$H;Ur>01JBx
zLKc3MlrFNzVONmImbRES$6maKA=f~+%S%;A)J9}w0vo;hnrt~WN32h>5=B6P(W4$G
zIk-Q{NMd?t8w1!r&>!)hSue$R{~3j2T0Cok9$Vpqqswz5o1|r+rG&iP8?2L0``P74
zX90pUGN4XSh%1n@Ndg@T<qxP#qnvG~J7~-JTQtzEe&^)*JC|2o%aUcn4W`rJ@3wCe
zlu_xKD%&zR#CTC`6|j7yD~at1SrxQ2u!!-da57+#*e#3j6|VQ&yQTq`7>M9%qOMQ|
zv+cFWqN-~c2*SUomGTWlVVcN^s%u37I}k1XoDSD(0h9-2_1`zO(qFZdPAS$B183jH
zu;0dUy;C2ezm}P4(R?LRG;~2W6(0N~uZ*f3qo1tu^KjKv3AbCqTp7BV+pRp;zmD5C
zV5q%{FIegQ;fKnjWwQu7N6fo^*LWE34R3EWn?tCbW5K%*=N>X^trGt<Z*P4ZQ7N6`
zcf)la$Lm_T*fi1mP}Y$bDYs#IcM&j3sw9o_YWpazARhrOE6F|^47tM{u8~?{`Iz5|
zsfo&YLg{v!-v~r<DUl`*d?@vOB>U#xbgHvDB*gU3a6T<{OBsdV6V)=DPi-8p&h6^i
z@?S-vHp=e_-FR=m<VU&ZkBZXEr`nZDJo4iC5PMz((i>^tq1lnIlhD&3layE-NuS;B
zIa^LTah|t__5|7K#h;fAFz9I<et+ZR^?t3>X6*dzK&6>ejFx2$dgSNM<ePV`F0>C+
z6o`>A&bX`f_yTuCwu&P4wcL@hB^4Dlh*~@WwVN4LWZHb63%_2gsWcG_p*&(;O|)2?
za_o;T#0;xXpxUGEQ64R<OgU;(^$z^uEMAFoDrfvgsi$vv5&6{__w62%nHT4M0R{~s
zV2rb@T+1yYp<~7rZx>46Pu-X6gFBiKVciCKLujv^hNFY4W5D2$P$GhLFP=j-#EZ<q
zZpnjEeE2O)rKv(B8iVOqpJ+vBc_Pg`kr-!OF7@DM$LnWkLJ?X4$VgleN|JUC*|3V2
zeKVY{f`9FEU;Cw<S#62e;O}3t_xW_cSHk(UJ?JKGjFwr=<_R4ig`aDG$13ywww--w
ziSg=6zyd$N;zCbPAmQP=i-#iY(aV0j?TKdRn`L*7Nk6<T31rTCS&KM2sEaV6d*ry4
z(Z1swth>dz7EV?rNRz0z3!XMO*CNH(9n7Wb4_sFVFXd3zA!^rI*lo=3toX524hgP_
z@cL5vw9%542wv3;5b*ZhbJPJEK9Us)it3qa?D~FkoN){#H(FIGZ{8c#+!_8;Z5g3V
z*S76Npv&F38@EZ{cCmBYkvv~37*#hk|Cp_a!90TDz4|)SNNNkd<nGwBeCle16md4;
zWpVM(j_}W;aFbZAFbb(y<I1hT7~xrG-0^7rFx(>^QG@FfBD{cS)~&qJJ#U7r+Oh`o
z7St!gGL_1k7Xlc6N^Obo`cv**QRIvMs#Y7wyg|QDZ%#FMO1@4wy^(bMX8u*JvRk|R
zF|#6nbSG)5>4D6EBbB-0U}g|pj_8$J_}CD+>8q!1#;czj2%^6j*e)0&mp275pVYIg
zAI_&W#Px<v{@F*Afv~O=QJ;=Cb(~DVrfBij<Hf}MC8r#9HvDlJmIwMX8`(oMj@~Xk
zx{0KFO?{jpYwEv^@~3hnPdZvw(o4R=xV^2#jhWenD_49x9gYh)if{1En-nE>3b#`}
zeAz-P<ui8IDI@38(%lVCt@8W*X9WpWPR>`gOW#2a``QC$J`okbEU0JMc?=FLiapj>
zw6weLjLV>ynykCdsl_((r+iT?1iTQRDjROcjIHVan+oJ&YNPggASpxlyUBX)$kjTV
zjZ|4xSc{j0zev64qg2`b0k;;fH@gzKU#B>=C>mXPy<6{@Wm=B#JL6u)xgd-a`N!i<
zYMXji8qS3%ICptZo`D5qCx#PY=8DjA%0vi(T9(XF#iet?r5c@ooCLL*x8Ttem+F@-
z8RQ+2FfjP;&F(N6Xfv)fpVTKFUlI#ph#iGHi*K>#eUk1Fu12Jhp4o~|ZQL)u6)b-k
zopL!B^o~Kh=P<lPSldoAR@bEzj^HLv*``3}2q;Lt;8BiCwl5G5f>9$I4;TEGdUwjI
z$=;|e_CrR<v~(|=yR=70-5Gbjg&l`*`MN^_1lRZ#fNO+H_0v}V4v2p&WHA+Xez%$p
z0x)k69@Ak;yBAxb7J-Y=!%g%0+Bx@de)J%@hxqXBmdxSk_(!9T(nEpnAfeYmQtQ<{
zqwfd3cjFo+`ET*ha0+J9j)!N{&#o2;D4mN}sXyeENtho0wfTY3_&q8S-{5E9k=66m
zMx&LiOufm~a?Pw~O&Obi^nFVIWR&B7y&&zD!lZW0)Nn4Q`jfgD^Xf<PY2nuKvcq1s
zL{sBvq~OU30h9ai?jH;O?T6D~m$VwuHMMG<*1r3&n|R@Q2dSc^(1=*?<v51!Y)hVx
zMT&|13rbqe<9j2Yf5D|I>Bcu6UO%u}Uzq*9=WWn1nmes00e<t0*9*V3$6#t$o!Uq#
zD7?68<oS70?BkR_m*lLg^Wcbv>{~_}#M2!;T@bOtK5;~`44vB0uWI6ScOSA>{2>ka
zeLUd`#*RPZG$g9v3mYmI4Y8s91HZMulnT3oN`qHjq00yV48bMqfP4e>TB(?1m^~`I
zmnU2aSMf-QlC@6M8Ta*|E@a_quRfx8wn!6K@z`yw#%1XNg8)v=fbvB{!#AmowjYny
zDOt%`xNu0!li0R8ZU>tcaFUPbjX3;*uPkqLs0UjG+@#D}j*Ex6Qzo^P8K3wdddXRq
zv|*2xkJF<yBtTe6_UP;o$0Zc3bous2+qZ)EMs{+vNw(OzXI(szphv0VmLI!OOoW;h
z%*Um}-c@X?2ft|Ot9bbl;Y7hY7ncZQTE`;pHf&_a`F8Tz0gzMVK^#2d5D=OTsu)E}
zF4@nSqwt+UP!gNMHn^{k-DL0{u%9F$o|-U-;e2!C%LjC$wJQMO8sx&sIRP{Io)laI
z7chDO%#)N7l2@JTS+8yrxKr9aO>JcSq@?weg%1Z^lG1JpEENG>BUHf$u`tfP6Xn4f
z&fdv=OHNroq&p>nWCb&VY?n(cL;)gkM7u`t3z=%fpCT;5yWqDDr-Lq(|39J*t_g2^
z2-4udZl6dsLfDc?8FU_%mt?>St5}G{)2OUU8C_hsrASNzuw<G#3a5AuK-1gdzCMa6
z1h`u^JMIK;jm&V8c{<#rU|rF4#tnxiFnLTmj0fdTIb;g*+}#hNvD0x(XZK_e3w;!R
zs|Zs76=_xpMb;P7OnAfrFnoKROdJ91zH$VyXqSxU6bp&vWdogD&KcK(l~xXkDu5HT
zJJ6$mrFzk71P2EM8c=$l!5He8^Kr?r-xa{Ah3|eGvZEj^Bz+()m*{VR(9LibH(<LM
z$mnw1p-?ZyIu?2rNR*)gw$E5zmQ8GsMv!fTh`yL&bES}V##MnL9_>X3GQf0S{%NZ0
zqfz*r>{ay0i9UiX`iJlduoM7taqE@?0G)++x*=8raFg_~TnEVqsCwT4;#GmPFy?@?
zs0e$5&~>Vtp`Zq<38FE=vTK=jc?t{N4U|V^Da5Og_S?Z%QGpb!iy)#rZ3+_{!K3h4
zDB>5F1VIKQ!4**~1P?TY5F>cSzbFm}_VhadElbG?Xb$1dkO90L1gNsKm!84gKw88V
z|5LYs$tRG-jP^Uh<uWTBvTChZ=+h9#tf3Odjd=+(J~`l!{SG2}FEYGQ6$ZS4B7S|q
z95i`P9Rx@aF{r|G)dUWQAc}&z{d>UDI+P2xcK~z<r|jo(i0+b7D8NgI)N*eJF5ygp
zw75oqv@rDzfzW}tAOCmL7>x@_h`>T`R|g!!R^NGgKAf7PZPnmB5Yg9Eq#;oCi$f8&
zDQK~Cr(DRRKm&e)_KfdN{(T4AHFDPnfh8yx^7p{UIc$*w=6L#Gs}ztLt$|U&Z9VQ(
zpCH4|J<t>On}+Z(b>~6jgG~!xL6K%@lei$-d1+2EK<^uZ-@;(Zv1|gOw30{0hvuM@
z771QkTrC2vj&%H2Nu?=hrk=PQgSz_IRws^dojHG^f9~iP`l_$dR7?f6E23t`jY!!*
z3MC+$2u+kY1q7<&s&cqdp=oqQY~zaQD}}2?`T+qO$4tuMQa~Vn{)o8!Vp_w}Zni|`
zQmiGv_3nm8Us_N7lF-2Bu2_$p2PeqF*ZETt1qPHr9h17$ic1~J)L$mWXY}NoD-yNq
zD{Kv>G~?LO=FjeNiOhg2t<0k*37K-Nk%!VF0&y3Ljvr>aJN`V`7gLy#6+q*y+82sO
zr8W+l<BO)PHfPxVy*Ny$l$>MeRw?0Y+qo#B2F=&PzOgW-A=feL6{76N*n~<y2G7zo
zD{2bFSgwCWpCX)zhaW0c31mSM#(9Ax{>6O(g-6nk79-!qLJVy!NJUewe_8b~N<HCp
zb=(yzMlf_WL@%omBk{z*ueLNTX+@LXdh9wFA!)=yB2kZ!L;67<yQM#r8;rtvm&Fg~
z0_ygf?|bbeTR=Mwn+udfkuft*NK=ko|8t8e3Z(Zhc@{vQYR3Js=j^7Sc1SO3d2XM+
zQdT=4lNx*HNZL6e4y5&&y5JO?(+;jOpbRKR98Dfy8Rj<e=JU?_lwo5ZKMofi*&ljA
zJQeUqw&bSLSBm~QSIQwfE~dtMCjxwp(i>XtnzV`)0Ls<!>G5#PFhPBfaUIn!ZL%M8
zpktJOkcs?d;LjX*Bf%&@lNy1%3fj&u+oDzyjEG*%>HGt0P3;jUa6OFP`FO6r=b?xX
z=J1cH)u|sehP)h9#v{@nsEzpu8wr^6Lj7xY#Gkpz8*?$P7N3Z}7L{NGZAvXSiyS>(
zk28sAyFb(r0A=Fw&f4^@+5AAT|CkrGuC7&)pW|jVLh<W2yP|qaQg7F=VULddlB?<^
zb?h?^Wi<#RGP}W`h0A>Ysy-7aV^6UJbDmng$4*Eau@Kg5rn&|EdbF`IqJASLDt4|A
zNsoLCa&uu>q{#0eiuR^&<s44ty9zFWgQ@-^zZgX68Z#Z9Ls>0?3X>t)pDNqO3AJeO
zvn$kt{`XZGxgr(<?`t2_od)yh0S@wwGp-VYq2Vy-!gh~91sfGVgL;bM=HDNJ=UU8s
z7^#pLk><h!{$eI(d?iE2m>g-MDpEY+9Lxu0lHkR%;EyzRWXNA4?$nGybXpOWJ0k-F
br}*VODcw&6-!Opxst8k6(oigvH$(py(CiPM

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/dustbin.webp b/app/src/main/res/drawable-hdpi/dustbin.webp
deleted file mode 100755
index 50451f82c830f9214cb1569366fceaa97da4fbe5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 638
zcmV-^0)hQfNk&F?0ssJ4MM6+kP&iC#0ssInU%(d-%?Jb%fb$n#BBK8h2a;>scEjYn
z_rG&2z%4MN1{#U8R1Q;mpp2ZMfy~I+)_<2EX-UsvM2L`U+t#sX>-k>Bw#$rMg59Uf
z6|l5wt4yEPr7EMcZT-gQ7mowCkrc_b40m-5Pe8z533(XRO%`2@2!3(;CU-G9>#z-P
zvZB*aV#gT2h`#AvEV#HpID3XAlDQ=flI^)BvU`SDbh6$4A2OTCN8U^iv{L6r!wu6#
zE@Aq$daQzluB>7uA<_ptN}v##Jt4C8p#@>T9K@Hz6$+PiAx_C=o|<P0oaiUl*hyBU
z{HF-WPltf&FJ@XtbH!N@0J!E!W5BtO5XPCzj5Jj!W(6UR7};qUAjIqrU@YUnaZL3h
zlYEzYTQNi^kzzvh3kwl|V;Evq2LMCv@pp5fIC}|@<gK6XMZK{Uxjk8;27)~V80+-!
zb1}ICKns2!Iu1C94@MS3%v=}nF>*7snAjLN0sxj7RGQwwAar$ZhXy1D37>J9{=WA`
zAd`E3G7v$3B?$VT05i_(LwwQ+!R3-Qc@{<gHyFg|pEw}qcK`%3o!qg1WCC!E=^ch}
zP_nJK_(rS&0LJ7FBk;DUY`c!0g)z9-3%xosI~akUOH8&GmaWt8q}B|4<FS$LPPkiY
z-&RsjNmM!c(*Avs4f*NFW@}^B@`eQtt%b#p(U2azbxOllw`4RLK?0{x*bDjE!ULQ^
zIJd#Bb+JlG#Vk1UFSBtHjGw->a0_P=_B298DOOR5uj*`_-Tu_O?sC-wXB5u5>7|0>
YtmUZCX2U-5F2;A!aAv{F3H%8Y0JK~x%>V!Z

diff --git a/app/src/main/res/layouts/alert/layout/popup_download_full.xml b/app/src/main/res/layouts/alert/layout/popup_download_full.xml
index c3d4acfe..6ea8cd11 100644
--- a/app/src/main/res/layouts/alert/layout/popup_download_full.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_download_full.xml
@@ -89,7 +89,7 @@
                     android:clickable="false"
                     android:padding="0dp"
                     android:paddingStart="15dp"
-                    android:text="@string/ALERT_WELCOME_MESSAGE_BT_1"
+                    android:text="@string/ALERT_DOWNLOAD_OPTION_1"
                     android:textAlignment="textStart"
                     android:textAllCaps="false"
                     android:textColor="@color/c_alert_text"
diff --git a/app/src/main/res/layouts/alert/layout/popup_find.xml b/app/src/main/res/layouts/alert/layout/popup_find.xml
new file mode 100644
index 00000000..a850f725
--- /dev/null
+++ b/app/src/main/res/layouts/alert/layout/popup_find.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/pPopupFindContainer"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:id="@+id/pNavigationContainer"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_marginTop="2dp"
+        android:layout_marginBottom="2dp"
+        android:background="@color/c_background"
+        android:elevation="8dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <EditText
+            android:layout_width="0dp"
+            android:id="@+id/pFindText"
+            android:background="@color/c_background"
+            android:textColorHint="@color/c_hint_text"
+            android:layout_height="match_parent"
+            android:layout_weight="3"
+            android:focusedByDefault="true"
+            android:textSize="16sp"
+            android:padding="15dp"
+            android:hint="@string/GENERAL_FIND_HINT"
+            android:inputType="text"
+            android:importantForAutofill="yes"
+            android:autofillHints="yes">
+
+        </EditText>
+
+        <TextView
+            android:id="@+id/pFindCount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAlignment="center"
+            android:layout_weight="1"/>
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
+            android:layout_marginRight="5dp"
+            android:background="@color/c_view_divier_background_inner_v1"
+            app:layout_constraintBottom_toTopOf="@+id/pNavigationContainer" />
+
+        <ImageButton
+            android:id="@+id/pFindPrevious"
+            android:layout_width="50dp"
+            android:layout_gravity="center"
+            android:layout_height="50dp"
+            android:onClick="onFindPrev"
+            android:background="@xml/gx_ripple_default_round"
+            android:src="@xml/ic_baseline_keyboard_arrow_up"
+            android:tint="@color/c_navigation_tint"
+            android:contentDescription="@string/GENERAL_TODO" />
+
+        <ImageButton
+            android:id="@+id/pFindNext"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:onClick="onFindNext"
+            android:layout_gravity="center"
+            android:background="@xml/gx_ripple_default_round"
+            android:src="@xml/ic_baseline_keyboard_arrow_down"
+            android:tint="@color/c_navigation_tint"
+            android:contentDescription="@string/GENERAL_TODO" />
+
+        <ImageButton
+            android:id="@+id/pClose"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_gravity="center"
+            android:onClick="onHideFindBar"
+            android:background="@xml/gx_ripple_default_round"
+            android:src="@xml/ic_close"
+            android:tint="@color/c_navigation_tint"
+            android:contentDescription="@string/GENERAL_TODO" />
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/popup_undo.xml b/app/src/main/res/layouts/alert/layout/popup_undo.xml
new file mode 100644
index 00000000..bb0a4b10
--- /dev/null
+++ b/app/src/main/res/layouts/alert/layout/popup_undo.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/pToastLayoutRoot"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/pMainLayout"
+        android:layout_width="360dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="26dp"
+        android:layout_marginEnd="25dp"
+        android:layout_marginBottom="25dp"
+        android:background="@xml/ax_background_inverted"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <TextView
+            android:id="@+id/pDescription"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="25dp"
+            android:alpha="0.6"
+            android:paddingStart="15dp"
+            android:paddingEnd="15dp"
+            android:text="@string/ALERT_UNDO_TAB_REMOVE_INFO"
+            android:textAlignment="textStart"
+            android:textStyle="bold"
+            android:textColor="@color/c_alert_text_inverted"
+            android:textSize="14sp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="SmallSp" />
+
+        <Button
+            android:id="@+id/pUndo"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="10dp"
+            android:layout_weight="1"
+            android:background="@xml/ax_ripple_default_round_right"
+            android:padding="0dp"
+            android:onClick="onRestoreTab"
+            android:text="@string/ALERT_UNDO_TAB_REMOVE_BUTTON"
+            android:textAllCaps="false"
+            android:textColor="@color/c_button_text_v1_inverted"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/bookmark/layout/bookmark_view.xml b/app/src/main/res/layouts/bookmark/layout/bookmark_view.xml
index 1869400a..f6091fc0 100644
--- a/app/src/main/res/layouts/bookmark/layout/bookmark_view.xml
+++ b/app/src/main/res/layouts/bookmark/layout/bookmark_view.xml
@@ -92,6 +92,7 @@
                 android:scaleType="fitCenter"
                 android:src="@drawable/menu_item"
                 android:tint="@color/black" />
+
         </LinearLayout>
 
         <View
diff --git a/app/src/main/res/layouts/bridge/layout/bridge_settings_view.xml b/app/src/main/res/layouts/bridge/layout/bridge_settings_view.xml
index d71e2423..a6dc531a 100644
--- a/app/src/main/res/layouts/bridge/layout/bridge_settings_view.xml
+++ b/app/src/main/res/layouts/bridge/layout/bridge_settings_view.xml
@@ -24,6 +24,8 @@
                     android:layout_width="match_parent"
                     android:layout_marginBottom="0dp"
                     android:focusable="true"
+                    android:elevation="8dp"
+                    android:background="@color/c_background"
                     android:orientation="horizontal"
                     android:layout_height="52dp">
                 <ImageButton
@@ -44,18 +46,32 @@
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="40"
-                    android:layout_marginTop="-3dp"
+                    android:layout_marginTop="2dp"
+                    android:layout_marginEnd="4dp"
                     android:gravity="center_vertical|start"
                     android:textStyle="bold"
                     android:text="@string/BRIDGE_HEADER"
                     />
-            </LinearLayout>
 
-            <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginBottom="10dp"
-                    android:background="@color/c_view_divier_background" />
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"/>
+
+                <ImageButton
+                    android:layout_width="45dp"
+                    android:layout_height="45dp"
+                    android:layout_marginStart="0dp"
+                    android:scaleX="1.08"
+                    android:scaleY="1.08"
+                    android:layout_marginTop="3dp"
+                    android:layout_marginEnd="7dp"
+                    android:background="@xml/gx_ripple_default_round"
+                    android:contentDescription="@string/GENERAL_TODO"
+                    android:src="@xml/ic_baseline_info"
+                    android:tint="@color/c_navigation_light" />
+
+            </LinearLayout>
 
             <!-- Title Header -->
             <LinearLayout
diff --git a/app/src/main/res/layouts/history/layout/empty_view.xml b/app/src/main/res/layouts/history/layout/empty_view.xml
new file mode 100644
index 00000000..61a4490a
--- /dev/null
+++ b/app/src/main/res/layouts/history/layout/empty_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/history/layout/history_view.xml b/app/src/main/res/layouts/history/layout/history_view.xml
index 49f87bf4..4493a40b 100644
--- a/app/src/main/res/layouts/history/layout/history_view.xml
+++ b/app/src/main/res/layouts/history/layout/history_view.xml
@@ -14,11 +14,11 @@
         android:id="@+id/pHeaderContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/c_background"
         android:clickable="true"
         android:elevation="7dp"
         android:focusable="true"
         android:orientation="vertical"
-        android:background="@color/c_background"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -28,10 +28,10 @@
             android:layout_width="match_parent"
             android:layout_height="48dp"
             android:clickable="true"
-            android:paddingEnd="7dp"
-            android:paddingStart="5dp"
             android:focusable="true"
             android:orientation="horizontal"
+            android:paddingStart="5dp"
+            android:paddingEnd="7dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -44,7 +44,7 @@
                 android:layout_marginTop="1dp"
                 android:background="@xml/gx_ripple_default_round"
                 android:contentDescription="@string/GENERAL_TODO"
-                android:onClick="onNewTabInvoked"
+                android:onClick="onBackPressed"
                 android:src="@xml/ic_arrow_back"
                 android:tint="@color/c_navigation_tint" />
 
@@ -53,8 +53,8 @@
                 android:layout_height="match_parent"
                 android:layout_marginTop="-3dp"
                 android:layout_weight="40"
-                android:onClick="onNewTabInvoked"
                 android:gravity="center_vertical|start"
+                android:onClick="onBackPressed"
                 android:text="@string/HOME_TITLE"
                 android:textColor="@color/c_text_v1"
                 android:textSize="17sp"
@@ -93,6 +93,85 @@
                 android:tint="@color/c_navigation_tint" />
         </LinearLayout>
 
+    </LinearLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/mMainScroll"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fillViewport="true"
+        android:paddingBottom="10dp"
+        android:layout_marginTop="48dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/pHeaderContainerBottom"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:background="@color/c_background"
+            android:clickable="true"
+            android:focusable="true"
+            android:orientation="horizontal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <Button
+                android:id="@+id/pClearButton"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginStart="0dp"
+                android:layout_marginTop="0dp"
+                android:layout_marginEnd="0dp"
+                android:layout_weight="17"
+                android:background="@xml/gx_ripple_blue"
+                android:paddingStart="20dp"
+                android:stateListAnimator="@null"
+                android:text="@string/HOME_CLEAR"
+                android:textAlignment="textStart"
+                android:textColor="@color/c_text_setting_heading"
+
+                android:textSize="13sp"
+                android:textStyle="bold"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                tools:ignore="RtlSymmetry" />
+
+            <EditText
+                android:id="@+id/pSearchInput"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginStart="0dp"
+                android:layout_marginTop="0dp"
+                android:layout_marginEnd="0dp"
+                android:layout_marginBottom="0dp"
+                android:layout_weight="30"
+                android:background="@xml/gx_generic_input_square"
+                android:ems="10"
+                android:hint="@string/HOME_SEARCH_HINT"
+                android:importantForAutofill="no"
+                android:inputType="textNoSuggestions"
+                android:maxLines="1"
+                android:paddingStart="11dp"
+                android:paddingEnd="8dp"
+                android:textColor="@color/c_text_v1"
+                android:textColorHighlight="@color/text_color_highlight_v1"
+                android:textColorHint="@color/c_text_v2"
+                android:textCursorDrawable="@xml/gx_search_cursor_state"
+                android:textSize="15sp"
+                android:visibility="gone"
+                tools:targetApi="o" />
+
+        </LinearLayout>
+
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
@@ -100,78 +179,16 @@
             android:paddingStart="10dp"
             android:paddingEnd="10dp" />
 
-    <LinearLayout
-        android:id="@+id/pHeaderContainerBottom"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:background="@color/c_background"
-        android:clickable="true"
-        android:focusable="true"
-        android:orientation="horizontal"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <Button
-            android:id="@+id/pClearButton"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_marginStart="0dp"
-            android:layout_marginTop="0dp"
-            android:layout_marginEnd="0dp"
-            android:layout_weight="17"
-            android:background="@xml/gx_ripple_blue"
-            android:paddingStart="20dp"
-            android:stateListAnimator="@null"
-            android:text="@string/HOME_CLEAR"
-            android:textAlignment="textStart"
-            android:textColor="@color/c_text_setting_heading"
-
-            android:textSize="13sp"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:ignore="RtlSymmetry" />
-
-        <EditText
-            android:id="@+id/pSearchInput"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_marginStart="0dp"
-            android:layout_weight="30"
-            android:layout_marginTop="0dp"
-            android:layout_marginEnd="0dp"
-            android:layout_marginBottom="0dp"
-            android:background="@xml/gx_generic_input_square"
-            android:ems="10"
-            android:hint="@string/HOME_SEARCH_HINT"
-            android:importantForAutofill="no"
-            android:inputType="textNoSuggestions"
-            android:maxLines="1"
-            android:paddingStart="11dp"
-            android:paddingEnd="8dp"
-            android:textColorHint="@color/c_text_v2"
-            android:textColor="@color/c_text_v1"
-            android:textColorHighlight="@color/text_color_highlight_v1"
-            android:textCursorDrawable="@xml/gx_search_cursor_state"
-            android:textSize="15sp"
-            android:visibility="gone"
-            tools:targetApi="o" />
-
-    </LinearLayout>
-
-    </LinearLayout>
-
-    <androidx.recyclerview.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/pRecycleView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="97dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/pHeaderContainer" />
 
+    </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
     <ImageView
         android:id="@+id/pEmptyListNotification"
         android:layout_width="130dp"
diff --git a/app/src/main/res/layouts/language/layout/language_view.xml b/app/src/main/res/layouts/language/layout/language_view.xml
index eb43c10f..f85cb955 100644
--- a/app/src/main/res/layouts/language/layout/language_view.xml
+++ b/app/src/main/res/layouts/language/layout/language_view.xml
@@ -12,7 +12,8 @@
             android:id="@+id/pHeaderContainerTop"
             android:layout_width="match_parent"
             android:layout_height="48dp"
-            android:elevation="7dp"
+            android:elevation="8dp"
+            android:background="@color/c_background"
             android:clickable="true"
             android:focusable="true"
             android:orientation="horizontal"
@@ -46,6 +47,23 @@
                 android:textSize="17sp"
                 android:textStyle="bold" />
 
+            <View
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1"/>
+
+            <ImageButton
+                android:layout_width="45dp"
+                android:layout_height="45dp"
+                android:layout_marginStart="0dp"
+                android:scaleX="1.08"
+                android:scaleY="1.08"
+                android:layout_marginTop="1dp"
+                android:background="@xml/gx_ripple_default_round"
+                android:contentDescription="@string/GENERAL_TODO"
+                android:src="@xml/ic_baseline_info"
+                android:tint="@color/c_navigation_light" />
+
         </LinearLayout>
 
 
@@ -66,11 +84,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/c_view_divier_background" />
-
             <Button
                 android:id="@+id/langEnglish"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layouts/orbot/layout/orbot_settings_view.xml b/app/src/main/res/layouts/orbot/layout/orbot_settings_view.xml
index 4f0549d4..5720f63f 100644
--- a/app/src/main/res/layouts/orbot/layout/orbot_settings_view.xml
+++ b/app/src/main/res/layouts/orbot/layout/orbot_settings_view.xml
@@ -18,6 +18,8 @@
             <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_marginBottom="0dp"
+                    android:elevation="8dp"
+                    android:background="@color/c_background"
                     android:orientation="horizontal"
                     android:layout_height="52dp">
                 <ImageButton
@@ -43,13 +45,26 @@
                         android:textStyle="bold"
                         android:text="@string/ORBOT_HEADER"
                         />
-            </LinearLayout>
 
-            <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginBottom="10dp"
-                    android:background="@color/c_view_divier_background" />
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"/>
+
+                <ImageButton
+                    android:layout_width="45dp"
+                    android:layout_height="45dp"
+                    android:layout_marginStart="0dp"
+                    android:scaleX="1.08"
+                    android:scaleY="1.08"
+                    android:layout_marginTop="3dp"
+                    android:layout_marginEnd="7dp"
+                    android:background="@xml/gx_ripple_default_round"
+                    android:contentDescription="@string/GENERAL_TODO"
+                    android:src="@xml/ic_baseline_info"
+                    android:tint="@color/c_navigation_light" />
+
+            </LinearLayout>
 
             <!-- Title Header -->
             <LinearLayout
@@ -220,7 +235,7 @@
                         android:paddingTop="2dp"
                         android:layout_marginTop="-3dp"
                         android:scaleType="fitCenter"
-                        android:src="@xml/ic_gateway_splash"
+                        android:src="@xml/ic_gear"
                         android:background="?attr/selectableItemBackgroundBorderless"
                         android:contentDescription="@string/GENERAL_TODO"
                         app:tint="@color/c_navigation_tint" />
diff --git a/app/src/main/res/layouts/orbotLog/layout/orbot_log_view.xml b/app/src/main/res/layouts/orbotLog/layout/orbot_log_view.xml
index 8115c159..5a5c5046 100644
--- a/app/src/main/res/layouts/orbotLog/layout/orbot_log_view.xml
+++ b/app/src/main/res/layouts/orbotLog/layout/orbot_log_view.xml
@@ -1,117 +1,172 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/c_background">
-    <ScrollView
-            android:layout_width="match_parent"
-            android:isScrollContainer="true"
-            android:id="@+id/pScollview"
-            android:layout_height="match_parent">
+
+    <LinearLayout
+        android:id="@+id/linearLayout2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:elevation="8dp"
+        android:orientation="horizontal"
+        android:clipToPadding="false"
+        android:background="@color/c_background"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageButton
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="1dp"
+            android:background="@xml/gx_ripple_default_round"
+            android:contentDescription="@string/GENERAL_TODO"
+            android:onClick="onClose"
+            android:src="@xml/ic_arrow_back"
+            android:tint="@color/c_navigation_tint" />
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="-3dp"
+            android:layout_weight="40"
+            android:gravity="center_vertical|start"
+            android:paddingStart="10dp"
+            android:onClick="onClose"
+            android:text="@string/ORBOT_LOG"
+            android:textColor="@color/c_text_v1"
+            android:textSize="17sp"
+            android:textStyle="bold"
+            tools:ignore="RtlSymmetry" />
+
+        <ImageButton
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="0dp"
+            android:layout_marginEnd="2dp"
+            android:background="@xml/gx_ripple_default_round"
+            android:contentDescription="@string/GENERAL_TODO"
+            android:onClick="openLogSettings"
+            android:src="@xml/ic_gear"
+            android:tint="@color/c_navigation_tint" />
+
+        <ImageButton
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:layout_marginStart="0dp"
+            android:scaleX="1.08"
+            android:scaleY="1.08"
+            android:layout_marginTop="0dp"
+            android:padding="5dp"
+            android:background="@xml/gx_ripple_default_round"
+            android:contentDescription="@string/GENERAL_TODO"
+            android:src="@xml/ic_baseline_info"
+            android:tint="@color/c_navigation_light" />
+
+    </LinearLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/mMainScroll"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fillViewport="true"
+        android:paddingBottom="10dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/linearLayout2">
+
         <LinearLayout
-                android:layout_width="match_parent"
-                android:orientation="vertical"
-                android:paddingBottom="50dp"
-                android:layout_height="wrap_content">
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="15dp"
+            android:orientation="vertical"
+            android:paddingBottom="50dp">
+
             <!-- Title Header -->
             <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_marginBottom="0dp"
-                    android:orientation="horizontal"
-                    android:layout_height="52dp">
-                <ImageButton
-                    android:layout_width="20dp"
-                    android:layout_height="45dp"
-                    android:onClick="onClose"
-                    android:layout_marginTop="3dp"
-                    android:layout_marginStart="3dp"
-                    android:layout_weight="2.5"
-                    android:tint="@color/c_navigation_tint"
-                    android:src="@xml/ic_arrow_back"
-                    android:background="@xml/gx_ripple_default_round"
-                    android:contentDescription="@string/GENERAL_TODO"/>
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginBottom="0dp"
+                android:background="@color/c_background"
+                android:orientation="horizontal">
+
                 <TextView
-                    android:textColor="@color/c_text_v1"
-                    android:onClick="onClose"
-                    android:textSize="17sp"
                     android:layout_width="0dp"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginTop="10dp"
                     android:layout_weight="40"
-                    android:layout_marginTop="-3dp"
-                    android:gravity="center_vertical|start"
-                    android:textStyle="bold"
-                    android:text="@string/ORBOT_LOG"
-                    />
-            </LinearLayout>
-
-            <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginBottom="10dp"
-                    android:background="@color/c_view_divier_background" />
-
-            <!-- Title Header -->
-            <LinearLayout
-                    android:layout_width="match_parent"
-                    android:background="@color/c_background"
-                    android:layout_marginBottom="0dp"
-                    android:orientation="horizontal"
-                    android:layout_height="40dp">
-                <TextView
-                        android:textColor="@color/c_text_setting_heading"
-                        android:textSize="16sp"
-                        android:layout_width="0dp"
-                        android:textStyle="bold"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="40"
-                        android:layout_marginTop="10dp"
-                        android:layout_marginStart="14dp"
-                        android:text="@string/ORBOT_LOG_HEADER"
-                        />
+                    android:text="@string/ORBOT_LOG_HEADER"
+                    android:textColor="@color/c_text_setting_heading"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
             </LinearLayout>
 
             <LinearLayout
-                    android:layout_width="match_parent"
-                    android:background="@color/clear_alpha"
-                    android:layout_marginBottom="0dp"
-                    android:layout_marginEnd = "20dp"
-                    android:orientation="horizontal"
-                    android:layout_height="wrap_content">
-                <TextView
-                        android:textSize="14sp"
-                        android:layout_width="0dp"
-                        android:textColor="@color/c_text_v2"
-                        android:paddingBottom="10dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="40"
-                        android:background="@color/clear_alpha"
-                        android:layout_marginStart="15dp"
-                        android:text="@string/ORBOT_LOG_INFO"
-                        />
-            </LinearLayout>
-
-            <View
                 android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginBottom="10dp"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginEnd="10dp"
-                android:background="@color/warning" />
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="20dp"
+                android:layout_marginBottom="0dp"
+                android:background="@color/clear_alpha"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:layout_weight="40"
+                    android:background="@color/clear_alpha"
+                    android:paddingBottom="10dp"
+                    android:text="@string/ORBOT_LOG_INFO"
+                    android:textColor="@color/c_text_v2"
+                    android:textSize="14sp" />
+            </LinearLayout>
 
             <TextView
                 android:id="@+id/pLogs"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="0dp"
                 android:layout_marginEnd="12dp"
-                android:paddingStart="5dp"
-                android:paddingEnd="20dp"
-                android:paddingBottom="10dp"
-                android:paddingTop="10dp"
+                android:background="@xml/sx_border_left"
+                android:layout_marginStart="10dp"
+                android:paddingStart="10dp"
+                android:paddingTop="5dp"
+                android:paddingBottom="5dp"
                 android:textColor="@color/c_text_v4"
                 android:textSize="14sp"
-                android:text="@string/HOME_LOADING_STATIC" />
+                android:visibility="gone"
+                android:text="@string/HOME_LOADING_STATIC"
+                tools:ignore="RtlSymmetry" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/pLogRecycleView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layoutAnimation="@anim/log_layout_controller"
+                android:nestedScrollingEnabled="false"/>
+
         </LinearLayout>
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/pFloatingScroller"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:alpha="0"
+        android:visibility="gone"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:onClick="onScrollTop"
+        android:clickable="true"
+        android:tint="@color/white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:srcCompat="@xml/ic_baseline_arrow_upward"
+        android:focusable="true"
+        android:contentDescription="@string/GENERAL_TODO" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layouts/other/layout/home_view.xml b/app/src/main/res/layouts/other/layout/home_view.xml
index 8f6dc7b7..71dd104f 100644
--- a/app/src/main/res/layouts/other/layout/home_view.xml
+++ b/app/src/main/res/layouts/other/layout/home_view.xml
@@ -1,29 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/c_background"
-        tools:context="com.darkweb.genesissearchengine.appManager.homeManager.homeController">
-
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/c_background"
+    tools:context="com.darkweb.genesissearchengine.appManager.homeManager.homeController">
 
     <FrameLayout
-            android:id="@+id/webviewContainer"
-            android:layout_width="match_parent"
-            android:layout_marginTop="55dp"
+        android:id="@+id/webviewContainer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="60dp"
         android:background="@color/c_background"
-            android:layout_height="match_parent">
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/frameLayout">
 
         <org.mozilla.geckoview.GeckoView
-                android:id="@+id/pWebView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="0dp"
-                android:background="@color/c_background"
-                android:alpha="1"
-                tools:layout_editor_absoluteX="8dp"
-                tools:layout_editor_absoluteY="8dp" >
+            android:id="@+id/pWebView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="0dp"
+            android:alpha="1"
+            android:background="@color/c_background"
+            tools:layout_editor_absoluteX="8dp"
+            tools:layout_editor_absoluteY="8dp">
 
         </org.mozilla.geckoview.GeckoView>
 
@@ -31,127 +33,130 @@
     </FrameLayout>
 
     <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="71dp"
-            android:background="#00000000"
-            app:layout_constraintTop_toTopOf="parent">
+        android:id="@+id/frameLayout"
+        android:layout_width="match_parent"
+        android:layout_height="71dp"
+        android:background="#00000000"
+        app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
-                android:id="@+id/topbar"
+            android:id="@+id/topbar"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:background="@xml/ic_secondary_gradinet"
+            android:elevation="7dp"
+            android:gravity="left"
+            android:orientation="vertical"
+            android:paddingBottom="1dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="RtlHardcoded,UselessParent">
+
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="60dp"
+                android:layout_height="match_parent"
                 android:elevation="7dp"
-                android:background="@xml/ic_secondary_gradinet"
                 android:gravity="left"
-                android:paddingBottom="1dp"
-                android:orientation="vertical"
+                android:orientation="horizontal"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:ignore="RtlHardcoded,UselessParent">
 
-            <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:elevation="7dp"
-                    android:gravity="left"
-                    android:orientation="horizontal"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:ignore="RtlHardcoded,UselessParent">
-
                 <AutoCompleteTextView
-                        android:id="@+id/pSearchInput"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_marginStart="10dp"
-                        android:layout_marginEnd="0dp"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginBottom="8dp"
-                        android:layout_weight="1"
-                        android:background="@xml/gx_generic_input"
-                        android:completionHintView="@layout/hint_view"
-                        android:ems="10"
-                        android:popupElevation="5dp"
-                        android:hint="@string/GENERAL_SEARCH_HINT"
-                        android:inputType="textNoSuggestions"
-                        android:importantForAutofill="no"
-                        android:maxLines="1"
-                        android:paddingLeft="15dp"
-                        android:paddingRight="15dp"
-                        android:selectAllOnFocus="true"
-                        android:text="@string/GENERAL_HOME_URL"
-                        android:textColor="@color/c_text_v1"
-                        android:textColorHint="@color/c_text_v1"
-                        android:textColorHighlight="@color/c_alert_background"
-                        android:textCursorDrawable="@xml/gx_search_cursor_state"
-                        android:textSize="16sp"
-                        tools:targetApi="o" />
+                    android:id="@+id/pSearchInput"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="0dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:background="@xml/gx_generic_input"
+                    android:completionHintView="@layout/hint_view"
+                    android:ems="10"
+                    android:hint="@string/GENERAL_SEARCH_HINT"
+                    android:importantForAutofill="no"
+                    android:inputType="textNoSuggestions"
+                    android:maxLines="1"
+                    android:paddingLeft="15dp"
+                    android:paddingRight="15dp"
+                    android:popupElevation="5dp"
+                    android:selectAllOnFocus="true"
+                    android:text="@string/GENERAL_HOME_URL"
+                    android:textColor="@color/c_text_v1"
+                    android:textColorHighlight="@color/text_color_highlight_v3"
+                    android:textColorHint="@color/c_text_v1"
+                    android:textCursorDrawable="@xml/gx_search_cursor_state"
+                    android:textSize="16sp"
+                    tools:targetApi="o" />
 
-                    <LinearLayout
-                        android:layout_width="40dp"
-                        android:layout_height="match_parent"
-                        android:gravity="left"
-                        android:onClick="onOpenTabViewBoundary"
-                        android:paddingBottom="1dp">
-                        <Button
-                            android:id="@+id/newButtonInvoke"
-                            android:layout_width="22dp"
-                            android:layout_height="22dp"
-                            android:layout_marginStart="12dp"
-                            android:layout_marginEnd="13dp"
-                            android:layout_marginTop="17dp"
-                            android:text="@string/HOME_TAB_TEXT"
-                            android:textColor="@color/c_text_v1"
-                            android:clickable="false"
-                            android:textSize="12.5sp"
-                            android:layout_marginBottom="0dp"
-                            android:background="@xml/gx_generic_tab_button"
-                            android:contentDescription="@string/GENERAL_TODO"
-                            android:scaleType="fitCenter"
-                            android:tint="@color/black" />
-                    </LinearLayout>
+                <LinearLayout
+                    android:layout_width="40dp"
+                    android:layout_height="match_parent"
+                    android:gravity="left"
+                    android:onClick="onOpenTabViewBoundary"
+                    android:paddingBottom="1dp">
+
+                    <Button
+                        android:id="@+id/newButtonInvoke"
+                        android:layout_width="22dp"
+                        android:layout_height="22dp"
+                        android:layout_marginStart="12dp"
+                        android:layout_marginTop="17dp"
+                        android:layout_marginEnd="13dp"
+                        android:layout_marginBottom="0dp"
+                        android:background="@xml/gx_generic_tab_button"
+                        android:clickable="false"
+                        android:contentDescription="@string/GENERAL_TODO"
+                        android:scaleType="fitCenter"
+                        android:text="@string/HOME_TAB_TEXT"
+                        android:textColor="@color/c_text_v1"
+                        android:textSize="12.5sp"
+                        android:tint="@color/black" />
+                </LinearLayout>
 
                 <ImageButton
-                        android:id="@+id/menu"
-                        android:layout_width="35dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="-4dp"
-                        android:layout_marginEnd="0dp"
-                        android:background="@xml/gx_ripple_gray"
-                        android:contentDescription="@string/GENERAL_TODO"
-                        android:tint="@color/c_navigation_tint"
-                        android:paddingLeft="8dp"
-                        android:paddingTop="15dp"
-                        android:onClick="onOpenMenuItem"
-                        android:paddingRight="8dp"
-                        android:paddingBottom="15dp"
-                        android:scaleType="fitCenter"
-                        android:src="@drawable/menu_item" />
+                    android:id="@+id/menu"
+                    android:layout_width="35dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="-4dp"
+                    android:layout_marginEnd="0dp"
+                    android:background="@xml/gx_ripple_gray"
+                    android:contentDescription="@string/GENERAL_TODO"
+                    android:onClick="onOpenMenuItem"
+                    android:paddingLeft="8dp"
+                    android:paddingTop="15dp"
+                    android:paddingRight="8dp"
+                    android:paddingBottom="15dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/menu_item"
+                    android:tint="@color/c_navigation_tint" />
 
             </LinearLayout>
         </LinearLayout>
     </FrameLayout>
 
     <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
         <com.darkweb.genesissearchengine.widget.AnimatedProgressBar
-                android:id="@+id/progressBar"
-                style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="4dp"
-                android:alpha="0"
-                android:progressDrawable="@xml/hox_photon_progress"
-                app:shiftDuration="@integer/progress_shift_duration"
-                app:wrapShiftDrawable="true"
-                android:layout_marginTop="55.9dp"
-                android:progress="0"
-                android:max="10000"
-                android:scaleY="0.7"
-                tools:progress="0"
-                app:layout_constraintTop_toTopOf="parent" />
+            android:id="@+id/progressBar"
+            style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="4dp"
+            android:layout_marginTop="55.9dp"
+            android:alpha="0"
+            android:max="10000"
+            android:progress="0"
+            android:progressDrawable="@xml/hox_photon_progress"
+            android:scaleY="0.7"
+            app:layout_constraintTop_toTopOf="parent"
+            app:shiftDuration="@integer/progress_shift_duration"
+            app:wrapShiftDrawable="true"
+            tools:progress="0" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/splashScreen"
@@ -163,11 +168,11 @@
 
             <LinearLayout
                 android:layout_width="wrap_content"
-                android:background="@xml/hox_rounded_corner_container_bottom"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="10dp"
+                android:background="@xml/hox_rounded_corner_container_bottom"
                 android:orientation="vertical"
                 android:padding="10dp"
-                android:layout_marginRight="10dp"
                 android:translationZ="11dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
@@ -218,7 +223,7 @@
                 android:contentDescription="@string/GENERAL_TODO"
                 android:elevation="2dp"
                 android:onClick="onLoadProxy"
-                android:src="@xml/ic_gateway_splash"
+                android:src="@xml/ic_gear"
                 android:tint="@color/black"
                 app:layout_constraintStart_toEndOf="@+id/Connect"
                 app:layout_constraintTop_toTopOf="@+id/Connect" />
@@ -260,36 +265,51 @@
     </FrameLayout>
 
 
-
     <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:layout_width="wrap_content"
-            android:src="@drawable/icon_ban"
-            android:layout_height="wrap_content"
-            android:alpha="0"
-            app:borderWidth="0dp"
-            app:elevation="10dp"
-            android:backgroundTint="@color/white"
-            android:clickable="true" app:srcCompat="?attr/actionModeSelectAllDrawable"
-            android:id="@+id/floatingActionButton3" app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" android:layout_marginBottom="24dp"
-            android:layout_marginEnd="24dp"
-            android:focusable="true" />
+        android:id="@+id/floatingActionButton3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
+        android:alpha="0"
+        android:backgroundTint="@color/white"
+        android:clickable="true"
+        android:contentDescription="@string/GENERAL_TODO"
+        android:focusable="true"
+        android:src="@drawable/icon_ban"
+        app:borderWidth="0dp"
+        app:elevation="10dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:srcCompat="?attr/actionModeSelectAllDrawable"
+        tools:ignore="ExtraText" />
 
     <com.google.android.gms.ads.AdView xmlns:ads="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/adView"
-            android:layout_width="395dp"
-            android:background="@color/holo_dark_gray"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="54.9dp"
-            android:alpha="0"
-            ads:adSize="SMART_BANNER"
-            ads:adUnitId="ca-app-pub-5074525529134731/7816565677"
-            ads:layout_constraintEnd_toEndOf="parent"
-            ads:layout_constraintHorizontal_bias="0.5"
-            ads:layout_constraintStart_toStartOf="parent"
-            ads:layout_constraintTop_toTopOf="parent" />
+        android:id="@+id/adView"
+        android:layout_width="395dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="54.9dp"
+        android:alpha="0"
+        android:background="@color/holo_dark_gray"
+        ads:adSize="SMART_BANNER"
+        ads:adUnitId="ca-app-pub-5074525529134731/7816565677"
+        ads:layout_constraintEnd_toEndOf="parent"
+        ads:layout_constraintHorizontal_bias="0.5"
+        ads:layout_constraintStart_toStartOf="parent"
+        ads:layout_constraintTop_toTopOf="parent" />
+
+    <include
+        android:id="@+id/pFindBar"
+        layout="@layout/popup_find"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:elevation="8dp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/frameLayout" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/other/layout/popup_menu.xml b/app/src/main/res/layouts/other/layout/popup_menu.xml
index bc6ae4b5..08a9bcce 100644
--- a/app/src/main/res/layouts/other/layout/popup_menu.xml
+++ b/app/src/main/res/layouts/other/layout/popup_menu.xml
@@ -7,45 +7,47 @@
         android:layout_height="wrap_content">
 
     <ScrollView
-            android:layout_width="260dp"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="20dp"
-            android:layout_marginEnd="5dp"
-            android:layout_marginTop="8dp"
-            android:elevation="4dp"
-            android:background="@xml/gx_side_menu"
-            app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_width="260dp"
+        android:layout_height="match_parent"
+        android:layout_marginStart="5dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="5dp"
+        android:layout_marginBottom="60dp"
+        android:background="@xml/gx_side_menu"
+        android:elevation="4dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-        <LinearLayout
-                android:layout_width="match_parent"
+            <LinearLayout
+                android:layout_width="259dp"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
+                android:layout_marginLeft="1dp"
+                android:layout_marginTop="1dp"
+                android:layout_marginRight="1dp"
+                android:background="@color/clear_alpha"
+                android:orientation="horizontal"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
 
-            <LinearLayout
-                    android:layout_width="259dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="1dp"
-                    android:layout_marginTop="1dp"
-                    android:layout_marginRight="1dp"
-                    android:background="@color/clear_alpha"
-                    android:orientation="horizontal"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
                 <ImageButton
-                        android:id="@+id/menu24"
-                        android:layout_width="wrap_content"
-                        android:layout_height="52dp"
-                        android:layout_weight="1"
-                        android:background="@xml/gx_ripple_gray"
-                        android:tint="@color/c_navigation_tint"
-                        android:onClick="onMenuItemInvoked"
-                        android:src="@xml/ic_home"
-                    android:contentDescription="@string/GENERAL_TODO" />
+                    android:id="@+id/menu24"
+                    android:layout_width="wrap_content"
+                    android:layout_height="52dp"
+                    android:layout_weight="1"
+                    android:background="@xml/gx_ripple_gray_top_left"
+                    android:contentDescription="@string/GENERAL_TODO"
+                    android:onClick="onMenuItemInvoked"
+                    android:src="@xml/ic_home"
+                    android:tint="@color/c_navigation_tint" />
 
                 <ImageButton
                     android:id="@+id/menu23"
@@ -53,239 +55,264 @@
                     android:layout_height="52dp"
                     android:layout_weight="1"
                     android:background="@xml/gx_ripple_gray"
-                    android:tint="@color/c_navigation_tint"
+                    android:contentDescription="@string/GENERAL_TODO"
                     android:onClick="onMenuItemInvoked"
                     android:src="@xml/ic_baseline_bookmark"
-                    android:contentDescription="@string/GENERAL_TODO" />
+                    android:tint="@color/c_navigation_tint" />
 
                 <ImageButton
-                        android:id="@+id/menu22"
-                        android:layout_width="wrap_content"
-                        android:layout_height="52dp"
-                        android:layout_weight="1"
-                        android:background="@xml/gx_ripple_gray"
-                        android:tint="@color/c_navigation_tint"
-                        android:onClick="onMenuItemInvoked"
-                        android:src="@xml/ic_arrow_right"
-                        android:contentDescription="@string/GENERAL_TODO" />
+                    android:id="@+id/menu22"
+                    android:layout_width="wrap_content"
+                    android:layout_height="52dp"
+                    android:layout_weight="1"
+                    android:background="@xml/gx_ripple_gray"
+                    android:contentDescription="@string/GENERAL_TODO"
+                    android:onClick="onMenuItemInvoked"
+                    android:src="@xml/ic_arrow_right"
+                    android:tint="@color/c_navigation_tint" />
 
                 <ImageButton
-                        android:id="@+id/menu21"
-                        android:layout_width="wrap_content"
-                        android:layout_height="52dp"
-                        android:layout_weight="1"
-                        android:background="@xml/gx_ripple_gray"
-                        android:tint="@color/c_navigation_tint"
-                        android:onClick="onMenuItemInvoked"
-                        android:src="@xml/ic_refresh"
-                        android:contentDescription="@string/GENERAL_TODO" />
+                    android:id="@+id/menu21"
+                    android:layout_width="wrap_content"
+                    android:layout_height="52dp"
+                    android:layout_weight="1"
+                    android:background="@xml/gx_ripple_gray"
+                    android:contentDescription="@string/GENERAL_TODO"
+                    android:onClick="onMenuItemInvoked"
+                    android:src="@xml/ic_refresh"
+                    android:tint="@color/c_navigation_tint" />
 
                 <ImageButton
-                        android:id="@+id/menu20"
-                        android:layout_width="wrap_content"
-                        android:layout_height="52dp"
-                        android:layout_gravity="center"
-                        android:layout_weight="1"
-                        android:background="@xml/gx_ripple_gray"
-                        android:tint="@color/c_navigation_tint"
-                        android:onClick="onMenuItemInvoked"
-                        android:src="@xml/ic_close"
-                        android:contentDescription="@string/GENERAL_TODO" />
+                    android:id="@+id/menu20"
+                    android:layout_width="wrap_content"
+                    android:layout_height="52dp"
+                    android:layout_gravity="center"
+                    android:layout_weight="1"
+                    android:background="@xml/gx_ripple_gray_top_right"
+                    android:contentDescription="@string/GENERAL_TODO"
+                    android:onClick="onMenuItemInvoked"
+                    android:src="@xml/ic_close"
+                    android:tint="@color/c_navigation_tint" />
             </LinearLayout>
-            <Button
+
+            <TextView
+                android:id="@+id/menu11"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:background="@xml/gx_side_item"
+                android:gravity="left|center_vertical"
+                android:onClick="onMenuItemInvoked"
+                android:paddingStart="18dp"
+                android:text="@string/HOME_MENU__NEW_TABS"
+                android:textAllCaps="false"
+                android:textColor="@color/c_text_home_menu"
+                android:textSize="16sp"
+                tools:ignore="RtlHardcoded,RtlSymmetry" />
+
+            <TextView
                 android:id="@+id/menu12"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:background="@xml/gx_side_item"
                 android:gravity="left|center_vertical"
                 android:onClick="onMenuItemInvoked"
-                android:paddingStart="15dp"
+                android:paddingStart="18dp"
                 android:text="@string/HOME_MENU__ORBOT_LOGS"
-                android:textColor="@color/c_text_v1"
-                android:textSize="14sp"
+                android:textAllCaps="false"
+                android:textColor="@color/c_text_home_menu"
+                android:textSize="16sp"
                 tools:ignore="RtlHardcoded,RtlSymmetry" />
 
-            <Button
-                    android:id="@+id/menu11"
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:background="@xml/gx_side_item"
-                    android:gravity="left|center_vertical"
-                    android:onClick="onMenuItemInvoked"
-                    android:paddingStart="15dp"
-                    android:text="@string/HOME_MENU__NEW_TABS"
-                    android:textColor="@color/c_text_v1"
-                    android:textSize="14sp"
-                    tools:ignore="RtlHardcoded,RtlSymmetry" />
-
-            <Button
+            <TextView
                 android:id="@+id/pMenuOpenNewTab"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:background="@xml/gx_side_item"
                 android:gravity="left|center_vertical"
                 android:onClick="onMenuItemInvoked"
-                android:paddingStart="15dp"
+                android:paddingStart="18dp"
                 android:text="@string/HOME_MENU_OPEN_BOOKMARK"
-                android:textColor="@color/c_text_v1"
-                android:textSize="14sp"
+                android:textAllCaps="false"
+                android:textColor="@color/c_text_home_menu"
+                android:textSize="16sp"
                 tools:ignore="RtlHardcoded,RtlSymmetry" />
 
 
-            <Button
+            <TextView
                 android:id="@+id/menu7"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:background="@xml/gx_side_item"
                 android:gravity="left|center_vertical"
                 android:onClick="onMenuItemInvoked"
-                android:paddingLeft="15dp"
+                android:paddingStart="18dp"
                 android:text="@string/HOME_MENU_HISTORY"
-                android:textColor="@color/c_text_v1"
-                android:textSize="14sp"
+                android:textAllCaps="false"
+                android:textColor="@color/c_text_home_menu"
+                android:textSize="16sp"
                 tools:ignore="RtlHardcoded,RtlSymmetry" />
 
-            <Button
+            <TextView
                 android:id="@+id/menu8"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:background="@xml/gx_side_item"
                 android:gravity="left|center_vertical"
                 android:onClick="onMenuItemInvoked"
-                android:paddingLeft="15dp"
+                android:paddingStart="18dp"
                 android:text="@string/HOME_MENU_DOWNLOAD"
-                android:textColor="@color/c_text_v1"
-                android:textSize="14sp"
+                android:textAllCaps="false"
+                android:textColor="@color/c_text_home_menu"
+                android:textSize="16sp"
                 tools:ignore="RtlHardcoded,RtlSymmetry" />
 
-            <Button
+            <TextView
                 android:id="@+id/menu25"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:background="@xml/gx_side_item"
                 android:gravity="left|center_vertical"
                 android:onClick="onMenuItemInvoked"
-                android:paddingLeft="15dp"
+                android:paddingStart="18dp"
                 android:text="@string/HOME_MENU_LANGUAGE"
-                android:textColor="@color/c_text_v1"
-                android:textSize="14sp"
+                android:textAllCaps="false"
+                android:textColor="@color/c_text_home_menu"
+                android:textSize="16sp"
                 tools:ignore="RtlHardcoded,RtlSymmetry" />
 
-            <Button
+            <TextView
                 android:id="@+id/pMenuShare"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:background="@xml/gx_side_item"
                 android:gravity="left|center_vertical"
                 android:onClick="onMenuItemInvoked"
-                android:paddingLeft="15dp"
+                android:paddingStart="18dp"
                 android:text="@string/HOME_MENU_RATE"
-                android:textColor="@color/c_text_v1"
-                android:textSize="14sp"
+                android:textAllCaps="false"
+                android:textColor="@color/c_text_home_menu"
+                android:textSize="16sp"
+                tools:ignore="RtlHardcoded,RtlSymmetry" />
+
+            <TextView
+                android:id="@+id/pMenuFind"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:background="@xml/gx_side_item"
+                android:gravity="left|center_vertical"
+                android:onClick="onMenuItemInvoked"
+                android:paddingStart="18dp"
+                android:text="@string/HOME_MENU_FIND"
+                android:textAllCaps="false"
+                android:textColor="@color/c_text_home_menu"
+                android:textSize="16sp"
                 tools:ignore="RtlHardcoded,RtlSymmetry" />
 
             <LinearLayout
                 android:id="@+id/menu26"
-                android:background="@xml/gx_side_item"
                 android:layout_width="259dp"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="1dp"
                 android:layout_marginTop="1dp"
                 android:layout_marginRight="1dp"
-                android:orientation="horizontal"
+                android:background="@xml/gx_side_item"
+                android:clickable="true"
+                android:focusable="true"
                 android:onClick="onMenuItemInvoked"
+                android:orientation="horizontal"
+                android:textAllCaps="false"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
-                <Button
+
+                <TextView
                     android:id="@+id/menu28"
                     android:layout_width="0dp"
-                    android:layout_weight="4"
                     android:layout_height="50dp"
-                    android:background="@xml/gx_side_item"
-                    android:gravity="left|center_vertical"
+                    android:layout_weight="4"
+                    android:background="@color/clear_alpha"
                     android:clickable="false"
+                    android:focusable="false"
+                    android:gravity="left|center_vertical"
                     android:onClick="onMenuItemInvoked"
-                    android:paddingLeft="15dp"
+                    android:paddingStart="16dp"
                     android:text="@string/HOME_MENU_DESKTOP"
-                    android:textColor="@color/c_text_v1"
-                    android:textSize="14sp"
+                    android:textAllCaps="false"
+                    android:textColor="@color/c_text_home_menu"
+                    android:textSize="16sp"
                     tools:ignore="RtlHardcoded,RtlSymmetry" />
 
                 <com.google.android.material.checkbox.MaterialCheckBox
                     android:id="@+id/menu27"
-                    android:clickable="false"
                     android:layout_width="0dp"
-                    android:layout_weight="1"
                     android:layout_height="50dp"
-                    android:background="@color/c_background"
-                    android:onClick="onMenuItemInvoked"
-                    android:buttonTint="@color/c_navigation_tint"
-                    android:gravity="left|center_vertical"
                     android:layout_marginLeft="15dp"
+                    android:layout_weight="1"
+                    android:background="@color/clear_alpha"
+                    android:buttonTint="@color/c_navigation_tint"
+                    android:clickable="false"
+                    android:focusable="false"
+                    android:gravity="left|center_vertical"
                     android:paddingLeft="20dp"
-                    android:textColor="@color/c_text_v1"
-                    android:textSize="14sp"
+                    android:textColor="@color/c_text_home_menu"
+                    android:textSize="16sp"
                     tools:ignore="RtlHardcoded,RtlSymmetry" />
             </LinearLayout>
 
 
-            <Button
+            <TextView
                 android:id="@+id/menu6"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:background="@xml/gx_side_item"
                 android:gravity="left|center_vertical"
                 android:onClick="onMenuItemInvoked"
-                android:paddingLeft="15dp"
+                android:paddingStart="18dp"
                 android:text="@string/HOME_MENU_SETTING"
-                android:textColor="@color/c_text_v1"
-                android:textSize="14sp"
+                android:textAllCaps="false"
+                android:textColor="@color/c_text_home_menu"
+                android:textSize="16sp"
                 tools:ignore="RtlHardcoded,RtlSymmetry" />
 
-            <Button
+            <TextView
                 android:id="@+id/menu30"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:background="@xml/gx_side_item"
                 android:gravity="left|center_vertical"
                 android:onClick="onMenuItemInvoked"
-                android:paddingLeft="15dp"
+                android:paddingStart="18dp"
                 android:text="@string/HOME_CHARACTER_ENCODING"
-                android:textColor="@color/c_text_v1"
-                android:textSize="14sp"
+                android:textAllCaps="false"
+                android:textColor="@color/c_text_home_menu"
+                android:textSize="16sp"
                 tools:ignore="RtlHardcoded,RtlSymmetry" />
 
-            <Button
-                    android:id="@+id/pMenuOpenCurrentTab"
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:background="@xml/gx_side_item"
-                    android:gravity="left|center_vertical"
-                    android:onClick="onMenuItemInvoked"
-                    android:paddingLeft="15dp"
-                    android:text="@string/HOME_MENU_REPORT"
-                    android:textColor="@color/c_text_v1"
-                    android:textSize="14sp"
-                tools:ignore="RtlHardcoded,RtlSymmetry" />
-
-            <View
+            <TextView
+                android:id="@+id/pMenuOpenCurrentTab"
                 android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/c_view_divier_background_inner"
-                android:paddingStart="10dp"
-                android:paddingEnd="10dp" />
+                android:layout_height="50dp"
+                android:background="@xml/gx_side_item"
+                android:gravity="left|center_vertical"
+                android:onClick="onMenuItemInvoked"
+                android:paddingStart="18dp"
+                android:text="@string/HOME_MENU_REPORT"
+                android:textAllCaps="false"
+                android:textColor="@color/c_text_home_menu"
+                android:textSize="16sp"
+                tools:ignore="RtlHardcoded,RtlSymmetry" />
 
-            <Button
-                    android:id="@+id/pMenuCopy"
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:background="@xml/gx_ripple_gray"
-                    android:gravity="left|center_vertical"
-                    android:onClick="onMenuItemInvoked"
-                    android:paddingLeft="15dp"
-                    android:text="@string/HOME_MENU_SHARE"
-                    android:textColor="@color/c_text_v1"
-                    android:textSize="14sp"
+            <TextView
+                android:id="@+id/pMenuCopy"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:background="@xml/gx_ripple_gray_bottom"
+                android:gravity="left|center_vertical"
+                android:onClick="onMenuItemInvoked"
+                android:paddingStart="18dp"
+                android:text="@string/HOME_MENU_SHARE"
+                android:textAllCaps="false"
+                android:textColor="@color/c_text_home_menu"
+                android:textSize="16sp"
                 tools:ignore="RtlHardcoded,RtlSymmetry" />
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/layouts/setting/layout/setting.xml b/app/src/main/res/layouts/setting/layout/setting.xml
index 7ba8c9cf..4423001c 100644
--- a/app/src/main/res/layouts/setting/layout/setting.xml
+++ b/app/src/main/res/layouts/setting/layout/setting.xml
@@ -22,9 +22,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="48dp"
                     android:clickable="true"
-                    android:paddingEnd="7dp"
+                    android:paddingEnd="0dp"
                     android:paddingStart="5dp"
                     android:focusable="true"
+                    android:elevation="8dp"
+                    android:background="@color/c_background"
                     android:orientation="horizontal"
                     tools:ignore="RtlSymmetry">
 
@@ -51,12 +53,25 @@
                         android:textColor="@color/c_text_v1"
                         android:textSize="17sp"
                         android:textStyle="bold" />
-                </LinearLayout>
 
-                <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/c_view_divier_background" />
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_weight="1"/>
+
+                    <ImageButton
+                        android:layout_width="45dp"
+                        android:layout_height="45dp"
+                        android:layout_marginStart="0dp"
+                        android:scaleX="1.08"
+                        android:layout_marginEnd="7dp"
+                        android:scaleY="1.08"
+                        android:layout_marginTop="1dp"
+                        android:background="@xml/gx_ripple_default_round"
+                        android:contentDescription="@string/GENERAL_TODO"
+                        android:src="@xml/ic_baseline_info"
+                        android:tint="@color/c_navigation_light" />
+                </LinearLayout>
 
                 <!-- Title Header -->
                 <LinearLayout
@@ -74,7 +89,7 @@
                         android:layout_height="match_parent"
                         android:padding="10dp"
                         android:layout_marginStart="5dp"
-                        android:layout_marginEnd="10dp"
+                        android:layout_marginEnd="5dp"
                         app:tint="@color/c_icon_tint"
                         android:src="@drawable/ic_baseline_browser"
                         android:contentDescription="@string/GENERAL_TODO" />
@@ -83,7 +98,7 @@
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="6"
-                        android:alpha="0.7"
+                        android:alpha="1"
                         android:background="@android:color/transparent"
                         android:clickable="false"
                         android:padding="0dp"
@@ -109,7 +124,7 @@
 
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="1dp"
+                    android:layout_height="0dp"
                     android:background="@color/c_view_divier_background" />
 
                 <LinearLayout
@@ -142,7 +157,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="12dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -157,7 +172,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -184,7 +199,7 @@
 
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="1dp"
+                    android:layout_height="0dp"
                     android:background="@color/c_view_divier_background" />
 
                 <LinearLayout
@@ -218,7 +233,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="12dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -233,7 +248,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -260,7 +275,7 @@
 
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="1dp"
+                    android:layout_height="0dp"
                     android:background="@color/c_view_divier_background" />
 
                 <LinearLayout
@@ -279,7 +294,7 @@
                         android:padding="10dp"
                         app:tint="@color/c_icon_tint"
                         android:layout_marginStart="5dp"
-                        android:layout_marginEnd="10dp"
+                        android:layout_marginEnd="5dp"
                         android:src="@drawable/ic_baseline_privacy"
                         android:contentDescription="@string/GENERAL_TODO" />
 
@@ -294,7 +309,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="12dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -309,7 +324,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -336,7 +351,7 @@
 
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="1dp"
+                    android:layout_height="0dp"
                     android:background="@color/c_view_divier_background" />
 
                 <LinearLayout
@@ -355,7 +370,7 @@
                         app:tint="@color/c_icon_tint"
                         android:padding="10dp"
                         android:layout_marginStart="5dp"
-                        android:layout_marginEnd="10dp"
+                        android:layout_marginEnd="5dp"
                         android:src="@drawable/ic_baseline_notifications"
                         android:contentDescription="@string/GENERAL_TODO" />
 
@@ -368,7 +383,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="12dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -383,7 +398,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -410,7 +425,7 @@
 
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="1dp"
+                    android:layout_height="0dp"
                     android:background="@color/c_view_divier_background"/>
 
                 <LinearLayout
@@ -428,7 +443,7 @@
                         android:layout_height="match_parent"
                         android:padding="10dp"
                         android:layout_marginStart="5dp"
-                        android:layout_marginEnd="10dp"
+                        android:layout_marginEnd="5dp"
                         app:tint="@color/c_icon_tint"
                         android:src="@drawable/ic_baseline_accessibility"
                         android:contentDescription="@string/GENERAL_TODO" />
@@ -443,7 +458,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="12dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -458,7 +473,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -485,7 +500,7 @@
 
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="1dp"
+                    android:layout_height="0dp"
                     android:background="@color/c_view_divier_background"/>
 
                 <LinearLayout
@@ -504,7 +519,7 @@
                         android:padding="10dp"
                         app:tint="@color/c_icon_tint"
                         android:layout_marginStart="5dp"
-                        android:layout_marginEnd="10dp"
+                        android:layout_marginEnd="5dp"
                         android:src="@drawable/ic_baseline_clear"
                         android:contentDescription="@string/GENERAL_TODO" />
 
@@ -518,7 +533,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="12dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -533,7 +548,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -560,7 +575,7 @@
 
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="1dp"
+                    android:layout_height="0dp"
                     android:background="@color/c_view_divier_background"/>
 
                 <LinearLayout
@@ -579,7 +594,7 @@
                         android:layout_height="match_parent"
                         android:padding="10dp"
                         android:layout_marginStart="5dp"
-                        android:layout_marginEnd="10dp"
+                        android:layout_marginEnd="5dp"
                         android:src="@drawable/ic_baseline_advance"
                         android:contentDescription="@string/GENERAL_TODO" />
 
@@ -593,7 +608,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="12dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -608,7 +623,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -635,7 +650,7 @@
 
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="1dp"
+                    android:layout_height="0dp"
                     android:background="@color/c_view_divier_background"/>
 
             </LinearLayout>
diff --git a/app/src/main/res/layouts/setting/layout/setting_accessibility_view.xml b/app/src/main/res/layouts/setting/layout/setting_accessibility_view.xml
index eff2abbe..555ab2aa 100644
--- a/app/src/main/res/layouts/setting/layout/setting_accessibility_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_accessibility_view.xml
@@ -19,7 +19,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="48dp"
                     android:clickable="true"
-                    android:paddingEnd="7dp"
+                    android:paddingEnd="0dp"
+                    android:elevation="8dp"
+                    android:background="@color/c_background"
                     android:paddingStart="5dp"
                     android:focusable="true"
                     android:orientation="horizontal"
@@ -48,12 +50,26 @@
                         android:textColor="@color/c_text_v1"
                         android:textSize="17sp"
                         android:textStyle="bold" />
-                </LinearLayout>
 
-                <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/c_view_divier_background" />
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_weight="1"/>
+
+                    <ImageButton
+                        android:layout_width="45dp"
+                        android:layout_height="45dp"
+                        android:layout_marginStart="0dp"
+                        android:scaleX="1.08"
+                        android:scaleY="1.08"
+                        android:layout_marginTop="1dp"
+                        android:layout_marginEnd="7dp"
+                        android:background="@xml/gx_ripple_default_round"
+                        android:contentDescription="@string/GENERAL_TODO"
+                        android:src="@xml/ic_baseline_info"
+                        android:tint="@color/c_navigation_light" />
+
+                </LinearLayout>
 
                 <!-- Title Header -->
 
@@ -69,7 +85,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="20dp"
                         android:layout_marginTop="12dp"
-                        android:alpha="0.7"
+                        android:alpha="1"
                         android:background="@android:color/transparent"
                         android:clickable="false"
                         android:padding="0dp"
@@ -103,7 +119,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -127,7 +143,7 @@
                                 android:layout_width="5dp"
                                 android:layout_weight="3"
                                 android:layout_height="20dp"
-                                android:alpha="0.7"
+                                android:alpha="1"
                                 android:background="@android:color/transparent"
                                 android:clickable="false"
                                 android:padding="0dp"
@@ -158,7 +174,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:layout_marginStart="13dp"
                             android:clickable="false"
                             android:padding="10dp"
@@ -199,7 +215,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="12dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -215,7 +231,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -265,7 +281,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="12dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -281,7 +297,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
diff --git a/app/src/main/res/layouts/setting/layout/setting_advance_view.xml b/app/src/main/res/layouts/setting/layout/setting_advance_view.xml
index bc11f8a0..897035e9 100644
--- a/app/src/main/res/layouts/setting/layout/setting_advance_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_advance_view.xml
@@ -18,8 +18,9 @@
                     android:id="@+id/pHeaderContainerTop"
                     android:layout_width="match_parent"
                     android:layout_height="48dp"
+                    android:elevation="8dp"
+                    android:background="@color/c_background"
                     android:clickable="true"
-                    android:paddingEnd="7dp"
                     android:paddingStart="5dp"
                     android:focusable="true"
                     android:orientation="horizontal"
@@ -48,12 +49,26 @@
                         android:textColor="@color/c_text_v1"
                         android:textSize="17sp"
                         android:textStyle="bold" />
-                </LinearLayout>
 
-                <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/c_view_divier_background" />
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_weight="1"/>
+
+                    <ImageButton
+                        android:layout_width="45dp"
+                        android:layout_height="45dp"
+                        android:layout_marginStart="0dp"
+                        android:scaleX="1.08"
+                        android:scaleY="1.08"
+                        android:layout_marginTop="1dp"
+                        android:layout_marginEnd="7dp"
+                        android:background="@xml/gx_ripple_default_round"
+                        android:contentDescription="@string/GENERAL_TODO"
+                        android:src="@xml/ic_baseline_info"
+                        android:tint="@color/c_navigation_light" />
+
+                </LinearLayout>
 
                 <!-- Title Header -->
 
@@ -74,7 +89,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="12dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -90,7 +105,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -156,7 +171,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="12dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -171,7 +186,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -216,7 +231,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="match_parent"
                                 android:layout_marginStart="15dp"
-                                android:alpha="0.7"
+                                android:alpha="1"
                                 android:background="@android:color/transparent"
                                 android:clickable="false"
                                 android:padding="0dp"
@@ -267,7 +282,7 @@
                                 android:layout_marginStart="15dp"
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
-                                android:alpha="0.7"
+                                android:alpha="1"
                                 android:background="@android:color/transparent"
                                 android:clickable="false"
                                 android:padding="0dp"
@@ -313,7 +328,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="12dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -329,7 +344,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -395,7 +410,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="12dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -411,7 +426,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
diff --git a/app/src/main/res/layouts/setting/layout/setting_clear_view.xml b/app/src/main/res/layouts/setting/layout/setting_clear_view.xml
index ced32263..535d7fac 100644
--- a/app/src/main/res/layouts/setting/layout/setting_clear_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_clear_view.xml
@@ -21,7 +21,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="48dp"
                     android:clickable="true"
-                    android:paddingEnd="7dp"
+                    android:elevation="8dp"
+                    android:background="@color/c_background"
                     android:paddingStart="5dp"
                     android:focusable="true"
                     android:orientation="horizontal"
@@ -50,12 +51,26 @@
                         android:textColor="@color/c_text_v1"
                         android:textSize="17sp"
                         android:textStyle="bold" />
-                </LinearLayout>
 
-                <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/c_view_divier_background" />
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_weight="1"/>
+
+                    <ImageButton
+                        android:layout_width="45dp"
+                        android:layout_height="45dp"
+                        android:layout_marginStart="0dp"
+                        android:scaleX="1.08"
+                        android:scaleY="1.08"
+                        android:layout_marginTop="1dp"
+                        android:background="@xml/gx_ripple_default_round"
+                        android:contentDescription="@string/GENERAL_TODO"
+                        android:src="@xml/ic_baseline_info"
+                        android:layout_marginEnd="7dp"
+                        android:tint="@color/c_navigation_light" />
+
+                </LinearLayout>
 
                 <!-- Title Header -->
 
@@ -80,7 +95,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="13dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -96,7 +111,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -151,7 +166,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="13dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -167,7 +182,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -222,7 +237,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="13dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -237,7 +252,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -292,7 +307,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="13dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -307,7 +322,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -363,7 +378,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="13dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -378,7 +393,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -433,7 +448,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="13dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -448,7 +463,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -503,7 +518,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="13dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -518,7 +533,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -574,7 +589,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="13dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -589,7 +604,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -640,7 +655,7 @@
                         android:padding="15dp"
                         android:paddingBottom="0dp"
                         android:elevation="7dp"
-                        android:textColor="@color/c_button_text"
+                        android:textColor="@color/c_background"
                         android:clickable="false"
                         android:layout_alignParentEnd="true"
                         android:textAllCaps="false"
diff --git a/app/src/main/res/layouts/setting/layout/setting_general_view.xml b/app/src/main/res/layouts/setting/layout/setting_general_view.xml
index 54c60528..079a1d16 100644
--- a/app/src/main/res/layouts/setting/layout/setting_general_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_general_view.xml
@@ -18,9 +18,9 @@
                     android:id="@+id/pHeaderContainerTop"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:elevation="10dp"
+                    android:elevation="8dp"
+                    android:background="@color/c_background"
                     android:clickable="true"
-                    android:paddingEnd="7dp"
                     android:paddingStart="5dp"
                     android:focusable="true"
                     android:orientation="horizontal"
@@ -49,14 +49,28 @@
                         android:textColor="@color/c_text_v1"
                         android:textSize="17sp"
                         android:textStyle="bold" />
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_weight="1"/>
+
+                    <ImageButton
+                        android:layout_width="45dp"
+                        android:layout_height="45dp"
+                        android:layout_marginStart="0dp"
+                        android:scaleX="1.08"
+                        android:scaleY="1.08"
+                        android:layout_marginTop="1dp"
+                        android:background="@xml/gx_ripple_default_round"
+                        android:contentDescription="@string/GENERAL_TODO"
+                        android:src="@xml/ic_baseline_info"
+                        android:layout_marginEnd="7dp"
+                        android:tint="@color/c_navigation_light" />
+
                 </LinearLayout>
 
                 <!-- Title Header -->
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/c_view_divier_background"/>
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -68,7 +82,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="20dp"
                         android:layout_marginTop="12dp"
-                        android:alpha="0.7"
+                        android:alpha="1"
                         android:background="@android:color/transparent"
                         android:clickable="false"
                         android:padding="0dp"
@@ -84,7 +98,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="2dp"
-                        android:alpha="0.7"
+                        android:alpha="1"
                         android:id="@+id/pHomePageText"
                         android:background="@android:color/transparent"
                         android:clickable="false"
@@ -126,7 +140,7 @@
                                     android:layout_width="wrap_content"
                                     android:layout_height="20dp"
                                     android:layout_marginTop="12dp"
-                                    android:alpha="0.7"
+                                    android:alpha="1"
                                     android:background="@android:color/transparent"
                                     android:clickable="false"
                                     android:padding="0dp"
@@ -142,7 +156,7 @@
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_marginTop="2dp"
-                                    android:alpha="0.7"
+                                    android:alpha="1"
                                     android:background="@android:color/transparent"
                                     android:clickable="false"
                                     android:padding="0dp"
@@ -192,7 +206,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="12dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -209,7 +223,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
                             android:layout_marginEnd="30dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -257,7 +271,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="12dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -273,7 +287,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -314,7 +328,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="20dp"
                         android:layout_marginTop="12dp"
-                        android:alpha="0.7"
+                        android:alpha="1"
                         android:background="@android:color/transparent"
                         android:clickable="false"
                         android:padding="0dp"
@@ -330,7 +344,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="2dp"
-                        android:alpha="0.7"
+                        android:alpha="1"
                         android:background="@android:color/transparent"
                         android:clickable="false"
                         android:padding="0dp"
@@ -375,7 +389,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="18dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:paddingStart="15dp"
                             android:background="@android:color/transparent"
                             android:clickable="false"
@@ -431,7 +445,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
                             android:layout_marginStart="0dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:text="@string/SETTING_GENERAL_THEME_LIGHT"
@@ -487,7 +501,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
                             android:layout_marginStart="0dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:text="@string/SETTING_GENERAL_THEME_DEFAULT"
diff --git a/app/src/main/res/layouts/setting/layout/setting_log_view.xml b/app/src/main/res/layouts/setting/layout/setting_log_view.xml
new file mode 100644
index 00000000..a3ace4a1
--- /dev/null
+++ b/app/src/main/res/layouts/setting/layout/setting_log_view.xml
@@ -0,0 +1,120 @@
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/c_background"
+    tools:context="com.darkweb.genesissearchengine.appManager.settingManager.logManager.settingLogController">
+        <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:orientation="vertical"
+                    android:layout_height="wrap_content">
+
+                <!-- Title Header -->
+                <LinearLayout
+                    android:id="@+id/pHeaderContainerTop"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:clickable="true"
+                    android:elevation="8dp"
+                    android:background="@color/c_background"
+                    android:paddingStart="5dp"
+                    android:focusable="true"
+                    android:orientation="horizontal"
+                    tools:ignore="RtlSymmetry">
+
+                    <ImageButton
+                        android:layout_width="45dp"
+                        android:layout_height="45dp"
+                        android:layout_marginStart="0dp"
+                        android:layout_marginTop="1dp"
+                        android:background="@xml/gx_ripple_default_round"
+                        android:contentDescription="@string/GENERAL_TODO"
+                        android:onClick="onClose"
+                        android:src="@xml/ic_arrow_back"
+                        android:tint="@color/c_navigation_tint" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:paddingLeft="10dp"
+                        android:paddingRight="10dp"
+                        android:onClick="onClose"
+                        android:layout_marginTop="-3dp"
+                        android:gravity="center_vertical|start"
+                        android:text="@string/SETTING_ORBOT_LOG_HEADER"
+                        android:textColor="@color/c_text_v1"
+                        android:textSize="17sp"
+                        android:textStyle="bold" />
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_weight="1"/>
+
+                    <ImageButton
+                        android:layout_width="45dp"
+                        android:layout_height="45dp"
+                        android:layout_marginStart="0dp"
+                        android:scaleX="1.08"
+                        android:scaleY="1.08"
+                        android:layout_marginTop="1dp"
+                        android:layout_marginEnd="7dp"
+                        android:background="@xml/gx_ripple_default_round"
+                        android:contentDescription="@string/GENERAL_TODO"
+                        android:src="@xml/ic_baseline_info"
+                        android:tint="@color/c_navigation_light" />
+
+                </LinearLayout>
+
+                <!-- Title Header -->
+
+                <LinearLayout
+                    android:id="@+id/pOption1"
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    android:onClick="onSwitchLogUIMode"
+                    android:background="@xml/gx_ripple_gray"
+                    android:orientation="horizontal"
+                    android:weightSum="7">
+
+                    <Button
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="6"
+                        android:alpha="1"
+                        android:background="@android:color/transparent"
+                        android:clickable="false"
+                        android:padding="0dp"
+                        android:paddingStart="15dp"
+                        android:text="@string/SETTING_ORBOT_LIST_VIEW"
+                        android:textAlignment="textStart"
+                        android:textAllCaps="false"
+                        android:textColor="@color/c_text_v1"
+                        android:textSize="15sp"
+                        tools:ignore="RtlSymmetry" />
+
+                    <com.google.android.material.switchmaterial.SwitchMaterial
+                        android:layout_width="0dp"
+                        android:id="@+id/pListView"
+                        android:layout_height="match_parent"
+                        android:clickable="false"
+                        android:layout_marginEnd="10dp"
+                        android:theme="@style/SCBSwitch"
+                        android:layout_weight="1"
+                        android:background="@android:color/transparent">
+                    </com.google.android.material.switchmaterial.SwitchMaterial>
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/c_view_divier_background"/>
+
+            </LinearLayout>
+        </ScrollView>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layouts/setting/layout/setting_notification_view.xml b/app/src/main/res/layouts/setting/layout/setting_notification_view.xml
index ce894af3..554e7294 100644
--- a/app/src/main/res/layouts/setting/layout/setting_notification_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_notification_view.xml
@@ -17,9 +17,10 @@
                 <LinearLayout
                     android:id="@+id/pHeaderContainerTop"
                     android:layout_width="match_parent"
+                    android:elevation="8dp"
+                    android:background="@color/c_background"
                     android:layout_height="48dp"
                     android:clickable="true"
-                    android:paddingEnd="7dp"
                     android:paddingStart="5dp"
                     android:focusable="true"
                     android:orientation="horizontal"
@@ -48,12 +49,26 @@
                         android:textColor="@color/c_text_v1"
                         android:textSize="17sp"
                         android:textStyle="bold" />
-                </LinearLayout>
 
-                <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/c_view_divier_background" />
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_weight="1"/>
+
+                    <ImageButton
+                        android:layout_width="45dp"
+                        android:layout_height="45dp"
+                        android:layout_marginStart="0dp"
+                        android:scaleX="1.08"
+                        android:scaleY="1.08"
+                        android:layout_marginEnd="7dp"
+                        android:layout_marginTop="1dp"
+                        android:background="@xml/gx_ripple_default_round"
+                        android:contentDescription="@string/GENERAL_TODO"
+                        android:src="@xml/ic_baseline_info"
+                        android:tint="@color/c_navigation_light" />
+
+                </LinearLayout>
 
                 <!-- Title Header -->
 
@@ -70,7 +85,7 @@
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="6"
-                        android:alpha="0.7"
+                        android:alpha="1"
                         android:background="@android:color/transparent"
                         android:clickable="false"
                         android:padding="0dp"
@@ -104,7 +119,7 @@
                     android:id="@+id/pOption3"
                     android:layout_width="match_parent"
                     android:layout_height="55dp"
-                    android:onClick="onOpenNotificationSettings"
+                    android:onClick="onSwitchLogUIMode"
                     android:background="@xml/gx_ripple_gray"
                     android:orientation="horizontal"
                     android:weightSum="7">
@@ -113,7 +128,7 @@
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="6"
-                        android:alpha="0.7"
+                        android:alpha="1"
                         android:background="@android:color/transparent"
                         android:clickable="false"
                         android:padding="0dp"
diff --git a/app/src/main/res/layouts/setting/layout/setting_privacy_view.xml b/app/src/main/res/layouts/setting/layout/setting_privacy_view.xml
index 2b2c061d..bb3d2959 100644
--- a/app/src/main/res/layouts/setting/layout/setting_privacy_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_privacy_view.xml
@@ -19,8 +19,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="48dp"
                     android:clickable="true"
-                    android:paddingEnd="7dp"
                     android:paddingStart="5dp"
+                    android:elevation="8dp"
+                    android:background="@color/c_background"
                     android:focusable="true"
                     android:orientation="horizontal"
                     tools:ignore="RtlSymmetry">
@@ -48,12 +49,26 @@
                         android:textColor="@color/c_text_v1"
                         android:textSize="17sp"
                         android:textStyle="bold" />
-                </LinearLayout>
 
-                <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/c_view_divier_background" />
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_weight="1"/>
+
+                    <ImageButton
+                        android:layout_width="45dp"
+                        android:layout_height="45dp"
+                        android:layout_marginStart="0dp"
+                        android:scaleX="1.08"
+                        android:scaleY="1.08"
+                        android:layout_marginTop="1dp"
+                        android:layout_marginEnd="7dp"
+                        android:background="@xml/gx_ripple_default_round"
+                        android:contentDescription="@string/GENERAL_TODO"
+                        android:src="@xml/ic_baseline_info"
+                        android:tint="@color/c_navigation_light" />
+
+                </LinearLayout>
 
                 <!-- Title Header -->
 
@@ -78,7 +93,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="12dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -94,7 +109,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -147,7 +162,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="12dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -163,7 +178,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -216,7 +231,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="12dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -232,7 +247,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -283,7 +298,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="12dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -299,7 +314,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:layout_marginEnd="10dp"
                             android:background="@android:color/transparent"
                             android:clickable="false"
@@ -453,7 +468,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="12dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -469,7 +484,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
diff --git a/app/src/main/res/layouts/setting/layout/setting_search_view.xml b/app/src/main/res/layouts/setting/layout/setting_search_view.xml
index 1db45717..19d0e59b 100644
--- a/app/src/main/res/layouts/setting/layout/setting_search_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_search_view.xml
@@ -2,7 +2,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/c_background"
     tools:context="com.darkweb.genesissearchengine.appManager.settingManager.searchEngineManager.settingSearchController">
         <ScrollView
@@ -21,7 +20,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="48dp"
                     android:clickable="true"
-                    android:paddingEnd="7dp"
+                    android:elevation="8dp"
+                    android:background="@color/c_background"
                     android:paddingStart="5dp"
                     android:focusable="true"
                     android:orientation="horizontal"
@@ -51,13 +51,25 @@
                         android:textColor="@color/c_text_v1"
                         android:textSize="17sp"
                         android:textStyle="bold" />
-                </LinearLayout>
 
-                <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:layout_marginBottom="10dp"
-                        android:background="@color/c_view_divier_background" />
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_weight="1"/>
+
+                    <ImageButton
+                        android:layout_width="45dp"
+                        android:layout_height="45dp"
+                        android:layout_marginStart="0dp"
+                        android:scaleX="1.08"
+                        android:scaleY="1.08"
+                        android:layout_marginEnd="7dp"
+                        android:layout_marginTop="1dp"
+                        android:background="@xml/gx_ripple_default_round"
+                        android:contentDescription="@string/GENERAL_TODO"
+                        android:src="@xml/ic_baseline_info"
+                        android:tint="@color/c_navigation_light" />
+                </LinearLayout>
 
                 <!-- Title Header -->
 
@@ -109,7 +121,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="8dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -125,7 +137,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -188,7 +200,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="8dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -204,7 +216,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -266,7 +278,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="8dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -282,7 +294,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -344,7 +356,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="8dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -360,7 +372,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -422,7 +434,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="8dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -438,7 +450,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -511,7 +523,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="6dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -527,7 +539,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -584,7 +596,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="20dp"
                             android:layout_marginTop="6dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
@@ -600,7 +612,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:alpha="0.7"
+                            android:alpha="1"
                             android:background="@android:color/transparent"
                             android:clickable="false"
                             android:padding="0dp"
diff --git a/app/src/main/res/layouts/shared/listviews/layout/orbotview_row.xml b/app/src/main/res/layouts/shared/listviews/layout/orbotview_row.xml
new file mode 100644
index 00000000..b5b658cd
--- /dev/null
+++ b/app/src/main/res/layouts/shared/listviews/layout/orbotview_row.xml
@@ -0,0 +1,116 @@
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/pRowContainer"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="8dp"
+    android:layout_marginStart="10dp"
+    android:paddingStart="5dp"
+    android:background="@xml/sx_border_left"
+    android:orientation="horizontal"
+    android:weightSum="10"
+    tools:ignore="RtlSymmetry">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/pRowContainerInner"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@xml/gx_ripple_gray"
+        android:clickable="true"
+        android:focusable="true"
+        android:longClickable="true"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="RtlSymmetry">
+
+        <LinearLayout
+            android:id="@+id/linearLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:clickable="false"
+            android:focusable="false"
+            android:orientation="vertical"
+            android:paddingTop="10dp"
+            android:paddingEnd="8dp"
+            android:paddingBottom="10dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/pRemoveRow"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="NestedWeights,RtlSymmetry">
+
+            <TextView
+                android:id="@+id/pHeader"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="15dp"
+                android:clickable="false"
+                android:text="test header"
+                android:textColor="@color/c_text_v1"
+                android:textSize="14.5sp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="15dp"
+                android:layout_marginTop="8dp"
+                android:clickable="false"
+                android:focusable="false"
+                android:orientation="horizontal"
+                android:paddingEnd="8dp"
+                tools:ignore="NestedWeights,RtlSymmetry"
+                tools:layout_editor_absoluteX="114dp">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="18dp"
+                    android:layout_marginStart="-5dp"
+                    android:layout_marginTop="0dp"
+                    android:clickable="false"
+                    android:contentDescription="@string/GENERAL_TODO"
+                    android:ellipsize="end"
+                    android:src="@xml/ic_baseline_clock"
+                    android:textColor="@color/c_text_v1"
+                    app:tint="@color/c_view_divier_background_inner_v1" />
+
+                <TextView
+                    android:id="@+id/pDescription"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="3dp"
+                    android:layout_marginTop="0dp"
+                    android:clickable="false"
+                    android:ellipsize="end"
+                    android:text="test description"
+                    android:textColor="@color/c_text_v3"
+                    android:textSize="13sp" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <ImageButton
+            android:id="@+id/pRemoveRow"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginEnd="15dp"
+            android:background="@color/clear_alpha"
+            android:contentDescription="@string/GENERAL_TODO"
+            android:longClickable="true"
+            android:scaleType="fitCenter"
+            android:src="@xml/ic_baseline_keyboard_arrow_right"
+            android:tint="@color/c_text_v3"
+            android:translationZ="10dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="RtlSymmetry" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+
diff --git a/app/src/main/res/layouts/shared/listviews/layout/tabview_row.xml b/app/src/main/res/layouts/shared/listviews/layout/tabview_row.xml
index 86c3e1e1..fd75790e 100644
--- a/app/src/main/res/layouts/shared/listviews/layout/tabview_row.xml
+++ b/app/src/main/res/layouts/shared/listviews/layout/tabview_row.xml
@@ -14,111 +14,181 @@
     android:weightSum="10"
     tools:ignore="RtlSymmetry">
 
-    <androidx.cardview.widget.CardView
-        android:id="@+id/cardView"
-        android:layout_width="110dp"
-        android:layout_height="70dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="10dp"
-        android:layout_weight="2"
-        android:background="@xml/gx_ripple_gray"
-        app:cardCornerRadius="4dp"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/pRowContainerInner"
+        android:layout_width="match_parent"
+        android:layout_height="90dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:orientation="horizontal"
+        android:paddingEnd="0dp"
+        android:weightSum="10"
+        android:longClickable="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="RtlSymmetry">
 
-        <org.mozilla.geckoview.GeckoView
-            android:id="@+id/pGeckoView"
-            android:layout_width="480dp"
-            android:layout_height="800dp"
-            android:layout_marginStart="-185dp"
-            android:layout_marginTop="-312dp"
-            android:adjustViewBounds="true"
+        <androidx.cardview.widget.CardView
+            android:id="@+id/cardView"
+            android:layout_width="89dp"
+            android:layout_height="70dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="10dp"
+            android:layout_weight="2"
+            app:cardCornerRadius="4dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <com.darkweb.genesissearchengine.helperManager.TopCropImageView
+                android:id="@+id/pWebThumbnail"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:adjustViewBounds="true"
+                android:contentDescription="@string/GENERAL_TODO"
+                android:elevation="10dp"
+                android:scaleType="matrix"
+                tools:srcCompat="@tools:sample/avatars" />
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:background="@color/c_list_alpha_black"
+                android:id="@+id/pSelectedView"
+                android:visibility="gone"
+                android:alpha="0"
+                android:layout_height="match_parent">
+
+                <ImageView
+                    android:id="@+id/imageView3"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="15dp"
+                    app:srcCompat="@drawable/tick_recycler_view"
+                    android:contentDescription="@string/GENERAL_TODO" />
+            </FrameLayout>
+
+        </androidx.cardview.widget.CardView>
+
+        <LinearLayout
+            android:id="@+id/linearLayout"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="7dp"
+            android:layout_weight="6"
             android:clickable="false"
             android:focusable="false"
-            android:focusableInTouchMode="false"
-            android:paddingBottom="500dp"
-            android:scaleType="fitStart"
-            android:scaleX="0.22"
-            android:scaleY="0.22">
+            android:orientation="vertical"
+            android:paddingEnd="8dp"
+            app:layout_constraintEnd_toStartOf="@+id/pRemoveRow"
+            app:layout_constraintStart_toEndOf="@+id/cardView"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="NestedWeights,RtlSymmetry">
 
-        </org.mozilla.geckoview.GeckoView>
-    </androidx.cardview.widget.CardView>
+            <TextView
+                android:id="@+id/pHeader"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="0dp"
+                android:layout_marginTop="0dp"
+                android:clickable="false"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:singleLine="true"
+                android:textColor="@color/c_text_v1"
+                android:textSize="14.5sp" />
 
-    <LinearLayout
-        android:id="@+id/linearLayout"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_marginStart="15dp"
-        android:layout_marginTop="24dp"
-        android:layout_weight="6"
-        android:background="@xml/gx_ripple_gray"
-        android:clickable="false"
-        android:focusable="false"
-        android:orientation="vertical"
-        android:paddingEnd="8dp"
-        app:layout_constraintEnd_toStartOf="@+id/pRemoveRow"
-        app:layout_constraintStart_toEndOf="@+id/cardView"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="NestedWeights,RtlSymmetry">
+            <TextView
+                android:id="@+id/pDescription"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="0dp"
+                android:layout_marginTop="1dp"
+                android:clickable="false"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:singleLine="true"
+                android:textColor="@color/c_text_v2"
+                android:textSize="13sp" />
 
-        <TextView
-            android:id="@+id/pHeader"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
-            android:layout_marginTop="0dp"
-            android:clickable="false"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:textColor="@color/c_text_v1"
-            android:textSize="14.5sp" />
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="18dp"
+                android:clickable="false"
+                android:focusable="false"
+                android:orientation="horizontal"
+                android:paddingEnd="8dp"
+                tools:ignore="NestedWeights,RtlSymmetry"
+                tools:layout_editor_absoluteX="114dp">
 
-        <TextView
-            android:id="@+id/pDescription"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
-            android:layout_marginTop="1dp"
-            android:clickable="false"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:textColor="@color/c_text_v2"
-            android:textSize="13sp" />
-    </LinearLayout>
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="18dp"
+                    android:layout_marginStart="-5dp"
+                    android:layout_marginTop="0dp"
+                    android:clickable="false"
+                    android:contentDescription="@string/GENERAL_TODO"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:singleLine="true"
+                    android:src="@xml/ic_baseline_clock"
+                    android:textColor="@color/c_text_v1"
+                    app:tint="@color/c_text_v3" />
 
-    <ImageButton
-        android:id="@+id/pRemoveRow"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="2"
-        android:background="@xml/gx_ripple_gray"
-        android:contentDescription="@string/GENERAL_TODO"
-        android:padding="20dp"
-        android:paddingTop="22dp"
-        android:paddingBottom="22dp"
-        android:scaleType="fitCenter"
-        android:src="@xml/ic_baseline_cross"
-        android:tint="@color/c_navigation_tint"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="RtlSymmetry" />
+                <TextView
+                    android:id="@+id/pDate"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="3dp"
+                    android:layout_marginTop="0dp"
+                    android:clickable="false"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:singleLine="true"
+                    android:textColor="@color/c_text_v3"
+                    android:textSize="13sp" />
 
-    <ImageView
-        android:id="@+id/pLoadSession"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:background="@xml/gx_ripple_gray"
-        android:clickable="true"
-        android:contentDescription="@string/GENERAL_TODO"
-        android:focusable="true"
-        android:translationZ="10dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/pRemoveRow"
-        app:layout_constraintHorizontal_weight="1"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <ImageView
+            android:id="@+id/pLoadSession"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:clickable="true"
+            android:contentDescription="@string/GENERAL_TODO"
+            android:focusable="true"
+            android:background="@xml/gx_ripple_light"
+            android:longClickable="true"
+            android:translationZ="10dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/pRemoveRow"
+            app:layout_constraintHorizontal_weight="1"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageButton
+            android:longClickable="true"
+            android:id="@+id/pRemoveRow"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="2"
+            android:background="@xml/gx_ripple_light"
+            android:contentDescription="@string/GENERAL_TODO"
+            android:padding="20dp"
+            android:paddingTop="22dp"
+            android:paddingBottom="22dp"
+            android:translationZ="10dp"
+            android:scaleType="fitCenter"
+            android:src="@xml/ic_baseline_cross"
+            android:tint="@color/c_navigation_tint"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="RtlSymmetry" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layouts/tab/layout/tab_view.xml b/app/src/main/res/layouts/tab/layout/tab_view.xml
index 16638950..9c063e5f 100644
--- a/app/src/main/res/layouts/tab/layout/tab_view.xml
+++ b/app/src/main/res/layouts/tab/layout/tab_view.xml
@@ -16,7 +16,7 @@
         android:layout_height="wrap_content"
         android:background="@color/c_background"
         android:clickable="true"
-        android:elevation="7dp"
+        android:elevation="8dp"
         android:focusable="true"
         android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="parent"
@@ -58,11 +58,12 @@
                 android:textStyle="bold" />
 
             <LinearLayout
+                android:id="@+id/pTabsContainer"
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:clickable="true"
                 android:focusable="true"
-                android:onClick="onBackPressed"
+                android:onClick="onBackPressedInvoked"
                 android:orientation="horizontal"
                 android:paddingStart="5dp"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -100,6 +101,33 @@
                 android:scaleType="fitCenter"
                 android:src="@drawable/menu_item"
                 android:tint="@color/c_navigation_tint" />
+
+            <ImageButton
+                android:id="@+id/pRemoveSelection"
+                android:layout_width="45dp"
+                android:layout_height="45dp"
+                android:layout_marginEnd="1dp"
+                android:layout_marginTop="1dp"
+                android:visibility="gone"
+                android:background="@xml/gx_ripple_default_round"
+                android:contentDescription="@string/GENERAL_TODO"
+                android:onClick="onRemoveSelection"
+                android:src="@xml/ic_baseline_delete"
+                android:tint="@color/c_navigation_tint" />
+
+            <ImageButton
+                android:id="@+id/pClearSelection"
+                android:layout_width="45dp"
+                android:layout_height="45dp"
+                android:layout_marginEnd="1dp"
+                android:visibility="gone"
+                android:layout_marginTop="1dp"
+                android:background="@xml/gx_ripple_default_round"
+                android:contentDescription="@string/GENERAL_TODO"
+                android:onClick="onClearSelection"
+                android:src="@xml/ic_refresh"
+                android:tint="@color/c_navigation_tint" />
+
         </LinearLayout>
 
         <View
@@ -108,8 +136,6 @@
             android:background="@color/c_view_divier_background_inner"
             android:paddingStart="10dp"
             android:paddingEnd="10dp" />
-
-
     </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView
@@ -121,4 +147,8 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/pHeaderContainer" />
 
+    <include android:id="@+id/pPopupUndo"
+        android:visibility="gone"
+        layout="@layout/popup_undo"/>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/attrs.xml b/app/src/main/res/values-night/attrs.xml
index 22a3e4bd..9be5b760 100644
--- a/app/src/main/res/values-night/attrs.xml
+++ b/app/src/main/res/values-night/attrs.xml
@@ -11,4 +11,5 @@
         <attr name="shiftDuration" format="reference" />
         <attr name="shiftInterpolator" format="reference" />
     </declare-styleable>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 9d273b9c..b99c8aea 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,19 +1,23 @@
 <resources>
     <color name="c_background">#1c1b21</color>
+    <color name="c_background_inverted">#ffffff</color>
     <color name="c_view_divier_background_inner">#0f0f0f</color>
-    <color name="c_view_divier_background">#2c2b31</color>
+    <color name="c_view_divier_background_inner_v1">#666666</color>
+    <color name="c_view_divier_background">#141316</color>
     <color name="c_text_v1">#ffffff</color>
     <color name="c_text_v2">#b3b3b3</color>
     <color name="c_text_v3">#666666</color>
     <color name="c_text_v4">#a6a6a6</color>
     <color name="c_text_v5">#ffffff</color>
-    <color name="c_icon_tint">#ffc266</color>
+    <color name="c_icon_tint">#7591bd</color>
     <color name="c_text_setting_heading">#ffad33</color>
     <color name="c_button_text_v1">#ffffff</color>
+    <color name="c_button_text_v1_inverted">#3385ff</color>
     <color name="c_button_text_v2">#ffffff</color>
     <color name="c_button_text_v3">#ffffff</color>
     <color name="c_text_setting_heading_v2">#ffad33</color>
     <color name="c_navigation_tint">#ffffff</color>
+    <color name="c_navigation_light">#999999</color>
     <color name="c_switch_theme">#ffad33</color>
     <color name="c_border_left">#0c0c0d</color>
     <color name="c_radio_tint">#ffad33</color>
@@ -21,17 +25,19 @@
     <color name="c_button">#ffad33</color>
     <color name="c_checkbox_tint">#ffad33</color>
     <color name="c_checkbox_tint_default">#ffffff</color>
-    <color name="c_border_background">#1a1a1e</color>
+    <color name="c_border_background">#18161d</color>
     <color name="c_font_change_background">#161618</color>
     <color name="c_font_change_foreground">#ffffff</color>
     <color name="c_seekbar_progress">#ffad33</color>
     <color name="c_seekbar_thumb">#ffad33</color>
-    <color name="c_ripple">#0c0b0e</color>
+    <color name="c_ripple">#808080</color>
     <color name="c_ripple_v1">#0c0b0e</color>
+    <color name="c_ripple_v2">#ededed</color>
     <color name="c_button_text">#1c1b21</color>
-    <color name="c_button_background">#ffffff</color>
+    <color name="c_button_background">#ffad33</color>
     <color name="c_alert_background">#3c3946</color>
-    <color name="c_view_divier_background_v1">#302e38</color>
+    <color name="c_view_divier_background_v1">#24222a</color>
+    <color name="c_view_divier_background_v2">#302e38</color>
     <color name="c_profile_radial_inner">#2c2b31</color>
     <color name="c_profile_radial_outer">#2c2b31</color>
     <color name="c_edittext_background">#3c3946</color>
@@ -40,13 +46,21 @@
     <color name="c_menu_drop_shadow_15">#00000000</color>
     <color name="c_menu_drop_shadow_20">#00000000</color>
     <color name="c_menu_drop_shadow_25">#00000000</color>
+    <color name="c_text_home_menu">#ffffff</color>
+    <color name="c_hint_text">#b3b3b3</color>
+    <color name="c_list_item_current">#0c0b0e</color>
+
     <color name="c_alert_text">#ffffff</color>
+    <color name="c_alert_text_inverted">#242B64</color>
+
     <color name="c_button_warning">#f65555</color>
     <color name="c_rateus_warning">#b3b3b3</color>
     <color name="c_splash_buttons">#ffffff</color>
     <color name="c_tab">#212d45</color>
     <color name="c_tab_background">#212d45</color>
     <color name="c_tab_border">#425e8a</color>
+    <color name="c_list_remove_back">#0f0f0f</color>
+    <color name="c_list_alpha_black">#90000000</color>
 
     <color name="blue">#0066FF</color>
     <color name="ease_blue_light">#fdfeff</color>
@@ -56,6 +70,7 @@
     <color name="landing_ease_blue_light_2">#eef1f7</color>
     <color name="cursor_blue">#3385ff</color>
     <color name="text_color_highlight_v1">#b3d1ff</color>
+    <color name="text_color_highlight_v3">#615c70</color>
     <color name="blue_dark">#212d45</color>
     <color name="blue_dark_v1">#212d45</color>
     <color name="blue_dark_v2">#55212d45</color>
diff --git a/app/src/main/res/values-night/strings.xml b/app/src/main/res/values-night/strings.xml
index d6dee644..92eb14fa 100644
--- a/app/src/main/res/values-night/strings.xml
+++ b/app/src/main/res/values-night/strings.xml
@@ -3,6 +3,7 @@
     <!-- Application Strings -->
     <string name="app_name" translatable="false">Genesis</string>
     <string name="GENERAL_SEARCH_HINT" translatable="false">Search or type web address</string>
+    <string name="GENERAL_FIND_HINT" translatable="false">Find in page</string>
     <string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
     <string name="GENERAL_ERROR_TITLE" translatable="false">\u0020\u0020\u0020Opps! Some Thing Went Wrong</string>
     <string name="GENERAL_TODO" translatable="false">TODO</string>
@@ -29,6 +30,8 @@
     <string name="SETTING_NOTIFICATION_HEADER" translatable="false">Settings | Notification</string>
     <string name="SETTING_NOTIFICATION_DISABLE_STATUS_NOTIFICATION" translatable="false">Network Status Notification</string>
     <string name="SETTING_NOTIFICATION_OPEN_NOTIFICATION_MANAGER" translatable="false">Device Notification Settings</string>
+    <string name="SETTING_ORBOT_LOG_HEADER" translatable="false">Log Settings</string>
+    <string name="SETTING_ORBOT_LIST_VIEW" translatable="false">Show Logs in Advance List View</string>
     <string name="SETTING_SEARCH" translatable="false">Manage Search</string>
     <string name="SETTING_SEARCH_INFO" translatable="false">Add, set default. show suggestions</string>
     <string name="SETTING_NOTIFICATION" translatable="false">Manage Notification</string>
@@ -193,6 +196,8 @@
     <string name="ALERT_DOWNLOAD_MESSAGE" translatable="false">Download File | </string>
     <string name="ALERT_DATA_CLEARED" translatable="false">Data Notification</string>
     <string name="ALERT_DATA_CLEARED_INFO" translatable="false">Private data cleared. Now you can safely continue browsing</string>
+    <string name="ALERT_UNDO_TAB_REMOVE_INFO" translatable="false">Tab Closed</string>
+    <string name="ALERT_UNDO_TAB_REMOVE_BUTTON" translatable="false">Undo</string>
 
     <!-- Bridge Settings -->
     <string name="BRIDGE_BASIC_SETTING" translatable="false">Security Settings</string>
@@ -207,21 +212,33 @@
     <string name="BRIDGE_OBFS4" translatable="false">obfs4 (Recommended)</string>
     <string name="BRIDGE_MEEK" translatable="false">Meek-azure (China)</string>
 
+    <!-- Orbot Log -->
+    <string name="ORBOT_LOG" translatable="false">Proxy Logs</string>
+    <string name="ORBOT_LOG_HEADER" translatable="false">Logs Info</string>
+    <string name="ORBOT_LOG_INFO" translatable="false">If you are facing connectivity issue while starting genesis please copy the following code and find issue online or send it to us so we can examine </string>
+
     <!-- Popup Menu -->
-    <string name="HOME_MENU__NEW_TABS" translatable="false">New Tabs</string>
+    <string name="HOME_MENU__ORBOT_LOGS" translatable="false">Orbot logs</string>
+    <string name="HOME_MENU__NEW_TABS" translatable="false">New tabs</string>
     <string name="HOME_MENU_CLOSE_TABS" translatable="false">Close Tab</string>
     <string name="HOME_MENU_OPEN_RECENT_TABS" translatable="false">Open Recent Tabs</string>
     <string name="HOME_MENU_LANGUAGE" translatable="false">Language</string>
     <string name="HOME_MENU_DOWNLOAD" translatable="false">Downloads</string>
     <string name="HOME_MENU_HISTORY" translatable="false">History</string>
     <string name="HOME_MENU_SETTING" translatable="false">Settings</string>
-    <string name="HOME_MENU_DESKTOP" translatable="false">Desktop Site</string>
+    <string name="HOME_MENU_DESKTOP" translatable="false">Desktop site</string>
     <string name="HOME_MENU_BOOKMARK" translatable="false">Bookmark This Page</string>
     <string name="HOME_MENU_OPEN_BOOKMARK" translatable="false">Bookmarks</string>
-    <string name="HOME_MENU_REPORT" translatable="false">Report Website</string>
-    <string name="HOME_MENU_RATE" translatable="false">Rate This App</string>
+    <string name="HOME_MENU_REPORT" translatable="false">Report website</string>
+    <string name="HOME_MENU_RATE" translatable="false">Rate this app</string>
+    <string name="HOME_MENU_FIND" translatable="false">Find in page</string>
     <string name="HOME_MENU_SHARE" translatable="false">Share</string>
-    <string name="HOME_CHARACTER_ENCODING" translatable="false">Character Encoding</string>
+    <string name="HOME_CHARACTER_ENCODING" translatable="false">Character encoding</string>
+
+    <!-- Tab View -->
+    <string name="TAB_MENU_OPEN_TAB" translatable="false">New tabs</string>
+    <string name="TAB_MENU_CLOSE_TAB" translatable="false">Close all tabs</string>
+    <string name="TAB_MENU_SETTINGS" translatable="false">Settings</string>
 
     <!-- Shared Recycler View -->
     <string name="SHARED_RECYCLER_VIEW_OPEN" translatable="false">Open tabs</string>
@@ -277,6 +294,7 @@
     <string name="HOME_TAB_TEXT" translatable="false">1</string>
     <string name="HOME_CONNECT" translatable="false">Connect</string>
     <string name="HOME_LOADING" translatable="false">Loading Please Wait</string>
+    <string name="HOME_LOADING_STATIC" translatable="false">~&#160;Genesis on standby at the moment</string>
 
     <!-- Landing Page -->
     <string name="LANDING_BRIDGES_INFO" translatable="false">"Sometimes you need a bridge to get to Tor."</string>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index ce137b2b..6f076548 100755
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -11,4 +11,5 @@
         <attr name="shiftDuration" format="reference" />
         <attr name="shiftInterpolator" format="reference" />
     </declare-styleable>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f530c311..17cc368b 100755
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="c_background">#ffffff</color>
+    <color name="c_background_inverted">#1c1b21</color>
     <color name="c_view_divier_background_inner">#ebebeb</color>
+    <color name="c_view_divier_background_inner_v1">#e6e6e6</color>
     <color name="c_view_divier_background">#f2f2f2</color>
-    <color name="c_text_v1">#212d45</color>
+    <color name="c_text_v1">#192234</color>
     <color name="c_text_v2">#999999</color>
     <color name="c_text_v3">#bfbfbf</color>
     <color name="c_text_v4">#425e8a</color>
@@ -11,10 +13,12 @@
     <color name="c_icon_tint">#425e8a</color>
     <color name="c_text_setting_heading">#3385ff</color>
     <color name="c_button_text_v1">#3385ff</color>
+    <color name="c_button_text_v1_inverted">#ffffff</color>
     <color name="c_button_text_v2">#b3b3b3</color>
     <color name="c_button_text_v3">#3385ff</color>
     <color name="c_text_setting_heading_v2">#00b3b3</color>
     <color name="c_navigation_tint">#000000</color>
+    <color name="c_navigation_light">#bfbfbf</color>
     <color name="c_switch_theme">#3385ff</color>
     <color name="c_border_left">#123456</color>
     <color name="c_radio_tint">#4d88ff</color>
@@ -29,19 +33,26 @@
     <color name="c_seekbar_thumb">#3385ff</color>
     <color name="c_ripple">#d9d9d9</color>
     <color name="c_ripple_v1">#d9d9d9</color>
+    <color name="c_ripple_v2">#f2f2f2</color>
     <color name="c_button_text">#ffffff</color>
     <color name="c_button_background">#3385ff</color>
     <color name="c_alert_background">#ffffff</color>
     <color name="c_view_divier_background_v1">#f2f2f2</color>
+    <color name="c_view_divier_background_v2">#f2f2f2</color>
     <color name="c_profile_radial_inner">#000000</color>
     <color name="c_profile_radial_outer">#ffffff</color>
     <color name="c_edittext_background">#e6e6e6</color>
-    <color name="c_button_warning">#f32323</color>
+    <color name="c_button_warning">#610505</color>
     <color name="c_rateus_warning">#b3b3b3</color>
     <color name="c_splash_buttons">#ffffff</color>
     <color name="c_tab">#dde3ee</color>
     <color name="c_tab_background">#212d45</color>
     <color name="c_tab_border">#6482b4</color>
+    <color name="c_list_remove_back">#999999</color>
+    <color name="c_list_alpha_black">#90000000</color>
+    <color name="c_text_home_menu">#212d45</color>
+    <color name="c_hint_text">#b3b3b3</color>
+    <color name="c_list_item_current">#e6e6e6</color>
 
     <color name="c_menu_drop_shadow_05">#05e6e6e6</color>
     <color name="c_menu_drop_shadow_10">#10e6e6e6</color>
@@ -50,6 +61,7 @@
     <color name="c_menu_drop_shadow_25">#25e6e6e6</color>
 
     <color name="c_alert_text">#242B64</color>
+    <color name="c_alert_text_inverted">#ffffff</color>
 
     <color name="blue">#0066FF</color>
     <color name="ease_blue_light">#fdfeff</color>
@@ -59,6 +71,7 @@
     <color name="landing_ease_blue_light_2">#eef1f7</color>
     <color name="cursor_blue">#3385ff</color>
     <color name="text_color_highlight_v1">#b3d1ff</color>
+    <color name="text_color_highlight_v3">#99bbff</color>
     <color name="blue_dark">#212d45</color>
     <color name="blue_dark_v1">#212d45</color>
     <color name="blue_dark_v2">#55212d45</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7200e387..47438136 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,6 +3,7 @@
     <!-- Application Strings -->
     <string name="app_name" translatable="false">Genesis</string>
     <string name="GENERAL_SEARCH_HINT" translatable="false">Search or type web address</string>
+    <string name="GENERAL_FIND_HINT" translatable="false">Find in page</string>
     <string name="GENERAL_HOME_URL" translatable="false">https://genesis.onion</string>
     <string name="GENERAL_ERROR_TITLE" translatable="false">\u0020\u0020\u0020Opps! Some Thing Went Wrong</string>
     <string name="GENERAL_TODO" translatable="false">TODO</string>
@@ -29,6 +30,8 @@
     <string name="SETTING_NOTIFICATION_HEADER" translatable="false">Settings | Notification</string>
     <string name="SETTING_NOTIFICATION_DISABLE_STATUS_NOTIFICATION" translatable="false">Network Status Notification</string>
     <string name="SETTING_NOTIFICATION_OPEN_NOTIFICATION_MANAGER" translatable="false">Device Notification Settings</string>
+    <string name="SETTING_ORBOT_LOG_HEADER" translatable="false">Log Settings</string>
+    <string name="SETTING_ORBOT_LIST_VIEW" translatable="false">Show Logs in Advance List View</string>
     <string name="SETTING_SEARCH" translatable="false">Manage Search</string>
     <string name="SETTING_SEARCH_INFO" translatable="false">Add, set default. show suggestions</string>
     <string name="SETTING_NOTIFICATION" translatable="false">Manage Notification</string>
@@ -193,6 +196,8 @@
     <string name="ALERT_DOWNLOAD_MESSAGE" translatable="false">Download File | </string>
     <string name="ALERT_DATA_CLEARED" translatable="false">Data Notification</string>
     <string name="ALERT_DATA_CLEARED_INFO" translatable="false">Private data cleared. Now you can safely continue browsing</string>
+    <string name="ALERT_UNDO_TAB_REMOVE_INFO" translatable="false">Tab Closed</string>
+    <string name="ALERT_UNDO_TAB_REMOVE_BUTTON" translatable="false">Undo</string>
 
     <!-- Bridge Settings -->
     <string name="BRIDGE_BASIC_SETTING" translatable="false">Security Settings</string>
@@ -209,25 +214,26 @@
 
     <!-- Orbot Log -->
     <string name="ORBOT_LOG" translatable="false">Proxy Logs</string>
-    <string name="ORBOT_LOG_HEADER" translatable="false">Proxy Connectivity Logs</string>
+    <string name="ORBOT_LOG_HEADER" translatable="false">Logs Info</string>
     <string name="ORBOT_LOG_INFO" translatable="false">If you are facing connectivity issue while starting genesis please copy the following code and find issue online or send it to us so we can examine </string>
 
     <!-- Popup Menu -->
-    <string name="HOME_MENU__ORBOT_LOGS" translatable="false">Orbot Logs</string>
-    <string name="HOME_MENU__NEW_TABS" translatable="false">New Tabs</string>
+    <string name="HOME_MENU__ORBOT_LOGS" translatable="false">Orbot logs</string>
+    <string name="HOME_MENU__NEW_TABS" translatable="false">New tabs</string>
     <string name="HOME_MENU_CLOSE_TABS" translatable="false">Close Tab</string>
     <string name="HOME_MENU_OPEN_RECENT_TABS" translatable="false">Open Recent Tabs</string>
     <string name="HOME_MENU_LANGUAGE" translatable="false">Language</string>
     <string name="HOME_MENU_DOWNLOAD" translatable="false">Downloads</string>
     <string name="HOME_MENU_HISTORY" translatable="false">History</string>
     <string name="HOME_MENU_SETTING" translatable="false">Settings</string>
-    <string name="HOME_MENU_DESKTOP" translatable="false">Desktop Site</string>
+    <string name="HOME_MENU_DESKTOP" translatable="false">Desktop site</string>
     <string name="HOME_MENU_BOOKMARK" translatable="false">Bookmark This Page</string>
     <string name="HOME_MENU_OPEN_BOOKMARK" translatable="false">Bookmarks</string>
-    <string name="HOME_MENU_REPORT" translatable="false">Report Website</string>
-    <string name="HOME_MENU_RATE" translatable="false">Rate This App</string>
+    <string name="HOME_MENU_REPORT" translatable="false">Report website</string>
+    <string name="HOME_MENU_RATE" translatable="false">Rate this app</string>
+    <string name="HOME_MENU_FIND" translatable="false">Find in page</string>
     <string name="HOME_MENU_SHARE" translatable="false">Share</string>
-    <string name="HOME_CHARACTER_ENCODING" translatable="false">Character Encoding</string>
+    <string name="HOME_CHARACTER_ENCODING" translatable="false">Character encoding</string>
 
     <!-- Tab View -->
     <string name="TAB_MENU_OPEN_TAB" translatable="false">New tabs</string>
diff --git a/build.gradle b/build.gradle
index 39b9436d..85644103 100755
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath 'com.google.gms:google-services:4.3.4'
     }
 }
diff --git a/chromiumTabs/.gitignore b/chromiumTabs/.gitignore
deleted file mode 100644
index 796b96d1..00000000
--- a/chromiumTabs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/chromiumTabs/build.gradle b/chromiumTabs/build.gradle
deleted file mode 100644
index 5fc9f32c..00000000
--- a/chromiumTabs/build.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-apply plugin: 'com.android.library'
-apply from: 'variables.gradle'
-apply from: 'variables.gradle'
-
-android {
-    compileSdkVersion 30
-    buildToolsVersion '29.0.3'
-
-    defaultConfig {
-        minSdkVersion project.ext.minSdkVersion
-        targetSdkVersion project.ext.targetSdkVersion
-    }
-    buildTypes {
-        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-
-        }
-    }
-}
-
-dependencies {
-    api 'com.github.michael-rapp:android-util:2.1.0'
-    api 'com.github.michael-rapp:android-material-views:3.0.1'
-    api 'androidx.annotation:annotation:1.1.0'
-    api 'androidx.appcompat:appcompat:1.2.0'
-}
\ No newline at end of file
diff --git a/chromiumTabs/gradle.properties b/chromiumTabs/gradle.properties
deleted file mode 100644
index f639a40d..00000000
--- a/chromiumTabs/gradle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-POM_NAME=ChromeLikeTabSwitcher
-POM_ARTIFACT_ID=chrome-like-tab-switcher
-POM_PACKAGING=aar
\ No newline at end of file
diff --git a/chromiumTabs/src/main/AndroidManifest.xml b/chromiumTabs/src/main/AndroidManifest.xml
deleted file mode 100644
index 348d305c..00000000
--- a/chromiumTabs/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2016 - 2020 Michael Rapp
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing permissions and limitations under the
-License.
--->
-<manifest package="de.mrapp.android.tabswitcher"/>
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/AbstractState.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/AbstractState.java
deleted file mode 100644
index bf595186..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/AbstractState.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher;
-
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import de.mrapp.android.tabswitcher.model.Restorable;
-import de.mrapp.util.Condition;
-
-/**
- * An abstract base class for the states of tabs, which can be used together with a {@link
- * StatefulTabSwitcherDecorator}. The state stores the tab it corresponds to and implements the
- * interface {@link Restorable} to be able to store and restore its state.
- *
- * @author Michael Rapp
- * @since 0.2.4
- */
-public abstract class AbstractState implements Restorable {
-
-    /**
-     * The tab, the state corresponds to.
-     */
-    private final Tab tab;
-
-    /**
-     * Creates a new state of a specific tab.
-     *
-     * @param tab
-     *         The tab, the state should correspond to, as an instance of the class {@link Tab}. The
-     *         tab may not be null
-     */
-    public AbstractState(@NonNull final Tab tab) {
-        Condition.INSTANCE.ensureNotNull(tab, "The tab may not be null");
-        this.tab = tab;
-    }
-
-    /**
-     * Returns the tab, the state corresponds to.
-     *
-     * @return The tab, the state corresponds to, as an instance of the class {@link Tab}. The tab
-     * may not be null
-     */
-    @NonNull
-    public Tab getTab() {
-        return tab;
-    }
-
-    @Override
-    public void saveInstanceState(@NonNull final Bundle outState) {
-
-    }
-
-    @Override
-    public void restoreInstanceState(@Nullable final Bundle savedInstanceState) {
-
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/AddTabButtonListener.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/AddTabButtonListener.java
deleted file mode 100644
index f6911e1d..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/AddTabButtonListener.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher;
-
-import androidx.annotation.NonNull;
-
-/**
- * Defines the interface of a listener, which should be notified, when a button, which allows to add
- * a tab to a {@link TabSwitcher}, has been clicked. The listener is responsible for instantiating
- * and adding the tab.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public interface AddTabButtonListener {
-
-    /**
-     * The method, which is invoked, when a button, which allows to add a tab to a tab switcher, has
-     * been clicked.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, the tab should be added to, as an instance of the class {@link
-     *         TabSwitcher}. The tab switcher may not be null
-     */
-    void onAddTab(@NonNull TabSwitcher tabSwitcher);
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/Animation.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/Animation.java
deleted file mode 100644
index 924635c9..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/Animation.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher;
-
-import android.view.animation.Interpolator;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import de.mrapp.util.Condition;
-
-/**
- * An animation, which can be used to add or remove tabs to/from a {@link TabSwitcher}.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public abstract class Animation {
-
-    /**
-     * An abstract base class for all builders, which allow to configure and create instances of the
-     * class {@link Animation}.
-     *
-     * @param <AnimationType>
-     *         The type of the animations, which are created by the builder
-     * @param <BuilderType>
-     *         The type of the builder
-     */
-    protected static abstract class Builder<AnimationType, BuilderType> {
-
-        /**
-         * The duration of the animations, which are created by the builder.
-         */
-        protected long duration;
-
-        /**
-         * The interpolator, which is used by the animations, which are created by the builder.
-         */
-        protected Interpolator interpolator;
-
-        /**
-         * Returns a reference to the builder.
-         *
-         * @return A reference to the builder, casted to the generic type BuilderType. The reference
-         * may not be null
-         */
-        @NonNull
-        @SuppressWarnings("unchecked")
-        protected final BuilderType self() {
-            return (BuilderType) this;
-        }
-
-        /**
-         * Creates a new builder, which allows to configure and create instances of the class {@link
-         * Animation}.
-         */
-        public Builder() {
-            setDuration(-1);
-            setInterpolator(null);
-        }
-
-        /**
-         * Creates and returns the animation.
-         *
-         * @return The animation, which has been created, as an instance of the generic type
-         * AnimationType. The animation may not be null
-         */
-        @NonNull
-        public abstract AnimationType create();
-
-        /**
-         * Sets the duration of the animations, which are created by the builder.
-         *
-         * @param duration
-         *         The duration, which should be set, in milliseconds as a {@link Long} value or -1,
-         *         if the default duration should be used
-         * @return The builder, this method has be called upon, as an instance of the generic type
-         * BuilderType. The builder may not be null
-         */
-        @NonNull
-        public final BuilderType setDuration(final long duration) {
-            Condition.INSTANCE.ensureAtLeast(duration, -1, "The duration must be at least -1");
-            this.duration = duration;
-            return self();
-        }
-
-        /**
-         * Sets the interpolator, which should be used by the animations, which are created by the
-         * builder.
-         *
-         * @param interpolator
-         *         The interpolator, which should be set, as an instance of the type {@link
-         *         Interpolator} or null, if the default interpolator should be used
-         * @return The builder, this method has be called upon, as an instance of the generic type
-         * BuilderType. The builder may not be null
-         */
-        @NonNull
-        public final BuilderType setInterpolator(@Nullable final Interpolator interpolator) {
-            this.interpolator = interpolator;
-            return self();
-        }
-
-    }
-
-    /**
-     * The duration of the animation in milliseconds.
-     */
-    private final long duration;
-
-    /**
-     * The interpolator, which is used by the animation.
-     */
-    private final Interpolator interpolator;
-
-    /**
-     * Creates a new animation.
-     *
-     * @param duration
-     *         The duration of the animation in milliseconds as a {@link Long} value or -1, if the
-     *         default duration should be used
-     * @param interpolator
-     *         The interpolator, which should be used by the animation, as an instance of the type
-     *         {@link Interpolator} or null, if the default interpolator should be used
-     */
-    protected Animation(final long duration, @Nullable final Interpolator interpolator) {
-        Condition.INSTANCE.ensureAtLeast(duration, -1, "The duration must be at least -1");
-        this.duration = duration;
-        this.interpolator = interpolator;
-    }
-
-    /**
-     * Returns the duration of the animation.
-     *
-     * @return The duration of the animation in milliseconds as a {@link Long} value or -1, if the
-     * default duration is used
-     */
-    public final long getDuration() {
-        return duration;
-    }
-
-    /**
-     * Returns the interpolator, which is used by the animation.
-     *
-     * @return The interpolator, which is used by the animation, as an instance of the type {@link
-     * Interpolator} or null, if the default interpolator is used
-     */
-    @Nullable
-    public final Interpolator getInterpolator() {
-        return interpolator;
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/DragGesture.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/DragGesture.java
deleted file mode 100644
index 41bcc37d..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/DragGesture.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher;
-
-import android.graphics.RectF;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import de.mrapp.util.Condition;
-
-/**
- * A drag gesture, which can be used to perform certain actions when dragging in a particular
- * direction.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public abstract class DragGesture {
-
-    /**
-     * A builder, which allows to configure and create instances of the class {@link DragGesture}.
-     *
-     * @param <GestureType>
-     *         The type of the drag gestures, which are created by the builder
-     * @param <BuilderType>
-     *         The type of the builder
-     */
-    protected static abstract class Builder<GestureType, BuilderType> {
-
-        /**
-         * The threshold of the gestures, which are created by the builder.
-         */
-        protected int threshold;
-
-        /**
-         * The bounds of the onscreen area, which is taken into consideration for recognizing the
-         * drag gestures, which are created by the builder.
-         */
-        protected RectF touchableArea;
-
-        /**
-         * Returns a reference to the builder.
-         *
-         * @return A reference to the builder, casted to the generic type Builder. The reference may
-         * not be null
-         */
-        @NonNull
-        @SuppressWarnings("unchecked")
-        protected final BuilderType self() {
-            return (BuilderType) this;
-        }
-
-        /**
-         * Creates a new builder, which allows to configure and create instances of the class {@link
-         * DragGesture}.
-         */
-        public Builder() {
-            setThreshold(-1);
-            setTouchableArea(null);
-        }
-
-        /**
-         * Creates and returns the drag gesture.
-         *
-         * @return The drag gesture, which has been created, as an instance of the generic type
-         * DragGesture. The drag gesture may not be null
-         */
-        public abstract GestureType create();
-
-        /**
-         * Sets the threshold of the drag gestures, which are created by the builder.
-         *
-         * @param threshold
-         *         The threshold, which should be set, in pixels as a {@link Integer} value. The
-         *         threshold must be at least 0 or -1, if the default threshold should be used
-         * @return The builder, this method has been called upon, as an instance of the generic type
-         * BuilderType. The builder may not be null
-         */
-        @NonNull
-        public final BuilderType setThreshold(final int threshold) {
-            Condition.INSTANCE.ensureAtLeast(threshold, -1, "The threshold must be at least -1");
-            this.threshold = threshold;
-            return self();
-        }
-
-        /**
-         * Sets the bounds of the onscreen area, which should be taken into consideration for
-         * recognizing the drag gestures, which are create by the builder. drag gestures.
-         *
-         * @param left
-         *         The coordinate of the left edge in pixels as a {@link Float} value. The
-         *         coordinate must be at least 0
-         * @param top
-         *         The coordinate of the top edge in pixels as a {@link Float} value. The coordinate
-         *         must be at least 0
-         * @param right
-         *         The coordinate of the right edge in pixels as a {@link Float} value. The
-         *         coordinate must be greater than the coordinate of the left edge
-         * @param bottom
-         *         The coordinate of the bottom edge in pixels as a {@link Float} value. The
-         *         coordinate must be greater than the coordinate of the top edge
-         * @return The builder, this method has been called upon, as an instance of the generic type
-         * BuilderType. The builder may not be null
-         */
-        @NonNull
-        public final BuilderType setTouchableArea(final float left, final float top,
-                                                  final float right, final float bottom) {
-            Condition.INSTANCE.ensureAtLeast(left, 0, "The left coordinate must be at least 0");
-            Condition.INSTANCE.ensureAtLeast(top, 0, "The top coordinate must be at least 0");
-            Condition.INSTANCE.ensureGreater(right, left,
-                    "The right coordinate must be greater than " + left);
-            Condition.INSTANCE.ensureGreater(bottom, top,
-                    "The bottom coordinate must be greater than " + top);
-            return setTouchableArea(new RectF(left, top, right, bottom));
-        }
-
-        /**
-         * Sets the bounds of the onscreen area, which should be taken into consideration for
-         * recognizing the drag gestures, which are create by the builder. drag gestures.
-         *
-         * @param bounds
-         *         The bounds, which should be set, as an instance of the class {@link RectF} or
-         *         null, if the area should not be restricted
-         * @return The builder, this method has been called upon, as an instance of the generic type
-         * BuilderType. The builder may not be null
-         */
-        @NonNull
-        public final BuilderType setTouchableArea(@Nullable final RectF bounds) {
-            this.touchableArea = bounds;
-            return self();
-        }
-
-    }
-
-    /**
-     * The distance in pixels, the gesture must last until it is recognized.
-     */
-    private final int threshold;
-
-    /**
-     * The bounds of the onscreen area, which is taken into consideration for recognizing the drag
-     * gesture.
-     */
-    private final RectF touchableArea;
-
-    /**
-     * Creates a new drag gesture, which can be used to perform certain action when dragging in a
-     * particular direction.
-     *
-     * @param threshold
-     *         The distance in pixels, the gesture must last until it is recognized, as an {@link
-     *         Integer} value. The distance must be at least 0 or -1, if the default distance should
-     *         be used
-     * @param touchableArea
-     *         The bounds of the onscreen area, which should be taken into consideration for
-     *         recognizing the drag gesture, as an instance of the class {@link RectF} or null, if
-     *         the area should not be restricted
-     */
-    protected DragGesture(final int threshold, @Nullable final RectF touchableArea) {
-        Condition.INSTANCE.ensureAtLeast(threshold, -1, "The threshold must be at least -1");
-        this.threshold = threshold;
-        this.touchableArea = touchableArea;
-    }
-
-    /**
-     * Returns the distance in pixels, the gesture must last until it is recognized.
-     * <p>
-     * The distance in pixels, the gesture must last until it is recognized, as an {@link Integer}
-     * value. The distance must be at least 0 or -1, if the default distance should be used
-     */
-    public final int getThreshold() {
-        return threshold;
-    }
-
-    /**
-     * Returns the bounds of the onscreen area, which is taken into consideration for recognizing
-     * the drag gesture.
-     *
-     * @return The bounds of the onscreen area, which is taken into consideration for recognizing
-     * the drag gesture, as an instance of the class {@link RectF} or null, if the area is not
-     * restricted
-     */
-    @Nullable
-    public final RectF getTouchableArea() {
-        return touchableArea;
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/Layout.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/Layout.java
deleted file mode 100644
index 29726a23..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/Layout.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher;
-
-/**
- * Contains all possible layouts of a {@link TabSwitcher}.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public enum Layout {
-
-    /**
-     * The layout, which is used on smartphones and phablet devices, when in portrait mode.
-     */
-    PHONE_PORTRAIT,
-
-    /**
-     * The layout, which is used on smartphones and phablet devices, when in landscape mode.
-     */
-    PHONE_LANDSCAPE,
-
-    /**
-     * The layout, which is used on tablets.
-     */
-    TABLET
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/LayoutPolicy.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/LayoutPolicy.java
deleted file mode 100644
index 73f7ab93..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/LayoutPolicy.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher;
-
-/**
- * Contains all possible layout policies of a {@link TabSwitcher}.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public enum LayoutPolicy {
-
-    /**
-     * If the layout should automatically adapted, depending on whether the device is a smartphone
-     * or tablet.
-     */
-    AUTO(0),
-
-    /**
-     * If the smartphone layout should be used, regardless of the device.
-     */
-    PHONE(1),
-
-    /**
-     * If the tablet layout should be used, regardless of the device.
-     */
-    TABLET(2);
-
-    /**
-     * The value of the layout policy.
-     */
-    private final int value;
-
-    /**
-     * Creates a new layout policy.
-     *
-     * @param value
-     *         The value of the layout policy as an {@link Integer} value
-     */
-    LayoutPolicy(final int value) {
-        this.value = value;
-    }
-
-    /**
-     * Returns the value of the layout policy.
-     *
-     * @return The value of the layout policy as an {@link Integer} value
-     */
-    public final int getValue() {
-        return value;
-    }
-
-    /**
-     * Returns the layout policy, which corresponds to a specific value.
-     *
-     * @param value
-     *         The value of the layout policy, which should be returned, as an {@link Integer}
-     *         value
-     * @return The layout policy, which corresponds to the given value, as a value of the enum
-     * {@link LayoutPolicy}
-     */
-    public static LayoutPolicy fromValue(final int value) {
-        for (LayoutPolicy layoutPolicy : values()) {
-            if (layoutPolicy.getValue() == value) {
-                return layoutPolicy;
-            }
-        }
-
-        throw new IllegalArgumentException("Invalid enum value: " + value);
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/PeekAnimation.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/PeekAnimation.java
deleted file mode 100644
index 771881dc..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/PeekAnimation.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher;
-
-import android.view.animation.Interpolator;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-/**
- * A peek animation, which animates the size of a tab starting at a specific position in order to
- * show the tab for a short time at the end of a {@link TabSwitcher}. Peek animations can be used to
- * add tabs while the tab switcher is not shown and when using the smartphone layout. They are meant
- * to be used when adding a tab without selecting it and enable the user to peek at the added tab
- * for a short moment.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public class PeekAnimation extends Animation {
-
-    /**
-     * A builder, which allows to configure and create instances of the class {@link
-     * PeekAnimation}.
-     */
-    public static class Builder extends Animation.Builder<PeekAnimation, Builder> {
-
-        /**
-         * The horizontal position, the animations, which are created by the builder, start at.
-         */
-        private float x;
-
-        /**
-         * The vertical position, the animations, which are created by the builder, start at.
-         */
-        private float y;
-
-        /**
-         * Creates a new builder, which allows to configure and create instances of the class {@link
-         * PeekAnimation}.
-         */
-        public Builder() {
-            setX(0);
-            setY(0);
-        }
-
-        /**
-         * Sets the horizontal position, the animations, which are created by the builder, should
-         * start at.
-         *
-         * @param x
-         *         The horizontal position, which should be set, in pixels as a {@link Float} value
-         * @return The builder, this method has be called upon, as an instance of the generic type
-         * BuilderType. The builder may not be null
-         */
-        @NonNull
-        public final Builder setX(final float x) {
-            this.x = x;
-            return self();
-        }
-
-        /**
-         * Sets the vertical position, the animations, which are created by the builder, should
-         * start at.
-         *
-         * @param y
-         *         The vertical position, which should be set, in pixels as a {@link Float} value
-         * @return The builder, this method has be called upon, as an instance of the generic type
-         * BuilderType. The builder may not be null
-         */
-        @NonNull
-        public final Builder setY(final float y) {
-            this.y = y;
-            return self();
-        }
-
-        @NonNull
-        @Override
-        public final PeekAnimation create() {
-            return new PeekAnimation(duration, interpolator, x, y);
-        }
-
-    }
-
-    /**
-     * The horizontal position, the animation starts at.
-     */
-    private final float x;
-
-    /**
-     * The vertical position, the animation starts at.
-     */
-    private final float y;
-
-    /**
-     * Creates a new reveal animation.
-     *
-     * @param x
-     *         The horizontal position, the animation should start at, in pixels as a {@link Float}
-     *         value
-     * @param y
-     *         The vertical position, the animation should start at, in pixels as a {@link Float}
-     *         value
-     */
-    private PeekAnimation(final long duration, @Nullable final Interpolator interpolator,
-                          final float x, final float y) {
-        super(duration, interpolator);
-        this.x = x;
-        this.y = y;
-    }
-
-    /**
-     * Returns the horizontal position, the animation starts at.
-     *
-     * @return The horizontal position, the animation starts at, in pixels as a {@link Float} value
-     */
-    public final float getX() {
-        return x;
-    }
-
-    /**
-     * Returns the vertical position, the animation starts at.
-     *
-     * @return The vertical position, the animation starts at, in pixels as a {@link Float} value
-     */
-    public final float getY() {
-        return y;
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/PullDownGesture.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/PullDownGesture.java
deleted file mode 100644
index 90b238c3..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/PullDownGesture.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher;
-
-import android.graphics.RectF;
-
-import androidx.annotation.Nullable;
-
-/**
- * A drag gesture, which can be used to show the tab switcher by pulling down the currently selected
- * tab, when using the smartphone layout.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public class PullDownGesture extends DragGesture {
-
-    /**
-     * A builder, which allows to configure and create instances of the class {@link
-     * PullDownGesture}.
-     */
-    public static class Builder extends DragGesture.Builder<PullDownGesture, Builder> {
-
-        @Override
-        public final PullDownGesture create() {
-            return new PullDownGesture(threshold, touchableArea);
-        }
-
-    }
-
-    /**
-     * Creates a new drag gesture, which can be used to show the tab switcher by pulling down the
-     * currently selected tab, when using the smartphone layout.
-     *
-     * @param threshold
-     *         The distance in pixels, the gesture must last until it is recognized, as an {@link
-     *         Integer} value. The distance must be at least 0 or -1, if the default distance should
-     *         be used
-     * @param touchableArea
-     *         The bounds of the onscreen area, which should be taken into consideration for
-     *         recognizing the drag gesture, as an instance of the class {@link RectF} or null, if
-     *         the area should not be restricted
-     */
-    private PullDownGesture(final int threshold, @Nullable final RectF touchableArea) {
-        super(threshold, touchableArea);
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/RevealAnimation.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/RevealAnimation.java
deleted file mode 100644
index a0de3fde..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/RevealAnimation.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher;
-
-import android.view.animation.Interpolator;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-/**
- * A reveal animation, which animates the size of a tab starting at a specific position. Reveal
- * animations can be used to add tabs to a {@link TabSwitcher} when using the smartphone layout.
- * Tabs, which have been added by using a reveal animation, are selected automatically.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public class RevealAnimation extends Animation {
-
-    /**
-     * A builder, which allows to configure and create instances of the class {@link
-     * RevealAnimation}.
-     */
-    public static class Builder extends Animation.Builder<RevealAnimation, Builder> {
-
-        /**
-         * The horizontal position, the animations, which are created by the builder, start at.
-         */
-        private float x;
-
-        /**
-         * The vertical position, the animations, which are created by the builder, start at.
-         */
-        private float y;
-
-        /**
-         * Creates a new builder, which allows to configure and create instances of the class {@link
-         * RevealAnimation}.
-         */
-        public Builder() {
-            setX(0);
-            setY(0);
-        }
-
-        /**
-         * Sets the horizontal position, the animations, which are created by the builder, should
-         * start at.
-         *
-         * @param x
-         *         The horizontal position, which should be set, in pixels as a {@link Float} value
-         * @return The builder, this method has be called upon, as an instance of the generic type
-         * BuilderType. The builder may not be null
-         */
-        @NonNull
-        public final Builder setX(final float x) {
-            this.x = x;
-            return self();
-        }
-
-        /**
-         * Sets the vertical position, the animations, which are created by the builder, should
-         * start at.
-         *
-         * @param y
-         *         The vertical position, which should be set, in pixels as a {@link Float} value
-         * @return The builder, this method has be called upon, as an instance of the generic type
-         * BuilderType. The builder may not be null
-         */
-        @NonNull
-        public final Builder setY(final float y) {
-            this.y = y;
-            return self();
-        }
-
-        @NonNull
-        @Override
-        public final RevealAnimation create() {
-            return new RevealAnimation(duration, interpolator, x, y);
-        }
-
-    }
-
-    /**
-     * The horizontal position, the animation starts at.
-     */
-    private final float x;
-
-    /**
-     * The vertical position, the animation starts at.
-     */
-    private final float y;
-
-    /**
-     * Creates a new reveal animation.
-     *
-     * @param x
-     *         The horizontal position, the animation should start at, in pixels as a {@link Float}
-     *         value
-     * @param y
-     *         The vertical position, the animation should start at, in pixels as a {@link Float}
-     *         value
-     */
-    private RevealAnimation(final long duration, @Nullable final Interpolator interpolator,
-                            final float x, final float y) {
-        super(duration, interpolator);
-        this.x = x;
-        this.y = y;
-    }
-
-    /**
-     * Returns the horizontal position, the animation starts at.
-     *
-     * @return The horizontal position, the animation starts at, in pixels as a {@link Float} value
-     */
-    public final float getX() {
-        return x;
-    }
-
-    /**
-     * Returns the vertical position, the animation starts at.
-     *
-     * @return The vertical position, the animation starts at, in pixels as a {@link Float} value
-     */
-    public final float getY() {
-        return y;
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/StatefulTabSwitcherDecorator.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/StatefulTabSwitcherDecorator.java
deleted file mode 100644
index 5374769d..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/StatefulTabSwitcherDecorator.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.util.SparseArray;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import java.lang.ref.SoftReference;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import de.mrapp.android.tabswitcher.model.Restorable;
-import de.mrapp.util.Condition;
-
-/**
- * A {@link TabSwitcherDecorator}, which allows to store any arbitrary state for each tab of the
- * associated {@link TabSwitcher}. The state is kept even if the tab is currently not shown.
- * However, it is possible that states are vanished, if few memory is available, because they are
- * stored using {@link SoftReference}s. Unlike the parameters, which can be set for an individual
- * {@link Tab} using the method {@link Tab#setParameters(Bundle)}, these states are not restored
- * when restoring the state of a {@link TabSwitcher}, e.g. after orientation changes. Instead the
- * state is vanished and will be created from scratch when the tab is shown for the next time.
- * <p>
- * If it is necessary to store some data from a state, it can be put into the bundle, which is
- * passed to the {@link #onSaveInstanceState(View, Tab, int, int, Object, Bundle)} method. The data
- * can later be retrieved from the bundle when the method
- * {@link #onCreateState(Context, TabSwitcher, View, Tab, int, int, Bundle)} is invoked for the next
- * time.
- * <p>
- * It is recommended to use the class {@link AbstractState} as a base class for implementing states.
- * This is not necessary though. Said class stores a reference to the tab, it corresponds to and
- * implements the interface {@link Restorable} to be able to store and restore its state. By
- * implementing the methods of this interface and calling them in the decorator's {@link
- * #onSaveInstanceState(View, Tab, int, int, Object, Bundle)}, respectively {@link
- * #onCreateState(Context, TabSwitcher, View, Tab, int, int, Bundle)} method, the selected
- * properties of the state can be stored and restored.
- * <p>
- * If {@link TabSwitcher#areSavedStatesClearedWhenRemovingTabs()} returns true, the state of tabs is
- * cleared when a tab has been removed from the {@link TabSwitcher}. This can be prevented by using
- * the method {@link TabSwitcher#clearSavedStatesWhenRemovingTabs(boolean)}. To manually remove the
- * state of a specific tab, the method {@link #clearState(Tab)} can be used. The method {@link
- * #clearAllStates()} allows to remove the states of all tabs accordingly.
- * <p>
- * IMPORTANT: States must not store references to views, which have been inflated in the decorator's
- * {@link #onInflateView(LayoutInflater, ViewGroup, int)} method, because these views can be reused
- * across all tabs of the {@link TabSwitcher} and therefore are not guaranteed to belong to the same
- * tab for the whole lifetime of the decorator.
- *
- * @param <StateType>
- *         The type of the states, which are stored by the decorator
- * @author Michael Rapp
- * @since 0.2.4
- */
-public abstract class StatefulTabSwitcherDecorator<StateType> extends TabSwitcherDecorator {
-
-    /**
-     * A sparse array, which is used to store the states of tabs.
-     */
-    private SparseArray<SoftReference<StateType>> states;
-
-    /**
-     * The method, which is invoked on subclasses in order to create the state for a specific tab.
-     * This method is invoked, when a tab is shown or refreshed and no corresponding state exists
-     * yet.
-     *
-     * @param context
-     *         The context, the tab switcher belongs to, as an instance of the class {@link
-     *         Context}. The context may not be null
-     * @param tabSwitcher
-     *         The tab switcher, whose tabs are visualized by the decorator, as an instance of the
-     *         type {@link TabSwitcher}. The tab switcher may not be null
-     * @param view
-     *         The view, which is used to visualize the tab, as an instance of the class {@link
-     *         View}. The view may not be null
-     * @param tab
-     *         The tab, for which a state should be created, as an instance of the class {@link
-     *         Tab}. The tab may not be null
-     * @param index
-     *         The index of the tab, for which a state should be created, as an {@link Integer}
-     *         value
-     * @param viewType
-     *         The view type of the tab, for which a state should be created, as an {@link Integer}
-     *         value
-     * @param savedInstanceState
-     *         The bundle, which has previously been used to save the state of the tab as an
-     *         instance of the class {@link Bundle} or null, if no saved state is available
-     * @return The state, which has been created, as an instance of the generic type {@link
-     * StateType} or null, if no state has been created
-     */
-    @Nullable
-    protected abstract StateType onCreateState(@NonNull final Context context,
-                                               @NonNull final TabSwitcher tabSwitcher,
-                                               @NonNull final View view, @NonNull final Tab tab,
-                                               final int index, final int viewType,
-                                               @Nullable final Bundle savedInstanceState);
-
-    /**
-     * The method, which is invoked on subclasses, when a state is cleared using the {@link
-     * #clearState(Tab)} or {@link #clearAllStates()} method.
-     *
-     * @param state
-     *         The state, which is cleared, as an instance of the generic type {@link StateType}.
-     *         The state may not be null
-     */
-    protected void onClearState(@NonNull final StateType state) {
-
-    }
-
-    /**
-     * The method which is invoked, when the view, which is used to visualize a tab, should be
-     * shown, respectively when it should be refreshed. The purpose of this method is to customize
-     * the appearance of the view, which is used to visualize the corresponding tab, depending on
-     * its state and whether the tab switcher is currently shown, or not.
-     *
-     * @param context
-     *         The context, the tab switcher belongs to, as an instance of the class {@link
-     *         Context}. The context may not be null
-     * @param tabSwitcher
-     *         The tab switcher, whose tabs are visualized by the decorator, as an instance of the
-     *         type {@link TabSwitcher}. The tab switcher may not be null
-     * @param view
-     *         The view, which is used to visualize the tab, as an instance of the class {@link
-     *         View}. The view may not be null
-     * @param tab
-     *         The tab, which should be visualized, as an instance of the class {@link Tab}. The tab
-     *         may not be null
-     * @param index
-     *         The index of the tab, which should be visualized, as an {@link Integer} value
-     * @param viewType
-     *         The view type of the tab, which should be visualized, as an {@link Integer} value
-     * @param state
-     *         The state of the tab, which should be visualized, as an instance of the generic type
-     *         {@link StateType} or null, if no state has been created yet
-     * @param savedInstanceState
-     *         The bundle, which has previously been used to save the state of the view as an
-     *         instance of the class {@link Bundle} or null, if no saved state is available
-     * @see #onShowTab(Context, TabSwitcher, View, Tab, int, int, Bundle)
-     */
-    protected abstract void onShowTab(@NonNull final Context context,
-                                      @NonNull final TabSwitcher tabSwitcher,
-                                      @NonNull final View view, @NonNull final Tab tab,
-                                      final int index, final int viewType,
-                                      @Nullable final StateType state,
-                                      @Nullable final Bundle savedInstanceState);
-
-    /**
-     * The method, which is invoked, when the view, which is used to visualize a tab, is removed.
-     * The purpose of this method is to save the current state of the tab in a bundle.
-     *
-     * @param view
-     *         The view, which is used to visualize the tab, as an instance of the class {@link
-     *         View}
-     * @param tab
-     *         The tab, whose state should be saved, as an instance of the class {@link Tab}. The
-     *         tab may not be null
-     * @param index
-     *         The index of the tab, whose state should be saved, as an {@link Integer} value
-     * @param viewType
-     *         The view type of the tab, whose state should be saved, as an {@link Integer} value
-     * @param state
-     *         The state of tab, whose state should be saved, as an instance of the generic type
-     *         {@link StateType} or null, if no state has been created yet
-     * @param outState
-     *         The bundle, the state of the tab should be saved to, as an instance of the class
-     *         {@link Bundle}. The bundle may not be null
-     * @see #onSaveInstanceState(View, Tab, int, int, Bundle)
-     */
-    protected void onSaveInstanceState(@NonNull final View view, @NonNull final Tab tab,
-                                       final int index, final int viewType,
-                                       @Nullable final StateType state,
-                                       @NonNull final Bundle outState) {
-
-    }
-
-    /**
-     * Returns the state of a specific tab.
-     *
-     * @param tab
-     *         The tab, whose state should be returned, as an instance of the class {@link Tab}. The
-     *         tab may not be null
-     * @return The state of the given tab as an instance of the generic type {@link StateType} or
-     * null, if no state has been created yet or if it was removed
-     */
-    @Nullable
-    public final StateType getState(@NonNull final Tab tab) {
-        Condition.INSTANCE.ensureNotNull(tab, "The tab may not be null");
-
-        if (states != null) {
-            SoftReference<StateType> reference = states.get(tab.hashCode());
-
-            if (reference != null) {
-                return reference.get();
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Removes the state of a specific tab.
-     *
-     * @param tab
-     *         The tab, whose state should be removed, as an instance of the class {@link Tab}. The
-     *         tab may not be null
-     */
-    public final void clearState(@NonNull final Tab tab) {
-        Condition.INSTANCE.ensureNotNull(tab, "The tab may not be null");
-
-        if (states != null) {
-            SoftReference<StateType> reference = states.get(tab.hashCode());
-
-            if (reference != null) {
-                StateType state = reference.get();
-
-                if (state != null) {
-                    onClearState(state);
-                }
-
-                states.remove(tab.hashCode());
-
-                if (states.size() == 0) {
-                    states = null;
-                }
-            }
-        }
-    }
-
-    /**
-     * Removes the states of all tabs.
-     */
-    public final void clearAllStates() {
-        if (states != null) {
-            for (int i = 0; i < states.size(); i++) {
-                SoftReference<StateType> reference = states.valueAt(i);
-                StateType state = reference.get();
-
-                if (state != null) {
-                    onClearState(state);
-                }
-            }
-
-            states.clear();
-            states = null;
-        }
-    }
-
-    @Override
-    public final void onShowTab(@NonNull final Context context,
-                                @NonNull final TabSwitcher tabSwitcher, @NonNull final View view,
-                                @NonNull final Tab tab, final int index, final int viewType,
-                                @Nullable final Bundle savedInstanceState) {
-        if (states == null) {
-            states = new SparseArray<>();
-        }
-
-        StateType state = getState(tab);
-
-        if (state == null) {
-            state = onCreateState(context, tabSwitcher, view, tab, index, viewType,
-                    savedInstanceState);
-
-            if (state != null) {
-                states.put(tab.hashCode(), new SoftReference<>(state));
-            }
-        }
-
-        onShowTab(context, tabSwitcher, view, tab, index, viewType, state, savedInstanceState);
-    }
-
-    @Override
-    public final void onSaveInstanceState(@NonNull final View view, @NonNull final Tab tab,
-                                          final int index, final int viewType,
-                                          @NonNull final Bundle outState) {
-        StateType state = getState(tab);
-        onSaveInstanceState(view, tab, index, viewType, state, outState);
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/SwipeAnimation.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/SwipeAnimation.java
deleted file mode 100644
index ccc306e9..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/SwipeAnimation.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher;
-
-import android.view.animation.Interpolator;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import de.mrapp.util.Condition;
-
-/**
- * A swipe animation, which moves tabs on the orthogonal axis. When using the smartphone layout,
- * their size and opacity is animated at the same time. Swipe animations can be used to add or
- * remove tabs to a {@link TabSwitcher}.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public class SwipeAnimation extends Animation {
-
-    /**
-     * Contains all possible directions of a swipe animation.
-     */
-    public enum SwipeDirection {
-
-        /**
-         * When the tab should be moved to/from the left, respectively the top when in landscape
-         * mode.
-         */
-        LEFT_OR_TOP,
-
-        /**
-         * When the tab should be moved to/from the right, respectively the bottom when in landscape
-         * mode.
-         */
-        RIGHT_OR_BOTTOM
-
-    }
-
-    /**
-     * A builder, which allows to configure and create instances of the class {@link
-     * SwipeAnimation}.
-     */
-    public static class Builder extends Animation.Builder<SwipeAnimation, Builder> {
-
-        /**
-         * The direction of the animations, which are created by the builder.
-         */
-        private SwipeDirection direction;
-
-        /**
-         * The duration of the animations, which are used to relocate the other tabs, when a tabs
-         * has been added or removed.
-         */
-        private long relocateAnimationDuration;
-
-        /**
-         * Creates a new builder, which allows to configure and create instances of the class {@link
-         * SwipeAnimation}.
-         */
-        public Builder() {
-            setDirection(SwipeDirection.RIGHT_OR_BOTTOM);
-            setRelocateAnimationDuration(-1);
-        }
-
-        /**
-         * Sets the direction of the animations, which are created by the builder.
-         *
-         * @param direction
-         *         The direction, which should be set, as a value of the enum {@link
-         *         SwipeDirection}. The direction may either be {@link SwipeDirection#LEFT_OR_TOP}
-         *         or {@link SwipeDirection#RIGHT_OR_BOTTOM}
-         * @return The builder, this method has be called upon, as an instance of the generic type
-         * BuilderType. The builder may not be null
-         */
-        @NonNull
-        public final Builder setDirection(@NonNull final SwipeDirection direction) {
-            Condition.INSTANCE.ensureNotNull(direction, "The direction may not be null");
-            this.direction = direction;
-            return self();
-        }
-
-        /**
-         * Sets the duration of the animations, which are used to relocate the other tabs, when a
-         * tab has been added or removed.
-         *
-         * @param relocateAnimationDuration
-         *         The duration, which should be set, in milliseconds as a {@link Long} value or -1,
-         *         if the default duration should be used
-         * @return The builder, this method has be called upon, as an instance of the generic type
-         * BuilderType. The builder may not be null
-         */
-        @NonNull
-        public final Builder setRelocateAnimationDuration(final long relocateAnimationDuration) {
-            Condition.INSTANCE.ensureAtLeast(relocateAnimationDuration, -1,
-                    "The relocate animation duration must be at least -1");
-            this.relocateAnimationDuration = relocateAnimationDuration;
-            return self();
-        }
-
-        @NonNull
-        @Override
-        public final SwipeAnimation create() {
-            return new SwipeAnimation(duration, interpolator, direction, relocateAnimationDuration);
-        }
-
-    }
-
-    /**
-     * The direction of the swipe animation.
-     */
-    private final SwipeDirection direction;
-
-    /**
-     * The duration of the animations, which are used to relocate the other tabs, when a tabs has
-     * been added or removed.
-     */
-    private final long relocateAnimationDuration;
-
-    /**
-     * Creates a new swipe animation.
-     *
-     * @param duration
-     *         The duration of the animation in milliseconds as a {@link Long} value or -1, if the
-     *         default duration should be used
-     * @param interpolator
-     *         The interpolator, which should be used by the animation, as an instance of the type
-     *         {@link Interpolator} or null, if the default interpolator should be used
-     * @param direction
-     *         The direction of the swipe animation as a value of the enum {@link SwipeDirection}.
-     *         The direction may not be null
-     * @param relocateAnimationDuration
-     *         The duration of the animations, which are used to relocate other tabs, when a tab has
-     *         been added or removed, in milliseconds as a {@link Long} value or -1, if the default
-     *         duration should be used
-     */
-    private SwipeAnimation(final long duration, @Nullable final Interpolator interpolator,
-                           @NonNull final SwipeDirection direction,
-                           final long relocateAnimationDuration) {
-        super(duration, interpolator);
-        Condition.INSTANCE.ensureNotNull(direction, "The direction may not be null");
-        Condition.INSTANCE.ensureAtLeast(relocateAnimationDuration, -1,
-                "The relocate animation duration must be at least -1");
-        this.direction = direction;
-        this.relocateAnimationDuration = relocateAnimationDuration;
-    }
-
-    /**
-     * Returns the direction of the swipe animation.
-     *
-     * @return The direction of the swipe animation as a value of the enum {@link SwipeDirection}.
-     * The direction may not be null
-     */
-    @NonNull
-    public final SwipeDirection getDirection() {
-        return direction;
-    }
-
-    /**
-     * Returns the duration of the animations, which are used to relocate the other tabs, when a tab
-     * has been added or removed.
-     *
-     * @return The duration of the animations, which are used to relocate the other tabs, when a tab
-     * has been added or removed, in milliseconds as a {@link Long} value or -1, if the default
-     * duration is used
-     */
-    public final long getRelocateAnimationDuration() {
-        return relocateAnimationDuration;
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/SwipeGesture.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/SwipeGesture.java
deleted file mode 100644
index 51602d78..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/SwipeGesture.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher;
-
-import android.graphics.RectF;
-
-import androidx.annotation.Nullable;
-import de.mrapp.util.Condition;
-
-/**
- * A drag gesture, which allows to switch between tabs, when swiping horizontally.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public class SwipeGesture extends DragGesture {
-
-    /**
-     * A builder, which allows to configure and create instances of the class {@link SwipeGesture}.
-     */
-    public static class Builder extends DragGesture.Builder<SwipeGesture, Builder> {
-
-        /**
-         * The duration of the swipe animation of the gestures, which are created by the builder.
-         */
-        private long animationDuration;
-
-        /**
-         * Creates a new builder, which allows to configure and create instances of the class {@link
-         * SwipeGesture}.
-         */
-        public Builder() {
-            animationDuration = -1;
-        }
-
-        /**
-         * Sets the duration of the swipe animation of the gestures, which are created by the
-         * builder.
-         *
-         * @param animationDuration
-         *         The duration, which should be set, in milliseconds as a {@link Long} value or -1,
-         *         if the default duration should be used
-         * @return The builder, this method has been called upon, as an instance of the generic type
-         * BuilderType. The builder may not be null
-         */
-        public Builder setAnimationDuration(final long animationDuration) {
-            Condition.INSTANCE.ensureAtLeast(animationDuration, -1,
-                    "The animation duration must be at least -1");
-            this.animationDuration = animationDuration;
-            return self();
-        }
-
-        @Override
-        public final SwipeGesture create() {
-            return new SwipeGesture(threshold, touchableArea, animationDuration);
-        }
-
-    }
-
-    /**
-     * The duration of the swipe animation in milliseconds.
-     */
-    private final long animationDuration;
-
-    /**
-     * Creates a new drag gesture, which allows to switch between tabs, when swiping horizontally.
-     *
-     * @param threshold
-     *         The distance in pixels, the gesture must last until it is recognized, as an {@link
-     *         Integer} value. The distance must be at least 0 or -1, if the default distance should
-     *         be used
-     * @param touchableArea
-     *         The bounds of the onscreen area, which should be taken into consideration for
-     *         recognizing the drag gesture, as an instance of the class {@link RectF} or null, if
-     *         the area should not be restricted
-     * @param animationDuration
-     *         The duration of the swipe animation in milliseconds as a {@link Long} value. The
-     *         duration must be at least -1
-     */
-    private SwipeGesture(final int threshold, @Nullable final RectF touchableArea,
-                         final long animationDuration) {
-        super(threshold, touchableArea);
-        Condition.INSTANCE
-                .ensureAtLeast(animationDuration, -1, "The animation duration must be at least -1");
-        this.animationDuration = animationDuration;
-    }
-
-    /**
-     * Returns the duration of the swipe animation.
-     *
-     * @return The duration of the swipe animation in milliseconds as a {@link Long} value or -1, if
-     * the default duration should be used
-     */
-    public final long getAnimationDuration() {
-        return animationDuration;
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/Tab.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/Tab.java
deleted file mode 100644
index 73e906c8..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/Tab.java
+++ /dev/null
@@ -1,863 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.graphics.Bitmap;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.text.TextUtils;
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.appcompat.content.res.AppCompatResources;
-import de.mrapp.util.Condition;
-import de.mrapp.util.datastructure.ListenerList;
-
-/**
- * A tab, which can be added to a {@link TabSwitcher} widget. It has a title, as well as an optional
- * icon. Furthermore, it is possible to set a custom color and to specify, whether the tab should be
- * closeable, or not.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public class Tab implements Parcelable {
-
-    /**
-     * The name of the parameter, which specifies, whether the tab was already shown in a {@link
-     * TabSwitcher}, or not. This parameter should be not be set or modified manually.
-     */
-    public static final String WAS_SHOWN_PARAMETER = Tab.class.getName() + "::wasShown";
-
-    /**
-     * A creator, which allows to create instances of the class {@link Tab} from parcels.
-     */
-    public static final Creator<Tab> CREATOR = new Creator<Tab>() {
-
-        @Override
-        public Tab createFromParcel(final Parcel source) {
-            return new Tab(source);
-        }
-
-        @Override
-        public Tab[] newArray(final int size) {
-            return new Tab[size];
-        }
-
-    };
-
-    /**
-     * Defines the interface, a class, which should be notified, when a tab's properties have been
-     * changed, must implement.
-     */
-    public interface Callback {
-
-        /**
-         * The method, which is invoked, when the tab's title has been changed.
-         *
-         * @param tab
-         *         The observed tab as an instance of the class {@link Tab}. The tab may not be
-         *         null
-         */
-        void onTitleChanged(@NonNull Tab tab);
-
-        /**
-         * The method, which is invoked, when the tab's icon has been changed.
-         *
-         * @param tab
-         *         The observed tab as an instance of the class {@link Tab}. The tab may not be
-         *         null
-         */
-        void onIconChanged(@NonNull Tab tab);
-
-        /**
-         * The method, which is invoked, when it has been changed, whether the tab is closeable, or
-         * not.
-         *
-         * @param tab
-         *         The observed tab as an instance of the class {@link Tab}. The tab may not be
-         *         null
-         */
-        void onCloseableChanged(@NonNull Tab tab);
-
-        /**
-         * The method, which is invoked, when the icon of the tab's close button has been changed.
-         *
-         * @param tab
-         *         The observed tab as an instance of the class {@link Tab}. The tab may not be
-         *         null
-         */
-        void onCloseButtonIconChanged(@NonNull Tab tab);
-
-        /**
-         * The method, which is invoked, when the tab's background color has been changed.
-         *
-         * @param tab
-         *         The observed tab as an instance of the class {@link Tab}. The tab may not be
-         *         null
-         */
-        void onBackgroundColorChanged(@NonNull Tab tab);
-
-        /**
-         * The method, which is invoked, when the background color of the tab's content has been
-         * changed.
-         *
-         * @param tab
-         *         The observed tab as an instance of the class {@link Tab}. The tab may not be
-         *         null
-         */
-        void onContentBackgroundColorChanged(@NonNull Tab tab);
-
-        /**
-         * The method, which is invoked, when the text color of the tab's title has been changed.
-         *
-         * @param tab
-         *         The observed tab as an instance of the class {@link Tab}. The tab may not be
-         *         null
-         */
-        void onTitleTextColorChanged(@NonNull Tab tab);
-
-        /**
-         * The method, which is invoked, when the visibility of the tab's progress bar has been
-         * changed.
-         *
-         * @param tab
-         *         The observed tab as an instance of the class {@link Tab}. The tab may not be
-         *         null
-         */
-        void onProgressBarVisibilityChanged(@NonNull Tab tab);
-
-        /**
-         * The method, which is invoked, when the color of the tab's progress bar has been changed.
-         *
-         * @param tab
-         *         The observed tab as an instance of the class {@link Tab}. The tab may not be
-         *         null
-         */
-        void onProgressBarColorChanged(@NonNull Tab tab);
-
-    }
-
-    /**
-     * A set, which contains the callbacks, which have been registered to be notified, when the
-     * tab's properties have been changed.
-     */
-    private final ListenerList<Callback> callbacks = new ListenerList<>();
-
-    /**
-     * The tab's title.
-     */
-    private CharSequence title;
-
-    /**
-     * The resource id of the tab's icon.
-     */
-    private int iconId;
-
-    /**
-     * The tab's icon as a bitmap.
-     */
-    private Bitmap iconBitmap;
-
-    /**
-     * The color state list, which is used to tint the tab's icon.
-     */
-    private ColorStateList iconTintList;
-
-    /**
-     * The mode, which is used to tint the tab's icon.
-     */
-    private PorterDuff.Mode iconTintMode;
-
-    /**
-     * True, if the tab is closeable, false otherwise.
-     */
-    private boolean closeable;
-
-    /**
-     * The resource id of the icon of the tab's close button.
-     */
-    private int closeButtonIconId;
-
-    /**
-     * The bitmap of the icon of the tab's close button.
-     */
-    private Bitmap closeButtonIconBitmap;
-
-    /**
-     * The color state list, which is used to tint the tab's close button.
-     */
-    private ColorStateList closeButtonIconTintList;
-
-    /**
-     * The mode, which is used to tint the tab's close button.
-     */
-    private PorterDuff.Mode closeButtonIconTintMode;
-
-    /**
-     * The background color of the tab.
-     */
-    private ColorStateList backgroundColor;
-
-    /**
-     * The background color of the tab's content.
-     */
-    private int contentBackgroundColor;
-
-    /**
-     * The text color of the tab's title.
-     */
-    private ColorStateList titleTextColor;
-
-    /**
-     * True, if the tab's progress bar is shown, false otherwise.
-     */
-    private boolean progressBarShown;
-
-    /**
-     * The color of the tab's progress bar.
-     */
-    private int progressBarColor;
-
-    /**
-     * Optional parameters, which are associated with the tab.
-     */
-    private Bundle parameters;
-
-    /**
-     * Notifies all callbacks, that the tab's title has been changed.
-     */
-    private void notifyOnTitleChanged() {
-        for (Callback callback : callbacks) {
-            callback.onTitleChanged(this);
-        }
-    }
-
-    /**
-     * Notifies all callbacks, that the tab's icon has been changed.
-     */
-    private void notifyOnIconChanged() {
-        for (Callback callback : callbacks) {
-            callback.onIconChanged(this);
-        }
-    }
-
-    /**
-     * Notifies all callbacks, that it has been changed, whether the tab is closeable, or not.
-     */
-    private void notifyOnCloseableChanged() {
-        for (Callback callback : callbacks) {
-            callback.onCloseableChanged(this);
-        }
-    }
-
-    /**
-     * Notifies all callbacks, that the icon of the tab's close button has been changed.
-     */
-    private void notifyOnCloseButtonIconChanged() {
-        for (Callback callback : callbacks) {
-            callback.onCloseButtonIconChanged(this);
-        }
-    }
-
-    /**
-     * Notifies all callbacks, that the background color of the tab has been changed.
-     */
-    private void notifyOnBackgroundColorChanged() {
-        for (Callback callback : callbacks) {
-            callback.onBackgroundColorChanged(this);
-        }
-    }
-
-    /**
-     * Notifies all callbacks, that the background color of the tab's content has been changed.
-     */
-    private void notifyOnContentBackgroundColorChanged() {
-        for (Callback callback : callbacks) {
-            callback.onContentBackgroundColorChanged(this);
-        }
-    }
-
-    /**
-     * Notifies all callbacks, that the text color of the tab has been changed.
-     */
-    private void notifyOnTitleTextColorChanged() {
-        for (Callback callback : callbacks) {
-            callback.onTitleTextColorChanged(this);
-        }
-    }
-
-    /**
-     * Notifies all callbacks, that the visibility of the tab's progress bar has been changed.
-     */
-    private void notifyOnProgressBarVisibilityChanged() {
-        for (Callback callback : callbacks) {
-            callback.onProgressBarVisibilityChanged(this);
-        }
-    }
-
-    /**
-     * Notifies all callbacks, that the color of the tab's progress bar has been changed.
-     */
-    private void notifyOnProgressBarColorChanged() {
-        for (Callback callback : callbacks) {
-            callback.onProgressBarColorChanged(this);
-        }
-    }
-
-    /**
-     * Creates a new tab, which can be added to a {@link TabSwitcher} widget.
-     *
-     * @param source
-     *         The parcel, the tab should be created from, as an instance of the class {@link
-     *         Parcel}. The parcel may not be null
-     */
-    private Tab(@NonNull final Parcel source) {
-        this.title = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(source);
-        this.iconId = source.readInt();
-        this.iconBitmap = source.readParcelable(getClass().getClassLoader());
-        this.iconTintList = source.readParcelable(getClass().getClassLoader());
-        this.iconTintMode = (PorterDuff.Mode) source.readSerializable();
-        this.closeable = source.readInt() > 0;
-        this.closeButtonIconId = source.readInt();
-        this.closeButtonIconBitmap = source.readParcelable(getClass().getClassLoader());
-        this.closeButtonIconTintList = source.readParcelable(getClass().getClassLoader());
-        this.closeButtonIconTintMode = (PorterDuff.Mode) source.readSerializable();
-        this.backgroundColor = source.readParcelable(getClass().getClassLoader());
-        this.contentBackgroundColor = source.readInt();
-        this.titleTextColor = source.readParcelable(getClass().getClassLoader());
-        this.progressBarShown = source.readInt() > 0;
-        this.progressBarColor = source.readInt();
-        this.parameters = source.readBundle(getClass().getClassLoader());
-    }
-
-    /**
-     * Creates a new tab, which can be added to a {@link TabSwitcher} widget.
-     *
-     * @param title
-     *         The tab's title as an instance of the type {@link CharSequence}. The title may not be
-     *         neither be null, nor empty
-     */
-    public Tab(@NonNull final CharSequence title) {
-        setTitle(title);
-        this.closeable = true;
-        this.closeButtonIconId = -1;
-        this.closeButtonIconBitmap = null;
-        this.closeButtonIconTintList = null;
-        this.closeButtonIconTintMode = null;
-        this.iconId = -1;
-        this.iconBitmap = null;
-        this.iconTintList = null;
-        this.iconTintMode = null;
-        this.backgroundColor = null;
-        this.contentBackgroundColor = -1;
-        this.titleTextColor = null;
-        this.progressBarShown = false;
-        this.progressBarColor = -1;
-        this.parameters = null;
-    }
-
-    /**
-     * Creates a new tab, which can be added to a {@link TabSwitcher} widget.
-     *
-     * @param context
-     *         The context, which should be used, as an instance of the class {@link Context}. The
-     *         context may not be null
-     * @param resourceId
-     *         The resource id of the tab's title as an {@link Integer} value. The resource id must
-     *         correspond to a valid string resource
-     */
-    public Tab(@NonNull final Context context, @StringRes final int resourceId) {
-        this(context.getString(resourceId));
-    }
-
-    /**
-     * Returns the tab's title.
-     *
-     * @return The tab's title as an instance of the type {@link CharSequence}. The title may
-     * neither be null, nor empty
-     */
-    @NonNull
-    public final CharSequence getTitle() {
-        return title;
-    }
-
-    /**
-     * Sets the tab's title.
-     *
-     * @param title
-     *         The title, which should be set, as an instance of the type {@link CharSequence}. The
-     *         title may neither be null, nor empty
-     */
-    public final void setTitle(@NonNull final CharSequence title) {
-        Condition.INSTANCE.ensureNotNull(title, "The title may not be null");
-        Condition.INSTANCE.ensureNotEmpty(title, "The title may not be empty");
-        this.title = title;
-        notifyOnTitleChanged();
-    }
-
-    /**
-     * Sets the tab's title.
-     *
-     * @param context
-     *         The context, which should be used, as an instance of the class {@link Context}. The
-     *         context may not be null
-     * @param resourceId
-     *         The resource id of the title, which should be set, as an {@link Integer} value. The
-     *         resource id must correspond to a valid string resource
-     */
-    public final void setTitle(@NonNull final Context context, @StringRes final int resourceId) {
-        setTitle(context.getText(resourceId));
-    }
-
-    /**
-     * Returns the tab's icon.
-     *
-     * @param context
-     *         The context, which should be used, as an instance of the class {@link Context}. The
-     *         context may not be null
-     * @return The tab's icon as an instance of the class {@link Drawable} or null, if no custom
-     * icon is set
-     */
-    @Nullable
-    public final Drawable getIcon(@NonNull final Context context) {
-        Condition.INSTANCE.ensureNotNull(context, "The context may not be null");
-
-        if (iconId != -1) {
-            return AppCompatResources.getDrawable(context, iconId);
-        } else {
-            return iconBitmap != null ? new BitmapDrawable(context.getResources(), iconBitmap) :
-                    null;
-        }
-    }
-
-    /**
-     * Sets the tab's icon.
-     *
-     * @param resourceId
-     *         The resource id of the icon, which should be set, as an {@link Integer} value. The
-     *         resource id must correspond to a valid drawable resource
-     */
-    public final void setIcon(@DrawableRes final int resourceId) {
-        this.iconId = resourceId;
-        this.iconBitmap = null;
-        notifyOnIconChanged();
-    }
-
-    /**
-     * Sets the tab's icon.
-     *
-     * @param icon
-     *         The icon, which should be set, as an instance of the class {@link Bitmap} or null, if
-     *         no custom icon should be set
-     */
-    public final void setIcon(@Nullable final Bitmap icon) {
-        this.iconId = -1;
-        this.iconBitmap = icon;
-        notifyOnIconChanged();
-    }
-
-    /**
-     * Returns the color state list, which is used to tint the tab's icon.
-     *
-     * @return The color state list, which is used to tint the tab's icon, as an instance of the
-     * class {@link ColorStateList} or null, if the icon is not tinted
-     */
-    public final ColorStateList getIconTintList() {
-        return iconTintList;
-    }
-
-    /**
-     * Sets the color, which should be used to tint the tab's icon.
-     *
-     * @param color
-     *         The color, which should be set, as an {@link Integer} value
-     */
-    public final void setIconTint(@ColorInt final int color) {
-        setIconTintList(ColorStateList.valueOf(color));
-    }
-
-    /**
-     * Sets the color state list, which should be used to tint the tab's icon.
-     *
-     * @param tintList
-     *         The color state list, which should be set, as an instance of the class {@link
-     *         ColorStateList} or null, if the icon should not be tinted
-     */
-    public final void setIconTintList(@Nullable final ColorStateList tintList) {
-        this.iconTintList = tintList;
-        notifyOnIconChanged();
-    }
-
-    /**
-     * Returns the mode, which is used to tint the tab's icon.
-     *
-     * @return The mode, which is used to tint the tab's icon, as a value of the enum {@link
-     * PorterDuff.Mode} or null, if the default mode is used
-     */
-    public final PorterDuff.Mode getIconTintMode() {
-        return iconTintMode;
-    }
-
-    /**
-     * Sets the mode, which should be used to tint the tab's icon.
-     *
-     * @param mode
-     *         The mode, which should be set, as a value of enum {@link PorterDuff.Mode} or null, if
-     *         the default mode should be used
-     */
-    public final void setIconTintMode(@Nullable final PorterDuff.Mode mode) {
-        this.iconTintMode = mode;
-        notifyOnIconChanged();
-    }
-
-    /**
-     * Returns, whether the tab is closeable, or not.
-     *
-     * @return True, if the tab is closeable, false otherwise
-     */
-    public final boolean isCloseable() {
-        return closeable;
-    }
-
-    /**
-     * Sets, whether the tab should be closeable, or not.
-     *
-     * @param closeable
-     *         True, if the tab should be closeable, false otherwise
-     */
-    public final void setCloseable(final boolean closeable) {
-        this.closeable = closeable;
-        notifyOnCloseableChanged();
-    }
-
-    /**
-     * Returns the icon of the tab's close button.
-     *
-     * @param context
-     *         The context, which should be used to retrieve the icon, as an instance of the class
-     *         {@link Context}. The context may not be null
-     * @return The icon of the tab's close button as an instance of the class {@link Drawable} or
-     * null, if no custom icon is set
-     */
-    @Nullable
-    public final Drawable getCloseButtonIcon(@NonNull final Context context) {
-        Condition.INSTANCE.ensureNotNull(context, "The context may not be null");
-
-        if (closeButtonIconId != -1) {
-            return AppCompatResources.getDrawable(context, closeButtonIconId);
-        } else {
-            return closeButtonIconBitmap != null ?
-                    new BitmapDrawable(context.getResources(), closeButtonIconBitmap) : null;
-        }
-    }
-
-    /**
-     * Sets the icon of the tab's close button.
-     *
-     * @param resourceId
-     *         The resource id of the icon, which should be set, as an {@link Integer} value. The
-     *         resource id must correspond to a valid drawable resource
-     */
-    public final void setCloseButtonIcon(@DrawableRes final int resourceId) {
-        this.closeButtonIconId = resourceId;
-        this.closeButtonIconBitmap = null;
-        notifyOnCloseButtonIconChanged();
-    }
-
-    /**
-     * Sets the icon of the tab's close button.
-     *
-     * @param icon
-     *         The icon, which should be set, as an instance of the class {@link Bitmap} or null, if
-     *         no custom icon should be set
-     */
-    public final void setCloseButtonIcon(@Nullable final Bitmap icon) {
-        this.closeButtonIconId = -1;
-        this.closeButtonIconBitmap = icon;
-        notifyOnCloseButtonIconChanged();
-    }
-
-    /**
-     * Returns the color state list, which is used to tint the tab's close button.
-     *
-     * @return The color state list, which is used to tint the tab's close button, as an instance of
-     * the class {@link ColorStateList} or null, if the close button is not tinted
-     */
-    public final ColorStateList getCloseButtonIconTintList() {
-        return closeButtonIconTintList;
-    }
-
-    /**
-     * Sets the color, which should be used to tint the tab's close button.
-     *
-     * @param color
-     *         The color, which should be set, as an {@link Integer} value
-     */
-    public final void setCloseButtonIconTint(@ColorInt final int color) {
-        setCloseButtonIconTintList(ColorStateList.valueOf(color));
-    }
-
-    /**
-     * Sets the color state list, which should be used to tint the tab's close button.
-     *
-     * @param tintList
-     *         The color state list, which should be set, as an instance of the class {@link
-     *         ColorStateList} or null, if the close button should not be tinted
-     */
-    public final void setCloseButtonIconTintList(@Nullable final ColorStateList tintList) {
-        this.closeButtonIconTintList = tintList;
-        notifyOnCloseButtonIconChanged();
-    }
-
-    /**
-     * Returns the mode, which is used to tint the tab's close button.
-     *
-     * @return The mode, which is used to tint the tab's close button, as a value of the enum {@link
-     * PorterDuff.Mode} or null, if the default mode is used
-     */
-    public final PorterDuff.Mode getCloseButtonIconTintMode() {
-        return closeButtonIconTintMode;
-    }
-
-    /**
-     * Sets the mode, which should be used to tint the tab's close button.
-     *
-     * @param mode
-     *         The mode, which should be set, as a value of enum {@link PorterDuff.Mode} or null, if
-     *         the default mode should be used
-     */
-    public final void setCloseButtonIconTintMode(@Nullable final PorterDuff.Mode mode) {
-        this.closeButtonIconTintMode = mode;
-        notifyOnCloseButtonIconChanged();
-    }
-
-    /**
-     * Returns the background color of the tab.
-     *
-     * @return The background color of the tab as an instance of the class {@link ColorStateList} or
-     * -1, if no custom color is set
-     */
-    @Nullable
-    public final ColorStateList getBackgroundColor() {
-        return backgroundColor;
-    }
-
-    /**
-     * Sets the tab's background color.
-     *
-     * @param color
-     *         The color, which should be set, as an {@link Integer} value or -1, if no custom color
-     *         should be set
-     */
-    public final void setBackgroundColor(@ColorInt final int color) {
-        setBackgroundColor(color != -1 ? ColorStateList.valueOf(color) : null);
-    }
-
-    /**
-     * Sets the tab's background color.
-     *
-     * @param colorStateList
-     *         The color state list, which should be set, as an instance of the class {@link
-     *         ColorStateList} or null, if no custom color should be set
-     */
-    public final void setBackgroundColor(@Nullable final ColorStateList colorStateList) {
-        this.backgroundColor = colorStateList;
-        notifyOnBackgroundColorChanged();
-    }
-
-    /**
-     * Returns the background color of the tab's content.
-     *
-     * @return The background color of the tab's content as an {@link Integer} value or -1, if no
-     * custom color is set
-     */
-    @ColorInt
-    public final int getContentBackgroundColor() {
-        return contentBackgroundColor;
-    }
-
-    /**
-     * Sets the background color of the tab's content.
-     *
-     * @param color
-     *         The color, which should be set, as an {@link Integer} value or -1, if no custom color
-     *         should be set
-     */
-    public final void setContentBackgroundColor(@ColorInt final int color) {
-        this.contentBackgroundColor = color;
-        notifyOnContentBackgroundColorChanged();
-    }
-
-    /**
-     * Returns the text color of the tab's title.
-     *
-     * @return The text color of the tab's title as an instance of the class {@link ColorStateList}
-     * or null, if no custom color is set
-     */
-    @Nullable
-    public final ColorStateList getTitleTextColor() {
-        return titleTextColor;
-    }
-
-    /**
-     * Sets the text color of the tab's title.
-     *
-     * @param color
-     *         The color, which should be set, as an {@link Integer} value or -1, if no custom color
-     *         should be set
-     */
-    public final void setTitleTextColor(@ColorInt final int color) {
-        setTitleTextColor(color != -1 ? ColorStateList.valueOf(color) : null);
-    }
-
-    /**
-     * Sets the text color of the tab's title.
-     *
-     * @param colorStateList
-     *         The color state list, which should be set, as an instance of the class {@link
-     *         ColorStateList} or null, if no custom color should be set
-     */
-    public final void setTitleTextColor(@Nullable final ColorStateList colorStateList) {
-        this.titleTextColor = colorStateList;
-        notifyOnTitleTextColorChanged();
-    }
-
-    /**
-     * Returns, whether the tab's progress bar is shown, or not.
-     *
-     * @return True, if the tab's progress bar is shown, false otherwise
-     */
-    public final boolean isProgressBarShown() {
-        return progressBarShown;
-    }
-
-    /**
-     * Sets, whether the tab's progress bar should be shown, or not.
-     *
-     * @param show
-     *         True, if the progress bar should be shown, false otherwise
-     */
-    public final void showProgressBar(final boolean show) {
-        this.progressBarShown = show;
-        notifyOnProgressBarVisibilityChanged();
-    }
-
-    /**
-     * Returns the color of the tab's progress bar.
-     *
-     * @return The color of the tab's progress bar as an {@link Integer} value or -1, if the default
-     * color should be used
-     */
-    @ColorInt
-    public final int getProgressBarColor() {
-        return progressBarColor;
-    }
-
-    /**
-     * Sets the color of the tab's progress bar.
-     *
-     * @param color
-     *         The color, which should be set, as an {@link Integer} value or -1, if the default
-     *         color should be used
-     */
-    public final void setProgressBarColor(@ColorInt final int color) {
-        this.progressBarColor = color;
-        notifyOnProgressBarColorChanged();
-    }
-
-    /**
-     * Returns a bundle, which contains the optional parameters, which are associated with the tab.
-     *
-     * @return A bundle, which contains the optional parameters, which are associated with the tab,
-     * as an instance of the class {@link Bundle} or null, if no parameters are associated with the
-     * tab
-     */
-    @Nullable
-    public final Bundle getParameters() {
-        return parameters;
-    }
-
-    /**
-     * Sets a bundle, which contains the optional parameters, which should be associated with the
-     * tab.
-     *
-     * @param parameters
-     *         The bundle, which should be set, as an instance of the class {@link Bundle} or null,
-     *         if no parameters should be associated with the tab
-     */
-    public final void setParameters(@Nullable final Bundle parameters) {
-        this.parameters = parameters;
-    }
-
-    /**
-     * Adds a new callback, which should be notified, when the tab's properties have been changed.
-     *
-     * @param callback
-     *         The callback, which should be added, as an instance of the type {@link Callback}. The
-     *         callback may not be null
-     */
-    public final void addCallback(@NonNull final Callback callback) {
-        Condition.INSTANCE.ensureNotNull(callback, "The callback may not be null");
-        this.callbacks.add(callback);
-    }
-
-    /**
-     * Removes a specific callback, which should not be notified, when the tab's properties have
-     * been changed, anymore.
-     *
-     * @param callback
-     *         The callback, which should be removed, as an instance of the type {@link Callback}.
-     *         The callback may not be null
-     */
-    public final void removeCallback(@NonNull final Callback callback) {
-        Condition.INSTANCE.ensureNotNull(callback, "The callback may not be null");
-        this.callbacks.remove(callback);
-    }
-
-    @Override
-    public final int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public final void writeToParcel(final Parcel parcel, final int flags) {
-        TextUtils.writeToParcel(title, parcel, flags);
-        parcel.writeInt(iconId);
-        parcel.writeParcelable(iconBitmap, flags);
-        parcel.writeParcelable(iconTintList, flags);
-        parcel.writeSerializable(iconTintMode);
-        parcel.writeInt(closeable ? 1 : 0);
-        parcel.writeInt(closeButtonIconId);
-        parcel.writeParcelable(closeButtonIconBitmap, flags);
-        parcel.writeParcelable(closeButtonIconTintList, flags);
-        parcel.writeSerializable(closeButtonIconTintMode);
-        parcel.writeParcelable(backgroundColor, flags);
-        parcel.writeInt(contentBackgroundColor);
-        parcel.writeParcelable(titleTextColor, flags);
-        parcel.writeInt(progressBarShown ? 1 : 0);
-        parcel.writeInt(progressBarColor);
-        parcel.writeBundle(parameters);
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/TabCloseListener.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/TabCloseListener.java
deleted file mode 100644
index c9acdf25..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/TabCloseListener.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher;
-
-import androidx.annotation.NonNull;
-
-/**
- * Defines the interface, a class, which should be notified, when a tab is about to be closed by
- * clicking its close button, must implement.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public interface TabCloseListener {
-
-    /**
-     * The method, which is invoked, when a tab is about to be closed by clicking its close button.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, the tab belongs to, as an instance of the class {@link
-     *         TabSwitcher}. The tab switcher may not be null
-     * @param tab
-     *         The tab, which is about to be closed, as an instance of the class {@link Tab}. The
-     *         tab may not be null
-     * @return True, if the tab should be closed, false otherwise
-     */
-    boolean onCloseTab(@NonNull TabSwitcher tabSwitcher, @NonNull Tab tab);
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/TabPreviewListener.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/TabPreviewListener.java
deleted file mode 100644
index 23b73983..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/TabPreviewListener.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher;
-
-import androidx.annotation.NonNull;
-
-/**
- * Defines the interface, a class, which should be notified, when the preview of a tab is about to
- * be loaded, must implement.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public interface TabPreviewListener {
-
-    /**
-     * The method, which is invoked, when the preview of a tab is about to be loaded.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, which contains the tab, whose preview is about to be loaded, as an
-     *         instance of the class {@link TabSwitcher}. The tab switcher may not be null
-     * @param tab
-     *         The tab, whose preview is about to be loaded, as an instance of the class {@link
-     *         Tab}. The tab may not be null
-     * @return True, if loading the preview should be proceeded, false otherwise. When returning
-     * false, the method gets invoked repeatedly until true is returned.
-     */
-    boolean onLoadTabPreview(@NonNull TabSwitcher tabSwitcher, @NonNull Tab tab);
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/TabSwitcher.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/TabSwitcher.java
deleted file mode 100644
index 042641f8..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/TabSwitcher.java
+++ /dev/null
@@ -1,2054 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.content.res.Resources.NotFoundException;
-import android.content.res.TypedArray;
-import android.graphics.Bitmap;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.util.AttributeSet;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
-import android.widget.FrameLayout;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Queue;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
-
-import androidx.annotation.AttrRes;
-import androidx.annotation.ColorInt;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.LayoutRes;
-import androidx.annotation.MenuRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.annotation.StyleRes;
-import androidx.appcompat.content.res.AppCompatResources;
-import androidx.appcompat.widget.Toolbar;
-import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener;
-import androidx.core.util.Pair;
-import androidx.core.view.ViewCompat;
-import de.mrapp.android.tabswitcher.gesture.AbstractTouchEventHandler;
-import de.mrapp.android.tabswitcher.gesture.DragGestureEventHandlerFactory;
-import de.mrapp.android.tabswitcher.gesture.TouchEventDispatcher;
-import de.mrapp.android.tabswitcher.layout.AbstractTabSwitcherLayout;
-import de.mrapp.android.tabswitcher.layout.AbstractTabSwitcherLayout.LayoutListenerWrapper;
-import de.mrapp.android.tabswitcher.layout.ContentRecyclerAdapter;
-import de.mrapp.android.tabswitcher.layout.TabSwitcherLayout;
-import de.mrapp.android.tabswitcher.layout.phone.PhoneArithmetics;
-import de.mrapp.android.tabswitcher.layout.phone.PhoneTabSwitcherLayout;
-import de.mrapp.android.tabswitcher.model.Model;
-import de.mrapp.android.tabswitcher.model.TabSwitcherModel;
-import de.mrapp.android.tabswitcher.model.TabSwitcherStyle;
-import de.mrapp.android.tabswitcher.util.ThemeHelper;
-import de.mrapp.android.tabswitcher.view.TabSwitcherButton;
-import de.mrapp.android.util.DisplayUtil.Orientation;
-import de.mrapp.android.util.ViewUtil;
-import de.mrapp.android.util.logging.LogLevel;
-import de.mrapp.android.util.view.AbstractSavedState;
-import de.mrapp.android.util.view.AbstractViewRecycler;
-import de.mrapp.util.Condition;
-
-import static de.mrapp.android.util.DisplayUtil.getOrientation;
-
-/**
- * A tab switcher, which allows to switch between multiple tabs. It it is designed similar to the
- * tab switcher of the Google Chrome Android app.
- * <p>
- * In order to specify the appearance of individual tabs, a class, which extends from the abstract
- * class {@link TabSwitcherDecorator}, must be implemented and set to the tab switcher via the
- * <code>setDecorator</code>-method.
- * <p>
- * The currently selected tab is shown fullscreen by default. When displaying the switcher via the
- * <code>showSwitcher-method</code>, an overview of all tabs is shown, allowing to select an other
- * tab by clicking it. By swiping a tab or by clicking its close button, it can be removed,
- * resulting in the selected tab to be altered automatically. The switcher can programmatically be
- * hidden by calling the <code>hideSwitcher</code>-method. By calling the
- * <code>setSelectedTab</code>-method programmatically, a tab is selected and shown fullscreen.
- * <p>
- * Individual tabs are represented by instances of the class {@link Tab}. Such tabs can dynamically
- * be added to the tab switcher by using the <code>addTab</code>-methods. In order to remove them
- * afterwards, the <code>removeTab</code> can be used. If the switcher is currently shown, calling
- * these methods results in the tabs being added or removed in an animated manner.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public class TabSwitcher extends FrameLayout implements TabSwitcherLayout, Model {
-
-    /**
-     * A saved state, which allows to store the state of a {@link TabSwitcher}.
-     */
-    private static class TabSwitcherState extends AbstractSavedState {
-
-        /**
-         * A creator, which allows to create instances of the class {@link TabSwitcherState}.
-         */
-        public static Creator<TabSwitcherState> CREATOR = new Creator<TabSwitcherState>() {
-
-            @Override
-            public TabSwitcherState createFromParcel(final Parcel source) {
-                return new TabSwitcherState(source);
-            }
-
-            @Override
-            public TabSwitcherState[] newArray(final int size) {
-                return new TabSwitcherState[size];
-            }
-
-        };
-
-        /**
-         * The saved layout policy, which is used by the tab switcher.
-         */
-        private LayoutPolicy layoutPolicy;
-
-        /**
-         * The saved state of the model, which is used by the tab switcher.
-         */
-        private Bundle modelState;
-
-        /**
-         * Creates a new saved state, which allows to store the state of a {@link TabSwitcher}.
-         *
-         * @param source
-         *         The parcel to read read from as a instance of the class {@link Parcel}. The
-         *         parcel may not be null
-         */
-        private TabSwitcherState(@NonNull final Parcel source) {
-            super(source);
-            layoutPolicy = (LayoutPolicy) source.readSerializable();
-            modelState = source.readBundle(getClass().getClassLoader());
-        }
-
-        /**
-         * Creates a new saved state, which allows to store the state of a {@link TabSwitcher}.
-         *
-         * @param superState
-         *         The state of the superclass of the view, this saved state corresponds to, as an
-         *         instance of the type {@link Parcelable} or null if no state is available
-         */
-        TabSwitcherState(@Nullable final Parcelable superState) {
-            super(superState);
-        }
-
-        @Override
-        public void writeToParcel(final Parcel dest, final int flags) {
-            super.writeToParcel(dest, flags);
-            dest.writeSerializable(layoutPolicy);
-            dest.writeBundle(modelState);
-        }
-
-    }
-
-    /**
-     * The index of the primary toolbar as returned by the method {@link
-     * TabSwitcher#getToolbars()}.
-     */
-    public static final int PRIMARY_TOOLBAR_INDEX = 0;
-
-    /**
-     * The index of the secondary toolbar as returned by the method {@link
-     * TabSwitcher#getToolbars()}.
-     */
-    public static final int SECONDARY_TOOLBAR_INDEX = 1;
-
-    /**
-     * A queue, which contains all pending actions.
-     */
-    private Queue<Runnable> pendingActions;
-
-    /**
-     * A set, which contains the listeners, which should be notified about the tab switcher's
-     * events.
-     */
-    private Set<TabSwitcherListener> listeners;
-
-    /**
-     * The layout policy, which is used by the tab switcher.
-     */
-    private LayoutPolicy layoutPolicy;
-
-    /**
-     * The model, which is used by the tab switcher.
-     */
-    private TabSwitcherModel model;
-
-    /**
-     * The style, which allows to retrieve the style attributes of the tab switcher.
-     */
-    private TabSwitcherStyle style;
-
-    /**
-     * The theme helper, which allows to retrieve resources, depending on the tab switcher's theme.
-     */
-    private ThemeHelper themeHelper;
-
-    /**
-     * The dispatcher, which is used to dispatch touch events.
-     */
-    private TouchEventDispatcher touchEventDispatcher;
-
-    /**
-     * The layout, which is used by the tab switcher, depending on whether the device is a
-     * smartphone or tablet and the set layout policy.
-     */
-    private AbstractTabSwitcherLayout layout;
-
-    /**
-     * Whether to preserve the tab switcher's state, or not.
-     */
-    private boolean preserveState = true;
-
-    /**
-     * Initializes the view.
-     *
-     * @param attributeSet
-     *         The attribute set, which should be used to initialize the view, as an instance of the
-     *         type {@link AttributeSet} or null, if no attributes should be obtained
-     * @param defaultStyle
-     *         The default style to apply to this view. If 0, no style will be applied (beyond what
-     *         is included in the theme). This may either be an attribute resource, whose value will
-     *         be retrieved from the current theme, or an explicit style resource
-     * @param defaultStyleResource
-     *         A resource identifier of a style resource that supplies default values for the view,
-     *         used only if the default style is 0 or can not be found in the theme. Can be 0 to not
-     *         look for defaults
-     */
-    private void initialize(@Nullable final AttributeSet attributeSet,
-                            @AttrRes final int defaultStyle,
-                            @StyleRes final int defaultStyleResource) {
-        pendingActions = new LinkedList<>();
-        listeners = new CopyOnWriteArraySet<>();
-        model = new TabSwitcherModel(this);
-        model.addListener(createModelListener());
-        touchEventDispatcher = new TouchEventDispatcher();
-        setPadding(super.getPaddingLeft(), super.getPaddingTop(), super.getPaddingRight(),
-                super.getPaddingBottom());
-        obtainStyledAttributes(attributeSet, defaultStyle, defaultStyleResource);
-        getViewTreeObserver().addOnGlobalLayoutListener(
-                new LayoutListenerWrapper(this, createGlobalLayoutListener(false)));
-    }
-
-    /**
-     * Initializes a specific layout.
-     *
-     * @param inflatedTabsOnly
-     *         True, if only the tabs should be inflated, false otherwise
-     * @param layout
-     *         The layout, which should be initialized, as a value of the enum {@link Layout}. The
-     *         layout may not be null
-     */
-    private void initializeLayout(@NonNull final Layout layout, final boolean inflatedTabsOnly) {
-        if (layout == Layout.TABLET) {
-            // TODO: Use tablet layout once implemented
-            this.layout = new PhoneTabSwitcherLayout(TabSwitcher.this, model,
-                    new PhoneArithmetics(TabSwitcher.this), style, touchEventDispatcher);
-        } else {
-            this.layout = new PhoneTabSwitcherLayout(TabSwitcher.this, model,
-                    new PhoneArithmetics(TabSwitcher.this), style, touchEventDispatcher);
-        }
-
-        this.layout.setCallback(createLayoutCallback());
-        this.model.addListener(this.layout);
-        this.layout.inflateLayout(inflatedTabsOnly);
-        this.touchEventDispatcher.addEventHandler(this.layout.getDragHandler());
-        final ViewGroup tabContainer = getTabContainer();
-        assert tabContainer != null;
-
-        if (ViewCompat.isLaidOut(tabContainer)) {
-            this.layout.onGlobalLayout();
-        } else {
-            tabContainer.getViewTreeObserver()
-                    .addOnGlobalLayoutListener(new OnGlobalLayoutListener() {
-
-                        @Override
-                        public void onGlobalLayout() {
-                            ViewUtil.removeOnGlobalLayoutListener(
-                                    tabContainer.getViewTreeObserver(), this);
-                            TabSwitcher.this.layout.onGlobalLayout();
-                        }
-
-                    });
-        }
-    }
-
-    /**
-     * Obtains all attributes from a specific attribute set.
-     *
-     * @param attributeSet
-     *         The attribute set, the attributes should be obtained from, as an instance of the type
-     *         {@link AttributeSet} or null, if no attributes should be obtained
-     * @param defaultStyle
-     *         The default style to apply to this view. If 0, no style will be applied (beyond what
-     *         is included in the theme). This may either be an attribute resource, whose value will
-     *         be retrieved from the current theme, or an explicit style resource
-     * @param defaultStyleResource
-     *         A resource identifier of a style resource that supplies default values for the view,
-     *         used only if the default style is 0 or can not be found in the theme. Can be 0 to not
-     *         look for defaults
-     */
-    private void obtainStyledAttributes(@Nullable final AttributeSet attributeSet,
-                                        @AttrRes final int defaultStyle,
-                                        @StyleRes final int defaultStyleResource) {
-        TypedArray typedArray = getContext()
-                .obtainStyledAttributes(attributeSet, R.styleable.TabSwitcher, defaultStyle,
-                        defaultStyleResource);
-
-        try {
-            int globalTheme = typedArray.getResourceId(R.styleable.TabSwitcher_themeGlobal, 0);
-            int phoneTheme = typedArray.getResourceId(R.styleable.TabSwitcher_themePhone, 0);
-            int tabletTheme = typedArray.getResourceId(R.styleable.TabSwitcher_themeTablet, 0);
-            themeHelper = new ThemeHelper(getContext(), globalTheme, phoneTheme, tabletTheme);
-            style = new TabSwitcherStyle(this, model, themeHelper);
-            obtainPreserveState(typedArray);
-            obtainLayoutPolicy(typedArray);
-            obtainBackground(typedArray);
-            obtainTabIcon(typedArray);
-            obtainTabIconTint(typedArray);
-            obtainTabBackgroundColor(typedArray);
-            obtainTabContentBackgroundColor(typedArray);
-            obtainAddTabButtonColor(typedArray);
-            obtainTabTitleTextColor(typedArray);
-            obtainTabCloseButtonIcon(typedArray);
-            obtainTabCloseButtonIconTint(typedArray);
-            obtainShowToolbars(typedArray);
-            obtainToolbarTitle(typedArray);
-            obtainToolbarNavigationIcon(typedArray);
-            obtainToolbarNavigationIconTint(typedArray);
-            obtainToolbarMenu(typedArray);
-            obtainTabPreviewFadeThreshold(typedArray);
-            obtainTabPreviewFadeDuration(typedArray);
-            obtainEmptyView(typedArray);
-        } finally {
-            typedArray.recycle();
-        }
-    }
-
-    /**
-     * Obtains whether the tab switcher's state should be preserved, or not, from a specific typed
-     * array.
-     *
-     * @param typedArray
-     *         The typed array, it should be obtained from, whether the tab switcher's state should
-     *         be preserved, as an instance of the class {@link TypedArray}. The typed array may not
-     *         be null
-     */
-    private void obtainPreserveState(@NonNull final TypedArray typedArray) {
-        setPreserveState(typedArray.getBoolean(R.styleable.TabSwitcher_preserveState, false));
-    }
-
-    /**
-     * Obtains the layout policy from a specific typed array.
-     *
-     * @param typedArray
-     *         The typed array, the layout policy should be obtained from, as an instance of the
-     *         class {@link TypedArray}. The typed array may not be null
-     */
-    private void obtainLayoutPolicy(@NonNull final TypedArray typedArray) {
-        int value = typedArray.getInt(R.styleable.TabSwitcher_layoutPolicy, 0);
-
-        if (value == 0) {
-            value = themeHelper.getInteger(getLayout(), R.attr.tabSwitcherLayoutPolicy, 0);
-        }
-
-        setLayoutPolicy(LayoutPolicy.fromValue(value));
-    }
-
-    /**
-     * Obtains the view's background from a specific typed array.
-     *
-     * @param typedArray
-     *         The typed array, the background should be obtained from, as an instance of the class
-     *         {@link TypedArray}. The typed array may not be null
-     */
-    private void obtainBackground(@NonNull final TypedArray typedArray) {
-        Drawable background = typedArray.getDrawable(R.styleable.TabSwitcher_android_background);
-
-        if (background == null) {
-            try {
-                background = themeHelper.getDrawable(getLayout(), R.attr.tabSwitcherBackground);
-            } catch (NotFoundException e) {
-                // There's nothing we can do
-            }
-        }
-
-        if (background != null) {
-            ViewUtil.setBackground(this, background);
-        }
-    }
-
-    /**
-     * Obtains the icon of a tab from a specific typed array.
-     *
-     * @param typedArray
-     *         The typed array, the icon should be obtained from, as an instance of the class {@link
-     *         TypedArray}. The typed array may not be null
-     */
-    private void obtainTabIcon(@NonNull final TypedArray typedArray) {
-        int resourceId = typedArray.getResourceId(R.styleable.TabSwitcher_tabIcon, 0);
-
-        if (resourceId != 0) {
-            setTabIcon(resourceId);
-        }
-    }
-
-    /**
-     * Obtains the color state list, which should be used to tint the icon of a tab, from a specific
-     * typed array.
-     *
-     * @param typedArray
-     *         The typed array, the color state list should be obtained from, as an instance of the
-     *         class {@link TypedArray}. The typed array may not be null
-     */
-    private void obtainTabIconTint(@NonNull final TypedArray typedArray) {
-        setTabIconTintList(typedArray.getColorStateList(R.styleable.TabSwitcher_tabIconTint));
-    }
-
-    /**
-     * Obtains the background color of a tab from a specific typed array.
-     *
-     * @param typedArray
-     *         The typed array, the background color should be obtained from, as an instance of the
-     *         class {@link TypedArray}. The typed array may not be null
-     */
-    private void obtainTabBackgroundColor(@NonNull final TypedArray typedArray) {
-        setTabBackgroundColor(
-                typedArray.getColorStateList(R.styleable.TabSwitcher_tabBackgroundColor));
-    }
-
-    /**
-     * Obtains the background color of a tab's content from a specific typed array.
-     *
-     * @param typedArray
-     *         The typed array, the background color should be obtained from, as an instance of the
-     *         class {@link TypedArray}. The typed array may not be null
-     */
-    private void obtainTabContentBackgroundColor(@NonNull final TypedArray typedArray) {
-        setTabContentBackgroundColor(
-                typedArray.getColor(R.styleable.TabSwitcher_tabContentBackgroundColor, -1));
-    }
-
-    /**
-     * Obtains the background color of the button, which allows to add a new tab, from a specific
-     * typed array.
-     *
-     * @param typedArray
-     *         The typed array, the color should be obtained from, as an instance of the class
-     *         {@link TypedArray}. The typed array may not be null
-     */
-    private void obtainAddTabButtonColor(@NonNull final TypedArray typedArray) {
-        setAddTabButtonColor(
-                typedArray.getColorStateList(R.styleable.TabSwitcher_addTabButtonColor));
-    }
-
-    /**
-     * Obtains the text color of a tab's title from a specific typed array.
-     *
-     * @param typedArray
-     *         The typed array, the text color should be obtained from, as an instance of the class
-     *         {@link TypedArray}. The typed array may not be null
-     */
-    private void obtainTabTitleTextColor(@NonNull final TypedArray typedArray) {
-        setTabTitleTextColor(
-                typedArray.getColorStateList(R.styleable.TabSwitcher_tabTitleTextColor));
-    }
-
-    /**
-     * Obtains the icon of a tab's close button from a specific typed array.
-     *
-     * @param typedArray
-     *         The typed array, the icon should be obtained from, as an instance of the class {@link
-     *         TypedArray}. The typed array may not be null
-     */
-    private void obtainTabCloseButtonIcon(@NonNull final TypedArray typedArray) {
-        int resourceId = typedArray.getResourceId(R.styleable.TabSwitcher_tabCloseButtonIcon, 0);
-
-        if (resourceId != 0) {
-            setTabCloseButtonIcon(resourceId);
-        }
-    }
-
-    /**
-     * Obtains the color state list, which should be used to tint the close button of a tab, from a
-     * specific typed array.
-     *
-     * @param typedArray
-     *         The typed array, the color state list should be obtained from, as an instance of the
-     *         class {@link TypedArray}. The typed array may not be null
-     */
-    private void obtainTabCloseButtonIconTint(@NonNull final TypedArray typedArray) {
-        setTabIconTintList(
-                typedArray.getColorStateList(R.styleable.TabSwitcher_tabCloseButtonIconTint));
-    }
-
-    /**
-     * Obtains, whether the tab switcher's toolbars should be shown, or not, from a specific typed
-     * array.
-     *
-     * @param typedArray
-     *         The typed array, it should be obtained from, whether the toolbars should be shown, as
-     *         an instance of the class {@link TypedArray}. The typed array may not be null
-     */
-    private void obtainShowToolbars(@NonNull final TypedArray typedArray) {
-        showToolbars(typedArray.getBoolean(R.styleable.TabSwitcher_showToolbars, false));
-    }
-
-    /**
-     * Obtains the title of the toolbar, which is shown, when the tab switcher is shown, from a
-     * specific typed array.
-     *
-     * @param typedArray
-     *         The typed array, the title should be obtained from, as an instance of the class
-     *         {@link TypedArray}. The typed array may not be null
-     */
-    private void obtainToolbarTitle(@NonNull final TypedArray typedArray) {
-        setToolbarTitle(typedArray.getText(R.styleable.TabSwitcher_toolbarTitle));
-    }
-
-    /**
-     * Obtains the navigation icon of the toolbar, which is shown, when the tab switcher is shown,
-     * from a specific typed array.
-     *
-     * @param typedArray
-     *         The typed array, the navigation icon should be obtained from, as an instance of the
-     *         class {@link TypedArray}. The typed array may not be null
-     */
-    private void obtainToolbarNavigationIcon(@NonNull final TypedArray typedArray) {
-        int resourceId =
-                typedArray.getResourceId(R.styleable.TabSwitcher_toolbarNavigationIcon, -1);
-        Drawable navigationIcon = null;
-
-        if (resourceId != -1) {
-            navigationIcon = AppCompatResources.getDrawable(getContext(), resourceId);
-        }
-
-        setToolbarNavigationIcon(navigationIcon, null);
-    }
-
-    /**
-     * Obtains the color state list, which should be used to tint the navigation icon of the
-     * toolbar, which is shown, when the tab switcher is shown, from a specific typed array.
-     *
-     * @param typedArray
-     *         The typed array, the color state list should be obtained from, as an instance of the
-     *         class {@link TypedArray}. The typed array may not be null
-     */
-    private void obtainToolbarNavigationIconTint(@NonNull final TypedArray typedArray) {
-        setToolbarNavigationIconTintList(
-                typedArray.getColorStateList(R.styleable.TabSwitcher_toolbarNavigationIconTint));
-    }
-
-    /**
-     * Obtains the menu of the toolbar, which is shown, when the tab switcher is shown, from a
-     * specific typed array.
-     *
-     * @param typedArray
-     *         The typed array, the menu should be obtained from, as an instance of the class {@link
-     *         TypedArray}. The typed array may not be null
-     */
-    private void obtainToolbarMenu(@NonNull final TypedArray typedArray) {
-        int resourceId = typedArray.getResourceId(R.styleable.TabSwitcher_toolbarMenu, 0);
-
-        if (resourceId == 0) {
-            resourceId = themeHelper.getResourceId(getLayout(), R.attr.tabSwitcherToolbarMenu, 0);
-        }
-
-        if (resourceId != 0) {
-            inflateToolbarMenu(resourceId, null);
-        }
-    }
-
-    /**
-     * Obtains the duration, which must be reached when loading the preview of tabs to use a fade
-     * duration, from a specific typed array.
-     *
-     * @param typedArray
-     *         The typed array, the duration should be obtained from, as an instance of the class
-     *         {@link TypedArray}. The typed array may not be null
-     */
-    private void obtainTabPreviewFadeThreshold(@NonNull final TypedArray typedArray) {
-        int threshold = typedArray.getInteger(R.styleable.TabSwitcher_tabPreviewFadeThreshold, -1);
-
-        if (threshold == -1) {
-            threshold = themeHelper
-                    .getInteger(getLayout(), R.attr.tabSwitcherTabToolbarPreviewFadeThreshold, -1);
-        }
-
-        if (threshold != -1) {
-            setTabPreviewFadeThreshold(threshold);
-        }
-    }
-
-    /**
-     * Sets the duration of the fade animation, which is used to show the previews of tabs.
-     *
-     * @param typedArray
-     *         The typed array, the duration should be obtained from, as an instance of the class
-     *         {@link TypedArray}. The typed array may not be null
-     */
-    private void obtainTabPreviewFadeDuration(@NonNull final TypedArray typedArray) {
-        int duration = typedArray.getInteger(R.styleable.TabSwitcher_tabPreviewFadeDuration, -1);
-
-        if (duration == -1) {
-            duration = themeHelper
-                    .getInteger(getLayout(), R.attr.tabSwitcherTabToolbarPreviewFadeDuration, -1);
-        }
-
-        if (duration != -1) {
-            setTabPreviewFadeDuration(duration);
-        }
-    }
-
-    /**
-     * Obtains the view, which should be shown, when the tab switcher is empty, from a specific
-     * typed array.
-     *
-     * @param typedArray
-     *         The typed array, trhe view should be obtained from, as an instance of the class
-     *         {@link TypedArray}. The typed array may not be null
-     */
-    private void obtainEmptyView(@NonNull final TypedArray typedArray) {
-        int resourceId = typedArray.getResourceId(R.styleable.TabSwitcher_emptyView, 0);
-
-        if (resourceId == 0) {
-            resourceId = themeHelper.getResourceId(getLayout(), R.attr.tabSwitcherEmptyView, 0);
-        }
-
-        if (resourceId != 0) {
-            long animationDuration =
-                    typedArray.getInteger(R.styleable.TabSwitcher_emptyViewAnimationDuration, -2);
-
-            if (animationDuration < -1) {
-                animationDuration = themeHelper
-                        .getInteger(getLayout(), R.attr.tabSwitcherEmptyViewAnimationDuration, -1);
-            }
-
-            setEmptyView(resourceId, animationDuration);
-        }
-    }
-
-    /**
-     * Enqueues a specific action to be executed, when no animation is running.
-     *
-     * @param action
-     *         The action, which should be enqueued as an instance of the type {@link Runnable}. The
-     *         action may not be null
-     */
-    private void enqueuePendingAction(@NonNull final Runnable action) {
-        Condition.INSTANCE.ensureNotNull(action, "The action may not be null");
-        pendingActions.add(action);
-        executePendingAction();
-    }
-
-    /**
-     * Executes the next pending action.
-     */
-    private void executePendingAction() {
-        if (!isAnimationRunning()) {
-            final Runnable action = pendingActions.poll();
-
-            if (action != null) {
-                new Runnable() {
-
-                    @Override
-                    public void run() {
-                        action.run();
-                        executePendingAction();
-                    }
-
-                }.run();
-            }
-        }
-    }
-
-    /**
-     * Creates and returns a listener, which allows to observe, when the tab switcher's model is
-     * modified.
-     *
-     * @return The listener, which has been created, as an instance of the type {@link
-     * Model.Listener}. The listener may not be null
-     */
-    @NonNull
-    private Model.Listener createModelListener() {
-        return new Model.Listener() {
-
-            @Override
-            public void onLogLevelChanged(@NonNull final LogLevel logLevel) {
-
-            }
-
-            @Override
-            public void onDecoratorChanged(@NonNull final TabSwitcherDecorator decorator) {
-
-            }
-
-            @Override
-            public void onSwitcherShown() {
-                notifyOnSwitcherShown();
-            }
-
-            @Override
-            public void onSwitcherHidden() {
-                notifyOnSwitcherHidden();
-            }
-
-            @Override
-            public void onSelectionChanged(final int previousIndex, final int index,
-                                           @Nullable final Tab selectedTab,
-                                           final boolean switcherHidden) {
-                notifyOnSelectionChanged(index, selectedTab);
-
-                if (switcherHidden) {
-                    notifyOnSwitcherHidden();
-                }
-            }
-
-            @Override
-            public void onTabAdded(final int index, @NonNull final Tab tab,
-                                   final int previousSelectedTabIndex, final int selectedTabIndex,
-                                   final boolean selectionChanged,
-                                   final boolean switcherVisibilityChanged,
-                                   @NonNull final Animation animation) {
-                notifyOnTabAdded(index, tab, animation);
-
-                if (selectionChanged) {
-                    notifyOnSelectionChanged(selectedTabIndex,
-                            selectedTabIndex != -1 ? getTab(selectedTabIndex) : null);
-                }
-
-                if (switcherVisibilityChanged) {
-                    notifyOnSwitcherHidden();
-                }
-            }
-
-            @Override
-            public void onAllTabsAdded(final int index, @NonNull final Tab[] tabs,
-                                       final int previousSelectedTabIndex,
-                                       final int selectedTabIndex, final boolean selectionChanged,
-                                       @NonNull final Animation animation) {
-                for (Tab tab : tabs) {
-                    notifyOnTabAdded(index, tab, animation);
-                }
-
-                if (selectionChanged) {
-                    notifyOnSelectionChanged(selectedTabIndex,
-                            selectedTabIndex != -1 ? getTab(selectedTabIndex) : null);
-                }
-            }
-
-            @Override
-            public void onTabRemoved(final int index, @NonNull final Tab tab,
-                                     final int previousSelectedTabIndex, final int selectedTabIndex,
-                                     final boolean selectionChanged,
-                                     @NonNull final Animation animation) {
-                notifyOnTabRemoved(index, tab, animation);
-
-                if (selectionChanged) {
-                    notifyOnSelectionChanged(selectedTabIndex,
-                            selectedTabIndex != -1 ? getTab(selectedTabIndex) : null);
-                }
-            }
-
-            @Override
-            public void onAllTabsRemoved(@NonNull final Tab[] tabs,
-                                         @NonNull final Animation animation) {
-                notifyOnAllTabsRemoved(tabs, animation);
-                notifyOnSelectionChanged(-1, null);
-            }
-
-            @Override
-            public void onPaddingChanged(final int left, final int top, final int right,
-                                         final int bottom) {
-
-            }
-
-            @Override
-            public void onApplyPaddingToTabsChanged(final boolean applyPaddingToTabs) {
-
-            }
-
-            @Override
-            public void onTabIconChanged(@Nullable final Drawable icon) {
-
-            }
-
-            @Override
-            public void onTabBackgroundColorChanged(@Nullable final ColorStateList colorStateList) {
-
-            }
-
-            @Override
-            public void onTabContentBackgroundColorChanged(@ColorInt final int color) {
-
-            }
-
-            @Override
-            public void onTabTitleColorChanged(@Nullable final ColorStateList colorStateList) {
-
-            }
-
-            @Override
-            public void onTabCloseButtonIconChanged(@Nullable final Drawable icon) {
-
-            }
-
-            @Override
-            public void onTabProgressBarColorChanged(@ColorInt final int color) {
-
-            }
-
-            @Override
-            public void onAddTabButtonVisibilityChanged(final boolean visible) {
-
-            }
-
-            @Override
-            public void onAddTabButtonColorChanged(@Nullable final ColorStateList colorStateList) {
-
-            }
-
-            @Override
-            public void onToolbarVisibilityChanged(final boolean visible) {
-
-            }
-
-            @Override
-            public void onToolbarTitleChanged(@Nullable final CharSequence title) {
-
-            }
-
-            @Override
-            public void onToolbarNavigationIconChanged(@Nullable final Drawable icon,
-                                                       @Nullable final OnClickListener listener) {
-
-            }
-
-            @Override
-            public void onToolbarMenuInflated(@MenuRes final int resourceId,
-                                              @Nullable final OnMenuItemClickListener listener) {
-
-            }
-
-            @Override
-            public void onEmptyViewChanged(@Nullable final View view,
-                                           final long animationDuration) {
-
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns a callback, which allows to observe, when all pending animations of a
-     * layout have been ended.
-     *
-     * @return The callback, which has been created, as an instance of the type {@link
-     * AbstractTabSwitcherLayout.Callback}. The callback may not be null
-     */
-    @NonNull
-    private AbstractTabSwitcherLayout.Callback createLayoutCallback() {
-        return new AbstractTabSwitcherLayout.Callback() {
-
-            @Override
-            public void onAnimationsEnded() {
-                executePendingAction();
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns a listener, which allows to inflate the view's layout once the view is
-     * laid out.
-     *
-     * @param inflateTabsOnly
-     *         True, if only the tabs should be inflated, false otherwise
-     * @return The listener, which has been created, as an instance of the type {@link
-     * OnGlobalLayoutListener}. The listener may not be null
-     */
-    @NonNull
-    private OnGlobalLayoutListener createGlobalLayoutListener(final boolean inflateTabsOnly) {
-        return new OnGlobalLayoutListener() {
-
-            @Override
-            public void onGlobalLayout() {
-                Condition.INSTANCE.ensureNotNull(getDecorator(), "No decorator has been set",
-                        IllegalStateException.class);
-                initializeLayout(getLayout(), inflateTabsOnly);
-            }
-
-        };
-    }
-
-    /**
-     * Notifies all listeners, that the tab switcher has been shown.
-     */
-    private void notifyOnSwitcherShown() {
-        for (TabSwitcherListener listener : listeners) {
-            listener.onSwitcherShown(this);
-        }
-    }
-
-    /**
-     * Notifies all listeners, that the tab switcher has been hidden.
-     */
-    private void notifyOnSwitcherHidden() {
-        for (TabSwitcherListener listener : listeners) {
-            listener.onSwitcherHidden(this);
-        }
-    }
-
-    /**
-     * Notifies all listeners, that the selected tab has been changed.
-     *
-     * @param selectedTabIndex
-     *         The index of the currently selected tab as an {@link Integer} value or -1, if no tab
-     *         is currently selected
-     * @param selectedTab
-     *         The currently selected tab as an instance of the class {@link Tab} or null,  if no
-     *         tab is currently selected
-     */
-    private void notifyOnSelectionChanged(final int selectedTabIndex,
-                                          @Nullable final Tab selectedTab) {
-        for (TabSwitcherListener listener : listeners) {
-            listener.onSelectionChanged(this, selectedTabIndex, selectedTab);
-        }
-    }
-
-    /**
-     * Notifies all listeners, that a specific tab has been added to the tab switcher.
-     *
-     * @param index
-     *         The index of the tab, which has been added, as an {@link Integer} value
-     * @param tab
-     *         The tab, which has been added, as an instance of the class {@link Tab}. The tab may
-     *         not be null
-     * @param animation
-     *         The animation, which has been used to add the tab, as an instance of the class {@link
-     *         Animation}. The animation may not be null
-     */
-    private void notifyOnTabAdded(final int index, @NonNull final Tab tab,
-                                  @NonNull final Animation animation) {
-        for (TabSwitcherListener listener : listeners) {
-            listener.onTabAdded(this, index, tab, animation);
-        }
-    }
-
-    /**
-     * Notifies all listeners, that a specific tab has been removed from the tab switcher.
-     *
-     * @param index
-     *         The index of the tab, which has been removed, as an {@link Integer} value
-     * @param tab
-     *         The tab, which has been removed, as an instance of the class {@link Tab}. The tab may
-     *         not be null
-     * @param animation
-     *         The animation, which has been used to remove the tab, as an instance of the class
-     *         {@link Animation}. The animation may not be null
-     */
-    private void notifyOnTabRemoved(final int index, @NonNull final Tab tab,
-                                    @NonNull final Animation animation) {
-        for (TabSwitcherListener listener : listeners) {
-            listener.onTabRemoved(this, index, tab, animation);
-        }
-    }
-
-    /**
-     * Notifies all listeners, that all tabs have been removed from the tab switcher.
-     *
-     * @param tabs
-     *         An array, which contains the tabs, which have been removed, as an array of the type
-     *         {@link Tab} or an empty array, if no tabs have been removed
-     * @param animation
-     *         The animation, which has been used to remove the tabs, as an instance of the class
-     *         {@link Animation}. The animation may not be null
-     */
-    private void notifyOnAllTabsRemoved(@NonNull final Tab[] tabs,
-                                        @NonNull final Animation animation) {
-        for (TabSwitcherListener listener : listeners) {
-            listener.onAllTabsRemoved(this, tabs, animation);
-        }
-    }
-
-    /**
-     * Creates a new tab switcher, which allows to switch between multiple tabs.
-     *
-     * @param context
-     *         The context, which should be used by the view, as an instance of the class {@link
-     *         Context}. The context may not be null
-     */
-    public TabSwitcher(@NonNull final Context context) {
-        this(context, null);
-    }
-
-    /**
-     * Creates a new tab switcher, which allows to switch between multiple tabs.
-     *
-     * @param context
-     *         The context, which should be used by the view, as an instance of the class {@link
-     *         Context}. The context may not be null
-     * @param attributeSet
-     *         The attribute set, the view's attributes should be obtained from, as an instance of
-     *         the type {@link AttributeSet} or null, if no attributes should be obtained
-     */
-    public TabSwitcher(@NonNull final Context context, @Nullable final AttributeSet attributeSet) {
-        super(context, attributeSet);
-        initialize(attributeSet, 0, 0);
-    }
-
-    /**
-     * Creates a new tab switcher, which allows to switch between multiple tabs.
-     *
-     * @param context
-     *         The context, which should be used by the view, as an instance of the class {@link
-     *         Context}. The context may not be null
-     * @param attributeSet
-     *         The attribute set, the view's attributes should be obtained from, as an instance of
-     *         the type {@link AttributeSet} or null, if no attributes should be obtained
-     * @param defaultStyle
-     *         The default style to apply to this view. If 0, no style will be applied (beyond what
-     *         is included in the theme). This may either be an attribute resource, whose value will
-     *         be retrieved from the current theme, or an explicit style resource
-     */
-    public TabSwitcher(@NonNull final Context context, @Nullable final AttributeSet attributeSet,
-                       @AttrRes final int defaultStyle) {
-        super(context, attributeSet, defaultStyle);
-        initialize(attributeSet, defaultStyle, 0);
-    }
-
-    /**
-     * Creates a new tab switcher, which allows to switch between multiple tabs.
-     *
-     * @param context
-     *         The context, which should be used by the view, as an instance of the class {@link
-     *         Context}. The context may not be null
-     * @param attributeSet
-     *         The attribute set, the view's attributes should be obtained from, as an instance of
-     *         the type {@link AttributeSet} or null, if no attributes should be obtained
-     * @param defaultStyle
-     *         The default style to apply to this view. If 0, no style will be applied (beyond what
-     *         is included in the theme). This may either be an attribute resource, whose value will
-     *         be retrieved from the current theme, or an explicit style resource
-     * @param defaultStyleResource
-     *         A resource identifier of a style resource that supplies default values for the view,
-     *         used only if the default style is 0 or can not be found in the theme. Can be 0 to not
-     *         look for defaults
-     */
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    public TabSwitcher(@NonNull final Context context, @Nullable final AttributeSet attributeSet,
-                       @AttrRes final int defaultStyle, @StyleRes final int defaultStyleResource) {
-        super(context, attributeSet, defaultStyle, defaultStyleResource);
-        initialize(attributeSet, defaultStyle, defaultStyleResource);
-    }
-
-    /**
-     * Setups the tab switcher to be associated with those menu items of its own toolbar menu, which
-     * use a {@link TabSwitcherButton} as their action view. The icon of such menu items will
-     * automatically be updated, when the number of tabs, which are contained by the tab switcher,
-     * changes.
-     * <p>
-     * Calling this method is basically the same as calling <code>setupWithMenu(tabSwitcher,
-     * tabSwitcher.getToolbarMenu(), listener)</code>. However, if the {@link Menu}, which is
-     * returned by <code>tabSwitcher.getToolbarMenu()</code> is null, a {@link
-     * OnGlobalLayoutListener} is registered at the given tab switcher to setup the tab switcher as
-     * soon as the menu is initialized.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, which should become associated with the menu items, as an instance
-     *         of the class {@link TabSwitcher}. The tab switcher may not be null
-     * @param listener
-     *         The listener, which should be set to the menu items, which use a {@link
-     *         TabSwitcherButton} as their action view, as an instance of the type {@link
-     *         OnClickListener} or null, if no listener should be set
-     */
-    public static void setupWithMenu(@NonNull final TabSwitcher tabSwitcher,
-                                     @Nullable final OnClickListener listener) {
-        Condition.INSTANCE.ensureNotNull(tabSwitcher, "The tab switcher may not be null");
-        Menu menu = tabSwitcher.getToolbarMenu();
-
-        if (menu != null) {
-            setupWithMenu(tabSwitcher, menu, listener);
-        } else {
-            tabSwitcher.getViewTreeObserver()
-                    .addOnGlobalLayoutListener(new OnGlobalLayoutListener() {
-
-                        @Override
-                        public void onGlobalLayout() {
-                            ViewUtil.removeOnGlobalLayoutListener(tabSwitcher.getViewTreeObserver(),
-                                    this);
-                            Menu menu = tabSwitcher.getToolbarMenu();
-
-                            if (menu != null) {
-                                TabSwitcher.setupWithMenu(tabSwitcher, menu, listener);
-                            }
-                        }
-
-                    });
-        }
-    }
-
-    /**
-     * Setups the tab switcher to be associated with those menu items of a specific menu, which use
-     * a {@link TabSwitcherButton} as their action view. The icon of such menu items will
-     * automatically be updated, when the number of tabs, which are contained by the tab switcher,
-     * changes.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, which should become associated with the menu items, as an instance
-     *         of the class {@link TabSwitcher}. The tab switcher may not be null
-     * @param menu
-     *         The menu, whose menu items should become associated with the given tab switcher, as
-     *         an instance of the type {@link Menu}. The menu may not be null
-     * @param listener
-     *         The listener, which should be set to the menu items, which use a {@link
-     *         TabSwitcherButton} as their action view, as an instance of the type {@link
-     *         OnClickListener} or null, if no listener should be set
-     */
-    public static void setupWithMenu(@NonNull final TabSwitcher tabSwitcher,
-                                     @NonNull final Menu menu,
-                                     @Nullable final OnClickListener listener) {
-        Condition.INSTANCE.ensureNotNull(tabSwitcher, "The tab switcher may not be null");
-        Condition.INSTANCE.ensureNotNull(menu, "The menu may not be null");
-
-        for (int i = 0; i < menu.size(); i++) {
-            MenuItem menuItem = menu.getItem(i);
-            View view = menuItem.getActionView();
-
-            if (view instanceof TabSwitcherButton) {
-                TabSwitcherButton tabSwitcherButton = (TabSwitcherButton) view;
-                tabSwitcherButton.setOnClickListener(listener);
-                tabSwitcherButton.setCount(tabSwitcher.getCount());
-                tabSwitcher.addListener(tabSwitcherButton);
-            }
-        }
-    }
-
-    /**
-     * Adds a listener, which should be notified about the tab switcher's events.
-     *
-     * @param listener
-     *         The listener, which should be added, as an instance of the type {@link
-     *         TabSwitcherListener}. The listener may not be null
-     */
-    public final void addListener(@NonNull final TabSwitcherListener listener) {
-        Condition.INSTANCE.ensureNotNull(listener, "The listener may not be null");
-        this.listeners.add(listener);
-    }
-
-    /**
-     * Removes a specific listener, which should not be notified about the tab switcher's events,
-     * anymore.
-     *
-     * @param listener
-     *         The listener, which should be removed, as an instance of the type {@link
-     *         TabSwitcherListener}. The listener may not be null
-     */
-    public final void removeListener(@NonNull final TabSwitcherListener listener) {
-        Condition.INSTANCE.ensureNotNull(listener, "The listener may not be null");
-        this.listeners.remove(listener);
-    }
-
-    /**
-     * Returns the layout policy, which is used by the tab switcher.
-     *
-     * @return The layout policy, which is used by the tab switcher, as a value of the enum {@link
-     * LayoutPolicy}. The layout policy may either be {@link LayoutPolicy#AUTO}, {@link
-     * LayoutPolicy#PHONE} or {@link LayoutPolicy#TABLET}
-     */
-    @NonNull
-    public final LayoutPolicy getLayoutPolicy() {
-        return layoutPolicy;
-    }
-
-    /**
-     * Sets the layout policy, which should be used by the tab switcher.
-     * <p>
-     * Changing the layout policy after the view has been laid out does not have any effect.
-     *
-     * @param layoutPolicy
-     *         The layout policy, which should be set, as a value of the enum {@link LayoutPolicy}.
-     *         The layout policy may either be {@link LayoutPolicy#AUTO}, {@link LayoutPolicy#PHONE}
-     *         or {@link LayoutPolicy#TABLET}
-     */
-    public final void setLayoutPolicy(@NonNull final LayoutPolicy layoutPolicy) {
-        Condition.INSTANCE.ensureNotNull(layoutPolicy, "The layout policy may not be null");
-
-        if (this.layoutPolicy != layoutPolicy) {
-            Layout previousLayout = getLayout();
-            this.layoutPolicy = layoutPolicy;
-
-            if (layout != null) {
-                Layout newLayout = getLayout();
-
-                if (previousLayout != newLayout) {
-                    layout.detachLayout(false);
-                    model.removeListener(layout);
-                    touchEventDispatcher.removeEventHandler(layout.getDragHandler());
-                    initializeLayout(newLayout, false);
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns the layout of the tab switcher.
-     *
-     * @return The layout of the tab switcher as a value of the enum {@link Layout}. The layout may
-     * either be {@link Layout#PHONE_PORTRAIT}, {@link Layout#PHONE_LANDSCAPE} or {@link
-     * Layout#TABLET}
-     */
-    @NonNull
-    public final Layout getLayout() {
-        // TODO: Return Layout.TABLET once supported
-        /*
-        if (layoutPolicy == LayoutPolicy.TABLET || (layoutPolicy == LayoutPolicy.AUTO &&
-                getDeviceType(getContext()) == DeviceType.TABLET)) {
-            return Layout.TABLET;
-        } else {
-        */
-        return getOrientation(getContext()) == Orientation.LANDSCAPE ? Layout.PHONE_LANDSCAPE :
-                Layout.PHONE_PORTRAIT;
-        //}
-    }
-
-    /**
-     * Adds a specific drag gesture to the tab switcher.
-     *
-     * @param dragGesture
-     *         The drag gesture, which should be added, as an instance of the class {@link
-     *         DragGesture}. The drag gesture may not be null
-     */
-    public final void addDragGesture(@NonNull final DragGesture dragGesture) {
-        Condition.INSTANCE.ensureNotNull(dragGesture, "The drag gesture may not be null");
-        AbstractTouchEventHandler eventHandler =
-                new DragGestureEventHandlerFactory(this).fromGesture(dragGesture);
-        touchEventDispatcher.addEventHandler(eventHandler);
-    }
-
-    /**
-     * Removes a specific drag gesture from the tab switcher.
-     *
-     * @param dragGesture
-     *         The drag gesture, which should be removed, as an instance of the class {@link
-     *         DragGesture}. The drag gesture may not be null
-     */
-    public final void removeDragGesture(@NonNull final DragGesture dragGesture) {
-        Condition.INSTANCE.ensureNotNull(dragGesture, "The drag gesture may not be null");
-        AbstractTouchEventHandler eventHandler =
-                new DragGestureEventHandlerFactory(this).fromGesture(dragGesture);
-        touchEventDispatcher.removeEventHandler(eventHandler);
-    }
-
-    /**
-     * Sets, whether the sate of the tab switcher should be saved in the method
-     * {@link #onSaveInstanceState()} and restored in the method
-     * {@link #onRestoreInstanceState(Parcelable)}, or not.
-     *
-     * @param enabled
-     *          True, if the state of the tab switcher should be preserved, false otherwise
-     */
-    public void setPreserveState(final boolean enabled) {
-        preserveState = enabled;
-    }
-
-    /**
-     * Returns, whether the state of the tab switcher is saved in the method
-     * {@link #onSaveInstanceState()} and restored in the method
-     * {@link #onRestoreInstanceState(Parcelable)}, or not.
-     *
-     * @return True, if the state of the tab switcher is preserved, false otherwise
-     */
-    public boolean isStatePreserved() {
-        return preserveState;
-    }
-
-    /**
-     * Clears the saved state of a specific tab.
-     *
-     * @param tab
-     *         The tab, whose saved state should be cleared, as an instance of the class {@link
-     *         Tab}. The tab may not be null
-     */
-    public void clearSavedState(@NonNull final Tab tab) {
-        Condition.INSTANCE.ensureNotNull(tab, "The tab may not be null");
-        ContentRecyclerAdapter contentRecyclerAdapter = model.getContentRecyclerAdapter();
-
-        if (contentRecyclerAdapter != null) {
-            contentRecyclerAdapter.clearSavedState(tab);
-        }
-    }
-
-    /**
-     * Clears the saved states of all tabs.
-     */
-    public void clearAllSavedStates() {
-        ContentRecyclerAdapter contentRecyclerAdapter = model.getContentRecyclerAdapter();
-
-        if (contentRecyclerAdapter != null) {
-            contentRecyclerAdapter.clearAllSavedStates();
-        }
-    }
-
-    /**
-     * Notifies the tab switcher that a specific tab has changed. This will cause the content of the
-     * tab to be updated by utilizing the tab switcher's adapter.
-     *
-     * @param tab
-     *         The tab, which has changed, as an instance of the class {@link Tab}. The tab may not
-     *         be null
-     */
-    public final void notifyTabChanged(@NonNull final Tab tab) {
-        Condition.INSTANCE.ensureNotNull(tab, "The tab may not be null");
-
-        if (layout != null) {
-            AbstractViewRecycler<Tab, Void> contentViewRecycler = layout.getContentViewRecycler();
-
-            if (contentViewRecycler != null) {
-                contentViewRecycler.notifyItemChanged(tab);
-            }
-        }
-    }
-
-    @Override
-    public final void addTab(@NonNull final Tab tab) {
-        enqueuePendingAction(new Runnable() {
-
-            @Override
-            public void run() {
-                model.addTab(tab);
-            }
-
-        });
-    }
-
-    @Override
-    public final void addTab(@NonNull final Tab tab, final int index) {
-        enqueuePendingAction(new Runnable() {
-
-            @Override
-            public void run() {
-                model.addTab(tab, index);
-            }
-
-        });
-    }
-
-    @Override
-    public final void addTab(@NonNull final Tab tab, final int index,
-                             @NonNull final Animation animation) {
-        enqueuePendingAction(new Runnable() {
-
-            @Override
-            public void run() {
-                model.addTab(tab, index, animation);
-            }
-
-        });
-    }
-
-    @Override
-    public final void addAllTabs(@NonNull final Collection<? extends Tab> tabs) {
-        enqueuePendingAction(new Runnable() {
-
-            @Override
-            public void run() {
-                model.addAllTabs(tabs);
-            }
-
-        });
-    }
-
-    @Override
-    public final void addAllTabs(@NonNull final Collection<? extends Tab> tabs, final int index) {
-        enqueuePendingAction(new Runnable() {
-
-            @Override
-            public void run() {
-                model.addAllTabs(tabs, index);
-            }
-
-        });
-    }
-
-    @Override
-    public final void addAllTabs(@NonNull final Collection<? extends Tab> tabs, final int index,
-                                 @NonNull final Animation animation) {
-        enqueuePendingAction(new Runnable() {
-
-            @Override
-            public void run() {
-                model.addAllTabs(tabs, index, animation);
-            }
-
-        });
-    }
-
-    @Override
-    public final void addAllTabs(@NonNull final Tab[] tabs) {
-        enqueuePendingAction(new Runnable() {
-
-            @Override
-            public void run() {
-                model.addAllTabs(tabs);
-            }
-
-        });
-    }
-
-    @Override
-    public final void addAllTabs(@NonNull final Tab[] tabs, final int index) {
-        enqueuePendingAction(new Runnable() {
-
-            @Override
-            public void run() {
-                model.addAllTabs(tabs, index);
-            }
-
-        });
-    }
-
-    @Override
-    public final void addAllTabs(@NonNull final Tab[] tabs, final int index,
-                                 @NonNull final Animation animation) {
-        enqueuePendingAction(new Runnable() {
-
-            @Override
-            public void run() {
-                model.addAllTabs(tabs, index, animation);
-            }
-
-        });
-    }
-
-    @Override
-    public final void removeTab(@NonNull final Tab tab) {
-        enqueuePendingAction(new Runnable() {
-
-            @Override
-            public void run() {
-                model.removeTab(tab);
-            }
-
-        });
-    }
-
-    @Override
-    public final void removeTab(@NonNull final Tab tab, @NonNull final Animation animation) {
-        enqueuePendingAction(new Runnable() {
-
-            @Override
-            public void run() {
-                model.removeTab(tab, animation);
-            }
-
-        });
-    }
-
-    @Override
-    public final void clear() {
-        enqueuePendingAction(new Runnable() {
-
-            @Override
-            public void run() {
-                model.clear();
-            }
-
-        });
-    }
-
-    @Override
-    public final void clear(@NonNull final Animation animationType) {
-        enqueuePendingAction(new Runnable() {
-
-            @Override
-            public void run() {
-                model.clear(animationType);
-            }
-
-        });
-    }
-
-    @Override
-    public final void selectTab(@NonNull final Tab tab) {
-        enqueuePendingAction(new Runnable() {
-
-            @Override
-            public void run() {
-                model.selectTab(tab);
-            }
-
-        });
-    }
-
-    @Override
-    public final void selectTab(final int index) {
-        model.selectTab(index);
-    }
-
-    @Nullable
-    @Override
-    public final Tab getSelectedTab() {
-        return model.getSelectedTab();
-    }
-
-    @Override
-    public final int getSelectedTabIndex() {
-        return model.getSelectedTabIndex();
-    }
-
-    @Override
-    public final Iterator<Tab> iterator() {
-        return model.iterator();
-    }
-
-    @Override
-    public final boolean isEmpty() {
-        return model.isEmpty();
-    }
-
-    @Override
-    public final int getCount() {
-        return model.getCount();
-    }
-
-    @NonNull
-    @Override
-    public final Tab getTab(final int index) {
-        return model.getTab(index);
-    }
-
-    @Override
-    public final int indexOf(@NonNull final Tab tab) {
-        return model.indexOf(tab);
-    }
-
-    @Override
-    public final boolean isSwitcherShown() {
-        return model.isSwitcherShown();
-    }
-
-    @Override
-    public final void showSwitcher() {
-        enqueuePendingAction(new Runnable() {
-
-            @Override
-            public void run() {
-                model.showSwitcher();
-            }
-
-        });
-    }
-
-    @Override
-    public final void hideSwitcher() {
-        enqueuePendingAction(new Runnable() {
-
-            @Override
-            public void run() {
-                model.hideSwitcher();
-            }
-
-        });
-    }
-
-    @Override
-    public final void toggleSwitcherVisibility() {
-        enqueuePendingAction(new Runnable() {
-
-            @Override
-            public void run() {
-                model.toggleSwitcherVisibility();
-            }
-
-        });
-    }
-
-    @Override
-    public final void setDecorator(@NonNull final TabSwitcherDecorator decorator) {
-        model.setDecorator(decorator);
-    }
-
-    @Override
-    public final TabSwitcherDecorator getDecorator() {
-        return model.getDecorator();
-    }
-
-    @NonNull
-    @Override
-    public final LogLevel getLogLevel() {
-        return model.getLogLevel();
-    }
-
-    @Override
-    public final void setLogLevel(@NonNull final LogLevel logLevel) {
-        model.setLogLevel(logLevel);
-    }
-
-    @Override
-    public final void setPadding(final int left, final int top, final int right, final int bottom) {
-        // The model might be null on old API levels, where the super constructor implicitly invokes
-        // the setPadding-method. We can simply ignore such method call and will set the correct
-        // padding later on
-        if (model != null) {
-            model.setPadding(left, top, right, bottom);
-        }
-    }
-
-    @Override
-    public final int getPaddingLeft() {
-        return model.getPaddingLeft();
-    }
-
-    @Override
-    public final int getPaddingTop() {
-        return model.getPaddingTop();
-    }
-
-    @Override
-    public final int getPaddingRight() {
-        return model.getPaddingRight();
-    }
-
-    @Override
-    public final int getPaddingBottom() {
-        return model.getPaddingBottom();
-    }
-
-    @Override
-    public final int getPaddingStart() {
-        return model.getPaddingStart();
-    }
-
-    @Override
-    public final int getPaddingEnd() {
-        return model.getPaddingEnd();
-    }
-
-    @Override
-    public final void applyPaddingToTabs(final boolean applyPaddingToTabs) {
-        model.applyPaddingToTabs(applyPaddingToTabs);
-    }
-
-    @Override
-    public final boolean isPaddingAppliedToTabs() {
-        return model.isPaddingAppliedToTabs();
-    }
-
-    @Nullable
-    @Override
-    public final Drawable getTabIcon() {
-        return model.getTabIcon();
-    }
-
-    @Override
-    public final void setTabIcon(@DrawableRes final int resourceId) {
-        model.setTabIcon(resourceId);
-    }
-
-    @Override
-    public final void setTabIcon(@Nullable final Bitmap icon) {
-        model.setTabIcon(icon);
-    }
-
-    @Override
-    public final ColorStateList getTabIconTintList() {
-        return model.getTabIconTintList();
-    }
-
-    @Override
-    public final void setTabIconTint(@ColorInt final int color) {
-        model.setTabIconTint(color);
-    }
-
-    @Override
-    public final void setTabIconTintList(@Nullable final ColorStateList tintList) {
-        model.setTabIconTintList(tintList);
-    }
-
-    @Override
-    public final PorterDuff.Mode getTabIconTintMode() {
-        return model.getTabIconTintMode();
-    }
-
-    @Override
-    public final void setTabIconTintMode(@Nullable final PorterDuff.Mode mode) {
-        model.setTabIconTintMode(mode);
-    }
-
-    @Nullable
-    @Override
-    public final ColorStateList getTabBackgroundColor() {
-        return model.getTabBackgroundColor();
-    }
-
-    @Override
-    public final void setTabBackgroundColor(@ColorInt final int color) {
-        model.setTabBackgroundColor(color);
-    }
-
-    @Override
-    public final void setTabBackgroundColor(@Nullable final ColorStateList colorStateList) {
-        model.setTabBackgroundColor(colorStateList);
-    }
-
-    @ColorInt
-    @Override
-    public final int getTabContentBackgroundColor() {
-        return model.getTabContentBackgroundColor();
-    }
-
-    @Override
-    public final void setTabContentBackgroundColor(@ColorInt final int color) {
-        model.setTabContentBackgroundColor(color);
-    }
-
-    @Nullable
-    @Override
-    public final ColorStateList getTabTitleTextColor() {
-        return model.getTabTitleTextColor();
-    }
-
-    @Override
-    public final void setTabTitleTextColor(@ColorInt final int color) {
-        model.setTabTitleTextColor(color);
-    }
-
-    @Override
-    public final void setTabTitleTextColor(@Nullable final ColorStateList colorStateList) {
-        model.setTabTitleTextColor(colorStateList);
-    }
-
-    @Nullable
-    @Override
-    public final Drawable getTabCloseButtonIcon() {
-        return model.getTabCloseButtonIcon();
-    }
-
-    @Override
-    public final int getTabProgressBarColor() {
-        return model.getTabProgressBarColor();
-    }
-
-    @Override
-    public final void setTabProgressBarColor(@ColorInt final int color) {
-        model.setTabProgressBarColor(color);
-    }
-
-    @Override
-    public final void setTabCloseButtonIcon(@DrawableRes final int resourceId) {
-        model.setTabCloseButtonIcon(resourceId);
-    }
-
-    @Override
-    public final void setTabCloseButtonIcon(@Nullable final Bitmap icon) {
-        model.setTabCloseButtonIcon(icon);
-    }
-
-    @Override
-    public final ColorStateList getTabCloseButtonIconTintList() {
-        return model.getTabCloseButtonIconTintList();
-    }
-
-    @Override
-    public final void setTabCloseButtonIconTint(@ColorInt final int color) {
-        model.setTabCloseButtonIconTint(color);
-    }
-
-    @Override
-    public final void setTabCloseButtonIconTintList(@Nullable final ColorStateList tintList) {
-        model.setTabCloseButtonIconTintList(tintList);
-    }
-
-    @Override
-    public final PorterDuff.Mode getTabCloseButtonIconTintMode() {
-        return model.getTabCloseButtonIconTintMode();
-    }
-
-    @Override
-    public final void setTabCloseButtonIconTintMode(@Nullable final PorterDuff.Mode mode) {
-        model.setTabCloseButtonIconTintMode(mode);
-    }
-
-    @Override
-    public final boolean isAddTabButtonShown() {
-        return model.isAddTabButtonShown();
-    }
-
-    @Override
-    public final void showAddTabButton(@Nullable final AddTabButtonListener listener) {
-        model.showAddTabButton(listener);
-    }
-
-    @Nullable
-    @Override
-    public final ColorStateList getAddTabButtonColor() {
-        return model.getAddTabButtonColor();
-    }
-
-    @Override
-    public final void setAddTabButtonColor(@ColorInt final int color) {
-        model.setAddTabButtonColor(color);
-    }
-
-    @Override
-    public final void setAddTabButtonColor(@Nullable final ColorStateList colorStateList) {
-        model.setAddTabButtonColor(colorStateList);
-    }
-
-    @Override
-    public final boolean areToolbarsShown() {
-        return model.areToolbarsShown();
-    }
-
-    @Override
-    public final void showToolbars(final boolean show) {
-        model.showToolbars(show);
-    }
-
-    @Nullable
-    @Override
-    public final CharSequence getToolbarTitle() {
-        Toolbar[] toolbars = getToolbars();
-        return toolbars != null ? toolbars[PRIMARY_TOOLBAR_INDEX].getTitle() :
-                model.getToolbarTitle();
-    }
-
-    @Override
-    public final void setToolbarTitle(@StringRes final int resourceId) {
-        model.setToolbarTitle(resourceId);
-    }
-
-    @Override
-    public final void setToolbarTitle(@Nullable final CharSequence title) {
-        model.setToolbarTitle(title);
-    }
-
-    @Nullable
-    @Override
-    public final Drawable getToolbarNavigationIcon() {
-        Toolbar[] toolbars = getToolbars();
-        return toolbars != null ? toolbars[PRIMARY_TOOLBAR_INDEX].getNavigationIcon() :
-                model.getToolbarNavigationIcon();
-    }
-
-    @Override
-    public final void setToolbarNavigationIcon(@Nullable final Drawable icon,
-                                               @Nullable final OnClickListener listener) {
-        model.setToolbarNavigationIcon(icon, listener);
-    }
-
-    @Override
-    public final void setToolbarNavigationIcon(@DrawableRes final int resourceId,
-                                               @Nullable final OnClickListener listener) {
-        model.setToolbarNavigationIcon(resourceId, listener);
-    }
-
-    @Override
-    public final ColorStateList getToolbarNavigationIconTintList() {
-        return model.getToolbarNavigationIconTintList();
-    }
-
-    @Override
-    public final void setToolbarNavigationIconTint(@ColorInt final int color) {
-        model.setToolbarNavigationIconTint(color);
-    }
-
-    @Override
-    public final void setToolbarNavigationIconTintList(@Nullable final ColorStateList tintList) {
-        model.setToolbarNavigationIconTintList(tintList);
-    }
-
-    @Override
-    public final PorterDuff.Mode getToolbarNavigationIconTintMode() {
-        return model.getToolbarNavigationIconTintMode();
-    }
-
-    @Override
-    public final void setToolbarNavigationIconTintMode(@Nullable final PorterDuff.Mode mode) {
-        model.setToolbarNavigationIconTintMode(mode);
-    }
-
-    @Override
-    public final void inflateToolbarMenu(@MenuRes final int resourceId,
-                                         @Nullable final OnMenuItemClickListener listener) {
-        model.inflateToolbarMenu(resourceId, listener);
-    }
-
-    @Override
-    public final long getTabPreviewFadeThreshold() {
-        return model.getTabPreviewFadeThreshold();
-    }
-
-    @Override
-    public final void setTabPreviewFadeThreshold(final long threshold) {
-        model.setTabPreviewFadeThreshold(threshold);
-    }
-
-    @Override
-    public final long getTabPreviewFadeDuration() {
-        return model.getTabPreviewFadeDuration();
-    }
-
-    @Override
-    public final void setTabPreviewFadeDuration(final long duration) {
-        model.setTabPreviewFadeDuration(duration);
-    }
-
-    @Nullable
-    @Override
-    public final View getEmptyView() {
-        return model.getEmptyView();
-    }
-
-    @Override
-    public void setEmptyView(@Nullable final View view) {
-        model.setEmptyView(view);
-    }
-
-    @Override
-    public final void setEmptyView(@Nullable final View view, final long animationDuration) {
-        model.setEmptyView(view, animationDuration);
-    }
-
-    @Override
-    public final void setEmptyView(@LayoutRes final int resourceId) {
-        model.setEmptyView(resourceId);
-    }
-
-    @Override
-    public final void setEmptyView(@LayoutRes final int resourceId, final long animationDuration) {
-        model.setEmptyView(resourceId);
-    }
-
-    @Override
-    public final boolean areSavedStatesClearedWhenRemovingTabs() {
-        return model.areSavedStatesClearedWhenRemovingTabs();
-    }
-
-    @Override
-    public final void clearSavedStatesWhenRemovingTabs(final boolean clear) {
-        model.clearSavedStatesWhenRemovingTabs(clear);
-    }
-
-    @Override
-    public final void addCloseTabListener(@NonNull final TabCloseListener listener) {
-        model.addCloseTabListener(listener);
-    }
-
-    @Override
-    public final void removeCloseTabListener(@NonNull final TabCloseListener listener) {
-        model.removeCloseTabListener(listener);
-    }
-
-    @Override
-    public final void addTabPreviewListener(@NonNull final TabPreviewListener listener) {
-        model.addTabPreviewListener(listener);
-    }
-
-    @Override
-    public final void removeTabPreviewListener(@NonNull final TabPreviewListener listener) {
-        model.removeTabPreviewListener(listener);
-    }
-
-    @Override
-    public final boolean isAnimationRunning() {
-        return layout != null && layout.isAnimationRunning();
-    }
-
-    @Nullable
-    @Override
-    public final ViewGroup getTabContainer() {
-        return layout != null ? layout.getTabContainer() : null;
-    }
-
-    @Override
-    public final Toolbar[] getToolbars() {
-        return layout != null ? layout.getToolbars() : null;
-    }
-
-    @Nullable
-    @Override
-    public final Menu getToolbarMenu() {
-        return layout != null ? layout.getToolbarMenu() : null;
-    }
-
-    @Override
-    public final boolean onTouchEvent(final MotionEvent event) {
-        return touchEventDispatcher.handleTouchEvent(event) || super.onTouchEvent(event);
-    }
-
-    @Override
-    public final Parcelable onSaveInstanceState() {
-        Parcelable superState = super.onSaveInstanceState();
-
-        if (layout != null && preserveState) {
-            TabSwitcherState savedState = new TabSwitcherState(superState);
-            savedState.layoutPolicy = layoutPolicy;
-            savedState.modelState = new Bundle();
-            Pair<Integer, Float> pair = layout.detachLayout(true);
-
-            if (pair != null) {
-                savedState.modelState
-                        .putInt(TabSwitcherModel.REFERENCE_TAB_INDEX_EXTRA, pair.first);
-                savedState.modelState
-                        .putFloat(TabSwitcherModel.REFERENCE_TAB_POSITION_EXTRA, pair.second);
-                model.setReferenceTabIndex(pair.first);
-                model.setReferenceTabPosition(pair.second);
-            } else {
-                model.setReferenceTabPosition(-1);
-                model.setReferenceTabIndex(-1);
-            }
-
-            model.removeListener(layout);
-            layout = null;
-            executePendingAction();
-            getViewTreeObserver().addOnGlobalLayoutListener(
-                    new LayoutListenerWrapper(this, createGlobalLayoutListener(true)));
-            model.saveInstanceState(savedState.modelState);
-            return savedState;
-        }
-
-        return superState;
-    }
-
-    @Override
-    public final void onRestoreInstanceState(final Parcelable state) {
-        if (state instanceof TabSwitcherState && preserveState) {
-            TabSwitcherState savedState = (TabSwitcherState) state;
-            this.layoutPolicy = savedState.layoutPolicy;
-            model.restoreInstanceState(savedState.modelState);
-            super.onRestoreInstanceState(savedState.getSuperState());
-        } else {
-            super.onRestoreInstanceState(state);
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/TabSwitcherDecorator.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/TabSwitcherDecorator.java
deleted file mode 100644
index d1a3a9d9..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/TabSwitcherDecorator.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.os.Parcelable;
-import android.util.SparseArray;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import de.mrapp.android.util.view.AbstractViewHolderAdapter;
-
-/**
- * An abstract base class for all decorators, which  are responsible for inflating views, which
- * should be used to visualize the tabs of a {@link TabSwitcher}.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public abstract class TabSwitcherDecorator extends AbstractViewHolderAdapter {
-
-    /**
-     * The name of the extra, which is used to store the state of a view hierarchy within a bundle.
-     */
-    private static final String VIEW_HIERARCHY_STATE_EXTRA =
-            TabSwitcherDecorator.class.getName() + "::ViewHierarchyState";
-
-    /**
-     * The method which is invoked, when a view, which is used to visualize a tab, should be
-     * inflated.
-     *
-     * @param inflater
-     *         The inflater, which should be used to inflate the view, as an instance of the class
-     *         {@link LayoutInflater}. The inflater may not be null
-     * @param parent
-     *         The parent view of the view, which should be inflated, as an instance of the class
-     *         {@link ViewGroup} or null, if no parent view is available
-     * @param viewType
-     *         The view type of the tab, which should be visualized, as an {@link Integer} value
-     * @return The view, which has been inflated, as an instance of the class {@link View}. The view
-     * may not be null
-     */
-    @NonNull
-    public abstract View onInflateView(@NonNull final LayoutInflater inflater,
-                                       @Nullable final ViewGroup parent, final int viewType);
-
-    /**
-     * The method which is invoked, when the view, which is used to visualize a tab, should be
-     * shown, respectively when it should be refreshed. The purpose of this method is to customize
-     * the appearance of the view, which is used to visualize the corresponding tab, depending on
-     * its state and whether the tab switcher is currently shown, or not.
-     *
-     * @param context
-     *         The context, the tab switcher belongs to, as an instance of the class {@link
-     *         Context}. The context may not be null
-     * @param tabSwitcher
-     *         The tab switcher, whose tabs are visualized by the decorator, as an instance of the
-     *         type {@link TabSwitcher}. The tab switcher may not be null
-     * @param view
-     *         The view, which is used to visualize the tab, as an instance of the class {@link
-     *         View}. The view may not be null
-     * @param tab
-     *         The tab, which should be visualized, as an instance of the class {@link Tab}. The tab
-     *         may not be null
-     * @param index
-     *         The index of the tab, which should be visualized, as an {@link Integer} value
-     * @param viewType
-     *         The view type of the tab, which should be visualized, as an {@link Integer} value
-     * @param savedInstanceState
-     *         The bundle, which has previously been used to save the state of the view as an
-     *         instance of the class {@link Bundle} or null, if no saved state is available
-     */
-    public abstract void onShowTab(@NonNull final Context context,
-                                   @NonNull final TabSwitcher tabSwitcher, @NonNull final View view,
-                                   @NonNull final Tab tab, final int index, final int viewType,
-                                   @Nullable final Bundle savedInstanceState);
-
-    /**
-     * The method, which is invoked, when the view, which is used to visualize a tab has been
-     * recycled. The purpose of this method is to reset the appearance of the view to the default
-     * state, as it might still display the content of tab for which it was previously used. This
-     * method is called prior to invoking the method {@link #onShowTab(Context, TabSwitcher, View,
-     * Tab, int, int, Bundle)}.
-     *
-     * @param context
-     *         The context, the tab switcher belongs to, as an instance of the class {@link
-     *         Context}. The context may not be null
-     * @param tabSwitcher
-     *         The tab switcher, whose tabs are visualized by the decorator, as an instance of the
-     *         type {@link TabSwitcher}. The tab switcher may not be null
-     * @param view
-     *         The view, which is used to visualize the tab, as an instance of the class {@link
-     *         View}. The view may not be null
-     * @param tab
-     *         The tab, which should be visualized, as an instance of the class {@link Tab}. The tab
-     *         may not be null
-     * @param index
-     *         The index of the tab, which should be visualized, as an {@link Integer} value
-     * @param viewType
-     *         The view type of the tab, which should be visualized, as an {@link Integer} value
-     * @param savedInstanceState
-     *         The bundle, which has previously been used to save the state of the view as an
-     *         instance of the class {@link Bundle} or null, if no saved state is available
-     */
-    public void onRecycleView(@NonNull final Context context,
-                              @NonNull final TabSwitcher tabSwitcher, @NonNull final View view,
-                              @NonNull final Tab tab, final int index, final int viewType,
-                              @Nullable final Bundle savedInstanceState) {
-
-    }
-
-    /**
-     * The method, which is invoked, when the view, which is used to visualize a tab, is removed.
-     * The purpose of this method is to save the current state of the tab in a bundle.
-     *
-     * @param view
-     *         The view, which is used to visualize the tab, as an instance of the class {@link
-     *         View}
-     * @param tab
-     *         The tab, whose state should be saved, as an instance of the class {@link Tab}. The
-     *         tab may not be null
-     * @param index
-     *         The index of the tab, whose state should be saved, as an {@link Integer} value
-     * @param viewType
-     *         The view type of the tab, whose state should be saved, as an {@link Integer} value
-     * @param outState
-     *         The bundle, the state of the tab should be saved to, as an instance of the class
-     *         {@link Bundle}. The bundle may not be null
-     */
-    public void onSaveInstanceState(@NonNull final View view, @NonNull final Tab tab,
-                                    final int index, final int viewType,
-                                    @NonNull final Bundle outState) {
-
-    }
-
-    /**
-     * Returns the view type, which corresponds to a specific tab. For each layout, which is
-     * inflated by the <code>onInflateView</code>-method, a distinct view type must be returned.
-     *
-     * @param tab
-     *         The tab, whose view type should be returned, as an instance of the class {@link Tab}.
-     *         The tab may not be null
-     * @param index
-     *         The index of the tab, whose view type should be returned, as an {@link Integer}
-     *         value
-     * @return The view type, which corresponds to the given tab, as an {@link Integer} value
-     */
-    public int getViewType(@NonNull final Tab tab, final int index) {
-        return 0;
-    }
-
-    /**
-     * Returns the number of view types, which are used by the decorator.
-     *
-     * @return The number of view types, which are used by the decorator, as an {@link Integer}
-     * value. The number of view types must correspond to the number of distinct values, which are
-     * returned by the <code>getViewType</code>-method
-     */
-    public int getViewTypeCount() {
-        return 1;
-    }
-
-    /**
-     * The method, which is invoked by a {@link TabSwitcher} to inflate the view, which should be
-     * used to visualize a specific tab.
-     *
-     * @param inflater
-     *         The inflater, which should be used to inflate the view, as an instance of the class
-     *         {@link LayoutInflater}. The inflater may not be null
-     * @param parent
-     *         The parent view of the view, which should be inflated, as an instance of the class
-     *         {@link ViewGroup} or null, if no parent view is available
-     * @param tab
-     *         The tab, which should be visualized, as an instance of the class {@link Tab}. The tab
-     *         may not be null
-     * @param index
-     *         The index of the tab, which should be visualized, as an {@link Integer} value
-     * @return The view, which has been inflated, as an instance of the class {@link View}. The view
-     * may not be null
-     */
-    @NonNull
-    public final View inflateView(@NonNull final LayoutInflater inflater,
-                                  @Nullable final ViewGroup parent, @NonNull final Tab tab,
-                                  final int index) {
-        int viewType = getViewType(tab, index);
-        return onInflateView(inflater, parent, viewType);
-    }
-
-    /**
-     * The method, which is invoked by a {@link TabSwitcher} to apply the decorator. It initializes
-     * the view holder pattern, which is provided by the decorator and then delegates the method
-     * call to the decorator's custom implementation of the method <code>onShowTab(...):void</code>.
-     *
-     * @param context
-     *         The context, the tab switcher belongs to, as an instance of the class {@link
-     *         Context}. The context may not be null
-     * @param tabSwitcher
-     *         The tab switcher, whose tabs are visualized by the decorator, as an instance of the
-     *         class {@link TabSwitcher}. The tab switcher may not be null
-     * @param view
-     *         The view, which is used to visualize the tab, as an instance of the class {@link
-     *         View}. The view may not be null
-     * @param tab
-     *         The tab, which should be visualized, as an instance of the class {@link Tab}. The tab
-     *         may not be null
-     * @param index
-     *         The index of the tab, which should be visualized, as an {@link Integer} value
-     * @param savedInstanceState
-     *         The bundle, which has previously been used to save the state of the view as an
-     *         instance of the class {@link Bundle} or null, if no saved state is available
-     * @param inflated
-     *         True, if the view has been inflated, false, if it has been reused
-     */
-    public final void applyDecorator(@NonNull final Context context,
-                                     @NonNull final TabSwitcher tabSwitcher,
-                                     @NonNull final View view, @NonNull final Tab tab,
-                                     final int index, @Nullable final Bundle savedInstanceState,
-                                     final boolean inflated) {
-        setCurrentParentView(view);
-        int viewType = getViewType(tab, index);
-
-        if (savedInstanceState != null) {
-            SparseArray<Parcelable> viewStates =
-                    savedInstanceState.getSparseParcelableArray(VIEW_HIERARCHY_STATE_EXTRA);
-
-            if (viewStates != null) {
-                view.restoreHierarchyState(viewStates);
-            }
-        }
-
-        if (!inflated) {
-            onRecycleView(context, tabSwitcher, view, tab, index, viewType, savedInstanceState);
-        }
-
-        onShowTab(context, tabSwitcher, view, tab, index, viewType, savedInstanceState);
-    }
-
-    /**
-     * The method, which is invoked by a {@link TabSwitcher} to save the current state of a tab. It
-     * initializes the view holder pattern, which is provided by the decorator and then delegates
-     * the method call to the decorator's custom implementation of the method
-     * <code>onSaveInstanceState(...):void</code>.
-     *
-     * @param view
-     *         The view, which is used to visualize the tab, as an instance of the class {@link
-     *         View}
-     * @param tab
-     *         The tab, whose state should be saved, as an instance of the class {@link Tab}. The
-     *         tab may not be null
-     * @param index
-     *         The index of the tab, whose state should be saved, as an {@link Integer} value
-     * @return The bundle, which has been used to save the state, as an instance of the class {@link
-     * Bundle}. The bundle may not be null
-     */
-    @NonNull
-    public final Bundle saveInstanceState(@NonNull final View view, @NonNull final Tab tab,
-                                          final int index) {
-        setCurrentParentView(view);
-        int viewType = getViewType(tab, index);
-        Bundle outState = new Bundle();
-        SparseArray<Parcelable> viewStates = new SparseArray<>();
-        view.saveHierarchyState(viewStates);
-        outState.putSparseParcelableArray(VIEW_HIERARCHY_STATE_EXTRA, viewStates);
-        onSaveInstanceState(view, tab, index, viewType, outState);
-        return outState;
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/TabSwitcherListener.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/TabSwitcherListener.java
deleted file mode 100644
index 80dd5102..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/TabSwitcherListener.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-/**
- * Defines the interface, a class, which should be notified about a tab switcher's events, must
- * implement.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public interface TabSwitcherListener {
-
-    /**
-     * The method, which is invoked, when the tab switcher has been shown.
-     *
-     * @param tabSwitcher
-     *         The observed tab switcher as an instance of the class {@link TabSwitcher}. The tab
-     *         switcher may not be null
-     */
-    void onSwitcherShown(@NonNull TabSwitcher tabSwitcher);
-
-    /**
-     * The method, which is invoked, when the tab switcher has been hidden.
-     *
-     * @param tabSwitcher
-     *         The observed tab switcher as an instance of the class {@link TabSwitcher}. The tab
-     *         switcher may not be null
-     */
-    void onSwitcherHidden(@NonNull TabSwitcher tabSwitcher);
-
-    /**
-     * The method, which is invoked, when the currently selected tab has been changed.
-     *
-     * @param tabSwitcher
-     *         The observed tab switcher as an instance of the class {@link TabSwitcher}. The tab
-     *         switcher may not be null
-     * @param selectedTabIndex
-     *         The index of the currently selected tab as an {@link Integer} value or -1, if the tab
-     *         switcher does not contain any tabs
-     * @param selectedTab
-     *         The currently selected tab as an instance of the class {@link Tab} or null, if the
-     *         tab switcher does not contain any tabs
-     */
-    void onSelectionChanged(@NonNull TabSwitcher tabSwitcher, int selectedTabIndex,
-                            @Nullable Tab selectedTab);
-
-    /**
-     * The method, which is invoked, when a tab has been added to the tab switcher.
-     *
-     * @param tabSwitcher
-     *         The observed tab switcher as an instance of the class {@link TabSwitcher}. The tab
-     *         switcher may not be null
-     * @param index
-     *         The index of the tab, which has been added, as an {@link Integer} value
-     * @param tab
-     *         The tab, which has been added, as an instance of the class {@link Tab}. The tab may
-     *         not be null
-     * @param animation
-     *         The animation, which has been used to add the tab, as an instance of the class {@link
-     *         Animation}. The animation may not be null
-     */
-    void onTabAdded(@NonNull TabSwitcher tabSwitcher, int index, @NonNull Tab tab,
-                    @NonNull Animation animation);
-
-    /**
-     * The method, which is invoked, when a tab has been removed from the tab switcher.
-     *
-     * @param tabSwitcher
-     *         The observed tab switcher as an instance of the class {@link TabSwitcher}. The tab
-     *         switcher may not be null
-     * @param index
-     *         The index of the tab, which has been removed, as an {@link Integer} value
-     * @param tab
-     *         The tab, which has been removed, as an instance of the class {@link Tab}. The tab may
-     *         not be null
-     * @param animation
-     *         The animation, which has been used to remove the tab, as an instance of the class
-     *         {@link Animation}. The animation may not be null
-     */
-    void onTabRemoved(@NonNull TabSwitcher tabSwitcher, int index, @NonNull Tab tab,
-                      @NonNull Animation animation);
-
-    /**
-     * The method, which is invoked, when all tabs have been removed from the tab switcher.
-     *
-     * @param tabSwitcher
-     *         The observed tab switcher as an instance of the class {@link TabSwitcher}. The tab
-     *         switcher may not be null
-     * @param tabs
-     *         An array, which contains the tabs, which have been removed, as an array of the type
-     *         {@link Tab} or an empty array, if no tabs have been removed
-     * @param animation
-     *         The animation, which has been used to remove the tabs, as an instance of the class
-     *         {@link Animation}. The animation may not be null
-     */
-    void onAllTabsRemoved(@NonNull TabSwitcher tabSwitcher, @NonNull Tab[] tabs,
-                          @NonNull Animation animation);
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/drawable/TabSwitcherDrawable.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/drawable/TabSwitcherDrawable.java
deleted file mode 100644
index b7bc37b9..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/drawable/TabSwitcherDrawable.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.drawable;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.ColorFilter;
-import android.graphics.Paint;
-import android.graphics.Paint.Align;
-import android.graphics.PixelFormat;
-import android.graphics.PorterDuff;
-import android.graphics.Rect;
-import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import de.mrapp.android.tabswitcher.Animation;
-import de.mrapp.android.tabswitcher.R;
-import de.mrapp.android.tabswitcher.Tab;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.TabSwitcherListener;
-import de.mrapp.android.util.ThemeUtil;
-import de.mrapp.util.Condition;
-
-/**
- * A drawable, which allows to display the number of tabs, which are currently contained by a {@link
- * TabSwitcher}. It must be registered at a {@link TabSwitcher} instance in order to keep the
- * displayed label up to date. It therefore implements the interface {@link TabSwitcherListener}.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public class TabSwitcherDrawable extends Drawable implements TabSwitcherListener {
-
-    /**
-     * The size of the drawable in pixels.
-     */
-    private final int size;
-
-    /**
-     * The default text size of the displayed label in pixels.
-     */
-    private final int textSizeNormal;
-
-    /**
-     * The text size of the displayed label, which is used when displaying a value greater than 99,
-     * in pixels.
-     */
-    private final int textSizeSmall;
-
-    /**
-     * The drawable, which is shown as the background.
-     */
-    private final Drawable background;
-
-    /**
-     * The paint, which is used to draw the drawable's label.
-     */
-    private final Paint paint;
-
-    /**
-     * The currently displayed label.
-     */
-    private String label;
-
-    /**
-     * Creates a new drawable, which allows to display the number of tabs, which are currently
-     * contained by a {@link TabSwitcher}.
-     *
-     * @param context
-     *         The context, which should be used by the drawable, as an instance of the class {@link
-     *         Context}. The context may not be null
-     */
-    public TabSwitcherDrawable(@NonNull final Context context) {
-        Condition.INSTANCE.ensureNotNull(context, "The context may not be null");
-        Resources resources = context.getResources();
-        size = resources.getDimensionPixelSize(R.dimen.tab_switcher_drawable_size);
-        textSizeNormal =
-                resources.getDimensionPixelSize(R.dimen.tab_switcher_drawable_font_size_normal);
-        textSizeSmall =
-                resources.getDimensionPixelSize(R.dimen.tab_switcher_drawable_font_size_small);
-        background = ContextCompat.getDrawable(context, R.drawable.tab_switcher_drawable_background)
-                .mutate();
-        paint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        paint.setColor(Color.WHITE);
-        paint.setTextAlign(Align.CENTER);
-        paint.setTextSize(textSizeNormal);
-        paint.setTypeface(Typeface.create(Typeface.SANS_SERIF, Typeface.BOLD));
-        label = Integer.toString(0);
-        int tint = ThemeUtil.getColor(context, android.R.attr.textColorPrimary);
-        setColorFilter(tint, PorterDuff.Mode.MULTIPLY);
-    }
-
-    /**
-     * Updates the drawable to display a specific value.
-     *
-     * @param count
-     *         The value, which should be displayed, as an {@link Integer} value. The value must be
-     *         at least 0
-     */
-    public final void setCount(final int count) {
-        Condition.INSTANCE.ensureAtLeast(count, 0, "The count must be at least 0");
-        label = Integer.toString(count);
-
-        if (label.length() > 2) {
-            label = "99+";
-            paint.setTextSize(textSizeSmall);
-        } else {
-            paint.setTextSize(textSizeNormal);
-        }
-
-        invalidateSelf();
-    }
-
-    @Override
-    public final void draw(@NonNull final Canvas canvas) {
-        Rect bounds = getBounds();
-        int width = bounds.right;
-        int height = bounds.bottom;
-        int intrinsicWidth = background.getIntrinsicWidth();
-        int intrinsicHeight = background.getIntrinsicHeight();
-        int left = (width / 2) - (intrinsicWidth / 2);
-        int top = (height / 2) - (intrinsicHeight / 2);
-        background.setBounds(left, top, left + intrinsicWidth, top + intrinsicHeight);
-        background.draw(canvas);
-        float x = width / 2f;
-        float y = (height / 2f) - ((paint.descent() + paint.ascent()) / 2f);
-        canvas.drawText(label, x, y, paint);
-    }
-
-    @Override
-    public final int getIntrinsicWidth() {
-        return size;
-    }
-
-    @Override
-    public final int getIntrinsicHeight() {
-        return size;
-    }
-
-    @Override
-    public final void setAlpha(final int alpha) {
-        background.setAlpha(alpha);
-        paint.setAlpha(alpha);
-    }
-
-    @Override
-    public final void setColorFilter(@Nullable final ColorFilter colorFilter) {
-        background.setColorFilter(colorFilter);
-        paint.setColorFilter(colorFilter);
-    }
-
-    @Override
-    public final int getOpacity() {
-        return PixelFormat.TRANSLUCENT;
-    }
-
-    @Override
-    public final void onSwitcherShown(@NonNull final TabSwitcher tabSwitcher) {
-
-    }
-
-    @Override
-    public final void onSwitcherHidden(@NonNull final TabSwitcher tabSwitcher) {
-
-    }
-
-    @Override
-    public final void onSelectionChanged(@NonNull final TabSwitcher tabSwitcher,
-                                         final int selectedTabIndex,
-                                         @Nullable final Tab selectedTab) {
-
-    }
-
-    @Override
-    public final void onTabAdded(@NonNull final TabSwitcher tabSwitcher, final int index,
-                                 @NonNull final Tab tab, @NonNull final Animation animation) {
-        setCount(tabSwitcher.getCount());
-    }
-
-    @Override
-    public final void onTabRemoved(@NonNull final TabSwitcher tabSwitcher, final int index,
-                                   @NonNull final Tab tab, @NonNull final Animation animation) {
-        setCount(tabSwitcher.getCount());
-    }
-
-    @Override
-    public final void onAllTabsRemoved(@NonNull final TabSwitcher tabSwitcher,
-                                       @NonNull final Tab[] tab,
-                                       @NonNull final Animation animation) {
-        setCount(tabSwitcher.getCount());
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/AbstractDragGestureEventHandler.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/AbstractDragGestureEventHandler.java
deleted file mode 100644
index 2bcabca8..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/AbstractDragGestureEventHandler.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.gesture;
-
-import android.graphics.RectF;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-
-/**
- * An abstract base class for all event handlers, which allow to handle drag gestures.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public abstract class AbstractDragGestureEventHandler extends AbstractTouchEventHandler {
-
-    /**
-     * The bounds of the onscreen area, the handler takes into consideration for handling
-     * touch events.
-     */
-    private final RectF touchableArea;
-
-    /**
-     * Creates a new handler, which can be managed by a {@link TouchEventDispatcher} in order to
-     * dispatch touch events to it.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, the event handler belongs to, as an instance of the class {@link
-     *         TabSwitcher}. The tab switcher may not be null
-     * @param dragThreshold
-     *         The threshold of the drag helper, which is used to recognize drag gestures, in pixels
-     *         as an {@link Integer} value The threshold must be at least 0
-     * @param touchableArea
-     *         The bounds of the onscreen area, the handler should take into consideration for
-     *         handling touch events, as an instance of the class {@link RectF} or null, if the are
-     *         should not be restricted
-     */
-    public AbstractDragGestureEventHandler(@NonNull final TabSwitcher tabSwitcher,
-                                           final int dragThreshold,
-                                           @Nullable final RectF touchableArea) {
-        super(MAX_PRIORITY, tabSwitcher, dragThreshold);
-        this.touchableArea = touchableArea;
-    }
-
-    @Nullable
-    @Override
-    public final RectF getTouchableArea() {
-        return touchableArea;
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/AbstractTouchEventHandler.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/AbstractTouchEventHandler.java
deleted file mode 100644
index e999baf8..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/AbstractTouchEventHandler.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.gesture;
-
-import android.graphics.RectF;
-import android.view.MotionEvent;
-import android.view.VelocityTracker;
-
-import java.util.Comparator;
-
-import androidx.annotation.CallSuper;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.util.gesture.DragHelper;
-import de.mrapp.util.Condition;
-
-/**
- * An abstract base class for all event handlers, which can be managed by a {@link
- * TouchEventDispatcher} in order to dispatch touch events to them.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public abstract class AbstractTouchEventHandler implements Comparator<AbstractTouchEventHandler> {
-
-    /**
-     * The maximum priority of an event handler.
-     */
-    protected static final int MAX_PRIORITY = Integer.MAX_VALUE;
-
-    /**
-     * The minimum priority of an event handler.
-     */
-    protected static final int MIN_PRIORITY = Integer.MIN_VALUE;
-
-    /**
-     * The priority of the event handler.
-     */
-    private final int priority;
-
-    /**
-     * The tab switcher, the event handler belongs to.
-     */
-    private final TabSwitcher tabSwitcher;
-
-    /**
-     * The drag helper, which is used by the touch handler to recognize drag gestures.
-     */
-    private final DragHelper dragHelper;
-
-    /**
-     * The current threshold of the drag helper, which is used to recognize drag gestures.
-     */
-    private int dragThreshold;
-
-    /**
-     * The velocity tracker, which is used by the touch handler to measure the velocity of drag
-     * gestures.
-     */
-    private VelocityTracker velocityTracker;
-
-    /**
-     * The id of the pointer, which has been used to start the current drag gesture.
-     */
-    private int pointerId;
-
-    /**
-     * Handles, when a drag gesture has been started.
-     *
-     * @param event
-     *         The motion event, which started the drag gesture, as an instance of the class {@link
-     *         MotionEvent}. The motion event may not be null
-     */
-    private void handleDown(@NonNull final MotionEvent event) {
-        pointerId = event.getPointerId(0);
-
-        if (velocityTracker == null) {
-            velocityTracker = VelocityTracker.obtain();
-        } else {
-            velocityTracker.clear();
-        }
-
-        velocityTracker.addMovement(event);
-        onDown(event);
-    }
-
-    /**
-     * Returns the tab switcher, the event handler belongs to.
-     *
-     * @return The tab switcher, the event handler belongs to, as an instance of the class {@link
-     * TabSwitcher}. The tab switcher may not be null
-     */
-    @NonNull
-    protected final TabSwitcher getTabSwitcher() {
-        return tabSwitcher;
-    }
-
-    /**
-     * The velocity tracker, which is used by the touch handler to measure the velocity of drag
-     * gestures.
-     *
-     * @return The velocity tracker, which is used by the touch handler to measure the velocity of
-     * drag gestures as an instance of the class {@link VelocityTracker} or null, if the velocity
-     * tracker has not be initialized yet
-     */
-    @Nullable
-    protected final VelocityTracker getVelocityTracker() {
-        return velocityTracker;
-    }
-
-    /**
-     * Resets the event handler once a drag gesture has been ended.
-     */
-    protected void reset() {
-        if (this.velocityTracker != null) {
-            this.velocityTracker.recycle();
-            this.velocityTracker = null;
-        }
-
-        this.pointerId = -1;
-        this.dragHelper.reset(dragThreshold);
-    }
-
-    /**
-     * Returns, whether performing a drag gesture is currently allowed, or not.
-     *
-     * @return True, if performing a drag gesture is currently allowed, false otherwise
-     */
-    protected abstract boolean isDraggingAllowed();
-
-    /**
-     * The method, which is invoked on implementing subclasses, when a touch event is about to be
-     * handled.
-     */
-    protected abstract void onTouchEvent();
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to handle, when a drag
-     * gesture has been started.
-     *
-     * @param event
-     *         The touch event, which started the drag gesture, as an instance of the class {@link
-     *         MotionEvent}. The touch event may not be null
-     */
-    protected abstract void onDown(@NonNull final MotionEvent event);
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to handle, when a drag
-     * gesture is performed.
-     *
-     * @param event
-     *         The last touch event of the drag gesture as an instance of the class {@link
-     *         MotionEvent}. The touch event may not be null
-     */
-    protected abstract void onDrag(@NonNull final MotionEvent event);
-
-    /**
-     * Handles, when a drag gesture has been ended.
-     *
-     * @param event
-     *         The touch event, which ended the drag gesture, as an instance of the class {@link
-     *         MotionEvent} or null, if no fling animation should be triggered
-     */
-    protected abstract void onUp(@Nullable final MotionEvent event);
-
-    /**
-     * Creates a new handler, which can be managed by a {@link TouchEventDispatcher} in order to
-     * dispatch touch events to it.
-     *
-     * @param priority
-     *         The priority of the handler as an {@link Integer} value. The priority must be at
-     *         least {@link AbstractTouchEventHandler#MIN_PRIORITY} and at maximum {@link
-     *         AbstractTouchEventHandler#MAX_PRIORITY}
-     * @param tabSwitcher
-     *         The tab switcher, the event handler belongs to, as an instance of the class {@link
-     *         TabSwitcher}. The tab switcher may not be null
-     * @param dragThreshold
-     *         The threshold of the drag helper, which is used to recognize drag gestures, in pixels
-     *         as an {@link Integer} value The threshold must be at least 0
-     */
-    public AbstractTouchEventHandler(final int priority, @NonNull final TabSwitcher tabSwitcher,
-                                     final int dragThreshold) {
-        Condition.INSTANCE.ensureAtLeast(priority, MIN_PRIORITY,
-                "The priority must be at least" + MIN_PRIORITY);
-        Condition.INSTANCE.ensureAtMaximum(priority, MAX_PRIORITY,
-                "The priority must be at maximum " + MAX_PRIORITY);
-        Condition.INSTANCE.ensureNotNull(tabSwitcher, "The tab switcher may not be null");
-        Condition.INSTANCE.ensureAtLeast(dragThreshold, 0, "The drag threshold must be at least 0");
-        this.priority = priority;
-        this.tabSwitcher = tabSwitcher;
-        this.dragHelper = new DragHelper(0);
-        this.dragThreshold = dragThreshold;
-        reset();
-    }
-
-    /**
-     * Returns, whether the event handler is reset, or not.
-     *
-     * @return True, if the event handler is reset, false otherwise
-     */
-    public final boolean isReset() {
-        return pointerId == -1;
-    }
-
-    /**
-     * Returns, whether a drag gesture is currently handled by the event handler, or not. This
-     * method may be overridden by subclasses, if multiple drag helpers are used.
-     *
-     * @return True, if a drag gesture is currently handled by the event handler, false otherwise
-     */
-    @CallSuper
-    public boolean isDragging() {
-        return dragHelper.hasThresholdBeenReached();
-    }
-
-    /**
-     * Returns the priority of the event handler. Events are first dispatched to handlers with a
-     * higher priority.
-     *
-     * @return The priority of the event handler as an {@link Integer} value
-     */
-    public final int getPriority() {
-        return priority;
-    }
-
-    /**
-     * Returns the bounds of the onscreen area, the handler takes into consideration for handling
-     * touch events. Touch events that occur outside of the area are clipped. By default, the area
-     * is not restricted. Subclasses may override this method in order to restrict the area.
-     *
-     * @return The bounds of the onscreen area, the handler takes into consideration for handling
-     * touch events, as an instance of the class {@link RectF} or null, if the area is not
-     * restricted
-     */
-    @Nullable
-    public RectF getTouchableArea() {
-        return null;
-    }
-
-    /**
-     * Returns, whether a specific touch event occurred inside the touchable area of the event
-     * handler.
-     *
-     * @param event
-     *         The touch event, which should be checked, as an instance of the class {@link
-     *         MotionEvent}. The touch event may not be null
-     * @return True, if the given touch event occurred inside the touchable area, false otherwise
-     */
-    public final boolean isInsideTouchableArea(@NonNull final MotionEvent event) {
-        return getTouchableArea() == null || (event.getX() >= getTouchableArea().left &&
-                event.getX() <= getTouchableArea().right &&
-                event.getY() >= getTouchableArea().top &&
-                event.getY() <= getTouchableArea().bottom);
-    }
-
-    /**
-     * Returns the drag helper, which is used by the event handler to recognize drag gestures.
-     *
-     * @return The drag helper, which is used by the event handler to recognize drag gestures, as an
-     * instance of the class DragHelper. The drag helper may not be null
-     */
-    @NonNull
-    public final DragHelper getDragHelper() {
-        return dragHelper;
-    }
-
-    /**
-     * Sets the id of the pointer, which has been used to start the current drag gesture.
-     *
-     * @param pointerId
-     *         The id, which should be set, as an {@link Integer} value or -1, if no drag gesture is
-     *         currently started
-     */
-    public final void setPointerId(final int pointerId) {
-        this.pointerId = pointerId;
-    }
-
-    /**
-     * Handles a specific touch event. The event is only handled, if it occurred inside the
-     * touchable area.
-     *
-     * @param event
-     *         The event, which should be handled, as an instance of the class {@link MotionEvent}.
-     *         The event may not be null
-     * @return True, if the event has been handled, false otherwise
-     */
-    public final boolean handleTouchEvent(@NonNull final MotionEvent event) {
-        Condition.INSTANCE.ensureNotNull(event, "The event may not be null");
-
-        if (!tabSwitcher.isAnimationRunning() && isDraggingAllowed()) {
-            onTouchEvent();
-
-            switch (event.getAction()) {
-                case MotionEvent.ACTION_DOWN:
-                    handleDown(event);
-                    return true;
-                case MotionEvent.ACTION_MOVE:
-                    if (event.getPointerId(0) == pointerId) {
-                        if (velocityTracker == null) {
-                            velocityTracker = VelocityTracker.obtain();
-                        }
-
-                        velocityTracker.addMovement(event);
-                        onDrag(event);
-                    } else {
-                        onUp(null);
-                        handleDown(event);
-                    }
-
-                    return true;
-                case MotionEvent.ACTION_UP:
-                    if (event.getPointerId(0) == pointerId) {
-                        onUp(event);
-                    }
-
-                    return true;
-                default:
-                    break;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public final int compare(final AbstractTouchEventHandler o1,
-                             final AbstractTouchEventHandler o2) {
-        int priority1 = o1.getPriority();
-        int priority2 = o2.getPriority();
-        return priority1 > priority2 ? 1 : (priority1 < priority2 ? -1 : 0);
-    }
-
-    @Override
-    public final int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + getClass().hashCode();
-        return result;
-    }
-
-    @Override
-    public final boolean equals(final Object obj) {
-        return obj != null && obj.getClass() == getClass();
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/DragGestureEventHandlerFactory.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/DragGestureEventHandlerFactory.java
deleted file mode 100644
index f6c81ab0..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/DragGestureEventHandlerFactory.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.gesture;
-
-import androidx.annotation.NonNull;
-import de.mrapp.android.tabswitcher.DragGesture;
-import de.mrapp.android.tabswitcher.PullDownGesture;
-import de.mrapp.android.tabswitcher.R;
-import de.mrapp.android.tabswitcher.SwipeGesture;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.util.Condition;
-
-/**
- * A factory, which allows to create instances of the class {@link AbstractDragGestureEventHandler}.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public class DragGestureEventHandlerFactory {
-
-    /**
-     * The tab switcher, the event handler are created for.
-     */
-    private final TabSwitcher tabSwitcher;
-
-    /**
-     * Creates a new factory, which allows to create instances of the class {@link
-     * AbstractDragGestureEventHandler}.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, the event handler should be created for, as an instance of the
-     *         class {@link TabSwitcher}. The tab switcher may not be null
-     */
-    public DragGestureEventHandlerFactory(@NonNull final TabSwitcher tabSwitcher) {
-        Condition.INSTANCE.ensureNotNull(tabSwitcher, "The tab switcher may not be null");
-        this.tabSwitcher = tabSwitcher;
-    }
-
-    /**
-     * Creates and returns the event handler, which corresponds to a specific drag gesture.
-     *
-     * @param dragGesture
-     *         The drag gesture, the event handler should be created from, as an instance of the
-     *         class {@link DragGesture}. The drag gesture may not be null
-     * @return The event handler, which has been created, as an instance of the class {@link
-     * AbstractTouchEventHandler}. The event handler may not be null
-     */
-    @NonNull
-    public final AbstractTouchEventHandler fromGesture(@NonNull final DragGesture dragGesture) {
-        Condition.INSTANCE.ensureNotNull(dragGesture, "The drag gesture may not be null");
-
-        if (dragGesture instanceof SwipeGesture) {
-            int dragThreshold = dragGesture.getThreshold() != -1 ? dragGesture.getThreshold() :
-                    tabSwitcher.getResources()
-                            .getDimensionPixelSize(R.dimen.swipe_gesture_threshold);
-            return new SwipeGestureEventHandler(tabSwitcher, dragThreshold,
-                    dragGesture.getTouchableArea(),
-                    ((SwipeGesture) dragGesture).getAnimationDuration());
-        } else if (dragGesture instanceof PullDownGesture) {
-            int dragThreshold = dragGesture.getThreshold() != -1 ? dragGesture.getThreshold() :
-                    tabSwitcher.getResources()
-                            .getDimensionPixelSize(R.dimen.pull_down_gesture_threshold);
-            return new PullDownGestureEventHandler(tabSwitcher, dragThreshold,
-                    dragGesture.getTouchableArea());
-        }
-
-        throw new IllegalArgumentException(
-                "Unsupported drag gesture: " + dragGesture.getClass().getSimpleName());
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/PullDownGestureEventHandler.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/PullDownGestureEventHandler.java
deleted file mode 100644
index daa363d0..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/PullDownGestureEventHandler.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.gesture;
-
-import android.graphics.RectF;
-import android.view.MotionEvent;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import de.mrapp.android.tabswitcher.Layout;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-
-/**
- * An event handler, which allows to handle pull down gestures, which can be used to show the tab
- * switcher by pulling down the currently selected tab, when using the smartphone layout.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public class PullDownGestureEventHandler extends AbstractDragGestureEventHandler {
-
-    /**
-     * Defines the interface, a class, which should be notified about the events of a {@link
-     * PullDownGestureEventHandler} , must implement.
-     */
-    public interface Callback {
-
-        /**
-         * The method, which is notified, when the currently selected tab has been pulled down.
-         */
-        void onPulledDown();
-
-    }
-
-    /**
-     * The previous drag position.
-     */
-    private float previousDragPosition;
-
-    /**
-     * The callback, which is notified about the event handler's events.
-     */
-    private Callback callback;
-
-    /**
-     * Notifies the callback, that the currently selected tab has been pulled down.
-     */
-    private void notifyOnPulledDown() {
-        if (callback != null) {
-            callback.onPulledDown();
-        }
-    }
-
-    /**
-     * Creates a new event handler, which allows to handle pull down gestures, which can be used to
-     * show the tab switcher by pulling down the currently selected tab, when using the smartphone
-     * layout.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, the event handler belongs to, as an instance of the class {@link
-     *         TabSwitcher}. The tab switcher may not be null
-     * @param dragThreshold
-     *         The threshold of the drag helper, which is used to recognize drag gestures, in pixels
-     *         as an {@link Integer} value The threshold must be at least 0
-     * @param touchableArea
-     *         The bounds of the onscreen area, the handler should take into consideration for
-     *         handling touch events, as an instance of the class {@link RectF} or null, if the are
-     */
-    public PullDownGestureEventHandler(@NonNull final TabSwitcher tabSwitcher,
-                                       final int dragThreshold,
-                                       @Nullable final RectF touchableArea) {
-        super(tabSwitcher, dragThreshold, touchableArea);
-        this.previousDragPosition = -1;
-        this.callback = null;
-    }
-
-    /**
-     * Sets the callback, which should be notified about the event handler's events.
-     *
-     * @param callback
-     *         The callback, which should be set, as an instance of the type {@link Callback} or
-     *         null, if no callback should be notified
-     */
-    public final void setCallback(@Nullable final Callback callback) {
-        this.callback = callback;
-    }
-
-    @Override
-    protected final boolean isDraggingAllowed() {
-        return getTabSwitcher().getLayout() != Layout.TABLET &&
-                !getTabSwitcher().isSwitcherShown() && getTabSwitcher().getSelectedTab() != null;
-    }
-
-    @Override
-    protected final void onTouchEvent() {
-
-    }
-
-    @Override
-    protected final void onDown(@NonNull final MotionEvent event) {
-
-    }
-
-    @Override
-    protected final void onDrag(@NonNull final MotionEvent event) {
-        float dragPosition = event.getY();
-
-        if (dragPosition > previousDragPosition) {
-            previousDragPosition = dragPosition;
-            getDragHelper().update(dragPosition);
-
-            if (getDragHelper().hasThresholdBeenReached()) {
-                onUp(null);
-                notifyOnPulledDown();
-            }
-        } else {
-            getDragHelper().reset();
-            previousDragPosition = -1;
-        }
-    }
-
-    @Override
-    protected final void onUp(@Nullable final MotionEvent event) {
-        previousDragPosition = -1;
-        reset();
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/SwipeGestureEventHandler.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/SwipeGestureEventHandler.java
deleted file mode 100644
index cb5f2edf..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/SwipeGestureEventHandler.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.gesture;
-
-import android.content.res.Resources;
-import android.graphics.RectF;
-import android.view.MotionEvent;
-import android.view.ViewConfiguration;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import de.mrapp.android.tabswitcher.Layout;
-import de.mrapp.android.tabswitcher.R;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-
-/**
- * An event handler, which allows to handle swipe gestures, which can be used to switch between
- * tabs.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public class SwipeGestureEventHandler extends AbstractDragGestureEventHandler {
-
-    /**
-     * Defines the interface, a class, which should be notified about the events of a {@link
-     * SwipeGestureEventHandler}, must implement.
-     */
-    public interface Callback {
-
-        /**
-         * The method, which is invoked, when switching between neighboring tabs.
-         *
-         * @param selectedTabIndex
-         *         The index of the currently selected tab as an {@link Integer} value
-         * @param distance
-         *         The distance, the currently selected tab is swiped by, in pixels as a {@link
-         *         Float} value
-         */
-        void onSwitchingBetweenTabs(int selectedTabIndex, float distance);
-
-        /**
-         * The method, which is invoked, when switching between neighboring tabs ended.
-         *
-         * @param selectedTabIndex
-         *         The index of the tab, which should become selected, as an {@link Integer} value
-         * @param previousSelectedTabIndex
-         *         The index of the previously selected tab as an {@link Integer} value
-         * @param selectionChanged
-         *         True, if the selection has changed, false otherwise
-         * @param velocity
-         *         The velocity of the swipe gesture in pixels per second as a {@link Float} value
-         * @param animationDuration
-         *         The duration of the swipe animation in milliseconds as a {@link Long} value
-         */
-        void onSwitchingBetweenTabsEnded(int selectedTabIndex, int previousSelectedTabIndex,
-                                         boolean selectionChanged, float velocity,
-                                         long animationDuration);
-
-    }
-
-    /**
-     * The velocity, which may be reached by a drag gesture at maximum to start a fling animation.
-     */
-    private final float maxFlingVelocity;
-
-    /**
-     * The velocity, which must be reached by a drag gesture in order to start a swipe animation.
-     */
-    private final float minSwipeVelocity;
-
-    /**
-     * The duration of the swipe animation in milliseconds.
-     */
-    private final long swipeAnimationDuration;
-
-    /**
-     * The distance between two neighboring tabs when being swiped in pixels.
-     */
-    private final int swipedTabDistance;
-
-    /**
-     * The index of the currently selected tab.
-     */
-    private int selectedTabIndex;
-
-    /**
-     * The callback, which is notified about the event handler's events.
-     */
-    private Callback callback;
-
-    /**
-     * Returns, whether the threshold of a swiped tab item, which causes the previous or next tab to
-     * be selected, has been reached, or not.
-     *
-     * @return True, if the threshold has been reached, false otherwise
-     */
-    private boolean isSwipeThresholdReached() {
-        return Math.abs(getDragHelper().getDragDistance()) > 4 * swipedTabDistance;
-    }
-
-    /**
-     * Notifies the callback about a swipe gesture, which is used to switch between neighboring
-     * tabs.
-     *
-     * @param selectedTabIndex
-     *         The index of the currently selected tab as an {@link Integer} value
-     * @param distance
-     *         The distance, the currently selected tab is swiped by, in pixels as a {@link Float}
-     *         value
-     */
-    private void notifyOnSwitchingBetweenTabs(final int selectedTabIndex, final float distance) {
-        if (callback != null) {
-            callback.onSwitchingBetweenTabs(selectedTabIndex, distance);
-        }
-    }
-
-    /**
-     * Notifies the callback, that a swipe gesture, which was used to switch between neighboring
-     * tabs, has ended.
-     *
-     * @param selectedTabIndex
-     *         The index of the tab, which should become selected, as an {@link Integer} value
-     * @param previousSelectedTabIndex
-     *         The index of the previously selected tab as an {@link Integer} value
-     * @param selectionChanged
-     *         True, if the selection has changed, false otherwise
-     * @param velocity
-     *         The velocity of the swipe gesture in pixels per second as a {@link Float} value
-     */
-    private void notifyOnSwitchingBetweenTabsEnded(final int selectedTabIndex,
-                                                   final int previousSelectedTabIndex,
-                                                   final boolean selectionChanged,
-                                                   final float velocity) {
-        if (callback != null) {
-            callback.onSwitchingBetweenTabsEnded(selectedTabIndex, previousSelectedTabIndex,
-                    selectionChanged, velocity, swipeAnimationDuration);
-        }
-    }
-
-    /**
-     * Creates a new event handler, which allows to handle swipe gestures, which can be used to
-     * switch between tabs.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, the event handler belongs to, as an instance of the class {@link
-     *         TabSwitcher}. The tab switcher may not be null
-     * @param dragThreshold
-     *         The drag threshold in pixels as an {@link Integer} value. The drag threshold must be
-     *         at least 0
-     * @param touchableArea
-     *         The bounds of the onscreen area, the handler should take into consideration for
-     *         handling touch events, as an instance of the class {@link RectF} or null, if the are
-     *         should not be restricted
-     * @param animationDuration
-     *         The duration of the swipe animation in milliseconds as a {@link Long} value or -1, if
-     *         the default duration should be used
-     */
-    public SwipeGestureEventHandler(@NonNull final TabSwitcher tabSwitcher, final int dragThreshold,
-                                    @Nullable final RectF touchableArea,
-                                    final long animationDuration) {
-        super(tabSwitcher, dragThreshold, touchableArea);
-        ViewConfiguration configuration = ViewConfiguration.get(tabSwitcher.getContext());
-        this.maxFlingVelocity = configuration.getScaledMaximumFlingVelocity();
-        Resources resources = tabSwitcher.getResources();
-        this.minSwipeVelocity = resources.getDimensionPixelSize(R.dimen.min_swipe_velocity);
-        this.swipeAnimationDuration = animationDuration != -1 ? animationDuration :
-                resources.getInteger(R.integer.swipe_animation_duration);
-        this.swipedTabDistance = resources.getDimensionPixelSize(R.dimen.swiped_tab_distance);
-        this.callback = null;
-        this.selectedTabIndex = -1;
-    }
-
-    /**
-     * Sets the callback, which should be notified about the event handler's events.
-     *
-     * @param callback
-     *         The callback, which should be set, as an instance of the type {@link Callback} or
-     *         null, if no callback should be notified
-     */
-    public final void setCallback(@Nullable final Callback callback) {
-        this.callback = callback;
-    }
-
-    @Override
-    protected final boolean isDraggingAllowed() {
-        return (getTabSwitcher().getLayout() == Layout.TABLET ||
-                !getTabSwitcher().isSwitcherShown()) && getTabSwitcher().getSelectedTab() != null;
-    }
-
-    @Override
-    protected final void onTouchEvent() {
-
-    }
-
-    @Override
-    protected final void onDown(@NonNull final MotionEvent event) {
-
-    }
-
-    @Override
-    protected final void onDrag(@NonNull final MotionEvent event) {
-        getDragHelper().update(event.getX());
-
-        if (getDragHelper().hasThresholdBeenReached()) {
-            if (selectedTabIndex == -1) {
-                selectedTabIndex = getTabSwitcher().getSelectedTabIndex();
-            }
-
-            notifyOnSwitchingBetweenTabs(selectedTabIndex, getDragHelper().getDragDistance());
-        }
-    }
-
-    @Override
-    protected final void onUp(@Nullable final MotionEvent event) {
-        if (selectedTabIndex != -1) {
-            float swipeVelocity = 0;
-
-            if (event != null && getVelocityTracker() != null) {
-                int pointerId = event.getPointerId(0);
-                getVelocityTracker().computeCurrentVelocity(1000, maxFlingVelocity);
-                swipeVelocity = Math.abs(getVelocityTracker().getXVelocity(pointerId));
-            }
-
-            int index = selectedTabIndex;
-            boolean selectionChanged = false;
-
-            if (swipeVelocity >= minSwipeVelocity || isSwipeThresholdReached()) {
-                index = getDragHelper().getDragDistance() > 0 ? selectedTabIndex + 1 :
-                        selectedTabIndex - 1;
-                selectionChanged = true;
-                index = Math.max(Math.min(index, getTabSwitcher().getCount() - 1), 0);
-            }
-
-            notifyOnSwitchingBetweenTabsEnded(index, selectedTabIndex, selectionChanged,
-                    swipeVelocity >= minSwipeVelocity ? swipeVelocity : 0);
-        }
-
-        selectedTabIndex = -1;
-        reset();
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/TouchEventDispatcher.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/TouchEventDispatcher.java
deleted file mode 100644
index 0923cde3..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/gesture/TouchEventDispatcher.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.gesture;
-
-import android.view.MotionEvent;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import de.mrapp.util.Condition;
-import de.mrapp.util.datastructure.ListenerList;
-
-/**
- * A dispatcher, which allows to dispatch touch events to multiple event handlers in the order of
- * their priority. Only the first event handler, which is suited to handle an event, is invoked.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public class TouchEventDispatcher implements Iterable<AbstractTouchEventHandler> {
-
-    /**
-     * Defines the interface, a class, which should be notified, when event handlers are added to or
-     * removed from a {@link TouchEventDispatcher}, must implement.
-     */
-    public interface Callback {
-
-        /**
-         * The method, which is invoked, when an event handler has been added.
-         *
-         * @param dispatcher
-         *         The dispatcher, the event handler has been added to, as an instance of the class
-         *         {@link TouchEventDispatcher}. The dispatcher may not be null
-         * @param eventHandler
-         *         The event handler, which has been added, as an instance of the class {@link
-         *         AbstractTouchEventHandler}. The event handler may not be null
-         */
-        void onAddedEventHandler(@NonNull TouchEventDispatcher dispatcher,
-                                 @NonNull AbstractTouchEventHandler eventHandler);
-
-        /**
-         * The method, which is invoked, when an event handler has been removed.
-         *
-         * @param dispatcher
-         *         The dispatcher, the event handler has been removed from, as an instance of the
-         *         class {@link TouchEventDispatcher}. The dispatcher may not be null
-         * @param eventHandler
-         *         The event handler, which has been removed, as an instance of the class {@link
-         *         AbstractTouchEventHandler}. The event handler may not be null
-         */
-        void onRemovedEventHandler(@NonNull TouchEventDispatcher dispatcher,
-                                   @NonNull AbstractTouchEventHandler eventHandler);
-
-    }
-
-    /**
-     * An iterator, which allows to iterate the event handlers of a {@link TouchEventDispatcher}.
-     */
-    private class EventHandlerIterator implements Iterator<AbstractTouchEventHandler> {
-
-        /**
-         * The iterator, which allows to iterate the priorities of the event handlers.
-         */
-        private Iterator<Integer> priorityIterator;
-
-        /**
-         * The iterator, which allows to iterate the event handlers with the current priority.
-         */
-        private Iterator<AbstractTouchEventHandler> eventHandlerIterator;
-
-        /**
-         * Creates a new iterator, which allows to iterate the event handlers of a {@link
-         * TouchEventDispatcher}.
-         */
-        EventHandlerIterator() {
-            priorityIterator = eventHandlers.keySet().iterator();
-
-            if (priorityIterator.hasNext()) {
-                int key = priorityIterator.next();
-                ListenerList<AbstractTouchEventHandler> handlers = eventHandlers.get(key);
-                eventHandlerIterator = handlers.iterator();
-            } else {
-                eventHandlerIterator = null;
-            }
-        }
-
-        @Override
-        public boolean hasNext() {
-            return (eventHandlerIterator != null && eventHandlerIterator.hasNext()) ||
-                    priorityIterator.hasNext();
-        }
-
-        @Override
-        public AbstractTouchEventHandler next() {
-            if (eventHandlerIterator.hasNext()) {
-                return eventHandlerIterator.next();
-            } else if (priorityIterator.hasNext()) {
-                int key = priorityIterator.next();
-                ListenerList<AbstractTouchEventHandler> handlers = eventHandlers.get(key);
-                eventHandlerIterator = handlers.iterator();
-                return next();
-            }
-
-            return null;
-        }
-
-    }
-
-    /**
-     * A sorted map, which contains the event handlers, touch events can be dispatched to. The
-     * handlers are sorted by decreasing priority.
-     */
-    private final SortedMap<Integer, ListenerList<AbstractTouchEventHandler>> eventHandlers;
-
-    /**
-     * A list, which contains the event handlers, which are currently active.
-     */
-    private final List<AbstractTouchEventHandler> activeEventHandlers;
-
-    /**
-     * The event handler, which currently handles a drag gesture.
-     */
-    private AbstractTouchEventHandler draggingEventHandler;
-
-    /**
-     * The callback, which is notified, when event handlers are added or removed.
-     */
-    private Callback callback;
-
-    /**
-     * Notifies the callback, that an event handler has been added to the dispatcher.
-     *
-     * @param eventHandler
-     *         The event handler, which has been added, as an instance of the class {@link
-     *         AbstractTouchEventHandler}. The event handler may not be null
-     */
-    private void notifyOnAddedEventHandler(@NonNull final AbstractTouchEventHandler eventHandler) {
-        if (callback != null) {
-            callback.onAddedEventHandler(this, eventHandler);
-        }
-    }
-
-    /**
-     * Notifies the callback, that an event handler has been removed from the dispatcher.
-     *
-     * @param eventHandler
-     *         The event handler, which has been removed, as an instance of the class {@link
-     *         AbstractTouchEventHandler}. The event handler may not be null
-     */
-    private void notifyOnRemovedEventHandler(
-            @NonNull final AbstractTouchEventHandler eventHandler) {
-        if (callback != null) {
-            callback.onRemovedEventHandler(this, eventHandler);
-        }
-    }
-
-    /**
-     * Creates a new dispatcher, which allows to dispatch touch events to multiple event handlers in
-     * the order of their priority.
-     */
-    public TouchEventDispatcher() {
-        this.eventHandlers = new TreeMap<>(Collections.reverseOrder());
-        this.activeEventHandlers = new ArrayList<>();
-        this.draggingEventHandler = null;
-        this.callback = null;
-    }
-
-    /**
-     * Sets the callback, which should be notified, when event handlers are added or removed.
-     *
-     * @param callback
-     *         The callback, which should be set, as an instance of the type {@link Callback} or
-     *         null, if no callback should be notified
-     */
-    public final void setCallback(@Nullable final Callback callback) {
-        this.callback = callback;
-    }
-
-    /**
-     * Adds a specific event handler to the dispatcher.
-     *
-     * @param handler
-     *         The event handler, which should be added, as an instance of hte class {@link
-     *         AbstractTouchEventHandler}. The event handler may not be null
-     */
-    public final void addEventHandler(@NonNull final AbstractTouchEventHandler handler) {
-        Condition.INSTANCE.ensureNotNull(handler, "The handler may not be null");
-        int key = handler.getPriority();
-        ListenerList<AbstractTouchEventHandler> handlers = eventHandlers.get(key);
-
-        if (handlers == null) {
-            handlers = new ListenerList<>();
-            eventHandlers.put(key, handlers);
-        }
-
-        handlers.add(handler);
-        notifyOnAddedEventHandler(handler);
-    }
-
-    /**
-     * Removes a specific event handler from the dispatcher.
-     *
-     * @param handler
-     *         The event handler, which should be removed, as an instance of the class {@link
-     *         AbstractTouchEventHandler}. The event handler may not be null
-     */
-    public final void removeEventHandler(@NonNull final AbstractTouchEventHandler handler) {
-        Condition.INSTANCE.ensureNotNull(handler, "The handler may not be null");
-        ListenerList<AbstractTouchEventHandler> handlers = eventHandlers.get(handler.getPriority());
-
-        if (handlers != null) {
-            Iterator<AbstractTouchEventHandler> iterator = handlers.iterator();
-
-            while (iterator.hasNext()) {
-                AbstractTouchEventHandler eventHandler = iterator.next();
-
-                if (handler.equals(eventHandler)) {
-                    iterator.remove();
-                    notifyOnRemovedEventHandler(eventHandler);
-                }
-            }
-        }
-
-        for (int i = activeEventHandlers.size() - 1; i >= 0; i--) {
-            AbstractTouchEventHandler eventHandler = activeEventHandlers.get(i);
-
-            if (handler.equals(eventHandler)) {
-                eventHandler.onUp(null);
-                activeEventHandlers.remove(i);
-                break;
-            }
-
-        }
-
-        if (handler.equals(draggingEventHandler)) {
-            draggingEventHandler.onUp(null);
-            draggingEventHandler = null;
-        }
-    }
-
-    /**
-     * Handles a specific touch event by dispatching it to the first suited event handler.
-     *
-     * @param event
-     *         The event, which should be handled, as an instance of the class {@link MotionEvent}.
-     *         The event may not be null
-     * @return True, if the event has been handled, false otherwise
-     */
-    public final boolean handleTouchEvent(@NonNull final MotionEvent event) {
-        Condition.INSTANCE.ensureNotNull(event, "The event may not be null");
-        boolean result = false;
-
-        if (draggingEventHandler != null) {
-            result = draggingEventHandler.handleTouchEvent(event);
-
-            if (!result || draggingEventHandler.isReset() || !draggingEventHandler.isDragging()) {
-                draggingEventHandler = null;
-            }
-        }
-
-        if (!result) {
-            for (int i = activeEventHandlers.size() - 1; i >= 0; i--) {
-                AbstractTouchEventHandler handler = activeEventHandlers.get(i);
-                boolean handled = handler.handleTouchEvent(event);
-
-                if (!handled || handler.isReset()) {
-                    activeEventHandlers.remove(i);
-                } else if (handled && handler.isDragging()) {
-                    draggingEventHandler = handler;
-                    activeEventHandlers.remove(i);
-
-                    for (AbstractTouchEventHandler activeHandler : activeEventHandlers) {
-                        activeHandler.onUp(null);
-                    }
-
-                    activeEventHandlers.clear();
-                    result = true;
-                    break;
-                }
-
-                result |= handled;
-            }
-        }
-
-        if (!result) {
-            Iterator<AbstractTouchEventHandler> iterator = iterator();
-            AbstractTouchEventHandler handler;
-            int handledPriority = Integer.MIN_VALUE;
-
-            while ((handler = iterator.next()) != null &&
-                    handler.getPriority() >= handledPriority) {
-                if (handler.isInsideTouchableArea(event)) {
-                    boolean handled = handler.handleTouchEvent(event);
-
-                    if (handled && !handler.isReset()) {
-                        result = true;
-
-                        if (handler.isDragging()) {
-                            draggingEventHandler = handler;
-
-                            for (AbstractTouchEventHandler activeHandler : activeEventHandlers) {
-                                activeHandler.onUp(null);
-                            }
-
-                            activeEventHandlers.clear();
-                            break;
-                        } else {
-                            activeEventHandlers.add(handler);
-                            handledPriority = handler.getPriority();
-                        }
-                    }
-                }
-            }
-        }
-
-        return result;
-    }
-
-    @Override
-    public final Iterator<AbstractTouchEventHandler> iterator() {
-        return new EventHandlerIterator();
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/iterator/AbstractItemIterator.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/iterator/AbstractItemIterator.java
deleted file mode 100644
index 330ee0a4..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/iterator/AbstractItemIterator.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.iterator;
-
-import java.util.Iterator;
-
-import androidx.annotation.NonNull;
-import de.mrapp.android.tabswitcher.model.AbstractItem;
-import de.mrapp.util.Condition;
-
-/**
- * An abstract base class for all iterators, which allow to iterate items of the type {@link
- * AbstractItem}.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public abstract class AbstractItemIterator implements Iterator<AbstractItem> {
-
-    /**
-     * An abstract base class of all builders, which allows to configure and create instances of the
-     * class {@link AbstractItemIterator}.
-     */
-    public static abstract class AbstractBuilder<BuilderType extends AbstractBuilder<?, ProductType>, ProductType extends AbstractItemIterator> {
-
-        /**
-         * True, if the items should be iterated in reverse order, false otherwise.
-         */
-        protected boolean reverse;
-
-        /**
-         * The index of the first item, which should be iterated.
-         */
-        protected int start;
-
-        /**
-         * Returns a reference to the builder itself. It is implicitly cast to the generic type
-         * BuilderType.
-         *
-         * @return The builder as an instance of the generic type BuilderType
-         */
-        @SuppressWarnings("unchecked")
-        private BuilderType self() {
-            return (BuilderType) this;
-        }
-
-        /**
-         * Creates a new builder, which allows to configure and create instances of the class {@link
-         * AbstractItemIterator}.
-         */
-        protected AbstractBuilder() {
-            reverse(false);
-            start(-1);
-        }
-
-        /**
-         * Creates the iterator, which has been configured by using the builder.
-         *
-         * @return The iterator, which has been created, as an instance of the class {@link
-         * ItemIterator}. The iterator may not be null
-         */
-        @NonNull
-        public abstract ProductType create();
-
-        /**
-         * Sets, whether the items should be iterated in reverse order, or not.
-         *
-         * @param reverse
-         *         True, if the items should be iterated in reverse order, false otherwise
-         * @return The builder, this method has been called upon, as an instance of the generic type
-         * BuilderType. The builder may not be null
-         */
-        @NonNull
-        public BuilderType reverse(final boolean reverse) {
-            this.reverse = reverse;
-            return self();
-        }
-
-        /**
-         * Sets the index of the first item, which should be iterated.
-         *
-         * @param start
-         *         The index, which should be set, as an {@link Integer} value or -1, if all items
-         *         should be iterated
-         * @return The builder, this method has been called upon, as an instance of the generic type
-         * BuilderType. The builder may not be null
-         */
-        @NonNull
-        public BuilderType start(final int start) {
-            Condition.INSTANCE.ensureAtLeast(start, -1, "The start must be at least -1");
-            this.start = start;
-            return self();
-        }
-
-    }
-
-    /**
-     * True, if the items should be iterated in reverse order, false otherwise.
-     */
-    private boolean reverse;
-
-    /**
-     * The index of the next item.
-     */
-    private int index;
-
-    /**
-     * The current item.
-     */
-    private AbstractItem current;
-
-    /**
-     * The previous item.
-     */
-    private AbstractItem previous;
-
-    /**
-     * The first item.
-     */
-    private AbstractItem first;
-
-    /**
-     * The method, which is invoked on subclasses in order to retrieve the total number of available
-     * items.
-     *
-     * @return The total number of available items as an {@link Integer} value
-     */
-    public abstract int getCount();
-
-    /**
-     * The method, which is invoked on subclasses in order to retrieve the item, which corresponds
-     * to a specific index.
-     *
-     * @param index
-     *         The index of the item, which should be returned, as an {@link Integer} value
-     * @return The item, which corresponds to the given index, as an instance of the class {@link
-     * AbstractItem}. The item may not be null
-     */
-    @NonNull
-    public abstract AbstractItem getItem(final int index);
-
-    /**
-     * Initializes the iterator.
-     *
-     * @param reverse
-     *         True, if the items should be iterated in reverse order, false otherwise
-     * @param start
-     *         The index of the first item, which should be iterated, as an {@link Integer} value or
-     *         -1, if all items should be iterated
-     */
-    protected final void initialize(final boolean reverse, final int start) {
-        Condition.INSTANCE.ensureAtLeast(start, -1, "The start must be at least -1");
-        this.reverse = reverse;
-        this.previous = null;
-        this.index = start != -1 ? start : (reverse ? getCount() - 1 : 0);
-        int previousIndex = reverse ? this.index + 1 : this.index - 1;
-
-        if (previousIndex >= 0 && previousIndex < getCount()) {
-            this.current = getItem(previousIndex);
-        } else {
-            this.current = null;
-        }
-    }
-
-    /**
-     * Returns the first item. Calling this method does not alter the current position of the
-     * iterator.
-     *
-     * @return The first item as an instance of the class {@link AbstractItem} or null, if no items
-     * are available
-     */
-    public final AbstractItem first() {
-        return first;
-    }
-
-    /**
-     * Returns the previous item. Calling this method does not alter the current position of the
-     * iterator.
-     *
-     * @return The previous item as an instance of the class {@link AbstractItem} or null, if no
-     * previous item is available
-     */
-    public final AbstractItem previous() {
-        return previous;
-    }
-
-    /**
-     * Returns the next item. Calling this method does not alter the current position of the
-     * iterator.
-     *
-     * @return The next item as an instance of the class {@link AbstractItem} or null, if no next
-     * item is available
-     */
-    public final AbstractItem peek() {
-        return index >= 0 && index < getCount() ? getItem(index) : null;
-    }
-
-    @Override
-    public final boolean hasNext() {
-        if (reverse) {
-            return index >= 0;
-        } else {
-            return getCount() - index >= 1;
-        }
-    }
-
-    @Override
-    public final AbstractItem next() {
-        if (hasNext()) {
-            previous = current;
-
-            if (first == null) {
-                first = current;
-            }
-
-            current = getItem(index);
-            index += reverse ? -1 : 1;
-            return current;
-        }
-
-        return null;
-    }
-
-}
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/iterator/ArrayItemIterator.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/iterator/ArrayItemIterator.java
deleted file mode 100644
index 70d57aac..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/iterator/ArrayItemIterator.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.iterator;
-
-import androidx.annotation.NonNull;
-import de.mrapp.android.tabswitcher.Tab;
-import de.mrapp.android.tabswitcher.model.AbstractItem;
-import de.mrapp.android.tabswitcher.model.Model;
-import de.mrapp.android.tabswitcher.model.TabItem;
-import de.mrapp.android.util.view.AttachedViewRecycler;
-import de.mrapp.util.Condition;
-
-/**
- * An iterator, which allows to iterate the items, which correspond to the tabs, which are contained
- * by an array.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public class ArrayItemIterator extends AbstractItemIterator {
-
-    /**
-     * A builder, which allows to configure an create instances of the class {@link
-     * ArrayItemIterator}.
-     */
-    public static class Builder extends AbstractBuilder<Builder, ArrayItemIterator> {
-
-        /**
-         * The model, which belongs to the tab switcher, whose items should be iterated by the
-         * iterator, which is created by the builder.
-         */
-        private final Model model;
-
-        /**
-         * The view recycler, which allows to inflate the views, which are used to visualize the
-         * tabs, which are iterated by the iterator, which is created by the builder.
-         */
-        private final AttachedViewRecycler<AbstractItem, ?> viewRecycler;
-
-        /**
-         * The array, which contains the tabs, which are iterated by the iterator, which is created
-         * by the builder.
-         */
-        private final Tab[] array;
-
-        /**
-         * The index of the first tab, which is iterated by the iterator, which is created by the
-         * builder.
-         */
-        private final int firstIndex;
-
-        /**
-         * Creates a new builder, which allows to configure and create instances of the class {@link
-         * ArrayItemIterator}.
-         *
-         * @param model
-         *         The model, which belongs to the tab switcher, whose items should be iterated by
-         *         the iterator, which is created by the builder, as an instance of the type {@link
-         *         Model}. The model may not be null
-         * @param viewRecycler
-         *         The view recycler, which allows to inflate the views, which are used to visualize
-         *         the tabs, which should be iterated by the iterator, as an instance of the class
-         *         AttachedViewRecycler. The view recycler may not be null
-         * @param array
-         *         The array, which contains the tabs, which should be iterated by the iterator, as
-         *         an array of the type {@link Tab}. The array may not be null
-         * @param firstIndex
-         *         The index of the first tab, which should be iterated by the iterator, as an
-         *         {@link Integer} value. The index must be at least 0
-         */
-        public Builder(@NonNull final Model model,
-                       @NonNull final AttachedViewRecycler<AbstractItem, ?> viewRecycler,
-                       @NonNull final Tab[] array, final int firstIndex) {
-            Condition.INSTANCE.ensureNotNull(model, "The model may not be null");
-            Condition.INSTANCE.ensureNotNull(viewRecycler, "The view recycler may not be null");
-            Condition.INSTANCE.ensureNotNull(array, "The array may not be null");
-            Condition.INSTANCE.ensureAtLeast(firstIndex, 0, "The first index must be at least 0");
-            this.model = model;
-            this.viewRecycler = viewRecycler;
-            this.array = array;
-            this.firstIndex = firstIndex;
-        }
-
-        @NonNull
-        @Override
-        public ArrayItemIterator create() {
-            return new ArrayItemIterator(model, viewRecycler, array, firstIndex, reverse, start);
-        }
-
-    }
-
-    /**
-     * The model, which belongs to the tab switcher, whose tabs are iterated.
-     */
-    private final Model model;
-
-    /**
-     * The view recycler, which allows to inflate the views, which are used to visualize the
-     * iterated tabs.
-     */
-    private final AttachedViewRecycler<AbstractItem, ?> viewRecycler;
-
-    /**
-     * The array, which contains the tabs, which are iterated by the iterator.
-     */
-    private final Tab[] array;
-
-    /**
-     * The index of the first tab, which is iterated by the iterator.
-     */
-    private final int firstIndex;
-
-    /**
-     * Creates a new iterator, which allows to iterate the items, which correspond to the tabs,
-     * which are contained by an array.
-     *
-     * @param model
-     *         The model, which belongs to the tab switcher, whose items should be iterated, as an
-     *         instance of the type {@link Model}. The model may not be null
-     * @param viewRecycler
-     *         The view recycler, which allows to inflate the views, which are used to visualize the
-     *         iterated tabs, as an instance of the class AttachedViewRecycler. The view recycler
-     *         may not be null
-     * @param array
-     *         The array, which contains the tabs, which should be iterated by the iterator, as an
-     *         array of the type {@link Tab}. The array may not be null
-     * @param firstIndex
-     *         The index of the first tab, which should be iterated by the iterator, as an {@link
-     *         Integer} value. The index must be at least 0
-     * @param reverse
-     *         True, if the items should be iterated in reverse order, false otherwise
-     * @param start
-     *         The index of the first item, which should be iterated, as an {@link Integer} value or
-     *         -1, if all items should be iterated
-     */
-    private ArrayItemIterator(@NonNull final Model model,
-                              @NonNull final AttachedViewRecycler<AbstractItem, ?> viewRecycler,
-                              @NonNull final Tab[] array, final int firstIndex,
-                              final boolean reverse, final int start) {
-        Condition.INSTANCE.ensureNotNull(model, "The model may not be null");
-        Condition.INSTANCE.ensureNotNull(viewRecycler, "The view recycler may not be null");
-        Condition.INSTANCE.ensureNotNull(array, "The array may not be null");
-        Condition.INSTANCE.ensureAtLeast(firstIndex, 0, "The first index must be at least 0");
-        this.model = model;
-        this.viewRecycler = viewRecycler;
-        this.array = array;
-        this.firstIndex = firstIndex;
-        initialize(reverse, start);
-    }
-
-    @Override
-    public final int getCount() {
-        return array.length;
-    }
-
-    @NonNull
-    @Override
-    public final AbstractItem getItem(final int index) {
-        return TabItem.create(model, viewRecycler, firstIndex + index, array[index]);
-    }
-
-}
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/iterator/ItemIterator.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/iterator/ItemIterator.java
deleted file mode 100644
index 094d9a16..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/iterator/ItemIterator.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.iterator;
-
-import androidx.annotation.NonNull;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.model.AbstractItem;
-import de.mrapp.android.tabswitcher.model.AddTabItem;
-import de.mrapp.android.tabswitcher.model.Model;
-import de.mrapp.android.tabswitcher.model.TabItem;
-import de.mrapp.android.util.view.AttachedViewRecycler;
-import de.mrapp.util.Condition;
-
-/**
- * An iterator, which allows to iterate the items, which correspond to the child views of a {@link
- * TabSwitcher}.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public class ItemIterator extends AbstractItemIterator {
-
-    /**
-     * A builder, which allows to configure and create instances of the class {@link ItemIterator}.
-     */
-    public static class Builder extends AbstractBuilder<Builder, ItemIterator> {
-
-        /**
-         * The model, which belongs to the tab switcher, whose items should be iterated by the
-         * iterator, which is created by the builder.
-         */
-        private final Model model;
-
-        /**
-         * The view recycler, which allows to inflate the views, which are used to visualize the
-         * items, which are iterated by the iterator, which is created by the builder.
-         */
-        private final AttachedViewRecycler<AbstractItem, ?> viewRecycler;
-
-        /**
-         * Creates a new builder, which allows to configure and create instances of the class {@link
-         * ItemIterator}.
-         *
-         * @param model
-         *         The model, which belongs to the tab switcher, whose items should be iterated by
-         *         the iterator, which is created by the builder, as an instance of the type {@link
-         *         Model}. The model may not be null
-         * @param viewRecycler
-         *         The view recycler, which allows to inflate the views, which are used to visualize
-         *         the items, which are iterated by the iterator, which is created by the builder,
-         *         as an instance of the class AttachedViewRecycler. The view recycler may not be
-         *         null
-         */
-        public Builder(@NonNull final Model model,
-                       @NonNull final AttachedViewRecycler<AbstractItem, ?> viewRecycler) {
-            Condition.INSTANCE.ensureNotNull(model, "The model may not be null");
-            Condition.INSTANCE.ensureNotNull(viewRecycler, "The view recycler may not be null");
-            this.model = model;
-            this.viewRecycler = viewRecycler;
-        }
-
-        @NonNull
-        @Override
-        public ItemIterator create() {
-            return new ItemIterator(model, viewRecycler, reverse, start);
-        }
-
-    }
-
-    /**
-     * The model, which belongs to the tab switcher, whose tabs are iterated.
-     */
-    private final Model model;
-
-    /**
-     * The view recycler, which allows to inflated the views, which are used to visualize the
-     * iterated items.
-     */
-    private final AttachedViewRecycler<AbstractItem, ?> viewRecycler;
-
-    /**
-     * Creates a new iterator, which allows to iterate the items, which correspond to the child
-     * views of a {@link TabSwitcher}.
-     *
-     * @param model
-     *         The model, which belongs to the tab switcher, whose items should be iterated, as an
-     *         instance of the type {@link Model}. The model may not be null
-     * @param viewRecycler
-     *         The view recycler, which allows to inflate the views, which are used to visualize the
-     *         iterated items, as an instance of the class AttachedViewRecycler. The view recycler
-     *         may not be null
-     * @param reverse
-     *         True, if the items should be iterated in reverse order, false otherwise
-     * @param start
-     *         The index of the first item, which should be iterated, as an {@link Integer} value or
-     *         -1, if all items should be iterated
-     */
-    private ItemIterator(@NonNull final Model model,
-                         @NonNull final AttachedViewRecycler<AbstractItem, ?> viewRecycler,
-                         final boolean reverse, final int start) {
-        Condition.INSTANCE.ensureNotNull(model, "The model may not be null");
-        Condition.INSTANCE.ensureNotNull(viewRecycler, "The view recycler may not be null");
-        this.model = model;
-        this.viewRecycler = viewRecycler;
-        initialize(reverse, start);
-    }
-
-    @Override
-    public final int getCount() {
-        return model.getCount() + (model.isAddTabButtonShown() ? 1 : 0);
-    }
-
-    @NonNull
-    @Override
-    public final AbstractItem getItem(final int index) {
-        if (index == 0 && model.isAddTabButtonShown()) {
-            return AddTabItem.create(viewRecycler);
-        } else {
-            return TabItem
-                    .create(model, viewRecycler, index - (model.isAddTabButtonShown() ? 1 : 0));
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/AbstractArithmetics.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/AbstractArithmetics.java
deleted file mode 100644
index 34f3a4cf..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/AbstractArithmetics.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.layout;
-
-import android.view.ViewPropertyAnimator;
-
-import androidx.annotation.NonNull;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.model.AbstractItem;
-import de.mrapp.util.Condition;
-
-/**
- * An abstract base class for all classes, which provide methods, which allow to calculate the
- * position, size and rotation of a {@link TabSwitcher}'s tabs.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public abstract class AbstractArithmetics implements Arithmetics {
-
-    /**
-     * The tab switcher, the arithmetics are calculated for.
-     */
-    private final TabSwitcher tabSwitcher;
-
-    /**
-     * Returns the tab switcher, the arithmetics are calculated for.
-     *
-     * @return The tab switcher, the arithmetics are calculated for, as an instance of the class
-     * {@link TabSwitcher}. The tab switcher may not be null
-     */
-    @NonNull
-    protected final TabSwitcher getTabSwitcher() {
-        return tabSwitcher;
-    }
-
-    /**
-     * Creates a new class, which provides methods, which allow to calculate the position, size and
-     * rotation of a {@link TabSwitcher}'s tabs.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, the arithmetics should be calculated for, as an instance of the
-     *         class {@link TabSwitcher}. The tab switcher may not be null
-     */
-    public AbstractArithmetics(@NonNull final TabSwitcher tabSwitcher) {
-        Condition.INSTANCE.ensureNotNull(tabSwitcher, "The tab switcher may not be null");
-        this.tabSwitcher = tabSwitcher;
-    }
-
-    @Override
-    public final float getTabContainerSize(@NonNull final Axis axis) {
-        return getTabContainerSize(axis, true);
-    }
-
-    @Override
-    public final void animatePosition(@NonNull final Axis axis,
-                                      @NonNull final ViewPropertyAnimator animator,
-                                      @NonNull final AbstractItem item, final float position) {
-        animatePosition(axis, animator, item, position, false);
-    }
-
-    @Override
-    public final float getScale(@NonNull final AbstractItem item) {
-        return getScale(item, false);
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/AbstractDragTabsEventHandler.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/AbstractDragTabsEventHandler.java
deleted file mode 100644
index 4d292208..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/AbstractDragTabsEventHandler.java
+++ /dev/null
@@ -1,768 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.layout;
-
-import android.content.res.Resources;
-import android.view.MotionEvent;
-import android.view.ViewConfiguration;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import de.mrapp.android.tabswitcher.R;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.gesture.AbstractTouchEventHandler;
-import de.mrapp.android.tabswitcher.layout.Arithmetics.Axis;
-import de.mrapp.android.tabswitcher.model.AbstractItem;
-import de.mrapp.android.tabswitcher.model.TabItem;
-import de.mrapp.android.util.gesture.DragHelper;
-import de.mrapp.util.Condition;
-
-/**
- * An abstract base class for all drag handlers, which allow to calculate the position and state of
- * tabs on touch events.
- *
- * @param <CallbackType>
- *         The type of the drag handler's callback
- * @author Michael Rapp
- * @since 0.1.0
- */
-public abstract class AbstractDragTabsEventHandler<CallbackType extends AbstractDragTabsEventHandler.Callback>
-        extends AbstractTouchEventHandler {
-
-    /**
-     * Contains all possible states of dragging gestures, which can be performed on a {@link
-     * TabSwitcher}.
-     */
-    public enum DragState {
-
-        /**
-         * When no dragging gesture is being performed.
-         */
-        NONE,
-
-        /**
-         * When the tabs are dragged towards the start.
-         */
-        DRAG_TO_START,
-
-        /**
-         * When the tabs are dragged towards the end.
-         */
-        DRAG_TO_END,
-
-        /**
-         * When an overshoot at the start is being performed.
-         */
-        OVERSHOOT_START,
-
-        /**
-         * When an overshoot at the end is being performed.
-         */
-        OVERSHOOT_END,
-
-        /**
-         * When a tab is swiped.
-         */
-        SWIPE,
-
-        /**
-         * When the currently selected tab is pulled down.
-         */
-        PULLING_DOWN
-
-    }
-
-    /**
-     * Defines the interface, a class, which should be notified about the events of a drag handler,
-     * must implement.
-     */
-    public interface Callback {
-
-        /**
-         * The method, which is invoked in order to calculate the positions of all tabs, depending
-         * on the current drag distance.
-         *
-         * @param dragState
-         *         The current drag state as a value of the enum {@link DragState}. The drag state
-         *         must either be {@link DragState#DRAG_TO_END} or {@link DragState#DRAG_TO_START}
-         * @param dragDistance
-         *         The current drag distance in pixels as a {@link Float} value
-         * @return A drag state, which specifies whether the tabs are overshooting, or not. If the
-         * tabs are overshooting, the drag state must be {@link DragState#OVERSHOOT_START} or {@link
-         * DragState#OVERSHOOT_END}, null otherwise
-         */
-        @Nullable
-        DragState onDrag(@NonNull DragState dragState, float dragDistance);
-
-        /**
-         * The method, which is invoked, when pressing a view has been started.
-         *
-         * @param item
-         *         The item, which corresponds to the view, which has been pressed, as an instance
-         *         of the class {@link AbstractItem}. The item may not be null
-         */
-        void onPressStarted(@NonNull AbstractItem item);
-
-        /**
-         * The method, which is invoked, when pressing a view has been ended.
-         *
-         * @param item
-         *         Tge item, which corresponds to the view, which was previously pressed, as an
-         *         instance of the class {@link AbstractItem}. The item may not be null
-         */
-        void onPressEnded(@NonNull AbstractItem item);
-
-        /**
-         * The method, which is invoked, when a view has been clicked.
-         *
-         * @param item
-         *         The item, which corresponds to the view, which has been clicked, as an instance
-         *         of the class {@link AbstractItem}. The item may not be null
-         */
-        void onClick(@NonNull AbstractItem item);
-
-        /**
-         * The method, which is invoked, when a fling has been triggered.
-         *
-         * @param distance
-         *         The distance of the fling in pixels as a {@link Float} value
-         * @param duration
-         *         The duration of the fling in milliseconds as a {@link Long} value
-         */
-        void onFling(float distance, long duration);
-
-        /**
-         * The method, which is invoked, when a fling has been cancelled.
-         */
-        void onCancelFling();
-
-        /**
-         * The method, which is invoked, when an overshoot at the start should be reverted.
-         */
-        void onRevertStartOvershoot();
-
-        /**
-         * The method, which is invoked, when an overshoot at the end should be reverted.
-         */
-        void onRevertEndOvershoot();
-
-        /**
-         * The method, which is invoked, when a tab is swiped.
-         *
-         * @param tabItem
-         *         The tab item, which corresponds to the swiped tab, as an instance of the class
-         *         {@link TabItem}. The tab item may not be null
-         * @param distance
-         *         The distance, the tab is swiped by, in pixels as a {@link Float} value
-         */
-        void onSwipe(@NonNull TabItem tabItem, float distance);
-
-        /**
-         * The method, which is invoked, when swiping a tab ended.
-         *
-         * @param tabItem
-         *         The tab item, which corresponds to the swiped tab, as an instance of the class
-         *         {@link TabItem}. The tab item may not be null
-         * @param remove
-         *         True, if the tab should be removed, false otherwise
-         * @param velocity
-         *         The velocity of the swipe gesture in pixels per second as a {@link Float} value
-         */
-        void onSwipeEnded(@NonNull TabItem tabItem, boolean remove, float velocity);
-
-    }
-
-    /**
-     * The arithmetics, which are used to calculate the positions, size and rotation of tabs.
-     */
-    private final Arithmetics arithmetics;
-
-    /**
-     * True, if tabs can be swiped on the orthogonal axis, false otherwise.
-     */
-    private final boolean swipeEnabled;
-
-    /**
-     * The drag helper, which is used to recognize swipe gestures on the orthogonal axis.
-     */
-    private final DragHelper swipeDragHelper;
-
-    /**
-     * The minimum velocity, which must be reached by a drag gesture to start a fling animation.
-     */
-    private final float minFlingVelocity;
-
-    /**
-     * The velocity, which may be reached by a drag gesture at maximum to start a fling animation.
-     */
-    private final float maxFlingVelocity;
-
-    /**
-     * The velocity, which must be reached by a drag gesture in order to start a swipe animation.
-     */
-    private final float minSwipeVelocity;
-
-    /**
-     * The currently swiped tab item.
-     */
-    private TabItem swipedTabItem;
-
-    /**
-     * The currently pressed item.
-     */
-    private AbstractItem pressedItem;
-
-    /**
-     * The state of the currently performed drag gesture.
-     */
-    private DragState dragState;
-
-    /**
-     * The distance of the current drag gesture in pixels.
-     */
-    private float dragDistance;
-
-    /**
-     * The drag distance at which the start overshoot begins.
-     */
-    private float startOvershootThreshold;
-
-    /**
-     * The drag distance at which the end overshoot begins.
-     */
-    private float endOvershootThreshold;
-
-    /**
-     * The callback, which is notified about the drag handler's events.
-     */
-    private CallbackType callback;
-
-    /**
-     * Resets the drag handler to its previous state, when a drag gesture has ended.
-     */
-    private void resetDragging() {
-        super.reset();
-        this.dragState = DragState.NONE;
-        this.swipedTabItem = null;
-        this.dragDistance = 0;
-        this.startOvershootThreshold = -Float.MAX_VALUE;
-        this.endOvershootThreshold = Float.MAX_VALUE;
-
-        if (this.swipeDragHelper != null) {
-            this.swipeDragHelper.reset();
-        }
-
-        if (pressedItem != null) {
-            notifyOnPressEnded(pressedItem);
-            pressedItem = null;
-        }
-    }
-
-    /**
-     * Handles a click.
-     *
-     * @param event
-     *         The motion event, which triggered the click, as an instance of the class {@link
-     *         MotionEvent}. The motion event may not be null
-     */
-    private void handleClick(@NonNull final MotionEvent event) {
-        AbstractItem item = getFocusedItem(arithmetics.getTouchPosition(Axis.DRAGGING_AXIS, event));
-
-        if (item != null) {
-            notifyOnClick(item);
-        }
-    }
-
-    /**
-     * Handles a fling gesture.
-     *
-     * @param event
-     *         The motion event, which triggered the fling gesture, as an instance of the class
-     *         {@link MotionEvent}. The motion event may not be null
-     * @param dragState
-     *         The current drag state, which determines the fling direction, as a value of the enum
-     *         {@link DragState}. The drag state may not be null
-     */
-    private void handleFling(@NonNull final MotionEvent event, @NonNull final DragState dragState) {
-        if (getVelocityTracker() != null) {
-            int pointerId = event.getPointerId(0);
-            getVelocityTracker().computeCurrentVelocity(1000, maxFlingVelocity);
-            float flingVelocity = Math.abs(getVelocityTracker().getYVelocity(pointerId));
-
-            if (flingVelocity > minFlingVelocity) {
-                float flingDistance = 0.25f * flingVelocity;
-
-                if (dragState == DragState.DRAG_TO_START) {
-                    flingDistance = -1 * flingDistance;
-                }
-
-                long duration = Math.round(Math.abs(flingDistance) / flingVelocity * 1000);
-                notifyOnFling(flingDistance, duration);
-            }
-        }
-    }
-
-    /**
-     * Handles, when the tabs are overshooting.
-     */
-    private void handleOvershoot() {
-        if (!getDragHelper().isReset()) {
-            getDragHelper().reset(0);
-            dragDistance = 0;
-        }
-    }
-
-    /**
-     * Notifies the callback in order to calculate the positions of all tabs, depending on the
-     * current drag distance.
-     *
-     * @param dragState
-     *         The current drag state as a value of the enum {@link DragState}. The drag state must
-     *         either be {@link DragState#DRAG_TO_END} or {@link DragState#DRAG_TO_START}
-     * @param dragDistance
-     *         The current drag distance in pixels as a {@link Float} value
-     * @return A drag state, which specifies whether the tabs are overshooting, or not. If the tabs
-     * are overshooting, the drag state must be {@link DragState#OVERSHOOT_START} or {@link
-     * DragState#OVERSHOOT_END}, null otherwise
-     */
-    private DragState notifyOnDrag(@NonNull final DragState dragState, final float dragDistance) {
-        if (callback != null) {
-            return callback.onDrag(dragState, dragDistance);
-        }
-
-        return null;
-    }
-
-    /**
-     * Notifies the callback, that pressing a view has been started.
-     *
-     * @param item
-     *         The item, which corresponds to the view, which has been pressed, as an instance of
-     *         the class {@link AbstractItem}. The item may not be null
-     */
-    private void notifyOnPressStarted(@NonNull final AbstractItem item) {
-        if (callback != null) {
-            callback.onPressStarted(item);
-        }
-    }
-
-    /**
-     * Notifies the callback, that pressing a view has been ended.
-     *
-     * @param item
-     *         The item, which corresponds to the view, which was previously pressed, as an instance
-     *         of the class {@link AbstractItem}. The item may not be null
-     */
-    private void notifyOnPressEnded(@NonNull final AbstractItem item) {
-        if (callback != null) {
-            callback.onPressEnded(item);
-        }
-    }
-
-    /**
-     * Notifies the callback, that a view has been clicked.
-     *
-     * @param item
-     *         The item, which corresponds to the view, which has been clicked, as an instance of
-     *         the class {@link AbstractItem}. The item may not be null
-     */
-    private void notifyOnClick(@NonNull final AbstractItem item) {
-        if (callback != null) {
-            callback.onClick(item);
-        }
-    }
-
-    /**
-     * Notifies the callback, that a fling has been triggered.
-     *
-     * @param distance
-     *         The distance of the fling in pixels as a {@link Float} value
-     * @param duration
-     *         The duration of the fling in milliseconds as a {@link Long} value
-     */
-    private void notifyOnFling(final float distance, final long duration) {
-        if (callback != null) {
-            callback.onFling(distance, duration);
-        }
-    }
-
-    /**
-     * Notifies the callback, that a fling has been cancelled.
-     */
-    private void notifyOnCancelFling() {
-        if (callback != null) {
-            callback.onCancelFling();
-        }
-    }
-
-    /**
-     * Notifies the callback, that an overshoot at the start should be reverted.
-     */
-    private void notifyOnRevertStartOvershoot() {
-        if (callback != null) {
-            callback.onRevertStartOvershoot();
-        }
-    }
-
-    /**
-     * Notifies the callback, that an overshoot at the end should be reverted.
-     */
-    private void notifyOnRevertEndOvershoot() {
-        if (callback != null) {
-            callback.onRevertEndOvershoot();
-        }
-    }
-
-    /**
-     * Notifies the callback, that a tab is swiped.
-     *
-     * @param tabItem
-     *         The tab item, which corresponds to the swiped tab, as an instance of the class {@link
-     *         TabItem}. The tab item may not be null
-     * @param distance
-     *         The distance, the tab is swiped by, in pixels as a {@link Float} value
-     */
-    private void notifyOnSwipe(@NonNull final TabItem tabItem, final float distance) {
-        if (callback != null) {
-            callback.onSwipe(tabItem, distance);
-        }
-    }
-
-    /**
-     * Notifies the callback, that swiping a tab ended.
-     *
-     * @param tabItem
-     *         The tab item, which corresponds to the swiped tab, as an instance of the class {@link
-     *         TabItem}. The tab item may not be null
-     * @param remove
-     *         True, if the tab should be removed, false otherwise
-     * @param velocity
-     *         The velocity of the swipe gesture in pixels per second as a {@link Float} value
-     */
-    private void notifyOnSwipeEnded(@NonNull final TabItem tabItem, final boolean remove,
-                                    final float velocity) {
-        if (callback != null) {
-            callback.onSwipeEnded(tabItem, remove, velocity);
-        }
-    }
-
-    /**
-     * Returns the arithmetics, which are used to calculate the positions, size and rotation of
-     * tabs.
-     *
-     * @return The arithmetics, which are used to calculate the positions, size and rotation of
-     * tabs, as an instance of the type {@link Arithmetics}. The arithmetics may not be null
-     */
-    @NonNull
-    protected Arithmetics getArithmetics() {
-        return arithmetics;
-    }
-
-    /**
-     * Returns the callback, which should be notified about the drag handler's events.
-     *
-     * @return The callback, which should be notified about the drag handler's events, as an
-     * instance of the generic type CallbackType or null, if no callback should be notified
-     */
-    @Nullable
-    protected CallbackType getCallback() {
-        return callback;
-    }
-
-    /**
-     * Creates a new drag handler, which allows to calculate the position and state of tabs on touch
-     * events.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, whose tabs' positions and states should be calculated by the drag
-     *         handler, as an instance of the class {@link TabSwitcher}. The tab switcher may not be
-     *         null
-     * @param arithmetics
-     *         The arithmetics, which should be used to calculate the position, size and rotation of
-     *         tabs, as an instance of the type {@link Arithmetics}. The arithmetics may not be
-     *         null
-     * @param swipeEnabled
-     *         True, if tabs can be swiped on the orthogonal axis, false otherwise
-     */
-    public AbstractDragTabsEventHandler(@NonNull final TabSwitcher tabSwitcher,
-                                        @NonNull final Arithmetics arithmetics,
-                                        final boolean swipeEnabled) {
-        super(MIN_PRIORITY, tabSwitcher,
-                tabSwitcher.getResources().getDimensionPixelSize(R.dimen.drag_threshold));
-        Condition.INSTANCE.ensureNotNull(arithmetics, "The arithmetics may not be null");
-        this.arithmetics = arithmetics;
-        this.swipeEnabled = swipeEnabled;
-        Resources resources = tabSwitcher.getResources();
-        this.swipeDragHelper =
-                new DragHelper(resources.getDimensionPixelSize(R.dimen.swipe_threshold));
-        this.callback = null;
-        ViewConfiguration configuration = ViewConfiguration.get(tabSwitcher.getContext());
-        this.minFlingVelocity = configuration.getScaledMinimumFlingVelocity();
-        this.maxFlingVelocity = configuration.getScaledMaximumFlingVelocity();
-        this.minSwipeVelocity = resources.getDimensionPixelSize(R.dimen.min_swipe_velocity);
-        resetDragging();
-    }
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to retrieve the item, which
-     * corresponds to the view, which is focused when clicking/dragging at a specific position.
-     *
-     * @param position
-     *         The position on the dragging axis in pixels as a {@link Float} value
-     * @return The item, which corresponds to the focused view, as an instance of the class {@link
-     * AbstractItem} or null, if no view is focused
-     */
-    protected abstract AbstractItem getFocusedItem(final float position);
-
-    /**
-     * The method, which is invoked on implementing subclasses, when the tabs are overshooting at
-     * the start.
-     *
-     * @param dragPosition
-     *         The position of the pointer on the dragging axis in pixels as a {@link Float} value
-     * @param overshootThreshold
-     *         The position on the dragging axis, an overshoot at the start currently starts at, in
-     *         pixels as a {@link Float} value
-     * @return The updated position on the dragging axis, an overshoot at the start starts at, in
-     * pixels as a {@link Float} value
-     */
-    protected float onOvershootStart(final float dragPosition, final float overshootThreshold) {
-        return overshootThreshold;
-    }
-
-    /**
-     * The method, which is invoked on implementing subclasses, when the tabs are overshooting at
-     * the end.
-     *
-     * @param dragPosition
-     *         The position of the pointer on the dragging axis in pixels as a {@link Float} value
-     * @param overshootThreshold
-     *         The position on the dragging axis, an overshoot at the end currently starts at, in
-     *         pixels as a {@link Float} value
-     * @return The updated position on the dragging axis, an overshoot at the end starts at, in
-     * pixels as a {@link Float} value
-     */
-    protected float onOvershootEnd(final float dragPosition, final float overshootThreshold) {
-        return overshootThreshold;
-    }
-
-    /**
-     * The method, which is invoked on implementing subclasses, when an overshoot has been
-     * reverted.
-     */
-    protected void onOvershootReverted() {
-
-    }
-
-    /**
-     * The method, which invoked on implementing subclasses, when the drag handler has been reset.
-     */
-    protected void onReset() {
-
-    }
-
-    /**
-     * Returns, whether the threshold of a swiped tab item, which causes the corresponding tab to be
-     * removed, has been reached, or not.
-     *
-     * @param swipedTabItem
-     *         The swiped tab item as an instance of the class {@link TabItem}. The tab item may not
-     *         be null
-     * @return True, if the threshold has been reached, false otherwise
-     */
-    protected boolean isSwipeThresholdReached(@NonNull final TabItem swipedTabItem) {
-        return false;
-    }
-
-    /**
-     * Sets the callback, which should be notified about the drag handler's events.
-     *
-     * @param callback
-     *         The callback, which should be set, as an instance of the generic type CallbackType or
-     *         null, if no callback should be notified
-     */
-    public final void setCallback(@Nullable final CallbackType callback) {
-        this.callback = callback;
-    }
-
-    /**
-     * Sets the state of the currently performed drag gesture.
-     *
-     * @param dragState
-     *         The state, which should be set, as a value of the enum {@link DragState}. The state
-     *         may not be null
-     */
-    public final void setDragState(@NonNull final DragState dragState) {
-        Condition.INSTANCE.ensureNotNull(dragState, "The drag state may not be null");
-        this.dragState = dragState;
-    }
-
-    /**
-     * Handles drag gestures.
-     *
-     * @param dragPosition
-     *         The position of the pointer on the dragging axis in pixels as a {@link Float} value
-     * @param orthogonalPosition
-     *         The position of the pointer of the orthogonal axis in pixels as a {@link Float}
-     *         value
-     * @return True, if any tabs have been moved, false otherwise
-     */
-    public final boolean handleDrag(final float dragPosition, final float orthogonalPosition) {
-        if (dragPosition <= startOvershootThreshold) {
-            handleOvershoot();
-            dragState = DragState.OVERSHOOT_START;
-            startOvershootThreshold = onOvershootStart(dragPosition, startOvershootThreshold);
-        } else if (dragPosition >= endOvershootThreshold) {
-            handleOvershoot();
-            dragState = DragState.OVERSHOOT_END;
-            endOvershootThreshold = onOvershootEnd(dragPosition, endOvershootThreshold);
-        } else {
-            onOvershootReverted();
-            float previousDistance =
-                    getDragHelper().isReset() ? 0 : getDragHelper().getDragDistance();
-            getDragHelper().update(dragPosition);
-
-            if (swipeEnabled) {
-                swipeDragHelper.update(orthogonalPosition);
-
-                if (dragState == DragState.NONE && swipeDragHelper.hasThresholdBeenReached()) {
-                    AbstractItem focusedItem =
-                            getFocusedItem(getDragHelper().getDragStartPosition());
-
-                    if (focusedItem != null && focusedItem instanceof TabItem) {
-                        dragState = DragState.SWIPE;
-                        swipedTabItem = (TabItem) focusedItem;
-                    }
-                }
-            }
-
-            if (dragState != DragState.SWIPE && getDragHelper().hasThresholdBeenReached()) {
-                if (dragState == DragState.OVERSHOOT_START) {
-                    dragState = DragState.DRAG_TO_END;
-                } else if (dragState == DragState.OVERSHOOT_END) {
-                    dragState = DragState.DRAG_TO_START;
-                } else {
-                    float dragDistance = getDragHelper().getDragDistance();
-
-                    if (dragDistance == 0) {
-                        if (dragState != DragState.PULLING_DOWN) {
-                            dragState = DragState.NONE;
-                        }
-                    } else {
-                        dragState = previousDistance - dragDistance < 0 ? DragState.DRAG_TO_END :
-                                DragState.DRAG_TO_START;
-                    }
-                }
-            }
-
-            if (dragState == DragState.SWIPE) {
-                notifyOnSwipe(swipedTabItem, swipeDragHelper.getDragDistance());
-            } else if (dragState != DragState.NONE) {
-                float currentDragDistance = getDragHelper().getDragDistance();
-                float distance = currentDragDistance - dragDistance;
-                dragDistance = currentDragDistance;
-                DragState overshoot = notifyOnDrag(dragState, distance);
-
-                if (overshoot == DragState.OVERSHOOT_END && (dragState == DragState.DRAG_TO_END ||
-                        dragState == DragState.OVERSHOOT_END)) {
-                    endOvershootThreshold = dragPosition;
-                    dragState = DragState.OVERSHOOT_END;
-                } else if (overshoot == DragState.OVERSHOOT_START &&
-                        (dragState == DragState.DRAG_TO_START ||
-                                dragState == DragState.OVERSHOOT_START)) {
-                    startOvershootThreshold = dragPosition;
-                    dragState = DragState.OVERSHOOT_START;
-                }
-
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public final boolean isDragging() {
-        return super.isDragging() || swipeDragHelper.hasThresholdBeenReached();
-    }
-
-    @Override
-    public final void reset() {
-        resetDragging();
-        onReset();
-    }
-
-    @Override
-    protected final boolean isDraggingAllowed() {
-        return getTabSwitcher().isSwitcherShown() && !getTabSwitcher().isEmpty();
-    }
-
-    @Override
-    protected final void onTouchEvent() {
-        notifyOnCancelFling();
-    }
-
-    @Override
-    protected final void onDown(@NonNull final MotionEvent event) {
-        pressedItem = getFocusedItem(getArithmetics().getTouchPosition(Axis.DRAGGING_AXIS, event));
-
-        if (pressedItem != null) {
-            notifyOnPressStarted(pressedItem);
-        }
-    }
-
-    @Override
-    protected final void onDrag(@NonNull final MotionEvent event) {
-        float dragPosition = arithmetics.getTouchPosition(Axis.DRAGGING_AXIS, event);
-        float orthogonalPosition = arithmetics.getTouchPosition(Axis.ORTHOGONAL_AXIS, event);
-
-        if (pressedItem != null && !isInsideTouchableArea(event)) {
-            notifyOnPressEnded(pressedItem);
-            pressedItem = null;
-        }
-
-        handleDrag(dragPosition, orthogonalPosition);
-    }
-
-    @Override
-    public final void onUp(@Nullable final MotionEvent event) {
-        if (dragState == DragState.SWIPE) {
-            float swipeVelocity = 0;
-
-            if (event != null && getVelocityTracker() != null) {
-                int pointerId = event.getPointerId(0);
-                getVelocityTracker().computeCurrentVelocity(1000, maxFlingVelocity);
-                swipeVelocity = Math.abs(getVelocityTracker().getXVelocity(pointerId));
-            }
-
-            boolean remove = swipedTabItem.getTab().isCloseable() &&
-                    (swipeVelocity >= minSwipeVelocity || isSwipeThresholdReached(swipedTabItem));
-            notifyOnSwipeEnded(swipedTabItem, remove,
-                    swipeVelocity >= minSwipeVelocity ? swipeVelocity : 0);
-        } else if (dragState == DragState.DRAG_TO_START || dragState == DragState.DRAG_TO_END) {
-            if (event != null && getDragHelper().hasThresholdBeenReached()) {
-                handleFling(event, dragState);
-            }
-        } else if (dragState == DragState.OVERSHOOT_END) {
-            notifyOnRevertEndOvershoot();
-        } else if (dragState == DragState.OVERSHOOT_START) {
-            notifyOnRevertStartOvershoot();
-        } else if (event != null && dragState != DragState.PULLING_DOWN) {
-            handleClick(event);
-        }
-
-        resetDragging();
-    }
-
-}
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/AbstractTabRecyclerAdapter.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/AbstractTabRecyclerAdapter.java
deleted file mode 100644
index 1e35fadc..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/AbstractTabRecyclerAdapter.java
+++ /dev/null
@@ -1,820 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.layout;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageButton;
-
-import androidx.annotation.CallSuper;
-import androidx.annotation.ColorInt;
-import androidx.annotation.MenuRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
-import de.mrapp.android.tabswitcher.Animation;
-import de.mrapp.android.tabswitcher.Layout;
-import de.mrapp.android.tabswitcher.R;
-import de.mrapp.android.tabswitcher.Tab;
-import de.mrapp.android.tabswitcher.TabCloseListener;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.TabSwitcherDecorator;
-import de.mrapp.android.tabswitcher.iterator.AbstractItemIterator;
-import de.mrapp.android.tabswitcher.iterator.ItemIterator;
-import de.mrapp.android.tabswitcher.model.AbstractItem;
-import de.mrapp.android.tabswitcher.model.Model;
-import de.mrapp.android.tabswitcher.model.State;
-import de.mrapp.android.tabswitcher.model.TabItem;
-import de.mrapp.android.tabswitcher.model.TabSwitcherModel;
-import de.mrapp.android.tabswitcher.model.TabSwitcherStyle;
-import de.mrapp.android.util.logging.LogLevel;
-import de.mrapp.android.util.view.AbstractViewRecycler;
-import de.mrapp.android.util.view.AttachedViewRecycler;
-import de.mrapp.util.Condition;
-
-/**
- * An abstract base class for all view recycler adapters, which allow to inflate the views, which
- * are used to visualize the tabs of a {@link TabSwitcher}.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public abstract class AbstractTabRecyclerAdapter
-        extends AbstractViewRecycler.Adapter<AbstractItem, Integer>
-        implements Tab.Callback, Model.Listener {
-
-    /**
-     * The view type of a tab.
-     */
-    private static final int TAB_VIEW_TYPE = 0;
-
-    /**
-     * The tab switcher, the tabs belong to.
-     */
-    private final TabSwitcher tabSwitcher;
-
-    /**
-     * The model, which belongs to the tab switcher.
-     */
-    private final TabSwitcherModel model;
-
-    /*
-     * The style, which allows to retrieve style attributes of the tab switcher.
-     */
-    private final TabSwitcherStyle style;
-
-    /**
-     * The view recycler, the adapter is bound to.
-     */
-    private AttachedViewRecycler<AbstractItem, Integer> viewRecycler;
-
-    /**
-     * Adapts the title of a tab.
-     *
-     * @param tabItem
-     *         The tab item, which corresponds to the tab, whose title should be adapted, as an
-     *         instance of the class {@link TabItem}. The tab item may not be null
-     */
-    private void adaptTitle(@NonNull final TabItem tabItem) {
-        Tab tab = tabItem.getTab();
-        AbstractTabViewHolder viewHolder = tabItem.getViewHolder();
-        viewHolder.titleTextView.setText(tab.getTitle());
-    }
-
-    /**
-     * Adapts the icon of a tab.
-     *
-     * @param tabItem
-     *         The tab item, which corresponds to the tab, whose icon should be adapted, as an
-     *         instance of the class {@link TabItem}. The tab item may not be null
-     */
-    private void adaptIcon(@NonNull final TabItem tabItem) {
-        Tab tab = tabItem.getTab();
-        AbstractTabViewHolder viewHolder = tabItem.getViewHolder();
-        Drawable icon = style.getTabIcon(tab);
-        viewHolder.iconImageView.setImageDrawable(icon);
-    }
-
-    /**
-     * Adapts the visibility of a tab's close button.
-     *
-     * @param tabItem
-     *         The tab item, which corresponds to the tab, whose close button should be adapted, as
-     *         an instance of the class {@link TabItem}. The tab item may not be null
-     */
-    private void adaptCloseButtonVisibility(@NonNull final TabItem tabItem) {
-        Tab tab = tabItem.getTab();
-        AbstractTabViewHolder viewHolder = tabItem.getViewHolder();
-        viewHolder.closeButton.setVisibility(tab.isCloseable() ? View.VISIBLE : View.GONE);
-        viewHolder.closeButton.setTag(R.id.tag_visibility, tab.isCloseable());
-        viewHolder.closeButton.setOnClickListener(
-                tab.isCloseable() ? createCloseButtonClickListener(viewHolder.closeButton, tab) :
-                        null);
-    }
-
-    /**
-     * Adapts the icon of a tab's close button.
-     *
-     * @param tabItem
-     *         The tab item, which corresponds to the tab, whose close button icon should be
-     *         adapted, as an instance of the class {@link TabItem}. The tab item may not be null
-     */
-    private void adaptCloseButtonIcon(@NonNull final TabItem tabItem) {
-        Tab tab = tabItem.getTab();
-        Drawable icon = style.getTabCloseButtonIcon(tab);
-        AbstractTabViewHolder viewHolder = tabItem.getViewHolder();
-        viewHolder.closeButton.setImageDrawable(icon);
-    }
-
-    /**
-     * Adapts the background color of a tab.
-     *
-     * @param tabItem
-     *         The tab item, which corresponds to the tab, whose background should be adapted, as an
-     *         instance of the class {@link TabItem}. The tab item may not be null
-     */
-    private void adaptBackgroundColor(@NonNull final TabItem tabItem) {
-        Tab tab = tabItem.getTab();
-        ColorStateList colorStateList = style.getTabBackgroundColor(tab);
-        int[] stateSet = model.getSelectedTab() == tab ? new int[]{android.R.attr.state_selected} :
-                new int[]{};
-        int color = colorStateList.getColorForState(stateSet, colorStateList.getDefaultColor());
-        View view = tabItem.getView();
-        Drawable background = view.getBackground();
-        background.setColorFilter(color, PorterDuff.Mode.MULTIPLY);
-        onAdaptBackgroundColor(color, tabItem);
-    }
-
-    /**
-     * Adapts the text color of a tab's title.
-     *
-     * @param tabItem
-     *         The tab item, which corresponds to the tab, whose title should be adapted, as an
-     *         instance of the class {@link TabItem}. The tab item may not be null
-     */
-    private void adaptTitleTextColor(@NonNull final TabItem tabItem) {
-        Tab tab = tabItem.getTab();
-        ColorStateList colorStateList = style.getTabTitleTextColor(tab);
-        AbstractTabViewHolder viewHolder = tabItem.getViewHolder();
-        viewHolder.titleTextView.setTextColor(colorStateList);
-    }
-
-    /**
-     * Adapts the visibility of a tab's progress bar.
-     *
-     * @param tabItem
-     *         The tab item, which corresponds to the tab, whose progress bar should be adapted, as
-     *         an instance of the class {@link TabItem}. The tab item may not be null
-     */
-    private void adaptProgressBarVisibility(@NonNull final TabItem tabItem) {
-        Tab tab = tabItem.getTab();
-        AbstractTabViewHolder viewHolder = tabItem.getViewHolder();
-        viewHolder.progressBar.setVisibility(tab.isProgressBarShown() ? View.VISIBLE : View.GONE);
-        viewHolder.iconImageView.setVisibility(tab.isProgressBarShown() ? View.GONE : View.VISIBLE);
-    }
-
-    /**
-     * Adapts the color of a tab's progress bar.
-     *
-     * @param tabItem
-     *         The tab item, which corresponds to the tab, whose progress bar should be adapted, as
-     *         an instance of the class {@link TabItem}. The tab item may not be null
-     */
-    private void adaptProgressBarColor(@NonNull final TabItem tabItem) {
-        Tab tab = tabItem.getTab();
-        AbstractTabViewHolder viewHolder = tabItem.getViewHolder();
-        int color = style.getTabProgressBarColor(tab);
-        viewHolder.progressBar.setColor(color);
-    }
-
-    /**
-     * Adapts the selection state of a tab's views.
-     *
-     * @param tabItem
-     *         The tab item, which corresponds to the tab, whose selection state should be adapted,
-     *         as an instance of the class {@link TabItem}. The tab item may not be null
-     */
-    private void adaptSelectionState(@NonNull final TabItem tabItem) {
-        boolean selected = model.getSelectedTab() == tabItem.getTab();
-        tabItem.getView().setSelected(selected);
-        AbstractTabViewHolder viewHolder = tabItem.getViewHolder();
-        viewHolder.titleTextView.setSelected(selected);
-        viewHolder.closeButton.setSelected(selected);
-    }
-
-    /**
-     * Adapts the appearance of all currently inflated tabs, depending on whether they are currently
-     * selected, or not.
-     */
-    private void adaptAllSelectionStates() {
-        AbstractItemIterator iterator =
-                new ItemIterator.Builder(model, getViewRecyclerOrThrowException()).create();
-        AbstractItem item;
-
-        while ((item = iterator.next()) != null) {
-            if (item.isInflated() && item instanceof TabItem) {
-                TabItem tabItem = (TabItem) item;
-                adaptSelectionState(tabItem);
-                adaptBackgroundColor(tabItem);
-            }
-        }
-    }
-
-    /**
-     * Creates and returns a listener, which allows to close a specific tab, when its close button
-     * is clicked.
-     *
-     * @param closeButton
-     *         The tab's close button as an instance of the class {@link ImageButton}. The button
-     *         may not be null
-     * @param tab
-     *         The tab, which should be closed, as an instance of the class {@link Tab}. The tab may
-     *         not be null
-     * @return The listener, which has been created, as an instance of the class {@link
-     * View.OnClickListener}. The listener may not be null
-     */
-    @NonNull
-    private View.OnClickListener createCloseButtonClickListener(
-            @NonNull final ImageButton closeButton, @NonNull final Tab tab) {
-        return new View.OnClickListener() {
-
-            @Override
-            public void onClick(final View v) {
-                TabItem tabItem = getTabItem(tab);
-
-                if (tabItem != null) {
-                    State state = tabItem.getTag().getState();
-
-                    if (state == State.FLOATING || state == State.STACKED_START_ATOP) {
-                        if (notifyOnCloseTab(tab)) {
-                            closeButton.setOnClickListener(null);
-                            tabSwitcher.removeTab(tab);
-                        }
-                    }
-                }
-            }
-
-        };
-    }
-
-    /**
-     * Notifies all listeners, that a tab is about to be closed by clicking its close button.
-     *
-     * @param tab
-     *         The tab, which is about to be closed, as an instance of the class {@link Tab}. The
-     *         tab may not be null
-     * @return True, if the tab should be closed, false otherwise
-     */
-    private boolean notifyOnCloseTab(@NonNull final Tab tab) {
-        boolean result = true;
-
-        for (TabCloseListener listener : model.getTabCloseListeners()) {
-            result &= listener.onCloseTab(tabSwitcher, tab);
-        }
-
-        return result;
-    }
-
-    /**
-     * Returns the tab switcher, which contains the tabs.
-     *
-     * @return The tab switcher, which contains the tabs, as an instance of the class {@link
-     * TabSwitcher}. The tab switcher may not be null
-     */
-    @NonNull
-    protected final TabSwitcher getTabSwitcher() {
-        return tabSwitcher;
-    }
-
-    /**
-     * Returns the model of the tab switcher.
-     *
-     * @return The model of the tab switcher as an instance of the class {@link TabSwitcherModel}.
-     * The model may not be null
-     */
-    @NonNull
-    protected final TabSwitcherModel getModel() {
-        return model;
-    }
-
-    /**
-     * Returns the style, which allow to retrieve style attributes of the tab switcher.
-     *
-     * @return The style, which allows to retrieve style attributes of the tab switcher, as an
-     * instance of the class {@link TabSwitcherStyle}. The style may not be null
-     */
-    @NonNull
-    protected final TabSwitcherStyle getStyle() {
-        return style;
-    }
-
-    /**
-     * Returns the tab item, which corresponds to a specific tab.
-     *
-     * @param tab
-     *         The tab, whose tab item should be returned, as an instance of the class {@link Tab}.
-     *         The tab may not be null
-     * @return The tab item, which corresponds to the given tab, as an instance of the class {@link
-     * TabItem} or null, if no view, which visualizes the tab, is currently inflated
-     */
-    @Nullable
-    protected final TabItem getTabItem(@NonNull final Tab tab) {
-        int index = model.indexOf(tab);
-
-        if (index != -1) {
-            TabItem tabItem = TabItem.create(model, getViewRecyclerOrThrowException(), index);
-
-            if (tabItem.isInflated()) {
-                return tabItem;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns the view recycler, the adapter is bound to, or throws an {@link
-     * IllegalStateException}, if no view recycler has been set.
-     *
-     * @return The view recycler, the adapter is bound to, as an instance of the class
-     * AttachedViewRecycler. The view recycler may not be null
-     */
-    @NonNull
-    protected final AttachedViewRecycler<AbstractItem, Integer> getViewRecyclerOrThrowException() {
-        Condition.INSTANCE.ensureNotNull(viewRecycler, "No view recycler has been set",
-                IllegalStateException.class);
-        return viewRecycler;
-    }
-
-    /**
-     * The method, which is invoked on implementing subclasses, when the background color of a tab
-     * has been changed.
-     *
-     * @param color
-     *         The color, which has been set, as an {@link Integer} value
-     * @param tabItem
-     *         The tab item, which corresponds to the tab, whose background color has been changed,
-     *         as an instance of the class {@link TabItem}. The tab item may not be null
-     */
-    protected void onAdaptBackgroundColor(@ColorInt final int color,
-                                          @NonNull final TabItem tabItem) {
-
-    }
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to inflate the view, which
-     * is used to visualize tabs.
-     *
-     * @param inflater
-     *         The layout inflater, which should be used, as an instance of the class {@link
-     *         LayoutInflater}. The layout inflater may not be null
-     * @param parent
-     *         The parent of the view, which should be inflated, as an instance of the class {@link
-     *         ViewGroup} or null, if no parent is available
-     * @param viewHolder
-     *         The view holder, which should hold references to the child views of the view, which
-     *         should be inflated, as an instance of the class {@link AbstractTabViewHolder}. The
-     *         view holder may not be null
-     * @return The view, which has been inflated, as an instance of the class {@link View}. The view
-     * may not be null
-     */
-    @NonNull
-    protected abstract View onInflateTabView(@NonNull final LayoutInflater inflater,
-                                             @Nullable final ViewGroup parent,
-                                             @NonNull final AbstractTabViewHolder viewHolder);
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to adapt the appearance of a
-     * view, which is used to visualize a tab.
-     *
-     * @param view
-     *         The view, which is used to visualize the tab, as an instance of the class {@link
-     *         View}. The view may not be null
-     * @param tabItem
-     *         The tab item, which corresponds to the tab, which is visualized by the given view, as
-     *         an instance of the class {@link TabItem}. The tab item may not be null
-     * @param params
-     *         An array, which may contain optional parameters, as an array of the generic type
-     *         ParamType or an empty array, if no optional parameters are available
-     */
-    @SuppressWarnings("unchecked")
-    protected abstract void onShowTabView(@NonNull final View view, @NonNull final TabItem tabItem,
-                                          @NonNull final Integer... params);
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to create the view holder,
-     * which should be associated with an inflated view.
-     *
-     * @return The view holder, which has been created, as an instance of the class {@link
-     * AbstractTabViewHolder}. The view holder may not be null
-     */
-    @NonNull
-    protected abstract AbstractTabViewHolder onCreateTabViewHolder();
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to retrieve the layout,
-     * which is used by the tab switcher.
-     *
-     * @return The layout, which is used by the tab switcher, as a value of the enum {@link Layout}.
-     * The layout may not be null
-     */
-    @NonNull
-    protected abstract Layout getLayout();
-
-    /**
-     * Creates a new view recycler adapter, which allows to inflate the views, which are used to
-     * visualize the tabs of a {@link TabSwitcher}.
-     *
-     * @param tabSwitcher
-     *         The tab switcher as an instance of the class {@link TabSwitcher}. The tab switcher
-     *         may not be null
-     * @param model
-     *         The model, which belongs to the tab switcher, as an instance of the class {@link
-     *         TabSwitcherModel}. The model may not be null
-     * @param style
-     *         The style, which allows to retrieve style attributes of the tab switcher switcher, as
-     *         an instance of the class {@link TabSwitcherStyle}. The style may not be null
-     */
-    public AbstractTabRecyclerAdapter(@NonNull final TabSwitcher tabSwitcher,
-                                      @NonNull final TabSwitcherModel model,
-                                      @NonNull final TabSwitcherStyle style) {
-        Condition.INSTANCE.ensureNotNull(tabSwitcher, "The tab switcher may not be null");
-        Condition.INSTANCE.ensureNotNull(model, "The model may not be null");
-        Condition.INSTANCE.ensureNotNull(style, "The style may not be null");
-        this.tabSwitcher = tabSwitcher;
-        this.model = model;
-        this.style = style;
-        this.viewRecycler = null;
-    }
-
-    /**
-     * Sets the view recycler, which allows to inflate the views, which are used to visualize tabs.
-     *
-     * @param viewRecycler
-     *         The view recycler, which should be set, as an instance of the class
-     *         AttachedViewRecycler. The view recycler may not be null
-     */
-    public final void setViewRecycler(
-            @NonNull final AttachedViewRecycler<AbstractItem, Integer> viewRecycler) {
-        Condition.INSTANCE.ensureNotNull(viewRecycler, "The view recycler may not be null");
-        this.viewRecycler = viewRecycler;
-    }
-
-    @Override
-    public void onLogLevelChanged(@NonNull final LogLevel logLevel) {
-
-    }
-
-    @Override
-    public final void onDecoratorChanged(@NonNull final TabSwitcherDecorator decorator) {
-
-    }
-
-    @Override
-    public final void onSwitcherShown() {
-
-    }
-
-    @Override
-    public final void onSwitcherHidden() {
-
-    }
-
-    @Override
-    public final void onSelectionChanged(final int previousIndex, final int index,
-                                         @Nullable final Tab selectedTab,
-                                         final boolean switcherHidden) {
-        adaptAllSelectionStates();
-    }
-
-    @Override
-    public final void onTabAdded(final int index, @NonNull final Tab tab,
-                                 final int previousSelectedTabIndex, final int selectedTabIndex,
-                                 final boolean selectionChanged,
-                                 final boolean switcherVisibilityChanged,
-                                 @NonNull final Animation animation) {
-        if (selectionChanged) {
-            adaptAllSelectionStates();
-        }
-    }
-
-    @Override
-    public final void onAllTabsAdded(final int index, @NonNull final Tab[] tabs,
-                                     final int previousSelectedTabIndex, final int selectedTabIndex,
-                                     final boolean selectionChanged,
-                                     @NonNull final Animation animation) {
-        if (selectionChanged) {
-            adaptAllSelectionStates();
-        }
-    }
-
-    @Override
-    public final void onTabRemoved(final int index, @NonNull final Tab tab,
-                                   final int previousSelectedTabIndex, final int selectedTabIndex,
-                                   final boolean selectionChanged,
-                                   @NonNull final Animation animation) {
-        if (selectionChanged) {
-            adaptAllSelectionStates();
-        }
-    }
-
-    @Override
-    public final void onAllTabsRemoved(@NonNull final Tab[] tabs,
-                                       @NonNull final Animation animation) {
-
-    }
-
-    @Override
-    public void onPaddingChanged(final int left, final int top, final int right, final int bottom) {
-
-    }
-
-    @Override
-    public void onApplyPaddingToTabsChanged(final boolean applyPaddingToTabs) {
-
-    }
-
-    @Override
-    public final void onTabIconChanged(@Nullable final Drawable icon) {
-        ItemIterator iterator =
-                new ItemIterator.Builder(model, getViewRecyclerOrThrowException()).create();
-        AbstractItem item;
-
-        while ((item = iterator.next()) != null) {
-            if (item.isInflated() && item instanceof TabItem) {
-                adaptIcon((TabItem) item);
-            }
-        }
-    }
-
-    @CallSuper
-    @Override
-    public void onTabBackgroundColorChanged(@Nullable final ColorStateList colorStateList) {
-        ItemIterator iterator =
-                new ItemIterator.Builder(model, getViewRecyclerOrThrowException()).create();
-        AbstractItem item;
-
-        while ((item = iterator.next()) != null) {
-            if (item.isInflated() && item instanceof TabItem) {
-                adaptBackgroundColor((TabItem) item);
-            }
-        }
-    }
-
-    @Override
-    public void onTabContentBackgroundColorChanged(@ColorInt final int color) {
-
-    }
-
-    @Override
-    public final void onTabTitleColorChanged(@Nullable final ColorStateList colorStateList) {
-        ItemIterator iterator =
-                new ItemIterator.Builder(model, getViewRecyclerOrThrowException()).create();
-        AbstractItem item;
-
-        while ((item = iterator.next()) != null) {
-            if (item.isInflated() && item instanceof TabItem) {
-                adaptTitleTextColor((TabItem) item);
-            }
-        }
-    }
-
-    @Override
-    public final void onTabCloseButtonIconChanged(@Nullable final Drawable icon) {
-        ItemIterator iterator =
-                new ItemIterator.Builder(model, getViewRecyclerOrThrowException()).create();
-        AbstractItem item;
-
-        while ((item = iterator.next()) != null) {
-            if (item.isInflated() && item instanceof TabItem) {
-                adaptCloseButtonIcon((TabItem) item);
-            }
-        }
-    }
-
-    @Override
-    public final void onTabProgressBarColorChanged(@ColorInt final int color) {
-        ItemIterator iterator =
-                new ItemIterator.Builder(model, getViewRecyclerOrThrowException()).create();
-        AbstractItem item;
-
-        while ((item = iterator.next()) != null) {
-            if (item.isInflated() && item instanceof TabItem) {
-                adaptProgressBarColor((TabItem) item);
-            }
-        }
-    }
-
-    @Override
-    public final void onAddTabButtonVisibilityChanged(final boolean visible) {
-
-    }
-
-    @Override
-    public void onAddTabButtonColorChanged(@Nullable final ColorStateList colorStateList) {
-
-    }
-
-    @Override
-    public final void onToolbarVisibilityChanged(final boolean visible) {
-
-    }
-
-    @Override
-    public final void onToolbarTitleChanged(@Nullable final CharSequence title) {
-
-    }
-
-    @Override
-    public final void onToolbarNavigationIconChanged(@Nullable final Drawable icon,
-                                                     @Nullable final View.OnClickListener listener) {
-
-    }
-
-    @Override
-    public final void onToolbarMenuInflated(@MenuRes final int resourceId,
-                                            @Nullable final Toolbar.OnMenuItemClickListener listener) {
-
-    }
-
-    @Override
-    public final void onEmptyViewChanged(@Nullable final View view, final long animationDuration) {
-
-    }
-
-    @Override
-    public final void onTitleChanged(@NonNull final Tab tab) {
-        TabItem tabItem = getTabItem(tab);
-
-        if (tabItem != null) {
-            adaptTitle(tabItem);
-        }
-    }
-
-    @Override
-    public final void onIconChanged(@NonNull final Tab tab) {
-        TabItem tabItem = getTabItem(tab);
-
-        if (tabItem != null) {
-            adaptIcon(tabItem);
-        }
-    }
-
-    @Override
-    public final void onCloseableChanged(@NonNull final Tab tab) {
-        TabItem tabItem = getTabItem(tab);
-
-        if (tabItem != null) {
-            adaptCloseButtonVisibility(tabItem);
-        }
-    }
-
-    @Override
-    public final void onCloseButtonIconChanged(@NonNull final Tab tab) {
-        TabItem tabItem = getTabItem(tab);
-
-        if (tabItem != null) {
-            adaptCloseButtonIcon(tabItem);
-        }
-    }
-
-    @Override
-    public final void onBackgroundColorChanged(@NonNull final Tab tab) {
-        TabItem tabItem = getTabItem(tab);
-
-        if (tabItem != null) {
-            adaptBackgroundColor(tabItem);
-        }
-    }
-
-    @Override
-    public void onContentBackgroundColorChanged(@NonNull final Tab tab) {
-
-    }
-
-    @Override
-    public final void onTitleTextColorChanged(@NonNull final Tab tab) {
-        TabItem tabItem = getTabItem(tab);
-
-        if (tabItem != null) {
-            adaptTitleTextColor(tabItem);
-        }
-    }
-
-    @Override
-    public final void onProgressBarVisibilityChanged(@NonNull final Tab tab) {
-        TabItem tabItem = getTabItem(tab);
-
-        if (tabItem != null) {
-            adaptProgressBarVisibility(tabItem);
-        }
-    }
-
-    @Override
-    public final void onProgressBarColorChanged(@NonNull final Tab tab) {
-        TabItem tabItem = getTabItem(tab);
-
-        if (tabItem != null) {
-            adaptProgressBarColor(tabItem);
-        }
-    }
-
-    @CallSuper
-    @Override
-    public int getViewType(@NonNull final AbstractItem item) {
-        if (item instanceof TabItem) {
-            return TAB_VIEW_TYPE;
-        } else {
-            throw new IllegalArgumentException("Unknown item type");
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    @CallSuper
-    @NonNull
-    @Override
-    public View onInflateView(@NonNull final LayoutInflater inflater,
-                              @Nullable final ViewGroup parent, @NonNull final AbstractItem item,
-                              final int viewType, @NonNull final Integer... params) {
-        if (viewType == TAB_VIEW_TYPE) {
-            TabItem tabItem = (TabItem) item;
-            AbstractTabViewHolder viewHolder = onCreateTabViewHolder();
-            View view = onInflateTabView(inflater, parent, viewHolder);
-            viewHolder.titleContainer = view.findViewById(R.id.tab_title_container);
-            viewHolder.titleTextView = view.findViewById(R.id.tab_title_text_view);
-            viewHolder.iconImageView = view.findViewById(R.id.tab_icon_image_view);
-            viewHolder.progressBar = view.findViewById(R.id.tab_progress_bar);
-            viewHolder.closeButton = view.findViewById(R.id.close_tab_button);
-            view.setTag(R.id.tag_view_holder, viewHolder);
-            tabItem.setViewHolder(viewHolder);
-            item.setView(view);
-            view.setTag(R.id.tag_properties, item.getTag());
-            return view;
-        } else {
-            throw new IllegalArgumentException("Unknown view type");
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    @CallSuper
-    @Override
-    public void onShowView(@NonNull final Context context, @NonNull final View view,
-                           @NonNull final AbstractItem item, final boolean inflated,
-                           @NonNull final Integer... params) {
-        if (item instanceof TabItem) {
-            TabItem tabItem = (TabItem) item;
-            AbstractTabViewHolder viewHolder =
-                    (AbstractTabViewHolder) view.getTag(R.id.tag_view_holder);
-
-            if (!tabItem.isInflated()) {
-                tabItem.setView(view);
-                tabItem.setViewHolder(viewHolder);
-                view.setTag(R.id.tag_properties, tabItem.getTag());
-            }
-
-            Tab tab = tabItem.getTab();
-            tab.addCallback(this);
-            adaptTitle(tabItem);
-            adaptIcon(tabItem);
-            adaptProgressBarVisibility(tabItem);
-            adaptCloseButtonVisibility(tabItem);
-            adaptCloseButtonIcon(tabItem);
-            adaptBackgroundColor(tabItem);
-            adaptTitleTextColor(tabItem);
-            adaptSelectionState(tabItem);
-            onShowTabView(view, tabItem, params);
-        } else {
-            throw new IllegalArgumentException("Unknown item type");
-        }
-    }
-
-    @CallSuper
-    @Override
-    public void onRemoveView(@NonNull final View view, @NonNull final AbstractItem item) {
-        if (item instanceof TabItem) {
-            TabItem tabItem = (TabItem) item;
-            Tab tab = tabItem.getTab();
-            tab.removeCallback(this);
-            view.setTag(R.id.tag_properties, null);
-        } else {
-            throw new IllegalArgumentException("Unknown item type");
-        }
-    }
-
-}
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/AbstractTabSwitcherLayout.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/AbstractTabSwitcherLayout.java
deleted file mode 100644
index 79d3e2b1..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/AbstractTabSwitcherLayout.java
+++ /dev/null
@@ -1,1690 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.layout;
-
-import android.animation.Animator;
-import android.animation.Animator.AnimatorListener;
-import android.animation.AnimatorListenerAdapter;
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.content.res.Resources;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
-import android.view.ContextThemeWrapper;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
-import android.view.animation.Animation;
-import android.view.animation.DecelerateInterpolator;
-import android.view.animation.Transformation;
-
-import androidx.annotation.CallSuper;
-import androidx.annotation.ColorInt;
-import androidx.annotation.MenuRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
-import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener;
-import androidx.core.util.Pair;
-import de.mrapp.android.tabswitcher.AddTabButtonListener;
-import de.mrapp.android.tabswitcher.R;
-import de.mrapp.android.tabswitcher.Tab;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.TabSwitcherDecorator;
-import de.mrapp.android.tabswitcher.gesture.AbstractTouchEventHandler;
-import de.mrapp.android.tabswitcher.gesture.PullDownGestureEventHandler;
-import de.mrapp.android.tabswitcher.gesture.SwipeGestureEventHandler;
-import de.mrapp.android.tabswitcher.gesture.TouchEventDispatcher;
-import de.mrapp.android.tabswitcher.iterator.AbstractItemIterator;
-import de.mrapp.android.tabswitcher.iterator.ItemIterator;
-import de.mrapp.android.tabswitcher.layout.AbstractDragTabsEventHandler.DragState;
-import de.mrapp.android.tabswitcher.layout.Arithmetics.Axis;
-import de.mrapp.android.tabswitcher.model.AbstractItem;
-import de.mrapp.android.tabswitcher.model.AddTabItem;
-import de.mrapp.android.tabswitcher.model.Model;
-import de.mrapp.android.tabswitcher.model.State;
-import de.mrapp.android.tabswitcher.model.TabItem;
-import de.mrapp.android.tabswitcher.model.TabSwitcherModel;
-import de.mrapp.android.tabswitcher.model.TabSwitcherStyle;
-import de.mrapp.android.util.ViewUtil;
-import de.mrapp.android.util.logging.LogLevel;
-import de.mrapp.android.util.logging.Logger;
-import de.mrapp.android.util.view.AbstractViewRecycler;
-import de.mrapp.android.util.view.AttachedViewRecycler;
-import de.mrapp.util.Condition;
-
-/**
- * An abstract base class for all layouts, which implement the functionality of a {@link
- * TabSwitcher}.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public abstract class AbstractTabSwitcherLayout
-        implements TabSwitcherLayout, OnGlobalLayoutListener, Model.Listener,
-        TouchEventDispatcher.Callback, AbstractDragTabsEventHandler.Callback,
-        SwipeGestureEventHandler.Callback, PullDownGestureEventHandler.Callback {
-
-    /**
-     * Defines the interface, a class, which should be notified about the events of a tab switcher
-     * layout, must implement.
-     */
-    public interface Callback {
-
-        /*
-         * The method, which is invoked, when all animations have been ended.
-         */
-        void onAnimationsEnded();
-
-    }
-
-    /**
-     * A layout listener, which unregisters itself from the observed view, when invoked. The
-     * listener allows to encapsulate another listener, which is notified, when the listener is
-     * invoked.
-     */
-    public static class LayoutListenerWrapper implements OnGlobalLayoutListener {
-
-        /**
-         * The observed view.
-         */
-        private final View view;
-
-        /**
-         * The encapsulated listener.
-         */
-        private final OnGlobalLayoutListener listener;
-
-        /**
-         * Creates a new layout listener, which unregisters itself from the observed view, when
-         * invoked.
-         *
-         * @param view
-         *         The observed view as an instance of the class {@link View}. The view may not be
-         *         null
-         * @param listener
-         *         The listener, which should be encapsulated, as an instance of the type {@link
-         *         OnGlobalLayoutListener} or null, if no listener should be encapsulated
-         */
-        public LayoutListenerWrapper(@NonNull final View view,
-                                     @Nullable final OnGlobalLayoutListener listener) {
-            Condition.INSTANCE.ensureNotNull(view, "The view may not be null");
-            this.view = view;
-            this.listener = listener;
-        }
-
-        @Override
-        public void onGlobalLayout() {
-            ViewUtil.removeOnGlobalLayoutListener(view.getViewTreeObserver(), this);
-
-            if (listener != null) {
-                listener.onGlobalLayout();
-            }
-        }
-
-    }
-
-    /**
-     * A animation listener, which increases the number of running animations, when the observed
-     * animation is started, and decreases the number of accordingly, when the animation is
-     * finished. The listener allows to encapsulate another animation listener, which is notified
-     * when the animation has been started, canceled or ended.
-     */
-    protected class AnimationListenerWrapper extends AnimatorListenerAdapter {
-
-        /**
-         * The encapsulated listener.
-         */
-        private final AnimatorListener listener;
-
-        /**
-         * Decreases the number of running animations and executes the next pending action, if no
-         * running animations remain.
-         */
-        private void endAnimation() {
-            if (--runningAnimations == 0) {
-                notifyOnAnimationsEnded();
-            }
-        }
-
-        /**
-         * Creates a new animation listener, which increases the number of running animations, when
-         * the observed animation is started, and decreases the number of accordingly, when the
-         * animation is finished.
-         *
-         * @param listener
-         *         The listener, which should be encapsulated, as an instance of the type {@link
-         *         AnimatorListener} or null, if no listener should be encapsulated
-         */
-        public AnimationListenerWrapper(@Nullable final AnimatorListener listener) {
-            this.listener = listener;
-            runningAnimations++;
-        }
-
-        @Override
-        public void onAnimationStart(final Animator animation) {
-            super.onAnimationStart(animation);
-
-            if (listener != null) {
-                listener.onAnimationStart(animation);
-            }
-        }
-
-        @Override
-        public void onAnimationEnd(final Animator animation) {
-            super.onAnimationEnd(animation);
-
-            if (listener != null) {
-                listener.onAnimationEnd(animation);
-            }
-
-            endAnimation();
-        }
-
-        @Override
-        public void onAnimationCancel(final Animator animation) {
-            super.onAnimationCancel(animation);
-
-            if (listener != null) {
-                listener.onAnimationCancel(animation);
-            }
-
-            endAnimation();
-        }
-
-    }
-
-    /**
-     * A builder, which allows to configure and create instances of the class {@link
-     * InitialItemIterator}.
-     */
-    protected class InitialItemIteratorBuilder extends
-            AbstractItemIterator.AbstractBuilder<InitialItemIteratorBuilder, InitialItemIterator> {
-
-        /**
-         * The backing array, which is used to store items, once their initial position and state
-         * has been calculated.
-         */
-        private final AbstractItem[] backingArray;
-
-        /**
-         * Creates a new builder, which allows to configure and create instances of the class {@link
-         * InitialItemIterator}.
-         *
-         * @param backingArray
-         *         The backing array, which should be used to store items, once their initial
-         *         position and state has been calculated. The backing array may not be null
-         */
-        public InitialItemIteratorBuilder(@NonNull final AbstractItem[] backingArray) {
-            Condition.INSTANCE.ensureNotNull(backingArray, "The backing array may not be null");
-            this.backingArray = backingArray;
-        }
-
-        @NonNull
-        @Override
-        public InitialItemIterator create() {
-            return new InitialItemIterator(backingArray, reverse, start);
-        }
-
-    }
-
-    /**
-     * An iterator, which allows to iterate the items, which correspond to the child views of a
-     * {@link TabSwitcher}. When an item is referenced for the first time, its initial position and
-     * state is calculated and the item is stored in a backing array. When the item is iterated
-     * again, it is retrieved from the backing array.
-     */
-    protected class InitialItemIterator extends AbstractItemIterator {
-
-        /**
-         * The backing array, which is used to store items, once their initial position and state
-         * has been calculated.
-         */
-        private final AbstractItem[] backingArray;
-
-        /**
-         * Calculates the initial position and state of a specific item.
-         *
-         * @param item
-         *         The item, whose position and state should be calculated, as an instance of the
-         *         class {@link AbstractItem}. The item may not be null
-         * @param predecessor
-         *         The predecessor of the given item as an instance of the class {@link
-         *         AbstractItem} or null, if the item does not have a predecessor
-         */
-        private void calculateAndClipStartPosition(@NonNull final AbstractItem item,
-                                                   @Nullable final AbstractItem predecessor) {
-            float position = calculateStartPosition(item);
-            Pair<Float, State> pair = clipPosition(item.getIndex(), position, predecessor);
-            item.getTag().setPosition(pair.first);
-            item.getTag().setState(pair.second);
-        }
-
-        /**
-         * Calculates and returns the initial position of a specific item.
-         *
-         * @param item
-         *         The item, whose position should be calculated, as an instance of the class {@link
-         *         AbstractItem}. The item may not be null
-         * @return The position, which has been calculated, as a {@link Float} value
-         */
-        private float calculateStartPosition(@NonNull final AbstractItem item) {
-            if (item.getIndex() == 0) {
-                return getCount() > getStackedTabCount() ?
-                        getStackedTabCount() * stackedTabSpacing :
-                        (getCount() - 1) * stackedTabSpacing;
-            } else {
-                return -1;
-            }
-        }
-
-        /**
-         * Creates a new iterator, which allows to iterate the items, which corresponds to the child
-         * views of a {@link TabSwitcher}. When an item is referenced for the first time, its
-         * initial position and state is calculated and the item is stored in a backing array. When
-         * the item is iterated again, it is retrieved from the backing array.
-         *
-         * @param backingArray
-         *         The backing array, which should be used to store items, once their initial
-         *         position and state has been calculated, as an array of the type {@link
-         *         AbstractItem}. The array may not be null
-         * @param reverse
-         *         True, if the items should be iterated in reverse order, false otherwise
-         * @param start
-         *         The index of the first item, which should be iterated, as an {@link Integer}
-         *         value or -1, if all items should be iterated
-         */
-        private InitialItemIterator(@NonNull final AbstractItem[] backingArray,
-                                    final boolean reverse, final int start) {
-            Condition.INSTANCE.ensureNotNull(backingArray, "The backing array may not be null");
-            this.backingArray = backingArray;
-            initialize(reverse, start);
-        }
-
-        @Override
-        public final int getCount() {
-            return backingArray.length;
-        }
-
-        @NonNull
-        @Override
-        public final AbstractItem getItem(final int index) {
-            AbstractItem item = backingArray[index];
-
-            if (item == null) {
-                if (index == 0 && getModel().isAddTabButtonShown()) {
-                    item = AddTabItem.create(getTabViewRecycler());
-                } else {
-                    item = TabItem.create(getModel(), getTabViewRecycler(),
-                            index - (getModel().isAddTabButtonShown() ? 1 : 0));
-                }
-
-                calculateAndClipStartPosition(item, index > 0 ? getItem(index - 1) : null);
-                backingArray[index] = item;
-            }
-
-            return item;
-        }
-
-    }
-
-    /**
-     * An animation, which allows to fling the tabs.
-     */
-    private class FlingAnimation extends android.view.animation.Animation {
-
-        /**
-         * The distance, the tabs should be moved.
-         */
-        private final float distance;
-
-        /**
-         * Creates a new fling animation.
-         *
-         * @param distance
-         *         The distance, the tabs should be moved, in pixels as a {@link Float} value
-         */
-        FlingAnimation(final float distance) {
-            this.distance = distance;
-        }
-
-        @Override
-        protected void applyTransformation(final float interpolatedTime, final Transformation t) {
-            if (flingAnimation != null) {
-                getDragHandler().handleDrag(distance * interpolatedTime, 0);
-            }
-        }
-
-    }
-
-    /**
-     * The tab switcher, the layout belongs to.
-     */
-    private final TabSwitcher tabSwitcher;
-
-    /**
-     * The model of the tab switcher, the layout belongs to.
-     */
-    private final TabSwitcherModel model;
-
-    /**
-     * The arithmetics, which are used by the layout.
-     */
-    private final Arithmetics arithmetics;
-
-    /**
-     * The style, which allows to retrieve style attributes of the tab switcher.
-     */
-    private final TabSwitcherStyle style;
-
-    /**
-     * The dispatcher, which is used to dispatch touch events to event handlers.
-     */
-    private final TouchEventDispatcher touchEventDispatcher;
-
-    /**
-     * The space between tabs, which are part of a stack, in pixels.
-     */
-    private final int stackedTabSpacing;
-
-    /**
-     * The logger, which is used for logging.
-     */
-    private final Logger logger;
-
-    /**
-     * The callback, which is notified about the layout's events.
-     */
-    private Callback callback;
-
-    /**
-     * The number of animations, which are currently running.
-     */
-    private int runningAnimations;
-
-    /**
-     * The animation, which is used to fling the tabs.
-     */
-    private android.view.animation.Animation flingAnimation;
-
-    /**
-     * The index of the first visible tab.
-     */
-    private int firstVisibleIndex;
-
-    /**
-     * Registers the layout as the callback of all touch event handlers.
-     */
-    private void registerEventHandlerCallbacks() {
-        for (AbstractTouchEventHandler eventHandler : touchEventDispatcher) {
-            registerEventHandlerCallback(eventHandler);
-        }
-
-        touchEventDispatcher.setCallback(this);
-    }
-
-    /**
-     * Registers the layout as the callback of a specific event handler.
-     *
-     * @param eventHandler
-     *         The event handler as an instance of the class {@link AbstractTouchEventHandler}. The
-     *         event handler may not be null
-     */
-    private void registerEventHandlerCallback(
-            @NonNull final AbstractTouchEventHandler eventHandler) {
-        if (eventHandler instanceof SwipeGestureEventHandler) {
-            ((SwipeGestureEventHandler) eventHandler).setCallback(this);
-        } else if (eventHandler instanceof PullDownGestureEventHandler) {
-            ((PullDownGestureEventHandler) eventHandler).setCallback(this);
-        }
-    }
-
-    /**
-     * Unregisters the layout as the callback of all touch event handlers.
-     */
-    private void unregisterEventHandlerCallbacks() {
-        for (AbstractTouchEventHandler eventHandler : touchEventDispatcher) {
-            unregisterEventHandlerCallback(eventHandler);
-        }
-
-        touchEventDispatcher.setCallback(null);
-    }
-
-    /**
-     * Unregisters the layout as the callback of a specific event handler.
-     *
-     * @param eventHandler
-     *         The event handler as an instance of the class {@link AbstractTouchEventHandler}. The
-     *         event handler may not be null
-     */
-    private void unregisterEventHandlerCallback(
-            @NonNull final AbstractTouchEventHandler eventHandler) {
-        if (eventHandler instanceof SwipeGestureEventHandler) {
-            ((SwipeGestureEventHandler) eventHandler).setCallback(null);
-        } else if (eventHandler instanceof PullDownGestureEventHandler) {
-            ((PullDownGestureEventHandler) eventHandler).setCallback(null);
-        }
-    }
-
-    /**
-     * Adapts the visibility of the toolbars, which are shown, when the tab switcher is shown.
-     */
-    private void adaptToolbarVisibility() {
-        Toolbar[] toolbars = getToolbars();
-
-        if (toolbars != null) {
-            for (Toolbar toolbar : toolbars) {
-                toolbar.setVisibility(
-                        getTabSwitcher().isSwitcherShown() && getModel().areToolbarsShown() ?
-                                View.VISIBLE : View.INVISIBLE);
-            }
-        }
-
-        // TODO: Detach and re-inflate layout
-    }
-
-    /**
-     * Adapts the title of the toolbar, which is shown, when the tab switcher is shown.
-     */
-    private void adaptToolbarTitle() {
-        Toolbar[] toolbars = getToolbars();
-
-        if (toolbars != null) {
-            CharSequence title = style.getToolbarTitle();
-            toolbars[TabSwitcher.PRIMARY_TOOLBAR_INDEX].setTitle(title);
-        }
-    }
-
-    /**
-     * Adapts the navigation icon of the toolbar, which is shown, when the tab switcher is shown.
-     */
-    private void adaptToolbarNavigationIcon() {
-        Toolbar[] toolbars = getToolbars();
-
-        if (toolbars != null) {
-            Toolbar toolbar = toolbars[TabSwitcher.PRIMARY_TOOLBAR_INDEX];
-            Drawable icon = style.getToolbarNavigationIcon();
-            toolbar.setNavigationIcon(icon);
-            toolbar.setNavigationOnClickListener(getModel().getToolbarNavigationIconListener());
-        }
-    }
-
-    /**
-     * Adapts the decorator.
-     */
-    private void adaptDecorator() {
-        getContentViewRecycler().setAdapter(onCreateContentRecyclerAdapter());
-    }
-
-    /**
-     * Adapts the log level.
-     */
-    private void adaptLogLevel() {
-        getTabViewRecycler().setLogLevel(getModel().getLogLevel());
-        getContentViewRecycler().setLogLevel(getModel().getLogLevel());
-    }
-
-    /**
-     * Inflates the menu of the toolbar, which is shown, when the tab switcher is shown.
-     */
-    private void inflateToolbarMenu() {
-        Toolbar[] toolbars = getToolbars();
-        int menuId = getModel().getToolbarMenuId();
-
-        if (toolbars != null && menuId != -1) {
-            Toolbar toolbar = toolbars.length > 1 ? toolbars[TabSwitcher.SECONDARY_TOOLBAR_INDEX] :
-                    toolbars[TabSwitcher.PRIMARY_TOOLBAR_INDEX];
-            Menu previousMenu = toolbar.getMenu();
-
-            if (previousMenu != null) {
-                previousMenu.clear();
-            }
-
-            toolbar.inflateMenu(menuId);
-            toolbar.setOnMenuItemClickListener(getModel().getToolbarMenuItemListener());
-        }
-    }
-
-    /**
-     * Creates and returns an animation listener, which allows to handle, when a fling animation
-     * ended.
-     *
-     * @return The listener, which has been created, as an instance of the class {@link
-     * Animation.AnimationListener}. The listener may not be null
-     */
-    @NonNull
-    private Animation.AnimationListener createFlingAnimationListener() {
-        return new Animation.AnimationListener() {
-
-            @Override
-            public void onAnimationStart(final android.view.animation.Animation animation) {
-
-            }
-
-            @Override
-            public void onAnimationEnd(final android.view.animation.Animation animation) {
-                getDragHandler().onUp(null);
-                flingAnimation = null;
-                notifyOnAnimationsEnded();
-            }
-
-            @Override
-            public void onAnimationRepeat(final android.view.animation.Animation animation) {
-
-            }
-
-        };
-    }
-
-    /**
-     * Calculates the positions of all items, when dragging towards the start.
-     *
-     * @param dragDistance
-     *         The current drag distance in pixels as a {@link Float} value
-     */
-    private void calculatePositionsWhenDraggingToEnd(final float dragDistance) {
-        firstVisibleIndex = -1;
-        AbstractItemIterator iterator =
-                new ItemIterator.Builder(getTabSwitcher(), getTabViewRecycler()).create();
-        AbstractItem item;
-        boolean abort = false;
-
-        while ((item = iterator.next()) != null && !abort) {
-            if (getItemCount() - item.getIndex() > 1) {
-                abort = calculatePositionWhenDraggingToEnd(dragDistance, item, iterator.previous());
-
-                if (firstVisibleIndex == -1 && item.getTag().getState() == State.FLOATING) {
-                    firstVisibleIndex = item.getIndex();
-                }
-            } else {
-                Pair<Float, State> pair = clipPosition(item.getIndex(), item.getTag().getPosition(),
-                        iterator.previous());
-                item.getTag().setPosition(pair.first);
-                item.getTag().setState(pair.second);
-            }
-
-            inflateOrRemoveView(item, true);
-        }
-    }
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to calculate the position of
-     * a specific item, when dragging towards the end.
-     *
-     * @param dragDistance
-     *         The current drag distance in pixels as a {@link Float} value
-     * @param item
-     *         The item whose position should be calculated, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @param predecessor
-     *         The predecessor of the given item as an instance of the class {@link AbstractItem} or
-     *         null, if the item does not have a predecessor
-     * @return True, if calculating the position of subsequent items can be omitted, false otherwise
-     */
-    private boolean calculatePositionWhenDraggingToEnd(final float dragDistance,
-                                                       @NonNull final AbstractItem item,
-                                                       @Nullable final AbstractItem predecessor) {
-        if (predecessor == null || predecessor.getTag().getState() != State.FLOATING) {
-            if ((item.getTag().getState() == State.STACKED_START_ATOP && item.getIndex() == 0) ||
-                    item.getTag().getState() == State.FLOATING) {
-                float currentPosition = item.getTag().getPosition();
-                float newPosition = currentPosition + dragDistance;
-                float maxEndPosition = calculateMaxEndPosition(item.getIndex());
-
-                if (maxEndPosition != -1) {
-                    newPosition = Math.min(newPosition, maxEndPosition);
-                }
-
-                Pair<Float, State> pair = clipPosition(item.getIndex(), newPosition, predecessor);
-                item.getTag().setPosition(pair.first);
-                item.getTag().setState(pair.second);
-            } else if (item.getTag().getState() == State.STACKED_START_ATOP) {
-                return true;
-            }
-        } else {
-            float newPosition = calculateSuccessorPosition(item, predecessor);
-            float maxEndPosition = calculateMaxEndPosition(item.getIndex());
-
-            if (maxEndPosition != -1) {
-                newPosition = Math.min(newPosition, maxEndPosition);
-            }
-            Pair<Float, State> pair = clipPosition(item.getIndex(), newPosition, predecessor);
-            item.getTag().setPosition(pair.first);
-            item.getTag().setState(pair.second);
-        }
-
-        return false;
-    }
-
-    /**
-     * Calculates the positions of all items, when dragging towards the end.
-     *
-     * @param dragDistance
-     *         The current drag distance in pixels as a {@link Float} value
-     */
-    private void calculatePositionsWhenDraggingToStart(final float dragDistance) {
-        AbstractItemIterator iterator =
-                new ItemIterator.Builder(getTabSwitcher(), getTabViewRecycler())
-                        .start(Math.max(0, firstVisibleIndex)).create();
-        AbstractItem item;
-        boolean abort = false;
-
-        while ((item = iterator.next()) != null && !abort) {
-            if (getItemCount() - item.getIndex() > 1) {
-                abort = calculatePositionWhenDraggingToStart(dragDistance, item,
-                        iterator.previous());
-            } else {
-                Pair<Float, State> pair = clipPosition(item.getIndex(), item.getTag().getPosition(),
-                        iterator.previous());
-                item.getTag().setPosition(pair.first);
-                item.getTag().setState(pair.second);
-            }
-
-            inflateOrRemoveView(item, true);
-        }
-
-        if (firstVisibleIndex > 0) {
-            int start = firstVisibleIndex - 1;
-            iterator =
-                    new ItemIterator.Builder(getTabSwitcher(), getTabViewRecycler()).reverse(true)
-                            .start(start).create();
-
-            while ((item = iterator.next()) != null) {
-                AbstractItem successor = iterator.previous();
-
-                if (item.getIndex() < start) {
-                    float successorPosition = successor.getTag().getPosition();
-                    Pair<Float, State> pair =
-                            clipPosition(successor.getIndex(), successorPosition, item);
-                    successor.getTag().setPosition(pair.first);
-                    successor.getTag().setState(pair.second);
-                    inflateOrRemoveView(successor, true);
-
-                    if (successor.getTag().getState() == State.FLOATING) {
-                        firstVisibleIndex = successor.getIndex();
-                    } else {
-                        break;
-                    }
-                }
-
-                float newPosition = calculatePredecessorPosition(item, successor);
-                item.getTag().setPosition(newPosition);
-
-                if (!iterator.hasNext()) {
-                    Pair<Float, State> pair =
-                            clipPosition(item.getIndex(), newPosition, (AbstractItem) null);
-                    item.getTag().setPosition(pair.first);
-                    item.getTag().setState(pair.second);
-                    inflateOrRemoveView(item, true);
-
-                    if (item.getTag().getState() == State.FLOATING) {
-                        firstVisibleIndex = item.getIndex();
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Calculates the position of a specific item, when dragging towards the start.
-     *
-     * @param dragDistance
-     *         The current drag distance in pixels as a {@link Float} value
-     * @param item
-     *         The item, whose position should be calculated, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @param predecessor
-     *         The predecessor of the given item as an instance of the class {@link AbstractItem} or
-     *         null, if the item does not have a predecessor
-     * @return True, if calculating the position of subsequent items can be omitted, false otherwise
-     */
-    private boolean calculatePositionWhenDraggingToStart(final float dragDistance,
-                                                         @NonNull final AbstractItem item,
-                                                         @Nullable final AbstractItem predecessor) {
-        float attachedPosition = calculateAttachedPosition(getTabSwitcher().getCount());
-
-        if (predecessor == null || predecessor.getTag().getState() != State.FLOATING ||
-                (attachedPosition != -1 && predecessor.getTag().getPosition() > attachedPosition)) {
-            if (item.getTag().getState() == State.FLOATING) {
-                float currentPosition = item.getTag().getPosition();
-                float newPosition = currentPosition + dragDistance;
-                float minStartPosition = calculateMinStartPosition(item.getIndex());
-
-                if (minStartPosition != -1) {
-                    newPosition = Math.max(newPosition, minStartPosition);
-                }
-
-                Pair<Float, State> pair = clipPosition(item.getIndex(), newPosition, predecessor);
-                item.getTag().setPosition(pair.first);
-                item.getTag().setState(pair.second);
-            } else if (item.getTag().getState() == State.STACKED_START_ATOP) {
-                float currentPosition = item.getTag().getPosition();
-                Pair<Float, State> pair =
-                        clipPosition(item.getIndex(), currentPosition, predecessor);
-                item.getTag().setPosition(pair.first);
-                item.getTag().setState(pair.second);
-                return true;
-            } else if (item.getTag().getState() == State.HIDDEN ||
-                    item.getTag().getState() == State.STACKED_START) {
-                return true;
-            }
-        } else {
-            float newPosition = calculateSuccessorPosition(item, predecessor);
-            float minStartPosition = calculateMinStartPosition(item.getIndex());
-
-            if (minStartPosition != -1) {
-                newPosition = Math.max(newPosition, minStartPosition);
-            }
-
-            Pair<Float, State> pair = clipPosition(item.getIndex(), newPosition, predecessor);
-            item.getTag().setPosition(pair.first);
-            item.getTag().setState(pair.second);
-        }
-
-        return false;
-    }
-
-    /**
-     * Notifies the callback, that all animations have been ended.
-     */
-    private void notifyOnAnimationsEnded() {
-        if (callback != null) {
-            callback.onAnimationsEnded();
-        }
-    }
-
-    /**
-     * Returns the tab switcher, the layout belongs to.
-     *
-     * @return The tab switcher, the layout belongs to, as an instance of the class {@link
-     * TabSwitcher}. The tab switcher may not be null
-     */
-    @NonNull
-    protected final TabSwitcher getTabSwitcher() {
-        return tabSwitcher;
-    }
-
-    /**
-     * Returns the model of the tab switcher, the layout belongs to.
-     *
-     * @return The model of the tab switcher, the layout belongs to, as an instance of the class
-     * {@link TabSwitcherModel}. The model may not be null
-     */
-    @NonNull
-    protected final TabSwitcherModel getModel() {
-        return model;
-    }
-
-    /**
-     * Returns the arithmetics, which are used by the layout.
-     *
-     * @return The arithmetics, which are used by the layout, as an instance of the type {@link
-     * Arithmetics}. The arithmetics may not be null
-     */
-    @NonNull
-    protected final Arithmetics getArithmetics() {
-        return arithmetics;
-    }
-
-    /**
-     * Returns the style, which allows to retrieve style attributes of the tab switcher.
-     *
-     * @return The style, which allows to retrieve style attributes of the tab switcher, as an
-     * instance of the class {@link TabSwitcherStyle}. The style may not be null
-     */
-    @NonNull
-    protected final TabSwitcherStyle getStyle() {
-        return style;
-    }
-
-    /**
-     * Returns the space between tabs, which are part of a stack.
-     *
-     * @return The space between tabs, which are part of a stack, in pixels as an {@link Integer}
-     * value
-     */
-    protected final int getStackedTabSpacing() {
-        return stackedTabSpacing;
-    }
-
-    /**
-     * Returns the logger, which is used for logging.
-     *
-     * @return The logger, which is used for logging, as an instance of the class Logger. The logger
-     * may not be null
-     */
-    @NonNull
-    protected final Logger getLogger() {
-        return logger;
-    }
-
-    /**
-     * Returns the context, which is used by the layout.
-     *
-     * @return The context, which is used by the layout, as an instance of the class {@link
-     * Context}. The context may not be null
-     */
-    @NonNull
-    protected final Context getContext() {
-        return tabSwitcher.getContext();
-    }
-
-    /**
-     * Returns the index of the first visible tab.
-     *
-     * @return The index of the first visible tab as an {@link Integer} value or -1, if no tabs is
-     * visible
-     */
-    protected final int getFirstVisibleIndex() {
-        return firstVisibleIndex;
-    }
-
-    /**
-     * Sets the index of the first visible tab.
-     *
-     * @param firstVisibleIndex
-     *         The index, which should be set, as an {@link Integer} value or -1, if no tab is
-     *         visible
-     */
-    protected final void setFirstVisibleIndex(final int firstVisibleIndex) {
-        this.firstVisibleIndex = firstVisibleIndex;
-    }
-
-    /**
-     * Returns the number of child views, which are contained by the tab switcher.
-     *
-     * @return The number of child views, which are contained by the tab switcher, as an {@link
-     * Integer} value
-     */
-    protected final int getItemCount() {
-        return getModel().getCount() + (getModel().isAddTabButtonShown() ? 1 : 0);
-    }
-
-    /**
-     * Returns, whether a hidden tab at a specific index, is part of the stack, which is located at
-     * the start, or not.
-     *
-     * @param index
-     *         The index of the hidden tab, as an {@link Integer} value
-     * @return True, if the hidden tab is part of the stack, which is located at the start, false
-     * otherwise
-     */
-    protected final boolean isStackedAtStart(final int index) {
-        boolean start = true;
-        AbstractItemIterator iterator =
-                new ItemIterator.Builder(getTabSwitcher(), getTabViewRecycler()).start(index + 1)
-                        .create();
-        AbstractItem item;
-
-        while ((item = iterator.next()) != null) {
-            State state = item.getTag().getState();
-
-            if (state == State.STACKED_START) {
-                start = true;
-                break;
-            } else if (state == State.FLOATING) {
-                start = false;
-                break;
-            }
-        }
-
-        return start;
-    }
-
-    /**
-     * Clips the position of a specific item.
-     *
-     * @param index
-     *         The index of the item, whose position should be clipped, as an {@link Integer} value
-     * @param position
-     *         The position, which should be clipped, in pixels as a {@link Float} value
-     * @param predecessor
-     *         The predecessor of the given item as an instance of the class {@link AbstractItem} or
-     *         null, if the item does not have a predecessor
-     * @return A pair, which contains the position and state of the item, as an instance of the
-     * class Pair. The pair may not be null
-     */
-    @NonNull
-    protected final Pair<Float, State> clipPosition(final int index, final float position,
-                                                    @Nullable final AbstractItem predecessor) {
-        return clipPosition(index, position,
-                predecessor != null ? predecessor.getTag().getState() : null);
-    }
-
-    /**
-     * Clips the position of a specific item.
-     *
-     * @param index
-     *         The index of the item, whose position should be clipped, as an {@link Integer} value
-     * @param position
-     *         The position, which should be clipped, in pixels as a {@link Float} value
-     * @param predecessorState
-     *         The state of the predecessor of the given item as a value of the enum {@link State}
-     *         or null, if the item does not have a predecessor
-     * @return A pair, which contains the position and state of the item, as an instance of the
-     * class Pair. The pair may not be null
-     */
-    protected final Pair<Float, State> clipPosition(final int index, final float position,
-                                                    @Nullable final State predecessorState) {
-        Pair<Float, State> startPair =
-                calculatePositionAndStateWhenStackedAtStart(getItemCount(), index,
-                        predecessorState);
-        float startPosition = startPair.first;
-
-        if (position <= startPosition) {
-            State state = startPair.second;
-            return Pair.create(startPosition, state);
-        } else {
-            Pair<Float, State> endPair = calculatePositionAndStateWhenStackedAtEnd(index);
-            float endPosition = endPair.first;
-
-            if (position >= endPosition) {
-                State state = endPair.second;
-                return Pair.create(endPosition, state);
-            } else {
-                State state = State.FLOATING;
-                return Pair.create(position, state);
-            }
-        }
-    }
-
-    /**
-     * Calculates and returns the position and state of a specific item, when stacked at the start.
-     *
-     * @param count
-     *         The total number of items, which are currently contained by the tab switcher, as an
-     *         {@link Integer} value
-     * @param index
-     *         The index of the item, whose position and state should be returned, as an {@link
-     *         Integer} value
-     * @param predecessor
-     *         The predecessor of the given item as an instance of the class {@link AbstractItem} or
-     *         null, if the item does not have a predecessor
-     * @return A pair, which contains the position and state of the given item, when stacked at the
-     * start, as an instance of the class Pair. The pair may not be null
-     */
-    @NonNull
-    protected final Pair<Float, State> calculatePositionAndStateWhenStackedAtStart(final int count,
-                                                                                   final int index,
-                                                                                   @Nullable final AbstractItem predecessor) {
-        return calculatePositionAndStateWhenStackedAtStart(count, index,
-                predecessor != null ? predecessor.getTag().getState() : null);
-    }
-
-    /**
-     * Inflates or removes the view, which is used to visualize a specific item, depending on the
-     * item's current state.
-     *
-     * @param item
-     *         The item, whose view should be inflated or removed, as an instance of the class
-     *         {@link AbstractItem}. The item may not be null
-     * @param dragging
-     *         True, if the item is currently being dragged, false otherwise
-     */
-    protected final void inflateOrRemoveView(@NonNull final AbstractItem item,
-                                             final boolean dragging) {
-        if (item.isInflated() && !item.isVisible()) {
-            getTabViewRecycler().remove(item);
-        } else if (item.isVisible()) {
-            if (!item.isInflated()) {
-                inflateAndUpdateView(item, dragging, null);
-            } else {
-                updateView(item, dragging);
-            }
-        }
-    }
-
-    /**
-     * Inflates the view, which is used to visualize a specific item.
-     *
-     * @param item
-     *         The item, whose view should be inflated, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @param listener
-     *         The layout listener, which should be notified, when the view has been inflated, as an
-     *         instance of the type {@link OnGlobalLayoutListener} or null, if no listener should be
-     *         notified
-     * @param params
-     *         An array, which contains optional parameters, which should be passed to the view
-     *         recycler, which is used to inflate the view, as an {@link Integer} array or null, if
-     *         no optional parameters should be used
-     */
-    protected final void inflateView(@NonNull final AbstractItem item,
-                                     @Nullable final OnGlobalLayoutListener listener,
-                                     @NonNull final Integer... params) {
-        Pair<View, Boolean> pair = getTabViewRecycler().inflate(item, params);
-
-        if (listener != null) {
-            boolean inflated = pair.second;
-
-            if (inflated) {
-                View view = pair.first;
-                view.getViewTreeObserver()
-                        .addOnGlobalLayoutListener(new LayoutListenerWrapper(view, listener));
-            } else {
-                listener.onGlobalLayout();
-            }
-        }
-    }
-
-    /**
-     * Updates the view, which is used to visualize a specific item.
-     *
-     * @param item
-     *         The item, whose view should be updated, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @param dragging
-     *         True, if the item is currently being dragged, false otherwise
-     */
-    @CallSuper
-    protected void updateView(@NonNull final AbstractItem item, final boolean dragging) {
-        float position = item.getTag().getPosition();
-        getArithmetics().setPosition(Axis.DRAGGING_AXIS, item, position);
-        getArithmetics().setPosition(Axis.ORTHOGONAL_AXIS, item, 0);
-    }
-
-    /**
-     * Calculates and returns the position on the dragging axis, where the distance between an item
-     * and its predecessor should have reached the maximum.
-     *
-     * @param count
-     *         The total number of items, which are contained by the tab switcher, as an {@link
-     *         Integer} value
-     * @return The position, which has been calculated, in pixels as an {@link Float} value or -1,
-     * if no attached position is used
-     */
-    protected float calculateAttachedPosition(final int count) {
-        return -1;
-    }
-
-    /**
-     * Creates a new layout, which implements the functionality of a {@link TabSwitcher}.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, the layout belongs to, as an instance of the class {@link
-     *         TabSwitcher}. The tab switcher may not be null
-     * @param model
-     *         The model of the tab switcher, the layout belongs to, as an instance of the class
-     *         {@link TabSwitcherModel}. The model may not be null
-     * @param arithmetics
-     *         The arithmetics, which should be used by the layout, as an instance of the type
-     *         {@link Arithmetics}. The arithmetics may not be null
-     * @param style
-     *         The style, which allows to retrieve style attributes of the tab switcher, as an
-     *         instance of the class {@link TabSwitcherStyle}. The style may not be null
-     * @param touchEventDispatcher
-     *         The dispatcher, which is used to dispatch touch events to event handlers, as an
-     *         instance of the class {@link TouchEventDispatcher}. The dispatcher may not be null
-     */
-    public AbstractTabSwitcherLayout(@NonNull final TabSwitcher tabSwitcher,
-                                     @NonNull final TabSwitcherModel model,
-                                     @NonNull final Arithmetics arithmetics,
-                                     @NonNull final TabSwitcherStyle style,
-                                     @NonNull final TouchEventDispatcher touchEventDispatcher) {
-        Condition.INSTANCE.ensureNotNull(tabSwitcher, "The tab switcher may not be null");
-        Condition.INSTANCE.ensureNotNull(model, "The model may not be null");
-        Condition.INSTANCE.ensureNotNull(arithmetics, "The arithmetics may not be null");
-        Condition.INSTANCE.ensureNotNull(style, "The style may not be null");
-        Condition.INSTANCE.ensureNotNull(touchEventDispatcher, "The dispatcher may not be null");
-        this.tabSwitcher = tabSwitcher;
-        this.model = model;
-        this.arithmetics = arithmetics;
-        this.style = style;
-        this.touchEventDispatcher = touchEventDispatcher;
-        Resources resources = tabSwitcher.getResources();
-        this.stackedTabSpacing = resources.getDimensionPixelSize(R.dimen.stacked_tab_spacing);
-        this.logger = new Logger(model.getLogLevel());
-        this.callback = null;
-        this.runningAnimations = 0;
-        this.flingAnimation = null;
-        this.firstVisibleIndex = -1;
-    }
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to retrieve the drag
-     * handler, which is used by the layout.
-     *
-     * @return The drag handler, which is used by the layout, as an instance of the class {@link
-     * AbstractDragTabsEventHandler} or null, if the drag handler has not been initialized yet
-     */
-    public abstract AbstractDragTabsEventHandler<?> getDragHandler();
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to inflate the layout.
-     *
-     * @param inflater
-     *         The layout inflater, which should be used, as an instance of the class {@link
-     *         LayoutInflater}. The layout inflater may not be null
-     * @param tabsOnly
-     *         True, if only the tabs should be inflated, false otherwise
-     */
-    protected abstract void onInflateLayout(@NonNull final LayoutInflater inflater,
-                                            final boolean tabsOnly);
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to detach the layout.
-     *
-     * @param tabsOnly
-     *         True, if only the tabs should be detached, false otherwise
-     * @return A pair, which contains the index of the tab, which should be used as a reference,
-     * when restoring the positions of tabs, as well as its current position in relation to the
-     * available space, as an instance of the class Pair or null, if the positions of tabs should
-     * not be restored
-     */
-    @Nullable
-    protected abstract Pair<Integer, Float> onDetachLayout(final boolean tabsOnly);
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to retrieve the view
-     * recycler, which allows to recycle the views, which are associated with tabs.
-     *
-     * @return The view recycler, which allows to recycle the views, which are associated with tabs,
-     * as an instance of the class ViewRecycler or null, if the view recycler has not been
-     * initialized yet
-     */
-    public abstract AbstractViewRecycler<Tab, Void> getContentViewRecycler();
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to retrieve the view
-     * recycler, which allows to inflate the views, which are used to visualize the tabs.
-     *
-     * @return The view recycler, which allows to inflate the views, which are used to visualize the
-     * tabs, as an instance of the class AttachedViewRecycler or null, if the view recycler has not
-     * been initialized yet
-     */
-    protected abstract AttachedViewRecycler<AbstractItem, Integer> getTabViewRecycler();
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to retrieve the adapter of
-     * the view recycler, which allows to inflate the views, which are used to visualize the tabs.
-     *
-     * @return The adapter of the view recycler, which allows to inflated the views, which are used
-     * to visualize the tabs, as an instance of the class {@link AbstractTabRecyclerAdapter} or
-     * null, if the view recycler has not been initialized yet
-     */
-    protected abstract AbstractTabRecyclerAdapter getTabRecyclerAdapter();
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to inflate and update the
-     * view, which is used to visualize a specific item.
-     *
-     * @param item
-     *         The item, whose view should be inflated, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @param dragging
-     *         True, if the view is currently being dragged, false otherwise
-     * @param listener
-     *         The layout listener, which should be notified, when the view has been inflated, as an
-     *         instance of the type {@link OnGlobalLayoutListener} or null, if no listener should be
-     *         notified
-     */
-    protected abstract void inflateAndUpdateView(@NonNull final AbstractItem item,
-                                                 final boolean dragging,
-                                                 @Nullable final OnGlobalLayoutListener listener);
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to retrieve the number of
-     * tabs, which are contained by a stack.
-     *
-     * @return The number of tabs, which are contained by a stack, as an {@link Integer} value
-     */
-    protected abstract int getStackedTabCount();
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to retrieve the position and
-     * state of a specific item, when stacked at the start.
-     *
-     * @param count
-     *         The total number of items, which are currently contained by the tab switcher, as an
-     *         {@link Integer} value
-     * @param index
-     *         The index of the item, whose position and state should be returned, as an {@link
-     *         Integer} value
-     * @param predecessorState
-     *         The state of the predecessor of the given item as a value of the enum {@link State}
-     *         or null, if the item does not have a predecessor
-     * @return A pair, which contains the position and state of the given item, when stacked at the
-     * start, as an instance of the class Pair. The pair may not be null
-     */
-    @NonNull
-    protected abstract Pair<Float, State> calculatePositionAndStateWhenStackedAtStart(
-            final int count, final int index, @Nullable final State predecessorState);
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to retrieve the position and
-     * state of a specific item, when stacked at the end.
-     *
-     * @param index
-     *         The index of the item, whose position and state should be returned, as an {@link
-     *         Integer} value
-     * @return A pair, which contains the position and state of the given item, when stacked at the
-     * end, as an instance of the class Pair. The pair may not be null
-     */
-    @NonNull
-    protected abstract Pair<Float, State> calculatePositionAndStateWhenStackedAtEnd(
-            final int index);
-
-    /**
-     * Calculates the position of an item in relation to the position of its predecessor.
-     *
-     * @param item
-     *         The item, whose position should be calculated, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @param predecessor
-     *         The predecessor as an instance of the class {@link AbstractItem}. The predecessor may
-     *         not be null
-     * @return The position, which has been calculated, as a {@link Float} value
-     */
-    protected abstract float calculateSuccessorPosition(@NonNull final AbstractItem item,
-                                                        @NonNull final AbstractItem predecessor);
-
-    /**
-     * Calculates the position of an item in relation to the position of its successor.
-     *
-     * @param item
-     *         The item, whose position should be calculated, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @param successor
-     *         The successor as an instance of the class {@link AbstractItem}. The successor may not
-     *         be null
-     * @return The position, which has been calculated, as a {@link Float} value
-     */
-    protected abstract float calculatePredecessorPosition(@NonNull final AbstractItem item,
-                                                          @NonNull final AbstractItem successor);
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to retrieve the minimum
-     * position of a specific item, when dragging towards the start.
-     *
-     * @param index
-     *         The index of the item, whose position should be calculated, as an {@link Integer}
-     *         value
-     * @return The position, which has been calculated, as a {@link Float} value or -1, if no
-     * minimum position is available
-     */
-    protected float calculateMinStartPosition(final int index) {
-        return -1;
-    }
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to retrieve the maximum
-     * position of a specific item, when dragging towards the end.
-     *
-     * @param index
-     *         The index of the item, whose position should be calculated, as an {@link Integer}
-     *         value
-     * @return The position, which has been calculated, as a {@link Float} value or -1, if no
-     * maximum position is available
-     */
-    protected float calculateMaxEndPosition(final int index) {
-        return -1;
-    }
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to retrieve, whether the
-     * items are overshooting at the start.
-     *
-     * @return True, if the items are overshooting at the start, false otherwise
-     */
-    protected boolean isOvershootingAtStart() {
-        return false;
-    }
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to retrieve, whether the
-     * items are overshooting at the end.
-     *
-     * @param dragState
-     *         The current drag state as an instance of the enum {@link DragState}. The drag state
-     *         may not be null
-     * @param iterator
-     *         An iterator, which allows to iterate the items, which are contained by the tab
-     *         switcher, as an instance of the class {@link AbstractItemIterator}. The iterator may
-     *         not be null
-     * @return True, if the items are overshooting at the end, false otherwise
-     */
-    protected boolean isOvershootingAtEnd(@NonNull final DragState dragState,
-                                          @NonNull final AbstractItemIterator iterator) {
-        return false;
-    }
-
-    /**
-     * The method, which is called when dragging after the positions and states of all tabs have
-     * been calculated. It may be overridden by subclasses in order to implement a second layout
-     * pass, which requires the information, which has been calculated in the first pass, and allows
-     * to perform additional modifications of the tabs based on that information.
-     *
-     * @param builder
-     *         The builder, which allows to create the iterator, which should be used to iterate the
-     *         tabs, as an instance of the class {@link AbstractItemIterator.AbstractBuilder}. The
-     *         builder may not be null
-     */
-    protected void secondLayoutPass(@NonNull final AbstractItemIterator.AbstractBuilder builder) {
-
-    }
-
-    /**
-     * The method, which is invoked on implementing subclasses in order to create the view recycler
-     * adapter, which allows to inflate the views, which are associated with tabs.
-     *
-     * @return The view recycler adapter, which has been created, as an instance of the class
-     * AttachedViewRecycler.Adapter. The recycler adapter may not be null }
-     */
-    @NonNull
-    protected AttachedViewRecycler.Adapter<Tab, Void> onCreateContentRecyclerAdapter() {
-        return getModel().getContentRecyclerAdapter();
-    }
-
-    /**
-     * Inflates the layout.
-     *
-     * @param tabsOnly
-     *         True, if only the tabs should be inflated, false otherwise
-     */
-    public final void inflateLayout(final boolean tabsOnly) {
-        int themeResourceId = style.getThemeHelper().getThemeResourceId(tabSwitcher.getLayout());
-        LayoutInflater inflater =
-                LayoutInflater.from(new ContextThemeWrapper(getContext(), themeResourceId));
-        onInflateLayout(inflater, tabsOnly);
-        registerEventHandlerCallbacks();
-        adaptDecorator();
-        adaptLogLevel();
-
-        if (!tabsOnly) {
-            adaptToolbarVisibility();
-            adaptToolbarTitle();
-            adaptToolbarNavigationIcon();
-            inflateToolbarMenu();
-        }
-    }
-
-    /**
-     * Detaches the layout.
-     *
-     * @param tabsOnly
-     *         True, if only the tabs should be detached, false otherwise
-     * @return A pair, which contains the index of the first visible tab, as well as its current
-     * position in relation to the available space, as an instance of the class Pair or null, if the
-     * tab switcher is not shown
-     */
-    @Nullable
-    public final Pair<Integer, Float> detachLayout(final boolean tabsOnly) {
-        Pair<Integer, Float> pair = onDetachLayout(tabsOnly);
-        getTabViewRecycler().removeAll();
-        getTabViewRecycler().clearCache();
-        unregisterEventHandlerCallbacks();
-        touchEventDispatcher.removeEventHandler(getDragHandler());
-
-        if (!tabsOnly) {
-            getTabSwitcher().removeAllViews();
-        }
-
-        return pair;
-    }
-
-    /**
-     * Sets the callback, which should be notified about the layout's events.
-     *
-     * @param callback
-     *         The callback, which should be set, as an instance of the type {@link Callback} or
-     *         null, if no callback should be notified
-     */
-    public final void setCallback(@Nullable final Callback callback) {
-        this.callback = callback;
-    }
-
-    @Override
-    public final boolean isAnimationRunning() {
-        return runningAnimations > 0 || flingAnimation != null;
-    }
-
-    @Nullable
-    @Override
-    public final Menu getToolbarMenu() {
-        Toolbar[] toolbars = getToolbars();
-
-        if (toolbars != null) {
-            Toolbar toolbar = toolbars.length > 1 ? toolbars[TabSwitcher.SECONDARY_TOOLBAR_INDEX] :
-                    toolbars[TabSwitcher.PRIMARY_TOOLBAR_INDEX];
-            return toolbar.getMenu();
-        }
-
-        return null;
-    }
-
-    @Override
-    public final void onLogLevelChanged(@NonNull final LogLevel logLevel) {
-        adaptLogLevel();
-    }
-
-    @CallSuper
-    @Override
-    public void onDecoratorChanged(@NonNull final TabSwitcherDecorator decorator) {
-        adaptDecorator();
-        detachLayout(true);
-        onGlobalLayout();
-    }
-
-    @Override
-    public void onAddTabButtonVisibilityChanged(final boolean visible) {
-
-    }
-
-    @Override
-    public final void onAddTabButtonColorChanged(@Nullable final ColorStateList colorStateList) {
-
-    }
-
-    @Override
-    public final void onToolbarVisibilityChanged(final boolean visible) {
-        adaptToolbarVisibility();
-    }
-
-    @Override
-    public final void onToolbarTitleChanged(@Nullable final CharSequence title) {
-        adaptToolbarTitle();
-    }
-
-    @Override
-    public final void onToolbarNavigationIconChanged(@Nullable final Drawable icon,
-                                                     @Nullable final OnClickListener listener) {
-        adaptToolbarNavigationIcon();
-    }
-
-    @Override
-    public final void onToolbarMenuInflated(@MenuRes final int resourceId,
-                                            @Nullable final OnMenuItemClickListener listener) {
-        inflateToolbarMenu();
-    }
-
-    @Override
-    public final void onTabIconChanged(@Nullable final Drawable icon) {
-
-    }
-
-    @Override
-    public void onTabBackgroundColorChanged(@Nullable final ColorStateList colorStateList) {
-
-    }
-
-    @Override
-    public void onTabContentBackgroundColorChanged(@ColorInt final int color) {
-
-    }
-
-    @Override
-    public final void onTabTitleColorChanged(@Nullable final ColorStateList colorStateList) {
-
-    }
-
-    @Override
-    public final void onTabCloseButtonIconChanged(@Nullable final Drawable icon) {
-
-    }
-
-    @Override
-    public final void onTabProgressBarColorChanged(@ColorInt final int color) {
-
-    }
-
-    @Override
-    public void onSwitcherShown() {
-
-    }
-
-    @Override
-    public void onSwitcherHidden() {
-
-    }
-
-    @Override
-    public final void onAddedEventHandler(@NonNull final TouchEventDispatcher dispatcher,
-                                          @NonNull final AbstractTouchEventHandler eventHandler) {
-        registerEventHandlerCallback(eventHandler);
-    }
-
-    @Override
-    public final void onRemovedEventHandler(@NonNull final TouchEventDispatcher dispatcher,
-                                            @NonNull final AbstractTouchEventHandler eventHandler) {
-        unregisterEventHandlerCallback(eventHandler);
-    }
-
-    @Nullable
-    @Override
-    public final DragState onDrag(@NonNull final DragState dragState, final float dragDistance) {
-        if (dragDistance != 0) {
-            if (dragState == DragState.DRAG_TO_END) {
-                calculatePositionsWhenDraggingToEnd(dragDistance);
-            } else {
-                calculatePositionsWhenDraggingToStart(dragDistance);
-            }
-
-            secondLayoutPass(new ItemIterator.Builder(getTabSwitcher(), getTabViewRecycler()));
-        }
-
-        DragState overshoot = isOvershootingAtEnd(dragState,
-                new ItemIterator.Builder(getTabSwitcher(), getTabViewRecycler()).create()) ?
-                DragState.OVERSHOOT_END :
-                (isOvershootingAtStart() ? DragState.OVERSHOOT_START : null);
-        getLogger().logVerbose(getClass(),
-                "Dragging using a distance of " + dragDistance + " pixels. Drag state is " +
-                        dragState + ", overshoot is " + overshoot);
-        return overshoot;
-    }
-
-    @Override
-    public final void onPressStarted(@NonNull final AbstractItem item) {
-        ColorStateList colorStateList = null;
-        boolean selected = false;
-
-        if (item instanceof TabItem) {
-            TabItem tabItem = (TabItem) item;
-            Tab tab = tabItem.getTab();
-            colorStateList = style.getTabBackgroundColor(tab);
-            selected = getModel().getSelectedTab() == tab;
-        } else if (item instanceof AddTabItem) {
-            colorStateList = style.getAddTabButtonColor();
-        }
-
-        if (colorStateList != null) {
-            int[] stateSet = selected ?
-                    new int[]{android.R.attr.state_pressed, android.R.attr.state_selected} :
-                    new int[]{android.R.attr.state_pressed};
-            int color = colorStateList.getColorForState(stateSet, -1);
-
-            if (color != -1) {
-                View view = item.getView();
-                Drawable background = view.getBackground();
-                background.setColorFilter(color, PorterDuff.Mode.MULTIPLY);
-            }
-        }
-    }
-
-    @Override
-    public final void onPressEnded(@NonNull final AbstractItem item) {
-        getTabRecyclerAdapter().onTabBackgroundColorChanged(getModel().getTabBackgroundColor());
-    }
-
-    @Override
-    public final void onClick(@NonNull final AbstractItem item) {
-        if (item instanceof TabItem) {
-            TabItem tabItem = (TabItem) item;
-            getModel().selectTab(tabItem.getTab());
-            getLogger().logVerbose(getClass(), "Clicked tab at index " +
-                    (tabItem.getIndex() - (getModel().isAddTabButtonShown() ? 1 : 0)));
-        } else if (item instanceof AddTabItem) {
-            AddTabButtonListener listener = getModel().getAddTabButtonListener();
-
-            if (listener != null) {
-                listener.onAddTab(getTabSwitcher());
-            }
-
-            getLogger().logVerbose(getClass(), "Clicked add tab button");
-        }
-    }
-
-    @Override
-    public final void onFling(final float distance, final long duration) {
-        if (getDragHandler() != null) {
-            flingAnimation = new FlingAnimation(distance);
-            flingAnimation.setFillAfter(true);
-            flingAnimation.setAnimationListener(createFlingAnimationListener());
-            flingAnimation.setDuration(duration);
-            flingAnimation.setInterpolator(new DecelerateInterpolator());
-            getTabSwitcher().startAnimation(flingAnimation);
-            logger.logVerbose(getClass(),
-                    "Started fling animation using a distance of " + distance +
-                            " pixels and a duration of " + duration + " milliseconds");
-        }
-    }
-
-    @Override
-    public final void onCancelFling() {
-        if (flingAnimation != null) {
-            flingAnimation.cancel();
-            flingAnimation = null;
-            getDragHandler().onUp(null);
-            logger.logVerbose(getClass(), "Canceled fling animation");
-        }
-    }
-
-    @Override
-    public void onRevertStartOvershoot() {
-
-    }
-
-    @Override
-    public void onRevertEndOvershoot() {
-
-    }
-
-    @Override
-    public void onSwipe(@NonNull final TabItem tabItem, final float distance) {
-
-    }
-
-    @Override
-    public void onSwipeEnded(@NonNull final TabItem tabItem, final boolean remove,
-                             final float velocity) {
-
-    }
-
-    @Override
-    public void onPulledDown() {
-
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/AbstractTabViewHolder.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/AbstractTabViewHolder.java
deleted file mode 100644
index 60ca1588..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/AbstractTabViewHolder.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.layout;
-
-import android.view.ViewGroup;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.view.CircularProgressBar;
-
-/**
- * An abstract base class for all view holders, which allow to store references to the views, a tab
- * of a {@link TabSwitcher} consists of.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public abstract class AbstractTabViewHolder {
-
-    /**
-     * The view group, which contains the title and close button of a tab.
-     */
-    public ViewGroup titleContainer;
-
-    /**
-     * The text view, which is used to display the title of a tab.
-     */
-    public TextView titleTextView;
-
-    /**
-     * The image view, which is used to display the icon of a tab.
-     */
-    public ImageView iconImageView;
-
-    /**
-     * The progress bar of a tab.
-     */
-    public CircularProgressBar progressBar;
-
-    /**
-     * The close button of a tab.
-     */
-    public ImageButton closeButton;
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/Arithmetics.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/Arithmetics.java
deleted file mode 100644
index 640172ce..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/Arithmetics.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package de.mrapp.android.tabswitcher.layout;
-
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewPropertyAnimator;
-
-import androidx.annotation.NonNull;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.layout.AbstractDragTabsEventHandler.DragState;
-import de.mrapp.android.tabswitcher.model.AbstractItem;
-
-/**
- * Defines the interface, a class, which provides methods, which allow to calculate the position,
- * size and rotation of a {@link TabSwitcher}'s children, must implement.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public interface Arithmetics {
-
-    /**
-     * Contains all axes on which the tabs of a {@link TabSwitcher} can be moved.
-     */
-    enum Axis {
-
-        /**
-         * The axis on which a tab is moved when dragging it.
-         */
-        DRAGGING_AXIS,
-
-        /**
-         * The axis on which a tab is moved, when it is added to or removed from the switcher.
-         */
-        ORTHOGONAL_AXIS,
-
-        /**
-         * The horizontal axis.
-         */
-        X_AXIS,
-
-        /**
-         * The vertical axis.
-         */
-        Y_AXIS
-
-    }
-
-    /**
-     * Returns the padding of the tab switcher on a specific axis and using a specific gravity.
-     *
-     * @param axis
-     *         The axis as a value of the enum {@link Axis}. The axis may not be null
-     * @param gravity
-     *         The gravity as an {@link Integer} value. The gravity must be
-     *         <code>Gravity.START</code> or <code>Gravity.END</code>
-     * @return The padding of the tab switcher on the given axis and using the given gravity as an
-     * {@link Integer} value
-     */
-    int getTabSwitcherPadding(@NonNull Axis axis, int gravity);
-
-    /**
-     * Returns the size of the container, which contains the tab switcher's tabs, on a specific
-     * axis. By default, the padding and the size of the toolbars are included.
-     *
-     * @param axis
-     *         The axis as a value of the enum {@link Axis}. The axis may not be null
-     * @return The size of the container, which contains the tab switcher's tabs, on the given axis
-     * as a {@link Float} value
-     */
-    float getTabContainerSize(@NonNull Axis axis);
-
-    /**
-     * Returns the size of the container, which contains the tab switcher's tabs, on a specific
-     * axis.
-     *
-     * @param axis
-     *         The axis as a value of the enum {@link Axis}. The axis may not be null
-     * @param includePadding
-     *         True, if the padding and the size of the toolbars should be included, false
-     *         otherwise
-     * @return The size of the container, which contains the tab switcher's tabs, on the given axis
-     * as a {@link Float} value
-     */
-    float getTabContainerSize(@NonNull Axis axis, boolean includePadding);
-
-    /**
-     * Returns the position of a touch event on a specific axis.
-     *
-     * @param axis
-     *         The axis as a value of the enum {@link Axis}. The axis may not be null
-     * @param event
-     *         The touch event, whose position should be returned, as an instance of the class
-     *         {@link MotionEvent}. The motion event may not be null
-     * @return The position of the given touch event on the given axis as a {@link Float} value
-     */
-    float getTouchPosition(@NonNull Axis axis, @NonNull MotionEvent event);
-
-    /**
-     * Returns the position of a specific item on a specific axis.
-     *
-     * @param axis
-     *         The axis as a value of the enum {@link Axis}. The axis may not be null
-     * @param item
-     *         The item, whose position should be returned, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @return The position of the given item on the given axis as a {@link Float} value
-     */
-    float getPosition(@NonNull Axis axis, @NonNull AbstractItem item);
-
-    /**
-     * Sets the position of an item on a specific axis.
-     *
-     * @param axis
-     *         The axis as a value of the enum {@link Axis}. The axis may not be null
-     * @param item
-     *         The item, whose position should be set, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @param position
-     *         The position, which should be set, as a {@link Float} value
-     */
-    void setPosition(@NonNull Axis axis, @NonNull AbstractItem item, float position);
-
-    /**
-     * Animates the position of an item on a specific axis. By default, the item's padding is not
-     * taken into account.
-     *
-     * @param axis
-     *         The axis as a value of the enum {@link Axis}. The axis may not be null
-     * @param animator
-     *         The animator, which should be used to animate the position, as an instance of the
-     *         class {@link ViewPropertyAnimator}. The animator may not be null
-     * @param item
-     *         The item, whose position should be animated, as an instance of the class {@link
-     *         View}. The view may not be null
-     * @param position
-     *         The position, which should be set by the animation, as a {@link Float} value
-     */
-    void animatePosition(@NonNull Axis axis, @NonNull ViewPropertyAnimator animator,
-                         @NonNull AbstractItem item, float position);
-
-    /**
-     * Animates the position of an item on a specific axis.
-     *
-     * @param axis
-     *         The axis as a value of the enum {@link Axis}. The axis may not be null
-     * @param animator
-     *         The animator, which should be used to animate the position, as an instance of the
-     *         class {@link ViewPropertyAnimator}. The animator may not be null
-     * @param item
-     *         The item, whose position should be animated, as an instance of the class {@link
-     *         View}. The view may not be null
-     * @param position
-     *         The position, which should be set by the animation, as a {@link Float} value
-     * @param includePadding
-     *         True, if the item's padding should be taken into account, false otherwise
-     */
-    void animatePosition(@NonNull Axis axis, @NonNull ViewPropertyAnimator animator,
-                         @NonNull AbstractItem item, float position, boolean includePadding);
-
-    /**
-     * Returns the scale of an item, depending on its margin. By default, the item's padding is
-     * not taken into account.
-     *
-     * @param item
-     *         The item, whose scale should be returned, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @return The scale of the given item as a {@link Float} value
-     */
-    float getScale(@NonNull final AbstractItem item);
-
-    /**
-     * Returns the scale of an item, depending on its margin.
-     *
-     * @param item
-     *         The item, whose scale should be returned, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @param includePadding
-     *         True, if the item's padding should be taken into account as well, false otherwise
-     * @return The scale of the given item as a {@link Float} value
-     */
-    float getScale(@NonNull final AbstractItem item, final boolean includePadding);
-
-    /**
-     * Sets the scale of an item on a specific axis.
-     *
-     * @param axis
-     *         The axis as a value of the enum {@link Axis}. The axis may not be null
-     * @param item
-     *         The item, whose scale should be set, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @param scale
-     *         The scale, which should be set, as a {@link Float} value
-     */
-    void setScale(@NonNull Axis axis, @NonNull AbstractItem item, float scale);
-
-    /**
-     * Animates the scale of an item on a specific axis.
-     *
-     * @param axis
-     *         The axis as a value of the enum {@link Axis}. The axis may not be null
-     * @param animator
-     *         The animator, which should be used to animate the scale, as an instance of the class
-     *         {@link ViewPropertyAnimator}. The animator may not be null
-     * @param scale
-     *         The scale, which should be set by the animation, as a {@link Float} value
-     */
-    void animateScale(@NonNull Axis axis, @NonNull ViewPropertyAnimator animator, float scale);
-
-    /**
-     * Returns the size of an item on a specific axis.
-     *
-     * @param axis
-     *         The axis as a value of the enum {@link Axis}. The axis may not be null
-     * @param item
-     *         The item, whose size should be returned, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @return The size of the given item on the given axis as a {@link Float} value
-     */
-    float getSize(@NonNull Axis axis, @NonNull AbstractItem item);
-
-    /**
-     * Returns the pivot of an item on a specific axis, depending on the current drag state.
-     *
-     * @param axis
-     *         The axis as a value of the enum {@link Axis}. The axis may not be null
-     * @param item
-     *         The item, whose pivot should be returned, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @param dragState
-     *         The current drag state as a value of the enum {@link DragState}. The drag state may
-     *         not be null
-     * @return The pivot of the given item on the given axis as a {@link Float} value
-     */
-    float getPivot(@NonNull Axis axis, @NonNull AbstractItem item, @NonNull DragState dragState);
-
-    /**
-     * Sets the pivot of an item on a specific axis.
-     *
-     * @param axis
-     *         The axis as a value of the enum {@link Axis}. The axis may not be null
-     * @param item
-     *         The item, whose pivot should be set, as an instance of the class {@link View}. The
-     *         item may not be null
-     * @param pivot
-     *         The pivot, which should be set, as a {@link Float} value
-     */
-    void setPivot(@NonNull Axis axis, @NonNull AbstractItem item, float pivot);
-
-    /**
-     * Returns the rotation of an item on a specific axis.
-     *
-     * @param axis
-     *         The axis as a value of the enum {@link Axis}. The axis may not be null
-     * @param item
-     *         The item, whose rotation should be returned, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @return The rotation of the given item on the given axis as a {@link Float} value
-     */
-    float getRotation(@NonNull Axis axis, @NonNull AbstractItem item);
-
-    /**
-     * Sets the rotation of an item on a specific axis.
-     *
-     * @param axis
-     *         The axis as a value of the enum {@link Axis}. The axis may not be null
-     * @param item
-     *         The item, whose rotation should be set, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @param angle
-     *         The rotation, which should be set, as a {@link Float} value
-     */
-    void setRotation(@NonNull Axis axis, @NonNull AbstractItem item, float angle);
-
-    /**
-     * Animates the rotation of an item on a specific axis.
-     *
-     * @param axis
-     *         The axis as a value of the enum {@link Axis}. The axis may not be null
-     * @param animator
-     *         The animator, should be used to animate the rotation, as an instance of the class
-     *         {@link ViewPropertyAnimator}. The animator may not be null
-     * @param angle
-     *         The rotation, which should be set by the animation, as a {@link Float} value
-     */
-    void animateRotation(@NonNull Axis axis, @NonNull ViewPropertyAnimator animator, float angle);
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/ContentRecyclerAdapter.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/ContentRecyclerAdapter.java
deleted file mode 100644
index 1d45a790..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/ContentRecyclerAdapter.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.layout;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.util.SparseArray;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import de.mrapp.android.tabswitcher.Animation;
-import de.mrapp.android.tabswitcher.StatefulTabSwitcherDecorator;
-import de.mrapp.android.tabswitcher.Tab;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.TabSwitcherDecorator;
-import de.mrapp.android.tabswitcher.TabSwitcherListener;
-import de.mrapp.android.tabswitcher.model.Restorable;
-import de.mrapp.android.util.view.AbstractViewRecycler;
-import de.mrapp.util.Condition;
-
-/**
- * A view recycler adapter, which allows to inflate the views, which are associated with the tabs of
- * a {@link TabSwitcher}, by encapsulating a {@link TabSwitcherDecorator}.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public class ContentRecyclerAdapter extends AbstractViewRecycler.Adapter<Tab, Void>
-        implements Restorable, TabSwitcherListener {
-
-    /**
-     * The name of the extra, which is used to store the saved instance states of previously removed
-     * associated views within a bundle.
-     */
-    private static final String SAVED_INSTANCE_STATES_EXTRA =
-            ContentRecyclerAdapter.class.getName() + "::SavedInstanceStates";
-
-    /**
-     * The tab switcher, which contains the tabs, the associated views, which are inflated by the
-     * adapter, correspond to.
-     */
-    private final TabSwitcher tabSwitcher;
-
-    /**
-     * The decorator, which is used to inflate the associated views.
-     */
-    private final TabSwitcherDecorator decorator;
-
-    /**
-     * A sparse array, which manages the saved instance states of previously removed associated
-     * views.
-     */
-    private SparseArray<Bundle> savedInstanceStates;
-
-    /**
-     * Puts the parameter {@link Tab#WAS_SHOWN_PARAMETER} into a specific bundle. If the bundle is
-     * null, a new bundle is created.
-     *
-     * @param parameters
-     *         The bundle, the parameter should be put into, as an instance of the class {@link
-     *         Bundle} or null
-     * @return The bundle, the parameter has been put into, as an instance of the clas {@link
-     * Bundle}. The bundle may not be null
-     */
-    @NonNull
-    private Bundle setWasShownParameter(@Nullable final Bundle parameters) {
-        Bundle result = parameters;
-
-        if (result == null) {
-            result = new Bundle();
-        }
-
-        result.putBoolean(Tab.WAS_SHOWN_PARAMETER, true);
-        return result;
-    }
-
-    /**
-     * Creates a new view recycler adapter, which allows to inflate views, which are associated with
-     * the tabs of a {@link TabSwitcher}, by encapsulating a {@link TabSwitcherDecorator}.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, which contains the tabs, whose associated views are inflated by the
-     *         adapter, correspond to, as an instance of the class {@link TabSwitcher}. The tab
-     *         switcher may not be null
-     * @param decorator
-     *         The decorator, which should be used to inflate the associated views, as an instance
-     *         of the class {@link TabSwitcherDecorator}. The decorator may not be null
-     */
-    public ContentRecyclerAdapter(@NonNull final TabSwitcher tabSwitcher,
-                                  @NonNull final TabSwitcherDecorator decorator) {
-        Condition.INSTANCE.ensureNotNull(tabSwitcher, "The tab switcher may not be null");
-        Condition.INSTANCE.ensureNotNull(decorator, "The decorator may not be null");
-        this.tabSwitcher = tabSwitcher;
-        tabSwitcher.addListener(this);
-        this.decorator = decorator;
-        this.savedInstanceStates = new SparseArray<>();
-    }
-
-    /**
-     * Clears the saved state of a specific tab.
-     *
-     * @param tab
-     *         The tab, whose saved state should be cleared, as an instance of the class {@link
-     *         Tab}. The tab may not be null
-     */
-    public void clearSavedState(@NonNull final Tab tab) {
-        Condition.INSTANCE.ensureNotNull(tab, "The tab may not be null");
-        savedInstanceStates.remove(tab.hashCode());
-    }
-
-    /**
-     * Clears the saved states of all tabs.
-     */
-    public void clearAllSavedStates() {
-        savedInstanceStates.clear();
-    }
-
-    @NonNull
-    @Override
-    public final View onInflateView(@NonNull final LayoutInflater inflater,
-                                    @Nullable final ViewGroup parent, @NonNull final Tab item,
-                                    final int viewType, @NonNull final Void... params) {
-        int index = tabSwitcher.indexOf(item);
-        View view = decorator.inflateView(inflater, parent, item, index);
-        view.setLayoutParams(new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT,
-                FrameLayout.LayoutParams.MATCH_PARENT));
-        return view;
-    }
-
-    @Override
-    public final void onShowView(@NonNull final Context context, @NonNull final View view,
-                                 @NonNull final Tab item, final boolean inflated,
-                                 @NonNull final Void... params) {
-        int index = tabSwitcher.indexOf(item);
-        Bundle savedInstanceState = null;
-        Bundle parameters = item.getParameters();
-
-        if (parameters != null && parameters.getBoolean(Tab.WAS_SHOWN_PARAMETER, false)) {
-            savedInstanceState = savedInstanceStates.get(item.hashCode());
-        }
-
-        item.setParameters(setWasShownParameter(parameters));
-        decorator.applyDecorator(context, tabSwitcher, view, item, index, savedInstanceState,
-                inflated);
-    }
-
-    @Override
-    public final void onRemoveView(@NonNull final View view, @NonNull final Tab item) {
-        int index = tabSwitcher.indexOf(item);
-        Bundle outState = decorator.saveInstanceState(view, item, index);
-        savedInstanceStates.put(item.hashCode(), outState);
-    }
-
-    @Override
-    public final int getViewTypeCount() {
-        return decorator.getViewTypeCount();
-    }
-
-    @Override
-    public final int getViewType(@NonNull final Tab item) {
-        int index = tabSwitcher.indexOf(item);
-        return decorator.getViewType(item, index);
-    }
-
-    @Override
-    public final void saveInstanceState(@NonNull final Bundle outState) {
-        outState.putSparseParcelableArray(SAVED_INSTANCE_STATES_EXTRA, savedInstanceStates);
-    }
-
-    @Override
-    public final void restoreInstanceState(@Nullable final Bundle savedInstanceState) {
-        if (savedInstanceState != null) {
-            savedInstanceStates =
-                    savedInstanceState.getSparseParcelableArray(SAVED_INSTANCE_STATES_EXTRA);
-        }
-    }
-
-    @Override
-    public final void onSwitcherShown(@NonNull final TabSwitcher tabSwitcher) {
-
-    }
-
-    @Override
-    public final void onSwitcherHidden(@NonNull final TabSwitcher tabSwitcher) {
-
-    }
-
-    @Override
-    public final void onSelectionChanged(@NonNull final TabSwitcher tabSwitcher,
-                                         final int selectedTabIndex,
-                                         @Nullable final Tab selectedTab) {
-
-    }
-
-    @Override
-    public final void onTabAdded(@NonNull final TabSwitcher tabSwitcher, final int index,
-                                 @NonNull final Tab tab, @NonNull final Animation animation) {
-
-    }
-
-    @Override
-    public final void onTabRemoved(@NonNull final TabSwitcher tabSwitcher, final int index,
-                                   @NonNull final Tab tab, @NonNull final Animation animation) {
-        if (tabSwitcher.areSavedStatesClearedWhenRemovingTabs()) {
-            clearSavedState(tab);
-            TabSwitcherDecorator decorator = tabSwitcher.getDecorator();
-
-            if (decorator instanceof StatefulTabSwitcherDecorator) {
-                ((StatefulTabSwitcherDecorator) decorator).clearState(tab);
-            }
-        }
-    }
-
-    @Override
-    public final void onAllTabsRemoved(@NonNull final TabSwitcher tabSwitcher,
-                                       @NonNull final Tab[] tabs,
-                                       @NonNull final Animation animation) {
-        if (tabSwitcher.areSavedStatesClearedWhenRemovingTabs()) {
-            clearAllSavedStates();
-
-            TabSwitcherDecorator decorator = tabSwitcher.getDecorator();
-
-            if (decorator instanceof StatefulTabSwitcherDecorator) {
-                ((StatefulTabSwitcherDecorator) decorator).clearAllStates();
-            }
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/TabSwitcherLayout.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/TabSwitcherLayout.java
deleted file mode 100644
index 94287773..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/TabSwitcherLayout.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.layout;
-
-import android.view.Menu;
-import android.view.ViewGroup;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-
-/**
- * Defines the interface, a layout, which implements the functionality of a {@link TabSwitcher},
- * must implement.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public interface TabSwitcherLayout {
-
-    /**
-     * Returns, whether an animation is currently running, or not.
-     *
-     * @return True, if an animation is currently running, false otherwise
-     */
-    boolean isAnimationRunning();
-
-    /**
-     * Returns the view group, which contains the tab switcher's tabs.
-     *
-     * @return The view group, which contains the tab switcher's tabs, as an instance of the class
-     * {@link ViewGroup} or null, if the view has not been laid out yet
-     */
-    @Nullable
-    ViewGroup getTabContainer();
-
-    /**
-     * Returns the toolbars, which are shown, when the tab switcher is shown. When using the
-     * smartphone layout, only one toolbar is shown. When using the tablet layout, a primary and
-     * secondary toolbar is shown. In such case, the index {@link TabSwitcher#PRIMARY_TOOLBAR_INDEX}
-     * of the returned array corresponds to the primary toolbar and the index {@link
-     * TabSwitcher#SECONDARY_TOOLBAR_INDEX} corresponds to the secondary toolbar.
-     *
-     * @return An array, which contains the toolbars, which are shown, when the tab switcher is
-     * shown, as an array of the type Toolbar or null, if the view has not been laid out yet
-     */
-    @Nullable
-    Toolbar[] getToolbars();
-
-    /**
-     * Returns the menu of the toolbar, which is shown, when the tab switcher is shown. When using
-     * the tablet layout, the menu corresponds to the secondary toolbar.
-     *
-     * @return The menu of the toolbar as an instance of the type {@link Menu} or null, if the view
-     * has not been laid out yet
-     */
-    @Nullable
-    Menu getToolbarMenu();
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PhoneArithmetics.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PhoneArithmetics.java
deleted file mode 100644
index 7228f1b3..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PhoneArithmetics.java
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.layout.phone;
-
-import android.content.res.Resources;
-import android.view.Gravity;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewPropertyAnimator;
-import android.widget.FrameLayout;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.Toolbar;
-import de.mrapp.android.tabswitcher.Layout;
-import de.mrapp.android.tabswitcher.R;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.layout.AbstractArithmetics;
-import de.mrapp.android.tabswitcher.layout.AbstractDragTabsEventHandler.DragState;
-import de.mrapp.android.tabswitcher.model.AbstractItem;
-import de.mrapp.util.Condition;
-
-/**
- * Provides methods, which allow to calculate the position, size and rotation of a {@link
- * TabSwitcher}'s tabs, when using the smartphone layout.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public class PhoneArithmetics extends AbstractArithmetics {
-
-    /**
-     * The height of a tab's title container in pixels.
-     */
-    private final int tabTitleContainerHeight;
-
-    /**
-     * The inset of tabs in pixels.
-     */
-    private final int tabInset;
-
-    /**
-     * The number of tabs, which are contained by a stack.
-     */
-    private final int stackedTabCount;
-
-    /**
-     * The space between tabs, which are part of a stack, in pixels.
-     */
-    private final float stackedTabSpacing;
-
-    /**
-     * The pivot when overshooting at the end.
-     */
-    private final float endOvershootPivot;
-
-    /**
-     * Modifies a specific axis depending on the orientation of the tab switcher.
-     *
-     * @param axis
-     *         The original axis as a value of the enum {@link Axis}. The axis may not be null
-     * @return The orientation invariant axis as a value of the enum {@link Axis}. The orientation
-     * invariant axis may not be null
-     */
-    @NonNull
-    private Axis getOrientationInvariantAxis(@NonNull final Axis axis) {
-        if (axis == Axis.Y_AXIS) {
-            return Axis.DRAGGING_AXIS;
-        } else if (axis == Axis.X_AXIS) {
-            return Axis.ORTHOGONAL_AXIS;
-        } else if (getTabSwitcher().getLayout() == Layout.PHONE_LANDSCAPE) {
-            return axis == Axis.DRAGGING_AXIS ? Axis.ORTHOGONAL_AXIS : Axis.DRAGGING_AXIS;
-        } else {
-            return axis;
-        }
-    }
-
-    /**
-     * Returns the default pivot of an item on a specific axis.
-     *
-     * @param axis
-     *         The axis as a value of the enum {@link Axis}. The axis may not be null
-     * @param item
-     *         The item, whose pivot should be returned, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @return The pivot of the given item on the given axis as a {@link Float} value
-     */
-    private float getDefaultPivot(@NonNull final Axis axis, @NonNull final AbstractItem item) {
-        if (axis == Axis.DRAGGING_AXIS || axis == Axis.Y_AXIS) {
-            return getTabSwitcher().getLayout() == Layout.PHONE_LANDSCAPE ?
-                    getSize(axis, item) / 2f : 0;
-        } else {
-            return getTabSwitcher().getLayout() == Layout.PHONE_LANDSCAPE ? 0 :
-                    getSize(axis, item) / 2f;
-        }
-    }
-
-    /**
-     * Returns the pivot of an item on a specific axis, when it is swiped.
-     *
-     * @param axis
-     *         The axis as a value of the enum {@link Axis}. The axis may not be null
-     * @param item
-     *         The item, whose pivot should be returned, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @return The pivot of the given item on the given axis as a {@link Float} value
-     */
-    private float getPivotWhenSwiping(@NonNull final Axis axis, @NonNull final AbstractItem item) {
-        if (axis == Axis.DRAGGING_AXIS || axis == Axis.Y_AXIS) {
-            return endOvershootPivot;
-        } else {
-            return getDefaultPivot(axis, item);
-        }
-    }
-
-    /**
-     * Returns the pivot of an item on a specific axis, when overshooting at the start.
-     *
-     * @param axis
-     *         The axis as a value of the enum {@link Axis}. The axis may not be null
-     * @param item
-     *         The item, whose pivot should be returned, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @return The pivot of the given item on the given axis as a {@link Float} value
-     */
-    private float getPivotWhenOvershootingAtStart(@NonNull final Axis axis,
-                                                  @NonNull final AbstractItem item) {
-        return getSize(axis, item) / 2f;
-    }
-
-    /**
-     * Returns the pivot of an item on a specific axis, when overshooting at the end.
-     *
-     * @param axis
-     *         The axis as a value of the enum {@link Axis}. The axis may not be null
-     * @param item
-     *         The item, whose pivot should be returned, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @return The pivot of the given item on the given axis as a {@link Float} value
-     */
-    private float getPivotWhenOvershootingAtEnd(@NonNull final Axis axis,
-                                                @NonNull final AbstractItem item) {
-        if (axis == Axis.DRAGGING_AXIS || axis == Axis.Y_AXIS) {
-            return getTabSwitcher().getCount() > 1 ? endOvershootPivot : getSize(axis, item) / 2f;
-        } else {
-            return getSize(axis, item) / 2f;
-        }
-    }
-
-    /**
-     * Creates a new class, which provides methods, which allow to calculate the position, size and
-     * rotation of a {@link TabSwitcher}'s tabs, when using the smartphone layout.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, the arithmetics should be calculated for, as an instance of the
-     *         class {@link TabSwitcher}. The tab switcher may not be null
-     */
-    public PhoneArithmetics(@NonNull final TabSwitcher tabSwitcher) {
-        super(tabSwitcher);
-        Resources resources = tabSwitcher.getResources();
-        tabTitleContainerHeight =
-                resources.getDimensionPixelSize(R.dimen.tab_title_container_height);
-        tabInset = resources.getDimensionPixelSize(R.dimen.tab_inset);
-        stackedTabCount = resources.getInteger(R.integer.phone_stacked_tab_count);
-        stackedTabSpacing = resources.getDimensionPixelSize(R.dimen.stacked_tab_spacing);
-        endOvershootPivot = resources.getDimensionPixelSize(R.dimen.end_overshoot_pivot);
-    }
-
-    @Override
-    public final int getTabSwitcherPadding(@NonNull final Axis axis, final int gravity) {
-        Condition.INSTANCE.ensureNotNull(axis, "The axis may not be null");
-        Condition.INSTANCE
-                .ensureTrue(gravity == Gravity.START || gravity == Gravity.END, "Invalid gravity");
-
-        if (getOrientationInvariantAxis(axis) == Axis.DRAGGING_AXIS) {
-            return gravity == Gravity.START ? getTabSwitcher().getPaddingTop() :
-                    getTabSwitcher().getPaddingBottom();
-        } else {
-            return gravity == Gravity.START ? getTabSwitcher().getPaddingLeft() :
-                    getTabSwitcher().getPaddingRight();
-        }
-    }
-
-    @Override
-    public final float getTabContainerSize(@NonNull final Axis axis, final boolean includePadding) {
-        Condition.INSTANCE.ensureNotNull(axis, "The axis may not be null");
-        ViewGroup tabContainer = getTabSwitcher().getTabContainer();
-        assert tabContainer != null;
-        FrameLayout.LayoutParams layoutParams =
-                (FrameLayout.LayoutParams) tabContainer.getLayoutParams();
-        int padding = !includePadding ? (getTabSwitcherPadding(axis, Gravity.START) +
-                getTabSwitcherPadding(axis, Gravity.END)) : 0;
-        Toolbar[] toolbars = getTabSwitcher().getToolbars();
-
-        if (getOrientationInvariantAxis(axis) == Axis.DRAGGING_AXIS) {
-            int toolbarSize =
-                    !includePadding && getTabSwitcher().areToolbarsShown() && toolbars != null ?
-                            toolbars[0].getHeight() - tabInset : 0;
-            return tabContainer.getHeight() - layoutParams.topMargin - layoutParams.bottomMargin -
-                    padding - toolbarSize;
-        } else {
-            return tabContainer.getWidth() - layoutParams.leftMargin - layoutParams.rightMargin -
-                    padding;
-        }
-    }
-
-    @Override
-    public final float getTouchPosition(@NonNull final Axis axis,
-                                        @NonNull final MotionEvent event) {
-        Condition.INSTANCE.ensureNotNull(axis, "The axis may not be null");
-        Condition.INSTANCE.ensureNotNull(event, "The motion event may not be null");
-
-        if (getOrientationInvariantAxis(axis) == Axis.DRAGGING_AXIS) {
-            return event.getY();
-        } else {
-            return event.getX();
-        }
-    }
-
-    @Override
-    public final float getPosition(@NonNull final Axis axis, @NonNull final AbstractItem item) {
-        Condition.INSTANCE.ensureNotNull(axis, "The axis may not be null");
-        Condition.INSTANCE.ensureNotNull(item, "The item may not be null");
-        View view = item.getView();
-
-        if (getOrientationInvariantAxis(axis) == Axis.DRAGGING_AXIS) {
-            Toolbar[] toolbars = getTabSwitcher().getToolbars();
-            return view.getY() -
-                    (getTabSwitcher().areToolbarsShown() && getTabSwitcher().isSwitcherShown() &&
-                            toolbars != null ?
-                            toolbars[TabSwitcher.PRIMARY_TOOLBAR_INDEX].getHeight() - tabInset :
-                            0) - getTabSwitcherPadding(axis, Gravity.START);
-        } else {
-            FrameLayout.LayoutParams layoutParams =
-                    (FrameLayout.LayoutParams) view.getLayoutParams();
-            return view.getX() - layoutParams.leftMargin - getTabSwitcher().getPaddingLeft() / 2f +
-                    getTabSwitcher().getPaddingRight() / 2f +
-                    (getTabSwitcher().getLayout() == Layout.PHONE_LANDSCAPE &&
-                            getTabSwitcher().isSwitcherShown() ?
-                            stackedTabCount * stackedTabSpacing / 2f : 0);
-        }
-    }
-
-    @Override
-    public final void setPosition(@NonNull final Axis axis, @NonNull final AbstractItem item,
-                                  final float position) {
-        Condition.INSTANCE.ensureNotNull(axis, "The axis may not be null");
-        Condition.INSTANCE.ensureNotNull(item, "The item may not be null");
-        View view = item.getView();
-
-        if (getOrientationInvariantAxis(axis) == Axis.DRAGGING_AXIS) {
-            Toolbar[] toolbars = getTabSwitcher().getToolbars();
-            view.setY((getTabSwitcher().areToolbarsShown() && getTabSwitcher().isSwitcherShown() &&
-                    toolbars != null ?
-                    toolbars[TabSwitcher.PRIMARY_TOOLBAR_INDEX].getHeight() - tabInset : 0) +
-                    getTabSwitcherPadding(axis, Gravity.START) + position);
-        } else {
-            FrameLayout.LayoutParams layoutParams =
-                    (FrameLayout.LayoutParams) view.getLayoutParams();
-            view.setX(position + layoutParams.leftMargin + getTabSwitcher().getPaddingLeft() / 2f -
-                    getTabSwitcher().getPaddingRight() / 2f -
-                    (getTabSwitcher().getLayout() == Layout.PHONE_LANDSCAPE &&
-                            getTabSwitcher().isSwitcherShown() ?
-                            stackedTabCount * stackedTabSpacing / 2f : 0));
-        }
-    }
-
-    @Override
-    public final void animatePosition(@NonNull final Axis axis,
-                                      @NonNull final ViewPropertyAnimator animator,
-                                      @NonNull final AbstractItem item, final float position,
-                                      final boolean includePadding) {
-        Condition.INSTANCE.ensureNotNull(axis, "The axis may not be null");
-        Condition.INSTANCE.ensureNotNull(animator, "The animator may not be null");
-        Condition.INSTANCE.ensureNotNull(item, "The item may not be null");
-
-        if (getOrientationInvariantAxis(axis) == Axis.DRAGGING_AXIS) {
-            Toolbar[] toolbars = getTabSwitcher().getToolbars();
-            animator.y((getTabSwitcher().areToolbarsShown() && getTabSwitcher().isSwitcherShown() &&
-                    toolbars != null ?
-                    toolbars[TabSwitcher.PRIMARY_TOOLBAR_INDEX].getHeight() - tabInset : 0) +
-                    (includePadding ? getTabSwitcherPadding(axis, Gravity.START) : 0) + position);
-        } else {
-            View view = item.getView();
-            FrameLayout.LayoutParams layoutParams =
-                    (FrameLayout.LayoutParams) view.getLayoutParams();
-            animator.x(position + layoutParams.leftMargin + (includePadding ?
-                    getTabSwitcher().getPaddingLeft() / 2f -
-                            getTabSwitcher().getPaddingRight() / 2f : 0) -
-                    (getTabSwitcher().getLayout() == Layout.PHONE_LANDSCAPE &&
-                            getTabSwitcher().isSwitcherShown() ?
-                            stackedTabCount * stackedTabSpacing / 2f : 0));
-        }
-    }
-
-    @Override
-    public final float getScale(@NonNull final AbstractItem item, final boolean includePadding) {
-        Condition.INSTANCE.ensureNotNull(item, "The item may not be null");
-        View view = item.getView();
-        FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) view.getLayoutParams();
-        float width = view.getWidth();
-        float targetWidth = width + layoutParams.leftMargin + layoutParams.rightMargin -
-                (includePadding ?
-                        getTabSwitcher().getPaddingLeft() + getTabSwitcher().getPaddingRight() :
-                        0) - (getTabSwitcher().getLayout() == Layout.PHONE_LANDSCAPE ?
-                stackedTabCount * stackedTabSpacing : 0);
-        return targetWidth / width;
-    }
-
-    @Override
-    public final void setScale(@NonNull final Axis axis, @NonNull final AbstractItem item,
-                               final float scale) {
-        Condition.INSTANCE.ensureNotNull(axis, "The axis may not be null");
-        Condition.INSTANCE.ensureNotNull(item, "The item may not be null");
-        View view = item.getView();
-
-        if (getOrientationInvariantAxis(axis) == Axis.DRAGGING_AXIS) {
-            view.setScaleY(scale);
-        } else {
-            view.setScaleX(scale);
-        }
-    }
-
-    @Override
-    public final void animateScale(@NonNull final Axis axis,
-                                   @NonNull final ViewPropertyAnimator animator,
-                                   final float scale) {
-        Condition.INSTANCE.ensureNotNull(axis, "The axis may not be null");
-        Condition.INSTANCE.ensureNotNull(animator, "The animator may not be null");
-
-        if (getOrientationInvariantAxis(axis) == Axis.DRAGGING_AXIS) {
-            animator.scaleY(scale);
-        } else {
-            animator.scaleX(scale);
-        }
-    }
-
-    @Override
-    public final float getSize(@NonNull final Axis axis, @NonNull final AbstractItem item) {
-        Condition.INSTANCE.ensureNotNull(axis, "The axis may not be null");
-        Condition.INSTANCE.ensureNotNull(item, "The item may not be null");
-        View view = item.getView();
-
-        if (getOrientationInvariantAxis(axis) == Axis.DRAGGING_AXIS) {
-            return view.getHeight() * getScale(item);
-        } else {
-            return view.getWidth() * getScale(item);
-        }
-    }
-
-    @Override
-    public final float getPivot(@NonNull final Axis axis, @NonNull final AbstractItem item,
-                                @NonNull final DragState dragState) {
-        Condition.INSTANCE.ensureNotNull(axis, "The axis may not be null");
-        Condition.INSTANCE.ensureNotNull(item, "The item may not be null");
-        Condition.INSTANCE.ensureNotNull(dragState, "The drag state may not be null");
-
-        if (dragState == DragState.SWIPE) {
-            return getPivotWhenSwiping(axis, item);
-        } else if (dragState == DragState.OVERSHOOT_START) {
-            return getPivotWhenOvershootingAtStart(axis, item);
-        } else if (dragState == DragState.OVERSHOOT_END) {
-            return getPivotWhenOvershootingAtEnd(axis, item);
-        } else {
-            return getDefaultPivot(axis, item);
-        }
-    }
-
-    @Override
-    public final void setPivot(@NonNull final Axis axis, @NonNull final AbstractItem item,
-                               final float pivot) {
-        Condition.INSTANCE.ensureNotNull(axis, "The axis may not be null");
-        Condition.INSTANCE.ensureNotNull(item, "The item may not be null");
-        View view = item.getView();
-        FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) view.getLayoutParams();
-
-        if (getOrientationInvariantAxis(axis) == Axis.DRAGGING_AXIS) {
-            float newPivot = pivot - layoutParams.topMargin - tabTitleContainerHeight;
-            view.setTranslationY(view.getTranslationY() +
-                    (view.getPivotY() - newPivot) * (1 - view.getScaleY()));
-            view.setPivotY(newPivot);
-        } else {
-            float newPivot = pivot - layoutParams.leftMargin;
-            view.setTranslationX(view.getTranslationX() +
-                    (view.getPivotX() - newPivot) * (1 - view.getScaleX()));
-            view.setPivotX(newPivot);
-        }
-    }
-
-    @Override
-    public final float getRotation(@NonNull final Axis axis, @NonNull final AbstractItem item) {
-        Condition.INSTANCE.ensureNotNull(axis, "The axis may not be null");
-        Condition.INSTANCE.ensureNotNull(item, "The view may not be null");
-        View view = item.getView();
-
-        if (getOrientationInvariantAxis(axis) == Axis.DRAGGING_AXIS) {
-            return view.getRotationY();
-        } else {
-            return view.getRotationX();
-        }
-    }
-
-    @Override
-    public final void setRotation(@NonNull final Axis axis, @NonNull final AbstractItem item,
-                                  final float angle) {
-        Condition.INSTANCE.ensureNotNull(axis, "The axis may not be null");
-        Condition.INSTANCE.ensureNotNull(item, "The item may not be null");
-        View view = item.getView();
-
-        if (getOrientationInvariantAxis(axis) == Axis.DRAGGING_AXIS) {
-            view.setRotationY(
-                    getTabSwitcher().getLayout() == Layout.PHONE_LANDSCAPE ? -1 * angle : angle);
-        } else {
-            view.setRotationX(
-                    getTabSwitcher().getLayout() == Layout.PHONE_LANDSCAPE ? -1 * angle : angle);
-        }
-    }
-
-    @Override
-    public final void animateRotation(@NonNull final Axis axis,
-                                      @NonNull final ViewPropertyAnimator animator,
-                                      final float angle) {
-        Condition.INSTANCE.ensureNotNull(axis, "The axis may not be null");
-        Condition.INSTANCE.ensureNotNull(animator, "The animator may not be null");
-
-        if (getOrientationInvariantAxis(axis) == Axis.DRAGGING_AXIS) {
-            animator.rotationY(
-                    getTabSwitcher().getLayout() == Layout.PHONE_LANDSCAPE ? -1 * angle : angle);
-        } else {
-            animator.rotationX(
-                    getTabSwitcher().getLayout() == Layout.PHONE_LANDSCAPE ? -1 * angle : angle);
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PhoneDragTabsEventHandler.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PhoneDragTabsEventHandler.java
deleted file mode 100644
index 75c6b7fb..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PhoneDragTabsEventHandler.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.layout.phone;
-
-import android.content.res.Resources;
-import android.view.Gravity;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
-import de.mrapp.android.tabswitcher.Layout;
-import de.mrapp.android.tabswitcher.R;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.iterator.AbstractItemIterator;
-import de.mrapp.android.tabswitcher.iterator.ItemIterator;
-import de.mrapp.android.tabswitcher.layout.AbstractDragTabsEventHandler;
-import de.mrapp.android.tabswitcher.layout.Arithmetics;
-import de.mrapp.android.tabswitcher.layout.Arithmetics.Axis;
-import de.mrapp.android.tabswitcher.model.AbstractItem;
-import de.mrapp.android.tabswitcher.model.State;
-import de.mrapp.android.tabswitcher.model.TabItem;
-import de.mrapp.android.util.gesture.DragHelper;
-import de.mrapp.android.util.view.AttachedViewRecycler;
-import de.mrapp.util.Condition;
-
-/**
- * A drag handler, which allows to calculate the position and state of tabs on touch events, when
- * using the smartphone layout.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public class PhoneDragTabsEventHandler
-        extends AbstractDragTabsEventHandler<PhoneDragTabsEventHandler.Callback> {
-
-    /**
-     * Defines the interface, a class, which should be notified about the events of a drag handler,
-     * must implement.
-     */
-    public interface Callback extends AbstractDragTabsEventHandler.Callback {
-
-        /**
-         * The method, which is invoked, when tabs are overshooting at the start.
-         *
-         * @param position
-         *         The position of the first tab in pixels as a {@link Float} value
-         */
-        void onStartOvershoot(float position);
-
-        /**
-         * The method, which is invoked, when the tabs should be tilted when overshooting at the
-         * start.
-         *
-         * @param angle
-         *         The angle, the tabs should be tilted by, in degrees as a {@link Float} value
-         */
-        void onTiltOnStartOvershoot(float angle);
-
-        /**
-         * The method, which is invoked, when the tabs should be tilted when overshooting at the
-         * end.
-         *
-         * @param angle
-         *         The angle, the tabs should be tilted by, in degrees as a {@link Float} value
-         */
-        void onTiltOnEndOvershoot(float angle);
-
-    }
-
-    /**
-     * The view recycler, which allows to inflate the views, which are used to visualize the tabs,
-     * whose positions and states are calculated by the drag handler.
-     */
-    private final AttachedViewRecycler<AbstractItem, ?> viewRecycler;
-
-    /**
-     * The drag helper, which is used to recognize drag gestures when overshooting.
-     */
-    private final DragHelper overshootDragHelper;
-
-    /**
-     * The maximum overshoot distance in pixels.
-     */
-    private final int maxOvershootDistance;
-
-    /**
-     * The maximum angle, tabs can be rotated by, when overshooting at the start, in degrees.
-     */
-    private final float maxStartOvershootAngle;
-
-    /**
-     * The maximum angle, tabs can be rotated by, when overshooting at the end, in degrees.
-     */
-    private final float maxEndOvershootAngle;
-
-    /**
-     * The number of tabs, which are contained by a stack.
-     */
-    private final int stackedTabCount;
-
-    /**
-     * The inset of tabs in pixels.
-     */
-    private final int tabInset;
-
-    /**
-     * Notifies the callback, that tabs are overshooting at the start.
-     *
-     * @param position
-     *         The position of the first tab in pixels as a {@link Float} value
-     */
-    private void notifyOnStartOvershoot(final float position) {
-        if (getCallback() != null) {
-            getCallback().onStartOvershoot(position);
-        }
-    }
-
-    /**
-     * Notifies the callback, that the tabs should be tilted when overshooting at the start.
-     *
-     * @param angle
-     *         The angle, the tabs should be tilted by, in degrees as a {@link Float} value
-     */
-    private void notifyOnTiltOnStartOvershoot(final float angle) {
-        if (getCallback() != null) {
-            getCallback().onTiltOnStartOvershoot(angle);
-        }
-    }
-
-    /**
-     * Notifies the callback, that the tabs should be titled when overshooting at the end.
-     *
-     * @param angle
-     *         The angle, the tabs should be tilted by, in degrees as a {@link Float} value
-     */
-    private void notifyOnTiltOnEndOvershoot(final float angle) {
-        if (getCallback() != null) {
-            getCallback().onTiltOnEndOvershoot(angle);
-        }
-    }
-
-    /**
-     * Creates a new drag handler, which allows to calculate the position and state of tabs on touch
-     * events, when using the smartphone layout.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, whose tabs' positions and states should be calculated by the drag
-     *         handler, as an instance of the class {@link TabSwitcher}. The tab switcher may not be
-     *         null
-     * @param arithmetics
-     *         The arithmetics, which should be used to calculate the position, size and rotation of
-     *         tabs, as an instance of the type {@link Arithmetics}. The arithmetics may not be
-     *         null
-     * @param viewRecycler
-     *         The view recycler, which allows to inflate the views, which are used to visualize the
-     *         tabs, whose positions and states should be calculated by the tab switcher, as an
-     *         instance of the class AttachedViewRecycler. The view recycler may not be null
-     */
-    public PhoneDragTabsEventHandler(@NonNull final TabSwitcher tabSwitcher,
-                                     @NonNull final Arithmetics arithmetics,
-                                     @NonNull final AttachedViewRecycler<AbstractItem, ?> viewRecycler) {
-        super(tabSwitcher, arithmetics, true);
-        Condition.INSTANCE.ensureNotNull(viewRecycler, "The view recycler may not be null");
-        this.viewRecycler = viewRecycler;
-        this.overshootDragHelper = new DragHelper(0);
-        Resources resources = tabSwitcher.getResources();
-        this.tabInset = resources.getDimensionPixelSize(R.dimen.tab_inset);
-        this.stackedTabCount = resources.getInteger(R.integer.phone_stacked_tab_count);
-        this.maxOvershootDistance = resources.getDimensionPixelSize(R.dimen.max_overshoot_distance);
-        this.maxStartOvershootAngle = resources.getInteger(R.integer.max_start_overshoot_angle);
-        this.maxEndOvershootAngle = resources.getInteger(R.integer.max_end_overshoot_angle);
-    }
-
-    @Override
-    @Nullable
-    protected final AbstractItem getFocusedItem(final float position) {
-        AbstractItemIterator iterator =
-                new ItemIterator.Builder(getTabSwitcher(), viewRecycler).create();
-        AbstractItem tabItem;
-
-        while ((tabItem = iterator.next()) != null) {
-            if (tabItem.getTag().getState() == State.FLOATING ||
-                    tabItem.getTag().getState() == State.STACKED_START_ATOP) {
-                Toolbar[] toolbars = getTabSwitcher().getToolbars();
-                float toolbarHeight = getTabSwitcher().getLayout() != Layout.PHONE_LANDSCAPE &&
-                        getTabSwitcher().areToolbarsShown() && toolbars != null ?
-                        toolbars[TabSwitcher.PRIMARY_TOOLBAR_INDEX].getHeight() - tabInset : 0;
-                float viewPosition =
-                        getArithmetics().getPosition(Axis.DRAGGING_AXIS, tabItem) + toolbarHeight +
-                                getArithmetics()
-                                        .getTabSwitcherPadding(Axis.DRAGGING_AXIS, Gravity.START);
-
-                if (viewPosition <= position) {
-                    return tabItem;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    @Override
-    protected final float onOvershootStart(final float dragPosition,
-                                           final float overshootThreshold) {
-        float result = overshootThreshold;
-        overshootDragHelper.update(dragPosition);
-        float overshootDistance = overshootDragHelper.getDragDistance();
-
-        if (overshootDistance < 0) {
-            float absOvershootDistance = Math.abs(overshootDistance);
-            float startOvershootDistance =
-                    getTabSwitcher().getCount() >= stackedTabCount ? maxOvershootDistance :
-                            (getTabSwitcher().getCount() > 1 ? (float) maxOvershootDistance /
-                                    (float) getTabSwitcher().getCount() : 0);
-
-            if (absOvershootDistance <= startOvershootDistance) {
-                float ratio =
-                        Math.max(0, Math.min(1, absOvershootDistance / startOvershootDistance));
-                AbstractItemIterator iterator =
-                        new ItemIterator.Builder(getTabSwitcher(), viewRecycler).create();
-                AbstractItem tabItem = iterator.getItem(0);
-                float currentPosition = tabItem.getTag().getPosition();
-                float position = currentPosition - (currentPosition * ratio);
-                notifyOnStartOvershoot(position);
-            } else {
-                float ratio =
-                        (absOvershootDistance - startOvershootDistance) / maxOvershootDistance;
-
-                if (ratio >= 1) {
-                    overshootDragHelper.setMinDragDistance(overshootDistance);
-                    result = dragPosition + maxOvershootDistance + startOvershootDistance;
-                }
-
-                notifyOnTiltOnStartOvershoot(
-                        Math.max(0, Math.min(1, ratio)) * maxStartOvershootAngle);
-            }
-        }
-
-        return result;
-    }
-
-    @Override
-    protected final float onOvershootEnd(final float dragPosition, final float overshootThreshold) {
-        float result = overshootThreshold;
-        overshootDragHelper.update(dragPosition);
-        float overshootDistance = overshootDragHelper.getDragDistance();
-        float ratio = overshootDistance / maxOvershootDistance;
-
-        if (ratio >= 1) {
-            overshootDragHelper.setMaxDragDistance(overshootDistance);
-            result = dragPosition - maxOvershootDistance;
-        }
-
-        notifyOnTiltOnEndOvershoot(Math.max(0, Math.min(1, ratio)) *
-                -(getTabSwitcher().getCount() > 1 ? maxEndOvershootAngle : maxStartOvershootAngle));
-        return result;
-    }
-
-    @Override
-    protected final void onOvershootReverted() {
-        overshootDragHelper.reset();
-    }
-
-    @Override
-    protected final void onReset() {
-        if (overshootDragHelper != null) {
-            overshootDragHelper.reset();
-        }
-    }
-
-    @Override
-    protected final boolean isSwipeThresholdReached(@NonNull final TabItem swipedTabItem) {
-        return Math.abs(getArithmetics().getPosition(Axis.ORTHOGONAL_AXIS, swipedTabItem)) >
-                getArithmetics().getTabContainerSize(Axis.ORTHOGONAL_AXIS) / 6f;
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PhoneTabRecyclerAdapter.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PhoneTabRecyclerAdapter.java
deleted file mode 100644
index e5339e77..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PhoneTabRecyclerAdapter.java
+++ /dev/null
@@ -1,448 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.layout.phone;
-
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.PorterDuff;
-import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout.LayoutParams;
-import android.widget.ImageView;
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import androidx.core.util.Pair;
-import de.mrapp.android.tabswitcher.Layout;
-import de.mrapp.android.tabswitcher.R;
-import de.mrapp.android.tabswitcher.Tab;
-import de.mrapp.android.tabswitcher.TabPreviewListener;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.iterator.ItemIterator;
-import de.mrapp.android.tabswitcher.layout.AbstractTabRecyclerAdapter;
-import de.mrapp.android.tabswitcher.layout.AbstractTabViewHolder;
-import de.mrapp.android.tabswitcher.model.AbstractItem;
-import de.mrapp.android.tabswitcher.model.TabItem;
-import de.mrapp.android.tabswitcher.model.TabSwitcherModel;
-import de.mrapp.android.tabswitcher.model.TabSwitcherStyle;
-import de.mrapp.android.util.ViewUtil;
-import de.mrapp.android.util.logging.LogLevel;
-import de.mrapp.android.util.multithreading.AbstractDataBinder;
-import de.mrapp.android.util.view.ViewRecycler;
-import de.mrapp.util.Condition;
-
-/**
- * A view recycler adapter, which allows to inflate the views, which are used to visualize the tabs
- * of a {@link TabSwitcher}, when using the smartphone layout.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public class PhoneTabRecyclerAdapter extends AbstractTabRecyclerAdapter
-        implements AbstractDataBinder.Listener<Bitmap, Tab, ImageView, TabItem> {
-
-    /**
-     * The view recycler, which allows to inflate the views, which are associated with tabs.
-     */
-    private final ViewRecycler<Tab, Void> tabViewRecycler;
-
-    /**
-     * The data binder, which allows to render previews of tabs.
-     */
-    private final AbstractDataBinder<Bitmap, Tab, ImageView, TabItem> dataBinder;
-
-    /**
-     * The inset of tabs in pixels.
-     */
-    private final int tabInset;
-
-    /**
-     * The width of the border, which is shown around the preview of tabs, in pixels.
-     */
-    private final int tabBorderWidth;
-
-    /**
-     * The height of the view group, which contains a tab's title and close button, in pixels.
-     */
-    private final int tabTitleContainerHeight;
-
-    /**
-     * Inflates the view, which is associated with a tab, and adds it to the view hierarchy.
-     *
-     * @param tabItem
-     *         The tab item, which corresponds to the tab, whose associated view should be inflated,
-     *         as an instance of the class {@link TabItem}. The tab item may not be null
-     */
-    private void addContentView(@NonNull final TabItem tabItem) {
-        PhoneTabViewHolder viewHolder = (PhoneTabViewHolder) tabItem.getViewHolder();
-        View view = viewHolder.content;
-        Tab tab = tabItem.getTab();
-
-        if (view == null) {
-            ViewGroup parent = viewHolder.contentContainer;
-            Pair<View, ?> pair = tabViewRecycler.inflate(tab, parent);
-            view = pair.first;
-            LayoutParams layoutParams =
-                    new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
-            Rect padding = getPadding();
-            layoutParams.setMargins(padding.left, padding.top, padding.right, padding.bottom);
-            parent.addView(view, 0, layoutParams);
-            viewHolder.content = view;
-        } else {
-            tabViewRecycler.getAdapter().onShowView(getModel().getContext(), view, tab, false);
-        }
-
-        viewHolder.previewImageView.setVisibility(View.GONE);
-        viewHolder.previewImageView.setImageBitmap(null);
-        viewHolder.borderView.setVisibility(View.GONE);
-    }
-
-    /**
-     * Renders and displays the preview of a tab.
-     *
-     * @param tabItem
-     *         The tab item, which corresponds to the tab, whose preview should be rendered, as an
-     *         instance of the class {@link TabItem}. The tab item may not be null
-     */
-    private void renderPreview(@NonNull final TabItem tabItem) {
-        Tab tab = tabItem.getTab();
-        PhoneTabViewHolder viewHolder = (PhoneTabViewHolder) tabItem.getViewHolder();
-        viewHolder.borderView
-                .setVisibility(getModel().isSwitcherShown() ? View.VISIBLE : View.GONE);
-
-        if (viewHolder.content != null) {
-            tabViewRecycler.getAdapter().onRemoveView(viewHolder.content, tab);
-            dataBinder.load(tab, viewHolder.previewImageView, false, tabItem);
-            removeContentView(viewHolder, tab);
-        } else {
-            dataBinder.load(tab, viewHolder.previewImageView, tabItem);
-        }
-    }
-
-    /**
-     * Removes the view, which is associated with a tab, from its parent.
-     *
-     * @param viewHolder
-     *         The view holder, which stores references to the tab's views, as an instance of the
-     *         class {@link PhoneTabViewHolder}. The view holder may not be null
-     * @param tab
-     *         The tab, whose associated view should be removed, as an instance of the class {@link
-     *         Tab}. The tab may not be null
-     */
-    private void removeContentView(@NonNull final PhoneTabViewHolder viewHolder,
-                                   @NonNull final Tab tab) {
-        if (viewHolder.contentContainer.getChildCount() > 2) {
-            viewHolder.contentContainer.removeViewAt(0);
-        }
-
-        viewHolder.content = null;
-        tabViewRecycler.remove(tab);
-    }
-
-    /**
-     * Adapts the visibility of a tab's background.
-     *
-     * @param tabItem
-     *         The tab item, which corresponds to the tab, whose backgrounds's visibility should be
-     *         adapted, as an instance of the class {@link TabItem}. The tab item may not be null
-     */
-    private void adaptBackgroundVisibility(@NonNull final TabItem tabItem) {
-        View view = tabItem.getView();
-        Drawable background = view.getBackground();
-        background.setAlpha(getModel().isSwitcherShown() ? 0xFF : 0x0);
-    }
-
-    /**
-     * Adapts the background color of a tab's content.
-     *
-     * @param tabItem
-     *         The tab item, which corresponds to the tab, whose content's background should be
-     *         adapted, as an instance of the class {@link TabItem}. The tab item may not be null
-     */
-    private void adaptContentBackgroundColor(@NonNull final TabItem tabItem) {
-        Tab tab = tabItem.getTab();
-        int color = getStyle().getTabContentBackgroundColor(tab);
-        PhoneTabViewHolder viewHolder = (PhoneTabViewHolder) tabItem.getViewHolder();
-        viewHolder.contentContainer.setBackgroundColor(color);
-    }
-
-    /**
-     * Adapts the log level.
-     */
-    private void adaptLogLevel() {
-        dataBinder.setLogLevel(getModel().getLogLevel());
-    }
-
-    /**
-     * Adapts the padding of a tab.
-     *
-     * @param viewHolder
-     *         The view holder, which stores references to the tab's views, as an instance of the
-     *         class {@link PhoneTabViewHolder}. The view holder may not be null
-     */
-    private void adaptPadding(@NonNull final PhoneTabViewHolder viewHolder) {
-        Rect padding = getPadding();
-
-        if (viewHolder.content != null) {
-            LayoutParams contentLayoutParams = (LayoutParams) viewHolder.content.getLayoutParams();
-            contentLayoutParams
-                    .setMargins(padding.left, padding.top, padding.right, padding.bottom);
-        }
-
-        LayoutParams previewLayoutParams =
-                (LayoutParams) viewHolder.previewImageView.getLayoutParams();
-        previewLayoutParams.setMargins(padding.left, padding.top, padding.right, padding.bottom);
-    }
-
-    /**
-     * Returns the padding of a tab.
-     *
-     * @return A rect, which contains the left, top, right and bottom padding of a tab, as an
-     * instance of the class {@link Rect}. The rect may not be null
-     */
-    @NonNull
-    private Rect getPadding() {
-        if (getModel().isPaddingAppliedToTabs()) {
-            return new Rect(getModel().getPaddingLeft(), getModel().getPaddingTop(),
-                    getModel().getPaddingRight(), getModel().getPaddingBottom());
-        } else {
-            return new Rect(0, 0, 0, 0);
-        }
-    }
-
-    /**
-     * Creates a new view recycler adapter, which allows to inflate the views, which are used to
-     * visualize the tabs of a {@link TabSwitcher}.
-     *
-     * @param tabSwitcher
-     *         The tab switcher as an instance of the class {@link TabSwitcher}. The tab switcher
-     *         may not be null
-     * @param model
-     *         The model, which belongs to the tab switcher, as an instance of the class {@link
-     *         TabSwitcherModel}. The model may not be null
-     * @param style
-     *         The style, which allows to retrieve style attributes of the tab switcher, as an
-     *         instance of the class {@link TabSwitcherStyle}. The style may not be null
-     * @param tabViewRecycler
-     *         The view recycler, which allows to inflate the views, which are associated with tabs,
-     *         as an instance of the class ViewRecycler. The view recycler may not be null
-     */
-    public PhoneTabRecyclerAdapter(@NonNull final TabSwitcher tabSwitcher,
-                                   @NonNull final TabSwitcherModel model,
-                                   @NonNull final TabSwitcherStyle style,
-                                   @NonNull final ViewRecycler<Tab, Void> tabViewRecycler) {
-        super(tabSwitcher, model, style);
-        Condition.INSTANCE.ensureNotNull(tabViewRecycler, "The tab view recycler may not be null");
-        this.tabViewRecycler = tabViewRecycler;
-        this.dataBinder = new PreviewDataBinder(tabSwitcher, tabViewRecycler, model);
-        this.dataBinder.addListener(this);
-        Resources resources = tabSwitcher.getResources();
-        this.tabInset = resources.getDimensionPixelSize(R.dimen.tab_inset);
-        this.tabBorderWidth = resources.getDimensionPixelSize(R.dimen.tab_border_width);
-        this.tabTitleContainerHeight =
-                resources.getDimensionPixelSize(R.dimen.tab_title_container_height);
-        adaptLogLevel();
-    }
-
-    /**
-     * Removes all previously rendered previews from the cache.
-     */
-    public final void clearCachedPreviews() {
-        dataBinder.clearCache();
-    }
-
-    @Override
-    protected final void onAdaptBackgroundColor(@ColorInt final int color,
-                                                @NonNull final TabItem tabItem) {
-        PhoneTabViewHolder viewHolder = (PhoneTabViewHolder) tabItem.getViewHolder();
-        Drawable border = viewHolder.borderView.getBackground();
-        border.setColorFilter(color, PorterDuff.Mode.MULTIPLY);
-    }
-
-    @NonNull
-    @Override
-    protected final View onInflateTabView(@NonNull final LayoutInflater inflater,
-                                          @Nullable final ViewGroup parent,
-                                          @NonNull final AbstractTabViewHolder viewHolder) {
-        View view = inflater.inflate(R.layout.phone_tab, parent, false);
-        Drawable backgroundDrawable =
-                ContextCompat.getDrawable(getModel().getContext(), R.drawable.phone_tab_background);
-        ViewUtil.setBackground(view, backgroundDrawable);
-        int padding = tabInset + tabBorderWidth;
-        view.setPadding(padding, tabInset, padding, padding);
-        ((PhoneTabViewHolder) viewHolder).contentContainer =
-                view.findViewById(R.id.content_container);
-        ((PhoneTabViewHolder) viewHolder).previewImageView =
-                view.findViewById(R.id.preview_image_view);
-        adaptPadding((PhoneTabViewHolder) viewHolder);
-        ((PhoneTabViewHolder) viewHolder).borderView = view.findViewById(R.id.border_view);
-        Drawable borderDrawable =
-                ContextCompat.getDrawable(getModel().getContext(), R.drawable.phone_tab_border);
-        ViewUtil.setBackground(((PhoneTabViewHolder) viewHolder).borderView, borderDrawable);
-        return view;
-    }
-
-    @Override
-    protected final void onShowTabView(@NonNull final View view, @NonNull final TabItem tabItem,
-                                       @NonNull final Integer... params) {
-        LayoutParams layoutParams =
-                new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
-        int borderMargin = -(tabInset + tabBorderWidth);
-        int bottomMargin = params.length > 0 && params[0] != -1 ? params[0] : borderMargin;
-        layoutParams.leftMargin = borderMargin;
-        layoutParams.topMargin = -(tabInset + tabTitleContainerHeight);
-        layoutParams.rightMargin = borderMargin;
-        layoutParams.bottomMargin = bottomMargin;
-        view.setLayoutParams(layoutParams);
-        adaptContentBackgroundColor(tabItem);
-        adaptBackgroundVisibility(tabItem);
-
-        if (!getModel().isSwitcherShown()) {
-            addContentView(tabItem);
-        } else {
-            renderPreview(tabItem);
-        }
-    }
-
-    @NonNull
-    @Override
-    protected final AbstractTabViewHolder onCreateTabViewHolder() {
-        return new PhoneTabViewHolder();
-    }
-
-    @NonNull
-    @Override
-    protected final Layout getLayout() {
-        return Layout.PHONE_PORTRAIT;
-    }
-
-    @Override
-    public final void onRemoveView(@NonNull final View view, @NonNull final AbstractItem item) {
-        if (item instanceof TabItem) {
-            TabItem tabItem = (TabItem) item;
-            PhoneTabViewHolder viewHolder = (PhoneTabViewHolder) view.getTag(R.id.tag_view_holder);
-            Tab tab = tabItem.getTab();
-            removeContentView(viewHolder, tab);
-
-            if (!dataBinder.isCached(tab)) {
-                Drawable drawable = viewHolder.previewImageView.getDrawable();
-                viewHolder.previewImageView.setImageBitmap(null);
-
-                if (drawable instanceof BitmapDrawable) {
-                    Bitmap bitmap = ((BitmapDrawable) drawable).getBitmap();
-
-                    if (bitmap != null && !bitmap.isRecycled()) {
-                        bitmap.recycle();
-                    }
-                }
-            } else {
-                viewHolder.previewImageView.setImageBitmap(null);
-            }
-
-            super.onRemoveView(view, tabItem);
-        } else {
-            throw new IllegalArgumentException("Unknown item type");
-        }
-    }
-
-    @Override
-    public final void onLogLevelChanged(@NonNull final LogLevel logLevel) {
-        adaptLogLevel();
-    }
-
-    @Override
-    public final void onPaddingChanged(final int left, final int top, final int right,
-                                       final int bottom) {
-        ItemIterator iterator =
-                new ItemIterator.Builder(getModel(), getViewRecyclerOrThrowException()).create();
-        AbstractItem item;
-
-        while ((item = iterator.next()) != null) {
-            if (item.isInflated() && item instanceof TabItem) {
-                AbstractTabViewHolder viewHolder = ((TabItem) item).getViewHolder();
-                adaptPadding((PhoneTabViewHolder) viewHolder);
-            }
-        }
-    }
-
-    @Override
-    public final void onApplyPaddingToTabsChanged(final boolean applyPaddingToTabs) {
-        ItemIterator iterator =
-                new ItemIterator.Builder(getModel(), getViewRecyclerOrThrowException()).create();
-        AbstractItem item;
-
-        while ((item = iterator.next()) != null) {
-            if (item.isInflated() && item instanceof TabItem) {
-                AbstractTabViewHolder viewHolder = ((TabItem) item).getViewHolder();
-                adaptPadding((PhoneTabViewHolder) viewHolder);
-            }
-        }
-    }
-
-    @Override
-    public final void onTabContentBackgroundColorChanged(@ColorInt final int color) {
-        ItemIterator iterator =
-                new ItemIterator.Builder(getModel(), getViewRecyclerOrThrowException()).create();
-        AbstractItem item;
-
-        while ((item = iterator.next()) != null) {
-            if (item.isInflated() && item instanceof TabItem) {
-                adaptContentBackgroundColor((TabItem) item);
-            }
-        }
-    }
-
-    @Override
-    public final void onContentBackgroundColorChanged(@NonNull final Tab tab) {
-        TabItem tabItem = getTabItem(tab);
-
-        if (tabItem != null) {
-            adaptContentBackgroundColor(tabItem);
-        }
-    }
-
-    @Override
-    public final boolean onLoadData(
-            @NonNull final AbstractDataBinder<Bitmap, Tab, ImageView, TabItem> dataBinder,
-            @NonNull final Tab key, @NonNull final TabItem... params) {
-        boolean result = true;
-
-        for (TabPreviewListener listener : getModel().getTabPreviewListeners()) {
-            result &= listener.onLoadTabPreview(getTabSwitcher(), key);
-        }
-
-        return result;
-    }
-
-    @Override
-    public final void onFinished(
-            @NonNull final AbstractDataBinder<Bitmap, Tab, ImageView, TabItem> dataBinder,
-            @NonNull final Tab key, @Nullable final Bitmap data, @NonNull final ImageView view,
-            @NonNull final TabItem... params) {
-
-    }
-
-    @Override
-    public final void onCanceled(
-            @NonNull final AbstractDataBinder<Bitmap, Tab, ImageView, TabItem> dataBinder) {
-
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PhoneTabSwitcherLayout.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PhoneTabSwitcherLayout.java
deleted file mode 100644
index 2e3c62b8..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PhoneTabSwitcherLayout.java
+++ /dev/null
@@ -1,3494 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.layout.phone;
-
-import android.animation.Animator;
-import android.animation.Animator.AnimatorListener;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.ValueAnimator;
-import android.content.res.Resources;
-import android.util.TypedValue;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewPropertyAnimator;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
-import android.view.animation.AccelerateDecelerateInterpolator;
-import android.view.animation.AccelerateInterpolator;
-import android.view.animation.DecelerateInterpolator;
-import android.view.animation.Interpolator;
-import android.widget.FrameLayout;
-
-import java.util.Collections;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.util.Pair;
-import androidx.core.view.ViewCompat;
-import de.mrapp.android.tabswitcher.Animation;
-import de.mrapp.android.tabswitcher.Layout;
-import de.mrapp.android.tabswitcher.PeekAnimation;
-import de.mrapp.android.tabswitcher.R;
-import de.mrapp.android.tabswitcher.RevealAnimation;
-import de.mrapp.android.tabswitcher.SwipeAnimation;
-import de.mrapp.android.tabswitcher.SwipeAnimation.SwipeDirection;
-import de.mrapp.android.tabswitcher.Tab;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.TabSwitcherDecorator;
-import de.mrapp.android.tabswitcher.gesture.TouchEventDispatcher;
-import de.mrapp.android.tabswitcher.iterator.AbstractItemIterator;
-import de.mrapp.android.tabswitcher.iterator.ArrayItemIterator;
-import de.mrapp.android.tabswitcher.iterator.ItemIterator;
-import de.mrapp.android.tabswitcher.layout.AbstractDragTabsEventHandler;
-import de.mrapp.android.tabswitcher.layout.AbstractDragTabsEventHandler.DragState;
-import de.mrapp.android.tabswitcher.layout.AbstractTabRecyclerAdapter;
-import de.mrapp.android.tabswitcher.layout.AbstractTabSwitcherLayout;
-import de.mrapp.android.tabswitcher.layout.Arithmetics;
-import de.mrapp.android.tabswitcher.layout.Arithmetics.Axis;
-import de.mrapp.android.tabswitcher.model.AbstractItem;
-import de.mrapp.android.tabswitcher.model.ItemComparator;
-import de.mrapp.android.tabswitcher.model.State;
-import de.mrapp.android.tabswitcher.model.TabItem;
-import de.mrapp.android.tabswitcher.model.TabSwitcherModel;
-import de.mrapp.android.tabswitcher.model.TabSwitcherStyle;
-import de.mrapp.android.tabswitcher.model.Tag;
-import de.mrapp.android.util.view.AbstractViewRecycler;
-import de.mrapp.android.util.view.AttachedViewRecycler;
-import de.mrapp.android.util.view.ViewRecycler;
-import de.mrapp.util.Condition;
-
-/**
- * A layout, which implements the functionality of a {@link TabSwitcher} on smartphones.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public class PhoneTabSwitcherLayout extends AbstractTabSwitcherLayout
-        implements PhoneDragTabsEventHandler.Callback {
-
-    /**
-     * A layout listener, which encapsulates another listener, which is notified, when the listener
-     * has been invoked a specific number of times.
-     */
-    private class CompoundLayoutListener implements OnGlobalLayoutListener {
-
-        /**
-         * The number of times, the listener must still be invoked, until the encapsulated listener
-         * is notified.
-         */
-        private int count;
-
-        /**
-         * The encapsulated listener;
-         */
-        private final OnGlobalLayoutListener listener;
-
-        /**
-         * Creates a new layout listener, which encapsulates another listener, which is notified,
-         * when the listener has been invoked a specific number of times.
-         *
-         * @param count
-         *         The number of times, the listener should be invoked until the encapsulated
-         *         listener is notified, as an {@link Integer} value. The count must be greater than
-         *         0
-         * @param listener
-         *         The encapsulated listener, which should be notified, when the listener has been
-         *         notified the given number of times, as an instance of the type {@link
-         *         OnGlobalLayoutListener} or null, if no listener should be notified
-         */
-        CompoundLayoutListener(final int count, @Nullable final OnGlobalLayoutListener listener) {
-            Condition.INSTANCE.ensureGreater(count, 0, "The count must be greater than 0");
-            this.count = count;
-            this.listener = listener;
-        }
-
-        @Override
-        public void onGlobalLayout() {
-            if (--count == 0) {
-                if (listener != null) {
-                    listener.onGlobalLayout();
-                }
-            }
-        }
-
-    }
-
-    /**
-     * The ratio, which specifies the maximum space between the currently selected tab and its
-     * predecessor in relation to the default space.
-     */
-    private static final float SELECTED_TAB_SPACING_RATIO = 1.5f;
-
-    /**
-     * The ratio, which specifies the minimum space between two neighboring tabs in relation to the
-     * maximum space.
-     */
-    private static final float MIN_TAB_SPACING_RATIO = 0.375f;
-
-    /**
-     * The number of tabs, which are contained by a stack.
-     */
-    private final int stackedTabCount;
-
-    /**
-     * The inset of tabs in pixels.
-     */
-    private final int tabInset;
-
-    /**
-     * The width of the border, which is drawn around the preview of tabs.
-     */
-    private final int tabBorderWidth;
-
-    /**
-     * The height of a tab's title container in pixels.
-     */
-    private final int tabTitleContainerHeight;
-
-    /**
-     * The maximum camera distance, when tilting a tab, in pixels.
-     */
-    private final int maxCameraDistance;
-
-    /**
-     * The alpha of a tab, when it is swiped.
-     */
-    private final float swipedTabAlpha;
-
-    /**
-     * The scale of a tab, when it is swiped.
-     */
-    private final float swipedTabScale;
-
-    /**
-     * The duration of the animation, which is used to show the switcher.
-     */
-    private final long showSwitcherAnimationDuration;
-
-    /**
-     * The duration of the animation, which is used to hide the switcher.
-     */
-    private final long hideSwitcherAnimationDuration;
-
-    /**
-     * The duration of the animation, which is used to show or hide the toolbar.
-     */
-    private final long toolbarVisibilityAnimationDuration;
-
-    /**
-     * The delay of the animation, which is used to show or hide the toolbar.
-     */
-    private final long toolbarVisibilityAnimationDelay;
-
-    /**
-     * The duration of the animation, which is used to swipe tabs.
-     */
-    private final long swipeAnimationDuration;
-
-    /**
-     * The duration of the animation, which is used to relocate tabs.
-     */
-    private final long relocateAnimationDuration;
-
-    /**
-     * The duration of the animation, which is used to revert overshoots.
-     */
-    private final long revertOvershootAnimationDuration;
-
-    /**
-     * The duration of a reveal animation.
-     */
-    private final long revealAnimationDuration;
-
-    /**
-     * The duration of a peek animation.
-     */
-    private final long peekAnimationDuration;
-
-    /**
-     * The duration of the fade animation, which is used to show or hide the empty view.
-     */
-    private final long emptyViewAnimationDuration;
-
-    /**
-     * The maximum angle, tabs can be rotated by, when overshooting at the start, in degrees.
-     */
-    private final float maxStartOvershootAngle;
-
-    /**
-     * The maximum angle, tabs can be rotated by, when overshooting at the end, in degrees.
-     */
-    private final float maxEndOvershootAngle;
-
-    /**
-     * The distance between two neighboring tabs when being swiped in pixels.
-     */
-    private final int swipedTabDistance;
-
-    /**
-     * The drag handler, which is used by the layout.
-     */
-    private PhoneDragTabsEventHandler dragHandler;
-
-    /**
-     * The view recycler, which allows to recycle the views, which are associated with tabs.
-     */
-    private ViewRecycler<Tab, Void> contentViewRecycler;
-
-    /**
-     * The adapter, which allows to inflate the views, which are used to visualize tabs.
-     */
-    private PhoneTabRecyclerAdapter tabRecyclerAdapter;
-
-    /**
-     * The view recycler, which allows to recycle the views, which are used to visualize tabs.
-     */
-    private AttachedViewRecycler<AbstractItem, Integer> tabViewRecycler;
-
-    /**
-     * The view group, which contains the tab switcher's tabs.
-     */
-    private ViewGroup tabContainer;
-
-    /**
-     * The toolbar, which is shown, when the tab switcher is shown.
-     */
-    private Toolbar toolbar;
-
-    /**
-     * The view, which is shown, when the tab switcher is empty.
-     */
-    private View emptyView;
-
-    /**
-     * The bottom margin of a view, which visualizes a tab.
-     */
-    private int tabViewBottomMargin;
-
-    /**
-     * The animation, which is used to show or hide the toolbar.
-     */
-    private ViewPropertyAnimator toolbarAnimation;
-
-    /**
-     * Adapts the decorator.
-     */
-    private void adaptDecorator() {
-        tabRecyclerAdapter.clearCachedPreviews();
-    }
-
-    /**
-     * Adapts the visibility of the view, which is shown, when the tab switcher is empty.
-     *
-     * @param animationDuration
-     *         The duration of the fade animation, which should be used to show or hide the view, in
-     *         milliseconds as a {@link Long} value
-     */
-    private void adaptEmptyView(final long animationDuration) {
-        detachEmptyView();
-
-        if (getModel().isEmpty()) {
-            emptyView = getModel().getEmptyView();
-
-            if (emptyView != null) {
-                emptyView.setAlpha(0);
-                FrameLayout.LayoutParams layoutParams =
-                        new FrameLayout.LayoutParams(emptyView.getLayoutParams().width,
-                                emptyView.getLayoutParams().height);
-                layoutParams.gravity = Gravity.CENTER_HORIZONTAL | Gravity.CENTER_VERTICAL;
-                getTabSwitcher().addView(emptyView, 0, layoutParams);
-                ViewPropertyAnimator animation = emptyView.animate();
-                animation.setDuration(
-                        animationDuration == -1 ? emptyViewAnimationDuration : animationDuration);
-                animation.alpha(1);
-                animation.start();
-            }
-        }
-    }
-
-    /**
-     * Detaches the view, which is shown, when the tab switcher is empty.
-     */
-    private void detachEmptyView() {
-        if (emptyView != null) {
-            getTabSwitcher().removeView(emptyView);
-            emptyView = null;
-        }
-    }
-
-    /**
-     * Adapts the margin of the toolbar, which is shown, when the tab switcher is shown.
-     */
-    private void adaptToolbarMargin() {
-        FrameLayout.LayoutParams layoutParams =
-                (FrameLayout.LayoutParams) toolbar.getLayoutParams();
-        layoutParams.setMargins(getModel().getPaddingLeft(), getModel().getPaddingTop(),
-                getModel().getPaddingRight(), 0);
-    }
-
-    /**
-     * Calculates and returns the delays of subsequently started animations, depending on the
-     * animations' durations.
-     *
-     * @param animationDuration
-     *         The duration of the animations in milliseconds as a {@link Long} value
-     * @return The delay, which has been calculated, as a {@link Long} value
-     */
-    private long calculateAnimationDelay(final long animationDuration) {
-        return Math.round(animationDuration * 0.4);
-    }
-
-    /**
-     * Calculates the position of a tab in relation to the position of its predecessor.
-     *
-     * @param predecessorPosition
-     *         The position of the predecessor in pixels as a {@link Float} value
-     * @param maxTabSpacing
-     *         The maximum space between two neighboring tabs in pixels as a {@link Float} value
-     * @return The position, which has been calculated, as a {@link Float} value
-     */
-    private float calculateSuccessorPosition(final float predecessorPosition,
-                                             final float maxTabSpacing) {
-        float ratio = Math.min(1,
-                predecessorPosition / calculateAttachedPosition(getTabSwitcher().getCount()));
-        float minTabSpacing = calculateMinTabSpacing();
-        return predecessorPosition - minTabSpacing - (ratio * (maxTabSpacing - minTabSpacing));
-    }
-
-    /**
-     * Calculates and returns the position of a tab, when it is swiped.
-     *
-     * @return The position, which has been calculated, in pixels as an {@link Float} value
-     */
-    private float calculateSwipePosition() {
-        return getArithmetics().getTabContainerSize(Axis.ORTHOGONAL_AXIS, true);
-    }
-
-    /**
-     * Calculates and returns the maximum space between a specific tab and its predecessor. The
-     * maximum space is greater for the currently selected tab.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, the maximum space should be returned for, as
-     *         an instance of the class {@link AbstractItem} or null, if the default maximum space
-     *         should be returned
-     * @return The maximum space between the given tab and its predecessor in pixels as a {@link
-     * Float} value
-     */
-    private float calculateMaxTabSpacing(@Nullable final AbstractItem item) {
-        float totalSpace = getArithmetics().getTabContainerSize(Axis.DRAGGING_AXIS, false);
-        float maxTabSpacing;
-        int count = getModel().getCount();
-
-        if (count <= 2) {
-            maxTabSpacing = totalSpace * 0.66f;
-        } else if (count == 3) {
-            maxTabSpacing = totalSpace * 0.33f;
-        } else if (count == 4) {
-            maxTabSpacing = totalSpace * 0.3f;
-        } else {
-            maxTabSpacing = totalSpace * 0.25f;
-        }
-
-        return count > 4 && item != null &&
-                ((TabItem) item).getTab() == getTabSwitcher().getSelectedTab() ?
-                maxTabSpacing * SELECTED_TAB_SPACING_RATIO : maxTabSpacing;
-    }
-
-    /**
-     * Calculates and returns the minimum space between two neighboring tabs.
-     *
-     * @return The minimum space between two neighboring tabs in pixels as a {@link Float} value
-     */
-    private float calculateMinTabSpacing() {
-        return calculateMaxTabSpacing(null) * MIN_TAB_SPACING_RATIO;
-    }
-
-    /**
-     * Calculates and returns the bottom margin of a specific tab.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, whose bottom margin should be calculated, as
-     *         an instance of the class {@link AbstractItem}. The item may not be null
-     * @return The bottom margin, which has been calculated, in pixels as an {@link Integer} value
-     */
-    private int calculateBottomMargin(@NonNull final AbstractItem item) {
-        View view = item.getView();
-        float tabHeight = (view.getHeight() - 2 * tabInset) * getArithmetics().getScale(item, true);
-        float containerHeight = getArithmetics().getTabContainerSize(Axis.Y_AXIS, false);
-        int stackHeight = getTabSwitcher().getLayout() == Layout.PHONE_LANDSCAPE ? 0 :
-                getStackedTabCount() * getStackedTabSpacing();
-        return Math.round(tabHeight + tabInset + stackHeight - containerHeight);
-    }
-
-    /**
-     * Animates the bottom margin of a specific view.
-     *
-     * @param view
-     *         The view, whose bottom margin should be animated, as an instance of the class {@link
-     *         View}. The view may not be null
-     * @param margin
-     *         The bottom margin, which should be set by the animation, as an {@link Integer} value
-     * @param duration
-     *         The duration of the animation in milliseconds as a {@link Long} value
-     * @param delay
-     *         The delay of the animation in milliseconds as a {@link Long} value
-     */
-    private void animateBottomMargin(@NonNull final View view, final int margin,
-                                     final long duration, final long delay) {
-        FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) view.getLayoutParams();
-        final int initialMargin = layoutParams.bottomMargin;
-        ValueAnimator animation = ValueAnimator.ofInt(margin - initialMargin);
-        animation.setDuration(duration);
-        animation.addListener(new AnimationListenerWrapper(null));
-        animation.setInterpolator(new AccelerateDecelerateInterpolator());
-        animation.setStartDelay(delay);
-        animation.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-
-            @Override
-            public void onAnimationUpdate(ValueAnimator animation) {
-                FrameLayout.LayoutParams layoutParams =
-                        (FrameLayout.LayoutParams) view.getLayoutParams();
-                layoutParams.bottomMargin = initialMargin + (int) animation.getAnimatedValue();
-                view.setLayoutParams(layoutParams);
-            }
-
-        });
-
-        animation.start();
-    }
-
-    /**
-     * Animates the visibility of the toolbar, which is shown, when the tab switcher is shown.
-     *
-     * @param visible
-     *         True, if the toolbar should become visible, false otherwise
-     * @param delay
-     *         The delay of the animation in milliseconds as a {@link Long} value
-     */
-    private void animateToolbarVisibility(final boolean visible, final long delay) {
-        if (toolbarAnimation != null) {
-            toolbarAnimation.cancel();
-        }
-
-        toolbarAnimation = toolbar.animate();
-        toolbarAnimation.setInterpolator(new AccelerateDecelerateInterpolator());
-        toolbarAnimation.setDuration(toolbarVisibilityAnimationDuration);
-        toolbarAnimation.setListener(createToolbarAnimationListener(visible));
-        toolbarAnimation.setStartDelay(delay);
-        toolbarAnimation.alpha(visible ? 1 : 0);
-        toolbarAnimation.start();
-    }
-
-    /**
-     * Shows the tab switcher in an animated manner.
-     *
-     * @param referenceTabIndex
-     *         The index of the tab, which is used as a reference, when restoring the positions of
-     *         tabs, as an {@link Integer} value or -1, if the positions of tabs should not be
-     *         restored
-     * @param referenceTabPosition
-     *         The position of tab, which is used as a reference, when restoring the positions of
-     *         tabs, in relation to the available space as a {@link Float} value or -1, if the
-     *         positions of tabs should not be restored
-     */
-    private void animateShowSwitcher(final int referenceTabIndex,
-                                     final float referenceTabPosition) {
-        AbstractItem[] items = calculateInitialItems(referenceTabIndex, referenceTabPosition);
-        AbstractItemIterator iterator = new InitialItemIteratorBuilder(items).create();
-        AbstractItem item;
-
-        while ((item = iterator.next()) != null) {
-            if (((TabItem) item).getTab() == getModel().getSelectedTab() || item.isVisible()) {
-                tabViewRecycler.inflate(item);
-                View view = item.getView();
-
-                if (!ViewCompat.isLaidOut(view)) {
-                    view.getViewTreeObserver().addOnGlobalLayoutListener(
-                            new LayoutListenerWrapper(view,
-                                    createShowSwitcherLayoutListener(item)));
-                } else {
-                    animateShowSwitcher(item, createUpdateViewAnimationListener(item));
-                }
-            }
-        }
-
-        animateToolbarVisibility(getModel().areToolbarsShown(), toolbarVisibilityAnimationDelay);
-    }
-
-    /**
-     * Calculates and returns the items, which correspond to the tabs, when the tab switcher is
-     * shown initially.
-     *
-     * @param referenceTabIndex
-     *         The index of the tab, which is used as a reference, when restoring the positions of
-     *         tabs, as an {@link Integer} value or -1, if the positions of tabs should not be
-     *         restored
-     * @param referenceTabPosition
-     *         The position of tab, which is used as a reference, when restoring the positions of
-     *         tabs, in relation to the available space as a {@link Float} value or -1, if the
-     *         positions of tabs should not be restored
-     * @return An array, which contains the items, as an array of the type {@link AbstractItem}. The
-     * array may not be null
-     */
-    @NonNull
-    private AbstractItem[] calculateInitialItems(final int referenceTabIndex,
-                                                 final float referenceTabPosition) {
-        dragHandler.reset();
-        setFirstVisibleIndex(-1);
-        AbstractItem[] items = new AbstractItem[getModel().getCount()];
-
-        if (!getModel().isEmpty()) {
-            int selectedTabIndex = getModel().getSelectedTabIndex();
-            float attachedPosition = calculateAttachedPosition(getModel().getCount());
-            int referenceIndex =
-                    referenceTabIndex != -1 && referenceTabPosition != -1 ? referenceTabIndex :
-                            selectedTabIndex;
-            float referencePosition = referenceTabIndex != -1 && referenceTabPosition != -1 ?
-                    referenceTabPosition *
-                            getArithmetics().getTabContainerSize(Axis.DRAGGING_AXIS, false) :
-                    attachedPosition;
-            referencePosition =
-                    Math.min(calculateMaxEndPosition(referenceIndex), referencePosition);
-            AbstractItemIterator iterator =
-                    new InitialItemIteratorBuilder(items).start(referenceIndex).create();
-            AbstractItem item;
-
-            while ((item = iterator.next()) != null) {
-                AbstractItem predecessor = iterator.previous();
-                float position;
-
-                if (item.getIndex() == getModel().getCount() - 1) {
-                    position = 0;
-                } else if (item.getIndex() == referenceIndex) {
-                    position = referencePosition;
-                } else {
-                    position = calculateSuccessorPosition(item, predecessor);
-                }
-
-                State predecessorState =
-                        item.getIndex() == referenceIndex && referenceIndex > 0 ? State.FLOATING :
-                                (predecessor != null ? predecessor.getTag().getState() : null);
-                Pair<Float, State> pair = clipPosition(item.getIndex(), position, predecessorState);
-                item.getTag().setPosition(pair.first);
-                item.getTag().setState(pair.second);
-
-                if (getFirstVisibleIndex() == -1 && pair.second != State.STACKED_END &&
-                        pair.second != State.HIDDEN) {
-                    setFirstVisibleIndex(item.getIndex());
-                }
-
-                if (pair.second == State.STACKED_START || pair.second == State.STACKED_START_ATOP) {
-                    break;
-                }
-            }
-
-            boolean overshooting = referenceIndex == getModel().getCount() - 1 ||
-                    isOvershootingAtEnd(DragState.NONE, iterator);
-            iterator = new InitialItemIteratorBuilder(items).reverse(true).start(referenceIndex - 1)
-                    .create();
-            float minTabSpacing = calculateMinTabSpacing();
-            float defaultTabSpacing = calculateMaxTabSpacing(null);
-            AbstractItem selectedItem =
-                    TabItem.create(getModel(), tabViewRecycler, selectedTabIndex);
-            float maxTabSpacing = calculateMaxTabSpacing(selectedItem);
-            AbstractItem currentReferenceItem = iterator.getItem(referenceIndex);
-
-            while ((item = iterator.next()) != null &&
-                    (overshooting || item.getIndex() < referenceIndex)) {
-                float currentTabSpacing = calculateMaxTabSpacing(currentReferenceItem);
-                AbstractItem predecessor = iterator.peek();
-                Pair<Float, State> pair;
-
-                if (overshooting) {
-                    float position;
-
-                    if (referenceIndex > item.getIndex()) {
-                        position = maxTabSpacing +
-                                ((getModel().getCount() - 1 - item.getIndex() - 1) *
-                                        defaultTabSpacing);
-                    } else {
-                        position =
-                                (getModel().getCount() - 1 - item.getIndex()) * defaultTabSpacing;
-                    }
-
-                    pair = clipPosition(item.getIndex(), position, predecessor);
-                } else if (referencePosition >= attachedPosition - currentTabSpacing) {
-                    float position;
-
-                    if (selectedTabIndex > item.getIndex() && selectedTabIndex <= referenceIndex) {
-                        position = referencePosition + maxTabSpacing +
-                                ((referenceIndex - item.getIndex() - 1) * defaultTabSpacing);
-                    } else {
-                        position = referencePosition +
-                                ((referenceIndex - item.getIndex()) * defaultTabSpacing);
-                    }
-
-                    pair = clipPosition(item.getIndex(), position, predecessor);
-                } else {
-                    AbstractItem successor = iterator.previous();
-                    float successorPosition = successor.getTag().getPosition();
-                    float position = (attachedPosition * (successorPosition + minTabSpacing)) /
-                            (minTabSpacing + attachedPosition - currentTabSpacing);
-                    pair = clipPosition(item.getIndex(), position, predecessor);
-
-                    if (pair.first >= attachedPosition - currentTabSpacing) {
-                        currentReferenceItem = item;
-                        referencePosition = pair.first;
-                        referenceIndex = item.getIndex();
-                    }
-                }
-
-                item.getTag().setPosition(pair.first);
-                item.getTag().setState(pair.second);
-
-                if ((getFirstVisibleIndex() == -1 || getFirstVisibleIndex() > item.getIndex()) &&
-                        pair.second == State.FLOATING) {
-                    setFirstVisibleIndex(item.getIndex());
-                }
-            }
-        }
-
-        dragHandler.setCallback(this);
-        return items;
-    }
-
-    /**
-     * Adds all tabs, which are contained by an array, to the tab switcher.
-     *
-     * @param index
-     *         The index, the first tab should be added at, as an {@link Integer} value
-     * @param tabs
-     *         The array, which contains the tabs, which should be added, as an array of the type
-     *         {@link Tab}. The array may not be null
-     * @param animation
-     *         The animation, which should be used to add the tabs, as an instance of the class
-     *         {@link Animation}. The animation may not be null
-     */
-    private void addAllTabs(final int index, @NonNull final Tab[] tabs,
-                            @NonNull final Animation animation) {
-        if (tabs.length > 0) {
-            if (getModel().isSwitcherShown()) {
-                SwipeAnimation swipeAnimation =
-                        animation instanceof SwipeAnimation ? (SwipeAnimation) animation :
-                                new SwipeAnimation.Builder().create();
-                AbstractItem[] items = new AbstractItem[tabs.length];
-                OnGlobalLayoutListener compoundListener = new CompoundLayoutListener(tabs.length,
-                        createSwipeLayoutListener(items, swipeAnimation));
-
-                for (int i = 0; i < tabs.length; i++) {
-                    Tab tab = tabs[i];
-                    AbstractItem item = TabItem.create(getModel(), index + i, tab);
-                    items[i] = item;
-                    inflateView(item, compoundListener);
-                }
-            } else if (!getModel().isSwitcherShown()) {
-                toolbar.setAlpha(0);
-
-                if (getModel().getSelectedTab() == tabs[0]) {
-                    AbstractItem item = TabItem.create(getTabSwitcher(), tabViewRecycler, index);
-                    inflateView(item, createAddSelectedTabLayoutListener(item));
-                }
-            }
-        }
-    }
-
-    /**
-     * Animates the position and size of a specific tab in order to show the tab switcher.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, which should be animated, as an instance of
-     *         the class {@link AbstractItem}. The item may not be null
-     * @param listener
-     *         The listener, which should be notified about the animation's progress, as an instance
-     *         of the type {@link AnimatorListener} or null, if no listener should be notified
-     */
-    private void animateShowSwitcher(@NonNull final AbstractItem item,
-                                     @Nullable final AnimatorListener listener) {
-        animateShowSwitcher(item, showSwitcherAnimationDuration,
-                new AccelerateDecelerateInterpolator(), listener);
-    }
-
-    /**
-     * Animates the position and size of a specific tab in order to show the tab switcher.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, which should be animated, as an instance of
-     *         the class {@link AbstractItem}. The item may not be null
-     * @param duration
-     *         The duration of the animation in milliseconds as a {@link Long} value
-     * @param interpolator
-     *         The interpolator, which should be used by the animation, as an instance of the type
-     *         {@link Interpolator}. The interpolator may not be null
-     * @param listener
-     *         The listener, which should be notified about the animation's progress, as an instance
-     *         of the type {@link AnimatorListener} or null, if no listener should be notified
-     */
-    private void animateShowSwitcher(@NonNull final AbstractItem item, final long duration,
-                                     @NonNull final Interpolator interpolator,
-                                     @Nullable final AnimatorListener listener) {
-        View view = item.getView();
-        FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) view.getLayoutParams();
-        view.setX(layoutParams.leftMargin);
-        view.setY(layoutParams.topMargin);
-        getArithmetics().setScale(Axis.DRAGGING_AXIS, item, 1);
-        getArithmetics().setScale(Axis.ORTHOGONAL_AXIS, item, 1);
-        getArithmetics().setPivot(Axis.DRAGGING_AXIS, item,
-                getArithmetics().getPivot(Axis.DRAGGING_AXIS, item, DragState.NONE));
-        getArithmetics().setPivot(Axis.ORTHOGONAL_AXIS, item,
-                getArithmetics().getPivot(Axis.ORTHOGONAL_AXIS, item, DragState.NONE));
-        float scale = getArithmetics().getScale(item, true);
-        int selectedTabIndex = getModel().getSelectedTabIndex();
-
-        if (item.getIndex() < selectedTabIndex) {
-            getArithmetics().setPosition(Axis.DRAGGING_AXIS, item,
-                    getArithmetics().getTabContainerSize(Axis.DRAGGING_AXIS));
-        } else if (item.getIndex() > selectedTabIndex) {
-            getArithmetics().setPosition(Axis.DRAGGING_AXIS, item,
-                    getTabSwitcher().getLayout() == Layout.PHONE_LANDSCAPE ? 0 :
-                            layoutParams.topMargin);
-        }
-
-        if (tabViewBottomMargin == -1) {
-            tabViewBottomMargin = calculateBottomMargin(item);
-        }
-
-        animateBottomMargin(view, tabViewBottomMargin, duration, 0);
-        ViewPropertyAnimator animation = view.animate();
-        animation.setDuration(duration);
-        animation.setInterpolator(interpolator);
-        animation.setListener(new AnimationListenerWrapper(listener));
-        getArithmetics().animateScale(Axis.DRAGGING_AXIS, animation, scale);
-        getArithmetics().animateScale(Axis.ORTHOGONAL_AXIS, animation, scale);
-        getArithmetics()
-                .animatePosition(Axis.DRAGGING_AXIS, animation, item, item.getTag().getPosition(),
-                        true);
-        getArithmetics().animatePosition(Axis.ORTHOGONAL_AXIS, animation, item, 0, true);
-        animation.setStartDelay(0);
-        animation.start();
-    }
-
-    /**
-     * Hides the tab switcher in an animated manner.
-     */
-    private void animateHideSwitcher() {
-        dragHandler.setCallback(null);
-        ItemIterator iterator =
-                new ItemIterator.Builder(getTabSwitcher(), tabViewRecycler).create();
-        AbstractItem item;
-
-        while ((item = iterator.next()) != null) {
-            if (item.isInflated()) {
-                animateHideSwitcher(item, item.getIndex() == getModel().getSelectedTabIndex() ?
-                        createHideSwitcherAnimationListener() : null);
-            } else if (((TabItem) item).getTab() == getModel().getSelectedTab()) {
-                inflateAndUpdateView(item, false, createHideSwitcherLayoutListener(item));
-            }
-        }
-
-        animateToolbarVisibility(getModel().areToolbarsShown() && getModel().isEmpty(), 0);
-    }
-
-    /**
-     * Animates the position and size of a specific tab in order to hide the tab switcher.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, which should be animated, as an instance of
-     *         the class {@link AbstractItem}. The item may not be null
-     * @param listener
-     *         The listener, which should be notified about the animation's progress, as an instance
-     *         of the type {@link AnimatorListener} or null, if no listener should be notified
-     */
-    private void animateHideSwitcher(@NonNull final AbstractItem item,
-                                     @Nullable final AnimatorListener listener) {
-        animateHideSwitcher(item, hideSwitcherAnimationDuration,
-                new AccelerateDecelerateInterpolator(), 0, listener);
-    }
-
-    /**
-     * Animates the position and size of a specific tab in order to hide the tab switcher.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, which should be animated, as an instance of
-     *         the class {@link AbstractItem}. The item may not be null
-     * @param duration
-     *         The duration of the animation in milliseconds as a {@link Long} value
-     * @param interpolator
-     *         The interpolator, which should be used by the animation, as an instance of the class
-     *         {@link Interpolator}. The interpolator may not be null
-     * @param delay
-     *         The delay of the animation in milliseconds as a {@link Long} value
-     * @param listener
-     *         The listener, which should be notified about the animation's progress, as an instance
-     *         of the type {@link AnimatorListener} or null, if no listener should be notified
-     */
-    private void animateHideSwitcher(@NonNull final AbstractItem item, final long duration,
-                                     @NonNull final Interpolator interpolator, final long delay,
-                                     @Nullable final AnimatorListener listener) {
-        View view = item.getView();
-        animateBottomMargin(view, -(tabInset + tabBorderWidth), duration, delay);
-        ViewPropertyAnimator animation = view.animate();
-        animation.setDuration(duration);
-        animation.setInterpolator(interpolator);
-        animation.setListener(new AnimationListenerWrapper(listener));
-        getArithmetics().animateScale(Axis.DRAGGING_AXIS, animation, 1);
-        getArithmetics().animateScale(Axis.ORTHOGONAL_AXIS, animation, 1);
-        FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) view.getLayoutParams();
-        getArithmetics().animatePosition(Axis.ORTHOGONAL_AXIS, animation, item,
-                getTabSwitcher().getLayout() == Layout.PHONE_LANDSCAPE ? layoutParams.topMargin :
-                        0);
-        int selectedTabIndex = getModel().getSelectedTabIndex();
-
-        if (item.getIndex() < selectedTabIndex) {
-            getArithmetics().animatePosition(Axis.DRAGGING_AXIS, animation, item,
-                    getArithmetics().getTabContainerSize(Axis.DRAGGING_AXIS));
-        } else if (item.getIndex() > selectedTabIndex) {
-            getArithmetics().animatePosition(Axis.DRAGGING_AXIS, animation, item,
-                    getTabSwitcher().getLayout() == Layout.PHONE_LANDSCAPE ? 0 :
-                            layoutParams.topMargin);
-        } else {
-            getArithmetics().animatePosition(Axis.DRAGGING_AXIS, animation, item,
-                    getTabSwitcher().getLayout() == Layout.PHONE_LANDSCAPE ? 0 :
-                            layoutParams.topMargin);
-        }
-
-        animation.setStartDelay(delay);
-        animation.start();
-    }
-
-    /**
-     * Animates the position, size and alpha of a specific tab in order to swipe it orthogonally.
-     *
-     * @param item
-     *         The item, corresponds to the tab, which should be animated, as an instance of the
-     *         class {@link AbstractItem}. The item may not be null
-     * @param remove
-     *         True, if the tab should be removed after the animation has finished, false otherwise
-     * @param delayMultiplier
-     *         The multiplied, which should be used to calculate the delay after which the animation
-     *         should be started, by being multiplied with the default delay, as an {@link Integer}
-     *         value
-     * @param swipeAnimation
-     *         The animation, which should be used, as an instance of the class {@link
-     *         SwipeAnimation}. The animation may not be null
-     * @param listener
-     *         The listener, which should be notified about the progress of the animation, as an
-     *         instance of the type {@link AnimatorListener} or null, if no listener should be
-     *         notified
-     */
-    private void animateSwipe(@NonNull final AbstractItem item, final boolean remove,
-                              final int delayMultiplier,
-                              @NonNull final SwipeAnimation swipeAnimation,
-                              @Nullable final AnimatorListener listener) {
-        View view = item.getView();
-        float currentScale = getArithmetics().getScale(item, true);
-        float swipePosition = calculateSwipePosition();
-        float targetPosition = remove ?
-                (swipeAnimation.getDirection() == SwipeDirection.LEFT_OR_TOP ? -1 * swipePosition :
-                        swipePosition) : 0;
-        float currentPosition = getArithmetics().getPosition(Axis.ORTHOGONAL_AXIS, item);
-        float distance = Math.abs(targetPosition - currentPosition);
-        long animationDuration = swipeAnimation.getDuration() != -1 ? swipeAnimation.getDuration() :
-                Math.round(swipeAnimationDuration * (distance / swipePosition));
-        ViewPropertyAnimator animation = view.animate();
-        animation.setInterpolator(
-                swipeAnimation.getInterpolator() != null ? swipeAnimation.getInterpolator() :
-                        new AccelerateDecelerateInterpolator());
-        animation.setListener(new AnimationListenerWrapper(listener));
-        animation.setDuration(animationDuration);
-        getArithmetics()
-                .animatePosition(Axis.ORTHOGONAL_AXIS, animation, item, targetPosition, true);
-        getArithmetics().animateScale(Axis.ORTHOGONAL_AXIS, animation,
-                remove ? swipedTabScale * currentScale : currentScale);
-        getArithmetics().animateScale(Axis.DRAGGING_AXIS, animation,
-                remove ? swipedTabScale * currentScale : currentScale);
-        animation.alpha(remove ? swipedTabAlpha : 1);
-        animation.setStartDelay(delayMultiplier * calculateAnimationDelay(animationDuration));
-        animation.start();
-    }
-
-    /**
-     * Animates a tab to be swiped horizontally.
-     *
-     * @param tabItem
-     *         The tab item, which corresponds to the tab, which should be swiped, as an instance of
-     *         the class {@link TabItem}. The tab item may not be null
-     * @param targetPosition
-     *         The position on the x-axis, the tab should be moved to, in pixels as a {@link Float}
-     *         value
-     * @param selected
-     *         True, if the tab should become the selected one, false otherwise
-     * @param animationDuration
-     *         The duration of the animation in milliseconds as a {@link Long} value
-     * @param velocity
-     *         The velocity of the drag gesture, which caused the tab to be swiped, in pixels per
-     *         second as a {@link Float} value
-     */
-    private void animateSwipe(@NonNull final TabItem tabItem, final float targetPosition,
-                              final boolean selected, final long animationDuration,
-                              final float velocity) {
-        View view = tabItem.getView();
-        float currentPosition = getArithmetics().getPosition(Axis.X_AXIS, tabItem);
-        float distance = Math.abs(targetPosition - currentPosition);
-        float maxDistance = getArithmetics().getSize(Axis.X_AXIS, tabItem) + swipedTabDistance;
-        long duration = velocity > 0 ? Math.round((distance / velocity) * 1000) :
-                Math.round(animationDuration * (distance / maxDistance));
-        ViewPropertyAnimator animation = view.animate();
-        animation.setListener(new AnimationListenerWrapper(
-                selected ? createSwipeSelectedTabAnimationListener(tabItem) :
-                        createSwipeNeighborAnimationListener(tabItem)));
-        animation.setInterpolator(new AccelerateDecelerateInterpolator());
-        animation.setDuration(duration);
-        animation.setStartDelay(0);
-        getArithmetics().animatePosition(Axis.X_AXIS, animation, tabItem, targetPosition, true);
-        animation.start();
-    }
-
-    /**
-     * Animates the removal of a specific tab.
-     *
-     * @param removedItem
-     *         The item, corresponds to the tab, which should be animated, as an instance of the
-     *         class {@link AbstractItem}. The item may not be null
-     * @param swipeAnimation
-     *         The animation, which should be used, as an instance of the class {@link
-     *         SwipeAnimation}. The animation may not be null
-     */
-    private void animateRemove(@NonNull final AbstractItem removedItem,
-                               @NonNull final SwipeAnimation swipeAnimation) {
-        getArithmetics().setPivot(Axis.DRAGGING_AXIS, removedItem,
-                getArithmetics().getPivot(Axis.DRAGGING_AXIS, removedItem, DragState.SWIPE));
-        getArithmetics().setPivot(Axis.ORTHOGONAL_AXIS, removedItem,
-                getArithmetics().getPivot(Axis.ORTHOGONAL_AXIS, removedItem, DragState.SWIPE));
-        animateSwipe(removedItem, true, 0, swipeAnimation,
-                createRemoveAnimationListener(removedItem, swipeAnimation));
-    }
-
-    /**
-     * Animates the position of a specific tab in order to relocate it.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, which should be animated, as an instance of
-     *         the class {@link AbstractItem}. The item may not be null
-     * @param position
-     *         The position, the tab should be relocated to, in pixels as a {@link Float} value
-     * @param tag
-     *         The tag, which should be applied to the given item, as an instance of the class
-     *         {@link Tag} or null, if no tag should be applied
-     * @param delayMultiplier
-     *         The multiplier, which should be used to calculate the delay of the relocate
-     *         animation, by being multiplied with the default delay, as an {@link Integer} value
-     * @param listener
-     *         The listener, which should be notified about the progress of the relocate animation,
-     *         as an instance of the type {@link AnimatorListener} or null, if no listener should be
-     *         notified
-     * @param swipeAnimation
-     *         The animation, which has been used to add or remove the tab, which caused the other
-     *         tabs to be relocated, as an instance of the class {@link SwipeAnimation}. The
-     *         animation may not be null
-     */
-    private void animateRelocate(@NonNull final AbstractItem item, final float position,
-                                 @Nullable final Tag tag, final int delayMultiplier,
-                                 @Nullable final AnimatorListener listener,
-                                 @NonNull final SwipeAnimation swipeAnimation) {
-        if (tag != null) {
-            item.getView().setTag(R.id.tag_properties, tag);
-            item.setTag(tag);
-        }
-
-        View view = item.getView();
-        long animationDuration = swipeAnimation.getRelocateAnimationDuration() != -1 ?
-                swipeAnimation.getRelocateAnimationDuration() : relocateAnimationDuration;
-        ViewPropertyAnimator animation = view.animate();
-        animation.setListener(new AnimationListenerWrapper(listener));
-        animation.setInterpolator(new AccelerateDecelerateInterpolator());
-        animation.setDuration(animationDuration);
-        getArithmetics().animatePosition(Axis.DRAGGING_AXIS, animation, item, position, true);
-        animation.setStartDelay(delayMultiplier * calculateAnimationDelay(animationDuration));
-        animation.start();
-    }
-
-    /**
-     * Animates reverting an overshoot at the start.
-     */
-    private void animateRevertStartOvershoot() {
-        boolean tilted = animateTilt(new AccelerateInterpolator(), maxStartOvershootAngle,
-                createRevertStartOvershootAnimationListener());
-
-        if (!tilted) {
-            animateRevertStartOvershoot(new AccelerateDecelerateInterpolator());
-        }
-    }
-
-    /**
-     * Animates reverting an overshoot at the start using a specific interpolator.
-     *
-     * @param interpolator
-     *         The interpolator, which should be used by the animation, as an instance of the type
-     *         {@link Interpolator}. The interpolator may not be null
-     */
-    private void animateRevertStartOvershoot(@NonNull final Interpolator interpolator) {
-        AbstractItem item = TabItem.create(getTabSwitcher(), tabViewRecycler, 0);
-        getArithmetics().setPivot(Axis.DRAGGING_AXIS, item,
-                getArithmetics().getPivot(Axis.DRAGGING_AXIS, item, DragState.NONE));
-        getArithmetics().setPivot(Axis.ORTHOGONAL_AXIS, item,
-                getArithmetics().getPivot(Axis.ORTHOGONAL_AXIS, item, DragState.NONE));
-        float position = getArithmetics().getPosition(Axis.DRAGGING_AXIS, item);
-        float targetPosition = item.getTag().getPosition();
-        final float startPosition = getArithmetics().getPosition(Axis.DRAGGING_AXIS, item);
-        ValueAnimator animation = ValueAnimator.ofFloat(targetPosition - position);
-        animation.setDuration(Math.round(revertOvershootAnimationDuration * Math.abs(
-                (targetPosition - position) /
-                        (float) (getStackedTabCount() * getStackedTabSpacing()))));
-        animation.addListener(new AnimationListenerWrapper(null));
-        animation.setInterpolator(interpolator);
-        animation.setStartDelay(0);
-        animation.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-
-            @Override
-            public void onAnimationUpdate(final ValueAnimator animation) {
-                ItemIterator iterator =
-                        new ItemIterator.Builder(getTabSwitcher(), tabViewRecycler).create();
-                AbstractItem item;
-
-                while ((item = iterator.next()) != null) {
-                    if (item.getIndex() == 0) {
-                        getArithmetics().setPosition(Axis.DRAGGING_AXIS, item,
-                                startPosition + (float) animation.getAnimatedValue());
-                    } else if (item.isInflated()) {
-                        AbstractItem firstItem = iterator.first();
-                        View view = item.getView();
-                        view.setVisibility(
-                                getArithmetics().getPosition(Axis.DRAGGING_AXIS, firstItem) <=
-                                        getArithmetics().getPosition(Axis.DRAGGING_AXIS, item) ?
-                                        View.INVISIBLE : View.VISIBLE);
-                    }
-                }
-            }
-
-        });
-
-        animation.start();
-    }
-
-    /**
-     * Animates reverting an overshoot at the end.
-     */
-    private void animateRevertEndOvershoot() {
-        animateTilt(new AccelerateDecelerateInterpolator(), maxEndOvershootAngle, null);
-    }
-
-    /**
-     * Animates to rotation of all tabs to be reset to normal.
-     *
-     * @param interpolator
-     *         The interpolator, which should be used by the animation, as an instance of the type
-     *         {@link Interpolator}. The interpolator may not be null
-     * @param maxAngle
-     *         The angle, the tabs may be rotated by at maximum, in degrees as a {@link Float}
-     *         value
-     * @param listener
-     *         The listener, which should be notified about the animation's progress, as an instance
-     *         of the type {@link AnimatorListener} or null, if no listener should be notified
-     * @return True, if at least one tab was animated, false otherwise
-     */
-    private boolean animateTilt(@NonNull final Interpolator interpolator, final float maxAngle,
-                                @Nullable final AnimatorListener listener) {
-        ItemIterator iterator =
-                new ItemIterator.Builder(getTabSwitcher(), tabViewRecycler).reverse(true).create();
-        AbstractItem item;
-        boolean result = false;
-
-        while ((item = iterator.next()) != null) {
-            if (item.isInflated() &&
-                    getArithmetics().getRotation(Axis.ORTHOGONAL_AXIS, item) != 0) {
-                View view = item.getView();
-                ViewPropertyAnimator animation = view.animate();
-                animation.setListener(new AnimationListenerWrapper(
-                        createRevertOvershootAnimationListener(item, !result ? listener : null)));
-                animation.setDuration(Math.round(revertOvershootAnimationDuration *
-                        (Math.abs(getArithmetics().getRotation(Axis.ORTHOGONAL_AXIS, item)) /
-                                maxAngle)));
-                animation.setInterpolator(interpolator);
-                getArithmetics().animateRotation(Axis.ORTHOGONAL_AXIS, animation, 0);
-                animation.setStartDelay(0);
-                animation.start();
-                result = true;
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Starts a reveal animation to add a specific tab.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, which should be added, as an instance of the
-     *         class {@link AbstractItem}. The item may not be null
-     * @param revealAnimation
-     *         The reveal animation, which should be started, as an instance of the class {@link
-     *         RevealAnimation}. The reveal animation may not be null
-     */
-    private void animateReveal(@NonNull final AbstractItem item,
-                               @NonNull final RevealAnimation revealAnimation) {
-        tabViewBottomMargin = -1;
-        tabRecyclerAdapter.clearCachedPreviews();
-        dragHandler.setCallback(null);
-        View view = item.getView();
-        ViewPropertyAnimator animation = view.animate();
-        animation.setInterpolator(
-                revealAnimation.getInterpolator() != null ? revealAnimation.getInterpolator() :
-                        new AccelerateDecelerateInterpolator());
-        animation.setListener(new AnimationListenerWrapper(createHideSwitcherAnimationListener()));
-        animation.setStartDelay(0);
-        animation.setDuration(revealAnimation.getDuration() != -1 ? revealAnimation.getDuration() :
-                revealAnimationDuration);
-        getArithmetics().animateScale(Axis.DRAGGING_AXIS, animation, 1);
-        getArithmetics().animateScale(Axis.ORTHOGONAL_AXIS, animation, 1);
-        animation.start();
-        animateToolbarVisibility(getModel().areToolbarsShown() && getModel().isEmpty(), 0);
-    }
-
-    /**
-     * Starts a peek animation to add a specific tab.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, which should be added, as an instance of the
-     *         class {@link AbstractItem}. The item may not be null
-     * @param duration
-     *         The duration of the animation in milliseconds as a {@link Long} value
-     * @param interpolator
-     *         The interpolator, which should be used by the animation, as an instance of the type
-     *         {@link Interpolator}. The interpolator may not be null
-     * @param peekPosition
-     *         The position on the dragging axis, the tab should be moved to, in pixels as a {@link
-     *         Float} value
-     * @param peekAnimation
-     *         The peek animation, which has been used to add the tab, as an instance of the class
-     *         {@link PeekAnimation}. The peek animation may not be null
-     */
-    private void animatePeek(@NonNull final AbstractItem item, final long duration,
-                             @NonNull final Interpolator interpolator, final float peekPosition,
-                             @NonNull final PeekAnimation peekAnimation) {
-        PhoneTabViewHolder viewHolder = (PhoneTabViewHolder) ((TabItem) item).getViewHolder();
-        viewHolder.closeButton.setVisibility(View.GONE);
-        View view = item.getView();
-        float x = peekAnimation.getX();
-        float y = peekAnimation.getY() + tabTitleContainerHeight;
-        FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) view.getLayoutParams();
-        view.setAlpha(1f);
-        getArithmetics().setPivot(Axis.X_AXIS, item, x);
-        getArithmetics().setPivot(Axis.Y_AXIS, item, y);
-        view.setX(layoutParams.leftMargin);
-        view.setY(layoutParams.topMargin);
-        getArithmetics().setScale(Axis.DRAGGING_AXIS, item, 0);
-        getArithmetics().setScale(Axis.ORTHOGONAL_AXIS, item, 0);
-        ViewPropertyAnimator animation = view.animate();
-        animation.setInterpolator(interpolator);
-        animation.setListener(
-                new AnimationListenerWrapper(createPeekAnimationListener(item, peekAnimation)));
-        animation.setStartDelay(0);
-        animation.setDuration(duration);
-        getArithmetics().animateScale(Axis.DRAGGING_AXIS, animation, 1);
-        getArithmetics().animateScale(Axis.ORTHOGONAL_AXIS, animation, 1);
-        getArithmetics().animatePosition(Axis.DRAGGING_AXIS, animation, item, peekPosition, true);
-        animation.start();
-        int selectedTabIndex = getModel().getSelectedTabIndex();
-        TabItem selectedItem = TabItem.create(getModel(), tabViewRecycler, selectedTabIndex);
-        tabViewRecycler.inflate(selectedItem);
-        selectedItem.getTag().setPosition(0);
-        PhoneTabViewHolder selectedTabViewHolder =
-                (PhoneTabViewHolder) selectedItem.getViewHolder();
-        selectedTabViewHolder.closeButton.setVisibility(View.GONE);
-        animateShowSwitcher(selectedItem, duration, interpolator,
-                createZoomOutAnimationListener(selectedItem, peekAnimation));
-    }
-
-    /**
-     * Creates and returns a layout listener, which allows to animate the position and size of a tab
-     * in order to show the tab switcher, once its view has been inflated.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, whose view should be animated, as an instance
-     *         of the class {@link AbstractItem}. The item may not be null
-     * @return The listener, which has been created, as an instance of the type {@link
-     * OnGlobalLayoutListener}. The listener may not be null
-     */
-    @NonNull
-    private OnGlobalLayoutListener createShowSwitcherLayoutListener(
-            @NonNull final AbstractItem item) {
-        return new OnGlobalLayoutListener() {
-
-            @Override
-            public void onGlobalLayout() {
-                animateShowSwitcher(item, createUpdateViewAnimationListener(item));
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns a layout listener, which allows to animate the position and size of a tab
-     * in order to hide the tab switcher, once its view has been inflated.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, whose view should be animated, as an instance
-     *         of the class {@link AbstractItem}. The item may not be null
-     * @return The listener, which has been created, as an instance of the type {@link
-     * OnGlobalLayoutListener}. The listener may not be null
-     */
-    @NonNull
-    private OnGlobalLayoutListener createHideSwitcherLayoutListener(
-            @NonNull final AbstractItem item) {
-        return new OnGlobalLayoutListener() {
-
-            @Override
-            public void onGlobalLayout() {
-                animateHideSwitcher(item, item.getIndex() == getModel().getSelectedTabIndex() ?
-                        createHideSwitcherAnimationListener() : null);
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns a layout listener, which allows to remove a tab, once its view has been
-     * inflated.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, which should be removed, as an instance of
-     *         the class {@link AbstractItem}. The item may not be null
-     * @param swipeAnimation
-     *         The animation, which should be used, as an instance of the class {@link
-     *         SwipeAnimation}. The animation may not be null
-     * @return The listener, which has been created, as an instance of the type {@link
-     * OnGlobalLayoutListener}. The listener may not be null
-     */
-    @NonNull
-    private OnGlobalLayoutListener createRemoveLayoutListener(@NonNull final AbstractItem item,
-                                                              @NonNull final SwipeAnimation swipeAnimation) {
-        return new OnGlobalLayoutListener() {
-
-            @Override
-            public void onGlobalLayout() {
-                animateRemove(item, swipeAnimation);
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns a layout listener, which allows to relocate a tab, once its view has been
-     * inflated.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, which should be relocated, as an instance of
-     *         the class {@link AbstractItem}. The item may not be null
-     * @param position
-     *         The position, the tab should be relocated to, in pixels as a {@link Float} value
-     * @param tag
-     *         The tag, which should be applied to the given item, as an instance of the class
-     *         {@link Tag} or null, if no tag should be applied
-     * @param delayMultiplier
-     *         The multiplier, which should be used to calculate the delay of the relocate
-     *         animation, by being multiplied with the default delay, as an {@link Integer} value
-     * @param listener
-     *         The listener, which should be notified about the progress of the relocate animation,
-     *         as an instance of the type {@link AnimatorListener} or null, if no listener should be
-     *         notified
-     * @param swipeAnimation
-     *         The animation, which has been used to add or remove the tab, which caused the other
-     *         tabs to be relocated, as an instance of the class {@link SwipeAnimation}. The
-     *         animation may not be null
-     * @return The listener, which has been created, as an instance of the class {@link
-     * OnGlobalLayoutListener}. The listener may not be null
-     */
-    @NonNull
-    private OnGlobalLayoutListener createRelocateLayoutListener(@NonNull final AbstractItem item,
-                                                                final float position,
-                                                                @Nullable final Tag tag,
-                                                                final int delayMultiplier,
-                                                                @Nullable final AnimatorListener listener,
-                                                                @NonNull final SwipeAnimation swipeAnimation) {
-        return new OnGlobalLayoutListener() {
-
-            @Override
-            public void onGlobalLayout() {
-                animateRelocate(item, position, tag, delayMultiplier, listener, swipeAnimation);
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns a layout listener, which allows to show a tab as the currently selected
-     * one, once it view has been inflated.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, which has been added, as an instance of the
-     *         class {@link AbstractItem}. The item may not be null
-     * @return The listener, which has been created, as an instance of the type {@link
-     * OnGlobalLayoutListener}. The listener may not be null
-     */
-    @NonNull
-    private OnGlobalLayoutListener createAddSelectedTabLayoutListener(
-            @NonNull final AbstractItem item) {
-        return new OnGlobalLayoutListener() {
-
-            @Override
-            public void onGlobalLayout() {
-                View view = item.getView();
-                FrameLayout.LayoutParams layoutParams =
-                        (FrameLayout.LayoutParams) view.getLayoutParams();
-                view.setAlpha(1f);
-                getArithmetics().setPivot(Axis.DRAGGING_AXIS, item,
-                        getArithmetics().getPivot(Axis.DRAGGING_AXIS, item, DragState.NONE));
-                getArithmetics().setPivot(Axis.ORTHOGONAL_AXIS, item,
-                        getArithmetics().getPivot(Axis.ORTHOGONAL_AXIS, item, DragState.NONE));
-                view.setX(layoutParams.leftMargin);
-                view.setY(layoutParams.topMargin);
-                getArithmetics().setScale(Axis.DRAGGING_AXIS, item, 1);
-                getArithmetics().setScale(Axis.ORTHOGONAL_AXIS, item, 1);
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns a layout listener, which allows to start a reveal animation to add a tab,
-     * once its view has been inflated.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, which should be added, as an instance of the
-     *         class {@link AbstractItem}. The item may not be null
-     * @param revealAnimation
-     *         The reveal animation, which should be started, as an instance of the class {@link
-     *         RevealAnimation}. The reveal animation may not be null
-     * @return The listener, which has been created, as an instance of the type {@link
-     * OnGlobalLayoutListener}. The listener may not be null
-     */
-    @NonNull
-    private OnGlobalLayoutListener createRevealLayoutListener(@NonNull final AbstractItem item,
-                                                              @NonNull final RevealAnimation revealAnimation) {
-        return new OnGlobalLayoutListener() {
-
-            @Override
-            public void onGlobalLayout() {
-                View view = item.getView();
-                float x = revealAnimation.getX();
-                float y = revealAnimation.getY() + tabTitleContainerHeight;
-                FrameLayout.LayoutParams layoutParams =
-                        (FrameLayout.LayoutParams) view.getLayoutParams();
-                view.setAlpha(1f);
-                getArithmetics().setPivot(Axis.X_AXIS, item, x);
-                getArithmetics().setPivot(Axis.Y_AXIS, item, y);
-                view.setX(layoutParams.leftMargin);
-                view.setY(layoutParams.topMargin);
-                getArithmetics().setScale(Axis.DRAGGING_AXIS, item, 0);
-                getArithmetics().setScale(Axis.ORTHOGONAL_AXIS, item, 0);
-                animateReveal(item, revealAnimation);
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns a layout listener, which allows to start a peek animation to add a tab,
-     * once its view has been inflated.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, which should be added, as an instance of the
-     *         class {@link AbstractItem}. The item may not be null
-     * @param peekAnimation
-     *         The peek animation, which should be started, as an instance of the class {@link
-     *         PeekAnimation}. The peek animation may not be null
-     * @return The listener, which has been created, as an instance of the type {@link
-     * OnGlobalLayoutListener}. The listener may not be null
-     */
-    private OnGlobalLayoutListener createPeekLayoutListener(@NonNull final AbstractItem item,
-                                                            @NonNull final PeekAnimation peekAnimation) {
-        return new OnGlobalLayoutListener() {
-
-            @Override
-            public void onGlobalLayout() {
-                long totalDuration =
-                        peekAnimation.getDuration() != -1 ? peekAnimation.getDuration() :
-                                peekAnimationDuration;
-                long duration = totalDuration / 3;
-                Interpolator interpolator =
-                        peekAnimation.getInterpolator() != null ? peekAnimation.getInterpolator() :
-                                new AccelerateDecelerateInterpolator();
-                float peekPosition =
-                        getArithmetics().getTabContainerSize(Axis.DRAGGING_AXIS, false) * 0.66f;
-                animatePeek(item, duration, interpolator, peekPosition, peekAnimation);
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns a layout listener, which allows to start a swipe animations to add
-     * several tabs, once their views have been inflated.
-     *
-     * @param addedItems
-     *         An array, which contains the items, which correspond to the tabs, which should be
-     *         added, as an array of the type {@link AbstractItem}. The array may not be null
-     * @param swipeAnimation
-     *         The swipe animation, which should be started, as an instance of the class {@link
-     *         SwipeAnimation}. The swipe animation may not be null
-     * @return The listener, which has been created, as an instance of the type {@link
-     * OnGlobalLayoutListener}. The listener may not be null
-     */
-    @NonNull
-    private OnGlobalLayoutListener createSwipeLayoutListener(
-            @NonNull final AbstractItem[] addedItems,
-            @NonNull final SwipeAnimation swipeAnimation) {
-        return new OnGlobalLayoutListener() {
-
-            @Override
-            public void onGlobalLayout() {
-                int count = getModel().getCount();
-                float previousAttachedPosition =
-                        calculateAttachedPosition(count - addedItems.length);
-                float attachedPosition = calculateAttachedPosition(count);
-                AbstractItem[] items;
-
-                if (count - addedItems.length == 0) {
-                    items = calculateInitialItems(-1, -1);
-                } else {
-                    AbstractItem firstAddedItem = addedItems[0];
-                    int index = firstAddedItem.getIndex();
-                    boolean isReferencingPredecessor = index > 0;
-                    int referenceIndex = isReferencingPredecessor ? index - 1 :
-                            (index + addedItems.length - 1 < count - 1 ? index + addedItems.length :
-                                    -1);
-                    AbstractItem referenceItem = referenceIndex != -1 ?
-                            TabItem.create(getTabSwitcher(), tabViewRecycler, referenceIndex) :
-                            null;
-                    State state = referenceItem != null ? referenceItem.getTag().getState() : null;
-
-                    if (state == null || state == State.STACKED_START) {
-                        items = relocateWhenAddingStackedTabs(true, addedItems, swipeAnimation);
-                    } else if (state == State.STACKED_END) {
-                        items = relocateWhenAddingStackedTabs(false, addedItems, swipeAnimation);
-                    } else if (state == State.FLOATING ||
-                            (state == State.STACKED_START_ATOP && (index > 0 || count <= 2))) {
-                        items = relocateWhenAddingFloatingTabs(addedItems, referenceItem,
-                                isReferencingPredecessor, attachedPosition,
-                                attachedPosition != previousAttachedPosition, swipeAnimation);
-                    } else {
-                        items = relocateWhenAddingHiddenTabs(addedItems, referenceItem);
-                    }
-                }
-
-                Tag previousTag = null;
-
-                for (AbstractItem item : items) {
-                    Tag tag = item.getTag();
-
-                    if (previousTag == null || tag.getPosition() != previousTag.getPosition()) {
-                        createBottomMarginLayoutListener(item).onGlobalLayout();
-                        View view = item.getView();
-                        view.setTag(R.id.tag_properties, tag);
-                        view.setAlpha(swipedTabAlpha);
-                        float swipePosition = calculateSwipePosition();
-                        float scale = getArithmetics().getScale(item, true);
-                        getArithmetics().setPivot(Axis.DRAGGING_AXIS, item, getArithmetics()
-                                .getPivot(Axis.DRAGGING_AXIS, item, DragState.NONE));
-                        getArithmetics().setPivot(Axis.ORTHOGONAL_AXIS, item, getArithmetics()
-                                .getPivot(Axis.ORTHOGONAL_AXIS, item, DragState.NONE));
-                        getArithmetics().setPosition(Axis.DRAGGING_AXIS, item, tag.getPosition());
-                        getArithmetics().setPosition(Axis.ORTHOGONAL_AXIS, item,
-                                swipeAnimation.getDirection() == SwipeDirection.LEFT_OR_TOP ?
-                                        -1 * swipePosition : swipePosition);
-                        getArithmetics().setScale(Axis.DRAGGING_AXIS, item, scale);
-                        getArithmetics().setScale(Axis.ORTHOGONAL_AXIS, item, scale);
-                        getArithmetics().setPivot(Axis.DRAGGING_AXIS, item, getArithmetics()
-                                .getPivot(Axis.DRAGGING_AXIS, item, DragState.SWIPE));
-                        getArithmetics().setPivot(Axis.ORTHOGONAL_AXIS, item, getArithmetics()
-                                .getPivot(Axis.ORTHOGONAL_AXIS, item, DragState.SWIPE));
-                        getArithmetics().setScale(Axis.DRAGGING_AXIS, item, swipedTabScale * scale);
-                        getArithmetics()
-                                .setScale(Axis.ORTHOGONAL_AXIS, item, swipedTabScale * scale);
-                        animateSwipe(item, false, 0, swipeAnimation,
-                                createSwipeAnimationListener(item));
-                    } else {
-                        tabViewRecycler.remove(item);
-                    }
-
-                    previousTag = tag;
-                }
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns a layout listener, which allows to position a tab, which is a neighbor of
-     * the currently selected tab, when swiping horizontally.
-     *
-     * @param neighbor
-     *         The tab item, which corresponds to the neighboring tab, as an instance of the class
-     *         {@link TabItem}. The tab item may not be null
-     * @param dragDistance
-     *         The distance of the swipe gesture in pixels as a {@link Float} value
-     * @return The layout listener, which has been created, as an instance of the type {@link
-     * OnGlobalLayoutListener}. The layout listener may not be null
-     */
-    @NonNull
-    private OnGlobalLayoutListener createSwipeNeighborLayoutListener(
-            @NonNull final TabItem neighbor, final float dragDistance) {
-        return new OnGlobalLayoutListener() {
-
-            @Override
-            public void onGlobalLayout() {
-                float position;
-
-                if (dragDistance > 0) {
-                    position = -getTabSwitcher().getWidth() + dragDistance - swipedTabDistance;
-                } else {
-                    position = getTabSwitcher().getWidth() + dragDistance + swipedTabDistance;
-                }
-
-                getArithmetics().setPosition(Axis.X_AXIS, neighbor, position);
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns a layout listener, which allows to adapt the bottom margin of a tab, once
-     * its view has been inflated.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, whose view should be adapted, as an instance
-     *         of the class {@link AbstractItem}. The item may not be null
-     * @return The layout listener, which has been created, as an instance of the type {@link
-     * OnGlobalLayoutListener}. The layout listener may not be null
-     */
-    private OnGlobalLayoutListener createBottomMarginLayoutListener(
-            @NonNull final AbstractItem item) {
-        return new OnGlobalLayoutListener() {
-
-            @Override
-            public void onGlobalLayout() {
-                View view = item.getView();
-
-                if (tabViewBottomMargin == -1) {
-                    tabViewBottomMargin = calculateBottomMargin(item);
-                }
-
-                FrameLayout.LayoutParams layoutParams =
-                        (FrameLayout.LayoutParams) view.getLayoutParams();
-                layoutParams.bottomMargin = tabViewBottomMargin;
-                view.setLayoutParams(layoutParams);
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns a layout listener, which allows to adapt the size and position of a tab,
-     * once its view has been inflated.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, whose view should be adapted, as an instance
-     *         of the class {@link AbstractItem}. The item may not be null
-     * @param dragging
-     *         True, if the item is currently being dragged, false otherwise
-     * @param layoutListener
-     *         The layout lister, which should be notified, when the created listener is invoked, as
-     *         an instance of the type {@link OnGlobalLayoutListener} or null, if no listener should
-     *         be notified
-     * @return The layout listener, which has been created, as an instance of the type {@link
-     * OnGlobalLayoutListener}. The layout listener may not be null
-     */
-    @NonNull
-    private OnGlobalLayoutListener createInflateViewLayoutListener(@NonNull final AbstractItem item,
-                                                                   final boolean dragging,
-                                                                   @Nullable final OnGlobalLayoutListener layoutListener) {
-        return new OnGlobalLayoutListener() {
-
-            @Override
-            public void onGlobalLayout() {
-                adaptViewSize(item);
-                updateView(item, dragging);
-
-                if (layoutListener != null) {
-                    layoutListener.onGlobalLayout();
-                }
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns an animation listener, which allows to adapt the visibility of the
-     * toolbar, when an animation, which is used to animate the alpha of the toolbar, has been
-     * started or ended, depending on whether the toolbar should be shown, or hidden.
-     *
-     * @param show
-     *         True, if the toolbar should be shown by the animation, false otherwise
-     * @return The listener, which has been created, as an instance of the type {@link
-     * AnimatorListener}. The listener may not be null
-     */
-    @NonNull
-    private AnimatorListener createToolbarAnimationListener(final boolean show) {
-        return new AnimatorListenerAdapter() {
-
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                super.onAnimationEnd(animation);
-
-                if (!show) {
-                    toolbar.setVisibility(View.INVISIBLE);
-                }
-            }
-
-            @Override
-            public void onAnimationStart(final Animator animation) {
-                super.onAnimationStart(animation);
-
-                if (show) {
-                    toolbar.setVisibility(View.VISIBLE);
-                }
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns an animation listener, which allows to update the view, which is used to
-     * visualize a specific tab, when an animation has been finished.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, whose view should be updated, as an instance
-     *         of the class {@link AbstractItem}. The item may not be null
-     * @return The animation listener, which has been created, as an instance of the type {@link
-     * AnimatorListener}. The listener may not be null
-     */
-    @NonNull
-    private AnimatorListener createUpdateViewAnimationListener(@NonNull final AbstractItem item) {
-        return new AnimatorListenerAdapter() {
-
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                super.onAnimationEnd(animation);
-                inflateOrRemoveView(item, false);
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns an animation listener, which allows to inflate or remove the views, which
-     * are used to visualize tabs, when an animation, which is used to hide the tab switcher, has
-     * been finished.
-     *
-     * @return The animation listener, which has been created, as an instance of the type {@link
-     * AnimatorListener}. The listener may not be null
-     */
-    @NonNull
-    private AnimatorListener createHideSwitcherAnimationListener() {
-        return new AnimatorListenerAdapter() {
-
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                super.onAnimationEnd(animation);
-                AbstractItemIterator iterator =
-                        new ItemIterator.Builder(getTabSwitcher(), tabViewRecycler).create();
-                AbstractItem item;
-
-                while ((item = iterator.next()) != null) {
-                    if (((TabItem) item).getTab() == getModel().getSelectedTab()) {
-                        Pair<View, Boolean> pair = tabViewRecycler.inflate(item);
-                        View view = pair.first;
-                        FrameLayout.LayoutParams layoutParams =
-                                (FrameLayout.LayoutParams) view.getLayoutParams();
-                        view.setAlpha(1f);
-                        getArithmetics().setScale(Axis.DRAGGING_AXIS, item, 1);
-                        getArithmetics().setScale(Axis.ORTHOGONAL_AXIS, item, 1);
-                        view.setX(layoutParams.leftMargin);
-                        view.setY(layoutParams.topMargin);
-                    } else {
-                        tabViewRecycler.remove(item);
-                    }
-                }
-
-                tabViewRecycler.clearCache();
-                tabRecyclerAdapter.clearCachedPreviews();
-                tabViewBottomMargin = -1;
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns an animation listener, which allows to remove all tabs, when the
-     * animation, which is used to swipe all tabs, has been finished.
-     *
-     * @return The animation listener, which has been created, as an instance of the type {@link
-     * AnimatorListener}. The listener may not be null
-     */
-    @NonNull
-    private AnimatorListener createClearAnimationListener() {
-        return new AnimatorListenerAdapter() {
-
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                super.onAnimationEnd(animation);
-                tabViewRecycler.removeAll();
-                setFirstVisibleIndex(-1);
-                animateToolbarVisibility(getModel().areToolbarsShown(), 0);
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns a listener, which allows to handle, when a tab has been swiped, but was
-     * not removed.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, which has been swiped, as an instance of the
-     *         class {@link AbstractItem}. The item may not be null
-     * @return The listener, which has been created, as an instance of the type {@link
-     * AnimatorListener}. The listener may not be null
-     */
-    @NonNull
-    private AnimatorListener createSwipeAnimationListener(@NonNull final AbstractItem item) {
-        return new AnimatorListenerAdapter() {
-
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                super.onAnimationEnd(animation);
-                inflateOrRemoveView(item, false);
-                adaptStackOnSwipeAborted(item, item.getIndex() + 1);
-                item.getTag().setClosing(false);
-                getArithmetics().setPivot(Axis.DRAGGING_AXIS, item,
-                        getArithmetics().getPivot(Axis.DRAGGING_AXIS, item, DragState.NONE));
-                animateToolbarVisibility(true, 0);
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns an animation listener, which allows to adapt the currently selected tab,
-     * when swiping the tabs horizontally has been ended.
-     *
-     * @param tabItem
-     *         The tab item, which corresponds to the tab, which should be selected, as an instance
-     *         of the class {@link TabItem}. The tab item may not be null
-     * @return The animation listener, which has been created, as an instance of the type {@link
-     * AnimatorListener}. The listener may not be null
-     */
-    @NonNull
-    private AnimatorListener createSwipeSelectedTabAnimationListener(
-            @NonNull final TabItem tabItem) {
-        return new AnimatorListenerAdapter() {
-
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                super.onAnimationEnd(animation);
-                Tab tab = tabItem.getTab();
-
-                if (getModel().getSelectedTab() != tab) {
-                    getModel().selectTab(tab);
-                }
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns an animation listener, which allows to remove the view, which is used to
-     * visualize a specific tab, when swiping the tabs horizontally has been ended.
-     *
-     * @param tabItem
-     *         The tab item, which corresponds to the tab, whose view should be removed, as an
-     *         instance of the class {@link TabItem}. The tab item may not be null
-     * @return The animation listener, which has been created, as an instance of the type {@link
-     * AnimatorListener}. The listener may not be null
-     */
-    @NonNull
-    private AnimatorListener createSwipeNeighborAnimationListener(@NonNull final TabItem tabItem) {
-        return new AnimatorListenerAdapter() {
-
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                super.onAnimationEnd(animation);
-                getTabViewRecycler().remove(tabItem);
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns a listener, which allows to relocate all previous tabs, when a tab has
-     * been removed.
-     *
-     * @param removedItem
-     *         The item, which corresponds to the tab, which has been removed, as an instance of the
-     *         class {@link AbstractItem}. The item may not be null
-     * @param swipeAnimation
-     *         The animation, which has been used to remove the tab, as an instance of the class
-     *         {@link SwipeAnimation}. The animation may not be null
-     * @return The listener, which has been created, as an instance of the type {@link
-     * AnimatorListener}. The listener may not be null
-     */
-    @NonNull
-    private AnimatorListener createRemoveAnimationListener(@NonNull final AbstractItem removedItem,
-                                                           @NonNull final SwipeAnimation swipeAnimation) {
-        return new AnimatorListenerAdapter() {
-
-            @Override
-            public void onAnimationStart(final Animator animation) {
-                super.onAnimationStart(animation);
-
-                if (getModel().isEmpty()) {
-                    setFirstVisibleIndex(-1);
-                    animateToolbarVisibility(getModel().areToolbarsShown(), 0);
-                }
-
-                float previousAttachedPosition =
-                        calculateAttachedPosition(getModel().getCount() + 1);
-                float attachedPosition = calculateAttachedPosition(getModel().getCount());
-                State state = removedItem.getTag().getState();
-
-                if (state == State.STACKED_END) {
-                    relocateWhenRemovingStackedTab(removedItem, false, swipeAnimation);
-                } else if (state == State.STACKED_START) {
-                    relocateWhenRemovingStackedTab(removedItem, true, swipeAnimation);
-                } else if (state == State.FLOATING || state == State.STACKED_START_ATOP) {
-                    relocateWhenRemovingFloatingTab(removedItem, attachedPosition,
-                            previousAttachedPosition != attachedPosition, swipeAnimation);
-                }
-            }
-
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                super.onAnimationEnd(animation);
-                tabViewRecycler.remove(removedItem);
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns an animation listener, which allows to update or remove the view, which
-     * is used to visualize a tab, when the animation, which has been used to relocate it, has been
-     * ended.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, which has been relocated, as an instance of
-     *         the class {@link AbstractItem}. The item may not be null
-     * @return The listener, which has been created, as an instance of the type {@link
-     * AnimatorListener}. The listener may not be null
-     */
-    @NonNull
-    private AnimatorListener createRelocateAnimationListener(@NonNull final AbstractItem item) {
-        return new AnimatorListenerAdapter() {
-
-            @Override
-            public void onAnimationStart(final Animator animation) {
-                super.onAnimationStart(animation);
-                item.getView().setVisibility(View.VISIBLE);
-            }
-
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                super.onAnimationEnd(animation);
-
-                if (item.getTag().getState() == State.STACKED_START_ATOP) {
-                    adaptStackOnSwipeAborted(item, item.getIndex() + 1);
-                }
-
-                if (item.isVisible()) {
-                    updateView(item, false);
-                } else {
-                    tabViewRecycler.remove(item);
-                }
-
-                ItemIterator iterator =
-                        new ItemIterator.Builder(getModel(), getTabViewRecycler()).create();
-                AbstractItem item;
-
-                while ((item = iterator.next()) != null) {
-                    if (item.getTag().getState() == State.FLOATING) {
-                        setFirstVisibleIndex(item.getIndex());
-                        break;
-                    }
-                }
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns an animation listener, which allows to adapt the pivot of a specific tab,
-     * when an animation, which reverted an overshoot, has been ended.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, whose pivot should be adapted, as an instance
-     *         of the class {@link AbstractItem}. The item may not be null
-     * @param listener
-     *         The listener, which should be notified about the animation's progress, as an instance
-     *         of the type {@link AnimatorListener} or null, if no listener should be notified
-     * @return The listener, which has been created, as an instance of the type {@link
-     * AnimatorListener}. The listener may not be null
-     */
-    @NonNull
-    private AnimatorListener createRevertOvershootAnimationListener(
-            @NonNull final AbstractItem item, @Nullable final AnimatorListener listener) {
-        return new AnimatorListenerAdapter() {
-
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                super.onAnimationEnd(animation);
-                getArithmetics().setPivot(Axis.DRAGGING_AXIS, item,
-                        getArithmetics().getPivot(Axis.DRAGGING_AXIS, item, DragState.NONE));
-                getArithmetics().setPivot(Axis.ORTHOGONAL_AXIS, item,
-                        getArithmetics().getPivot(Axis.DRAGGING_AXIS, item, DragState.NONE));
-
-                if (listener != null) {
-                    listener.onAnimationEnd(animation);
-                }
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns an animation listener, which allows to revert an overshoot at the start,
-     * when an animation has been ended.
-     *
-     * @return The listener, which has been created, as an instance of the type {@link
-     * AnimatorListener}. The listener may not be null
-     */
-    @NonNull
-    private AnimatorListener createRevertStartOvershootAnimationListener() {
-        return new AnimatorListenerAdapter() {
-
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                super.onAnimationEnd(animation);
-                animateRevertStartOvershoot(new DecelerateInterpolator());
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns an animation listener, which allows to hide a tab, which has been added
-     * by using a peek animation, when the animation has been ended.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, which has been added by using the peek
-     *         animation, as an instance of the class {@link AbstractItem}. The item may not be
-     *         null
-     * @param peekAnimation
-     *         The peek animation as an instance of the class {@link PeekAnimation}. The peek
-     *         animation may not be null
-     * @return The listener, which has been created, as an instance of the type {@link
-     * AnimatorListener}. The listener may not be null
-     */
-    @NonNull
-    private AnimatorListener createPeekAnimationListener(@NonNull final AbstractItem item,
-                                                         @NonNull final PeekAnimation peekAnimation) {
-        return new AnimatorListenerAdapter() {
-
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                super.onAnimationEnd(animation);
-                long totalDuration =
-                        peekAnimation.getDuration() != -1 ? peekAnimation.getDuration() :
-                                peekAnimationDuration;
-                long duration = totalDuration / 3;
-                Interpolator interpolator =
-                        peekAnimation.getInterpolator() != null ? peekAnimation.getInterpolator() :
-                                new AccelerateDecelerateInterpolator();
-                View view = item.getView();
-                getArithmetics().setPivot(Axis.DRAGGING_AXIS, item, tabTitleContainerHeight);
-                getArithmetics().setPivot(Axis.ORTHOGONAL_AXIS, item,
-                        getArithmetics().getSize(Axis.ORTHOGONAL_AXIS, item) / 2f);
-                ViewPropertyAnimator animator = view.animate();
-                animator.setDuration(duration);
-                animator.setStartDelay(duration);
-                animator.setInterpolator(interpolator);
-                animator.setListener(
-                        new AnimationListenerWrapper(createRevertPeekAnimationListener(item)));
-                animator.alpha(0);
-                getArithmetics().animatePosition(Axis.DRAGGING_AXIS, animator, item,
-                        getArithmetics().getPosition(Axis.DRAGGING_AXIS, item) * 1.5f);
-                getArithmetics().animateScale(Axis.DRAGGING_AXIS, animator, 0);
-                getArithmetics().animateScale(Axis.ORTHOGONAL_AXIS, animator, 0);
-                animator.start();
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns an animation listener, which allows to remove the view of a tab, which
-     * has been added by using a peek animation, when the animation, which reverts the peek
-     * animation, has been ended.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, which has been added by using the peek
-     *         animation, as an instance of the class {@link AbstractItem}. The item may not be
-     *         null
-     * @return The listener, which has been created, as an instance of the type {@link
-     * AnimatorListener}. The listener may not be null
-     */
-    @NonNull
-    private AnimatorListener createRevertPeekAnimationListener(@NonNull final AbstractItem item) {
-        return new AnimatorListenerAdapter() {
-
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                super.onAnimationEnd(animation);
-                tabViewRecycler.remove(item);
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns an animation listener, which allows to zoom in the currently selected
-     * tab, when a peek animation has been ended.
-     *
-     * @param selectedItem
-     *         The item, which corresponds to the currently selected tab, as an instance of the
-     *         class {@link AbstractItem}. The item may not be null
-     * @param peekAnimation
-     *         The peek animation as an instance of the class {@link PeekAnimation}. The peek
-     *         animation may not be null
-     * @return The listener, which has been created, as an instance of the type {@link
-     * AnimatorListener}. The listener may not be null
-     */
-    @NonNull
-    private AnimatorListener createZoomOutAnimationListener(
-            @NonNull final AbstractItem selectedItem, @NonNull final PeekAnimation peekAnimation) {
-        return new AnimatorListenerAdapter() {
-
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                super.onAnimationEnd(animation);
-                getModel().removeListener(PhoneTabSwitcherLayout.this);
-                getModel().hideSwitcher();
-                long totalDuration =
-                        peekAnimation.getDuration() != -1 ? peekAnimation.getDuration() :
-                                peekAnimationDuration;
-                long duration = totalDuration / 3;
-                Interpolator interpolator =
-                        peekAnimation.getInterpolator() != null ? peekAnimation.getInterpolator() :
-                                new AccelerateDecelerateInterpolator();
-                animateHideSwitcher(selectedItem, duration, interpolator, duration,
-                        createZoomInAnimationListener(selectedItem));
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns an animation listener, which allows to restore the original state of a
-     * tab, when an animation, which zooms in the tab, has been ended.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, which has been zoomed in, as an instance of
-     *         the class {@link AbstractItem}. The item may not be null
-     * @return The listener, which has been created, as an instance of the type {@link
-     * AnimatorListener}. The listener may not be null
-     */
-    private AnimatorListener createZoomInAnimationListener(@NonNull final AbstractItem item) {
-        return new AnimatorListenerAdapter() {
-
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                super.onAnimationEnd(animation);
-                getModel().addListener(PhoneTabSwitcherLayout.this);
-                tabViewRecycler.inflate(item);
-                tabViewRecycler.clearCache();
-                tabRecyclerAdapter.clearCachedPreviews();
-                tabViewBottomMargin = -1;
-            }
-
-        };
-    }
-
-    /**
-     * Adapts the stack, which is located at the start, when swiping a tab.
-     *
-     * @param swipedItem
-     *         The item, which corresponds to the swiped tab, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @param successorIndex
-     *         The index of the tab, which is located after the swiped tab, as an {@link Integer}
-     *         value
-     * @param count
-     *         The number of tabs, which are contained by the tab switcher, excluding the swiped
-     *         tab, as an {@link Integer} value
-     */
-    private void adaptStackOnSwipe(@NonNull final AbstractItem swipedItem, final int successorIndex,
-                                   final int count) {
-        if (swipedItem.getTag().getState() == State.STACKED_START_ATOP &&
-                successorIndex < getModel().getCount()) {
-            AbstractItem item = TabItem.create(getTabSwitcher(), tabViewRecycler, successorIndex);
-            State state = item.getTag().getState();
-
-            if (state == State.HIDDEN || state == State.STACKED_START) {
-                Pair<Float, State> pair =
-                        calculatePositionAndStateWhenStackedAtStart(count, swipedItem.getIndex(),
-                                (State) null);
-                item.getTag().setPosition(pair.first);
-                item.getTag().setState(pair.second);
-                inflateOrRemoveView(item, false);
-            }
-        }
-    }
-
-    /**
-     * Adapts the stack, which located at the start, when swiping a tab has been aborted.
-     *
-     * @param swipedItem
-     *         The item, which corresponds to the swiped tab, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @param successorIndex
-     *         The index of the the tab, which is located after the swiped tab, as an {@link
-     *         Integer} value
-     */
-    private void adaptStackOnSwipeAborted(@NonNull final AbstractItem swipedItem,
-                                          final int successorIndex) {
-        if (swipedItem.getTag().getState() == State.STACKED_START_ATOP &&
-                successorIndex < getModel().getCount()) {
-            AbstractItem item = TabItem.create(getTabSwitcher(), tabViewRecycler, successorIndex);
-
-            if (item.getTag().getState() == State.STACKED_START_ATOP) {
-                Pair<Float, State> pair =
-                        calculatePositionAndStateWhenStackedAtStart(getTabSwitcher().getCount(),
-                                item.getIndex(), swipedItem);
-                item.getTag().setPosition(pair.first);
-                item.getTag().setState(pair.second);
-                inflateOrRemoveView(item, false);
-            }
-        }
-    }
-
-    /**
-     * Adapts the size of the view, which is used to visualize a specific tab.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, whose view should be adapted, as an instance
-     *         of the class {@link AbstractItem}. The item may not be null
-     */
-    private void adaptViewSize(@NonNull final AbstractItem item) {
-        getArithmetics().setPivot(Axis.DRAGGING_AXIS, item,
-                getArithmetics().getPivot(Axis.DRAGGING_AXIS, item, DragState.NONE));
-        getArithmetics().setPivot(Axis.ORTHOGONAL_AXIS, item,
-                getArithmetics().getPivot(Axis.ORTHOGONAL_AXIS, item, DragState.NONE));
-        float scale = getArithmetics().getScale(item, true);
-        getArithmetics().setScale(Axis.DRAGGING_AXIS, item, scale);
-        getArithmetics().setScale(Axis.ORTHOGONAL_AXIS, item, scale);
-    }
-
-    /**
-     * Relocates all previous tabs, when a floating tab has been removed from the tab switcher.
-     *
-     * @param removedItem
-     *         The item, which corresponds to the tab, which has been removed, as an instance of the
-     *         class {@link AbstractItem}. The item may not be null
-     * @param attachedPosition
-     *         The attached position in pixels as a {@link Float} value
-     * @param attachedPositionChanged
-     *         True, if removing the tab caused the attached position to be changed, false
-     *         otherwise
-     * @param swipeAnimation
-     *         The animation, which has been used to remove the tab, as an instance of the class
-     *         {@link SwipeAnimation}. The animation may not be null
-     */
-    private void relocateWhenRemovingFloatingTab(@NonNull final AbstractItem removedItem,
-                                                 final float attachedPosition,
-                                                 final boolean attachedPositionChanged,
-                                                 final SwipeAnimation swipeAnimation) {
-        AbstractItemIterator iterator;
-        AbstractItem item;
-        float defaultTabSpacing = calculateMaxTabSpacing(null);
-        float minTabSpacing = calculateMinTabSpacing();
-        int referenceIndex = removedItem.getIndex();
-        AbstractItem currentReferenceItem = removedItem;
-        float referencePosition = removedItem.getTag().getPosition();
-
-        if (attachedPositionChanged && getModel().getCount() > 0) {
-            int neighboringIndex = removedItem.getIndex() > 0 ? referenceIndex - 1 : referenceIndex;
-            referencePosition += Math.abs(
-                    TabItem.create(getTabSwitcher(), tabViewRecycler, neighboringIndex).getTag()
-                            .getPosition() - referencePosition) / 2f;
-        }
-
-        referencePosition =
-                Math.min(calculateMaxEndPosition(removedItem.getIndex() - 1), referencePosition);
-        float initialReferencePosition = referencePosition;
-
-        if (removedItem.getIndex() > 0) {
-            int selectedTabIndex = getModel().getSelectedTabIndex();
-            AbstractItem selectedItem =
-                    TabItem.create(getTabSwitcher(), tabViewRecycler, selectedTabIndex);
-            float maxTabSpacing = calculateMaxTabSpacing(selectedItem);
-            iterator = new ItemIterator.Builder(getTabSwitcher(), tabViewRecycler)
-                    .start(removedItem.getIndex() - 1).reverse(true).create();
-
-            while ((item = iterator.next()) != null) {
-                AbstractItem predecessor = iterator.peek();
-                float currentTabSpacing = calculateMaxTabSpacing(currentReferenceItem);
-                Pair<Float, State> pair;
-
-                if (item.getIndex() == removedItem.getIndex() - 1) {
-                    pair = clipPosition(item.getIndex(), referencePosition, predecessor);
-                    currentReferenceItem = item;
-                    referencePosition = pair.first;
-                    referenceIndex = item.getIndex();
-                } else if (referencePosition >= attachedPosition - currentTabSpacing) {
-                    float position;
-
-                    if (selectedTabIndex > item.getIndex() && selectedTabIndex <= referenceIndex) {
-                        position = referencePosition + maxTabSpacing +
-                                ((referenceIndex - item.getIndex() - 1) * defaultTabSpacing);
-                    } else {
-                        position = referencePosition +
-                                ((referenceIndex - item.getIndex()) * defaultTabSpacing);
-                    }
-
-                    pair = clipPosition(item.getIndex(), position, predecessor);
-                } else {
-                    AbstractItem successor = iterator.previous();
-                    float successorPosition = successor.getTag().getPosition();
-                    float position = (attachedPosition * (successorPosition + minTabSpacing)) /
-                            (minTabSpacing + attachedPosition - currentTabSpacing);
-                    pair = clipPosition(item.getIndex(), position, predecessor);
-
-                    if (pair.first >= attachedPosition - currentTabSpacing) {
-                        currentReferenceItem = item;
-                        referencePosition = pair.first;
-                        referenceIndex = item.getIndex();
-                    }
-                }
-
-                Tag tag = item.getTag().clone();
-                tag.setPosition(pair.first);
-                tag.setState(pair.second);
-
-                if (tag.getState() != State.HIDDEN) {
-                    int delayMultiplier = Math.abs(removedItem.getIndex() - item.getIndex());
-
-                    if (!item.isInflated()) {
-                        Pair<Float, State> pair2 =
-                                calculatePositionAndStateWhenStackedAtEnd(item.getIndex());
-                        item.getTag().setPosition(pair2.first);
-                        item.getTag().setState(pair2.second);
-                    }
-
-                    relocate(item, tag.getPosition(), tag, delayMultiplier, swipeAnimation);
-                } else {
-                    break;
-                }
-            }
-        }
-
-        if (attachedPositionChanged && getModel().getCount() > 2 &&
-                removedItem.getTag().getState() != State.STACKED_START_ATOP) {
-            iterator = new ItemIterator.Builder(getTabSwitcher(), tabViewRecycler)
-                    .start(removedItem.getIndex()).create();
-            float previousPosition = initialReferencePosition;
-            Tag previousTag = removedItem.getTag();
-
-            while ((item = iterator.next()) != null &&
-                    item.getIndex() < getModel().getCount() - 1) {
-                float position =
-                        calculateSuccessorPosition(previousPosition, calculateMaxTabSpacing(item));
-                Pair<Float, State> pair =
-                        clipPosition(item.getIndex(), position, previousTag.getState());
-                Tag tag = item.getTag().clone();
-                tag.setPosition(pair.first);
-                tag.setState(pair.second);
-                int delayMultiplier = Math.abs(removedItem.getIndex() - item.getIndex()) + 1;
-
-                if (!item.isInflated()) {
-                    Pair<Float, State> pair2 =
-                            calculatePositionAndStateWhenStackedAtStart(getModel().getCount(),
-                                    item.getIndex(), iterator.previous());
-                    item.getTag().setPosition(pair2.first);
-                    item.getTag().setState(pair2.second);
-                }
-
-                relocate(item, tag.getPosition(), tag, delayMultiplier, swipeAnimation);
-                previousPosition = pair.first;
-                previousTag = tag;
-
-                if (pair.second == State.HIDDEN || pair.second == State.STACKED_START) {
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Relocates all neighboring tabs, when a stacked tab has been removed from the tab switcher.
-     *
-     * @param removedItem
-     *         The item, which corresponds to the tab, which has been removed, as an instance of the
-     *         class {@link AbstractItem}. The item may not be null
-     * @param start
-     *         True, if the removed tab was part of the stack, which is located at the start, false,
-     *         if it was part of the stack, which is located at the end
-     * @param swipeAnimation
-     *         The animation, which has been used to remove the tab, as an instance of the class
-     *         {@link SwipeAnimation}. The animation may not be nullD
-     */
-    private void relocateWhenRemovingStackedTab(@NonNull final AbstractItem removedItem,
-                                                final boolean start,
-                                                @NonNull final SwipeAnimation swipeAnimation) {
-        int startIndex = removedItem.getIndex() + (start ? -1 : 0);
-        ItemIterator iterator =
-                new ItemIterator.Builder(getTabSwitcher(), tabViewRecycler).reverse(start)
-                        .start(startIndex).create();
-        AbstractItem item;
-        float previousProjectedPosition = removedItem.getTag().getPosition();
-
-        while ((item = iterator.next()) != null && (item.getTag().getState() == State.HIDDEN ||
-                item.getTag().getState() == State.STACKED_START ||
-                item.getTag().getState() == State.STACKED_START_ATOP ||
-                item.getTag().getState() == State.STACKED_END)) {
-            float projectedPosition = item.getTag().getPosition();
-
-            if (item.getTag().getState() == State.HIDDEN) {
-                AbstractItem previous = iterator.previous();
-                item.getTag().setState(previous.getTag().getState());
-
-                if (item.isVisible()) {
-                    Pair<Float, State> pair = start ?
-                            calculatePositionAndStateWhenStackedAtStart(getTabSwitcher().getCount(),
-                                    item.getIndex(), item) :
-                            calculatePositionAndStateWhenStackedAtEnd(item.getIndex());
-                    item.getTag().setPosition(pair.first);
-                    item.getTag().setState(pair.second);
-                    inflateAndUpdateView(item, false, null);
-                }
-
-                break;
-            } else {
-                item.getTag().setPosition(previousProjectedPosition);
-                int delayMultiplier = Math.abs(startIndex - item.getIndex()) + 1;
-                animateRelocate(item, previousProjectedPosition, null, delayMultiplier,
-                        createRelocateAnimationListener(item), swipeAnimation);
-            }
-
-            previousProjectedPosition = projectedPosition;
-        }
-    }
-
-    /**
-     * Relocates all previous tabs, when floating tabs have been added to the tab switcher.
-     *
-     * @param addedItems
-     *         An array, which contains the items, which correspond to the tabs, which have been
-     *         added, as an array of the type {@link AbstractItem}. The array may not be null
-     * @param referenceItem
-     *         The item, which corresponds to the tab, which is used as a reference, as an instance
-     *         of the class {@link AbstractItem}. The item may not be null
-     * @param isReferencingPredecessor
-     *         True, if the tab, which is used as a reference, is the predecessor of the added tab,
-     *         false if it is the successor
-     * @param attachedPosition
-     *         The current attached position in pixels as a {@link Float} value
-     * @param attachedPositionChanged
-     *         True, if adding the tab caused the attached position to be changed, false otherwise
-     * @param swipeAnimation
-     *         The animation, which has been used to add the tabs, as an instance of the class
-     *         {@link SwipeAnimation}. The animation may not be null
-     * @return An array, which contains the items, which correspond to the tabs, which have been
-     * added, as an array of the type {@link AbstractItem}. The array may not be null
-     */
-    @NonNull
-    private AbstractItem[] relocateWhenAddingFloatingTabs(@NonNull final AbstractItem[] addedItems,
-                                                          @NonNull final AbstractItem referenceItem,
-                                                          final boolean isReferencingPredecessor,
-                                                          final float attachedPosition,
-                                                          final boolean attachedPositionChanged,
-                                                          @NonNull final SwipeAnimation swipeAnimation) {
-        AbstractItem firstAddedItem = addedItems[0];
-        AbstractItem lastAddedItem = addedItems[addedItems.length - 1];
-        float referencePosition = referenceItem.getTag().getPosition();
-
-        if (isReferencingPredecessor && attachedPositionChanged &&
-                lastAddedItem.getIndex() < getModel().getCount() - 1) {
-            int neighboringIndex = lastAddedItem.getIndex() + 1;
-            referencePosition -= Math.abs(referencePosition -
-                    TabItem.create(getTabSwitcher(), tabViewRecycler, neighboringIndex).getTag()
-                            .getPosition()) / 2f;
-        }
-
-        float initialReferencePosition = referencePosition;
-        int selectedTabIndex = getModel().getSelectedTabIndex();
-        AbstractItem selectedItem =
-                TabItem.create(getTabSwitcher(), tabViewRecycler, selectedTabIndex);
-        float defaultTabSpacing = calculateMaxTabSpacing(null);
-        float maxTabSpacing = calculateMaxTabSpacing(selectedItem);
-        float minTabSpacing = calculateMinTabSpacing();
-        AbstractItem currentReferenceItem = referenceItem;
-        int referenceIndex = referenceItem.getIndex();
-        AbstractItemIterator.AbstractBuilder builder =
-                new ItemIterator.Builder(getTabSwitcher(), tabViewRecycler);
-
-        for (AbstractItem addedItem : addedItems) {
-            int iterationReferenceIndex = referenceIndex;
-            float iterationReferencePosition = referencePosition;
-            AbstractItem iterationReferenceItem = currentReferenceItem;
-            AbstractItemIterator iterator =
-                    builder.start(addedItem.getIndex()).reverse(true).create();
-            AbstractItem item;
-
-            while ((item = iterator.next()) != null) {
-                AbstractItem predecessor = iterator.peek();
-                Pair<Float, State> pair;
-                float currentTabSpacing = calculateMaxTabSpacing(iterationReferenceItem);
-
-                if (isReferencingPredecessor && item.getIndex() == addedItem.getIndex()) {
-                    State predecessorState =
-                            predecessor != null ? predecessor.getTag().getState() : null;
-                    pair = clipPosition(item.getIndex(), iterationReferencePosition,
-                            predecessorState == State.STACKED_START_ATOP ? State.FLOATING :
-                                    predecessorState);
-                    currentReferenceItem = iterationReferenceItem = item;
-                    initialReferencePosition =
-                            referencePosition = iterationReferencePosition = pair.first;
-                    referenceIndex = iterationReferenceIndex = item.getIndex();
-                } else if (iterationReferencePosition >= attachedPosition - currentTabSpacing) {
-                    float position;
-
-                    if (selectedTabIndex > item.getIndex() &&
-                            selectedTabIndex <= iterationReferenceIndex) {
-                        position = iterationReferencePosition + maxTabSpacing +
-                                ((iterationReferenceIndex - item.getIndex() - 1) *
-                                        defaultTabSpacing);
-                    } else {
-                        position = iterationReferencePosition +
-                                ((iterationReferenceIndex - item.getIndex()) * defaultTabSpacing);
-                    }
-
-                    pair = clipPosition(item.getIndex(), position, predecessor);
-                } else {
-                    AbstractItem successor = iterator.previous();
-                    float successorPosition = successor.getTag().getPosition();
-                    float position = (attachedPosition * (successorPosition + minTabSpacing)) /
-                            (minTabSpacing + attachedPosition - currentTabSpacing);
-                    pair = clipPosition(item.getIndex(), position, predecessor);
-
-                    if (pair.first >= attachedPosition - currentTabSpacing) {
-                        iterationReferenceItem = item;
-                        iterationReferencePosition = pair.first;
-                        iterationReferenceIndex = item.getIndex();
-                    }
-                }
-
-                if (item.getIndex() >= firstAddedItem.getIndex() &&
-                        item.getIndex() <= lastAddedItem.getIndex()) {
-                    if (!isReferencingPredecessor && attachedPositionChanged &&
-                            getModel().getCount() > 3) {
-                        AbstractItem successor = iterator.previous();
-                        float successorPosition = successor.getTag().getPosition();
-                        float position = pair.first - Math.abs(pair.first - successorPosition) / 2f;
-                        pair = clipPosition(item.getIndex(), position, predecessor);
-                        initialReferencePosition = pair.first;
-                    }
-
-                    Tag tag = addedItems[item.getIndex() - firstAddedItem.getIndex()].getTag();
-                    tag.setPosition(pair.first);
-                    tag.setState(pair.second);
-                } else {
-                    Tag tag = item.getTag().clone();
-                    tag.setPosition(pair.first);
-                    tag.setState(pair.second);
-
-                    if (!item.isInflated()) {
-                        Pair<Float, State> pair2 =
-                                calculatePositionAndStateWhenStackedAtEnd(item.getIndex());
-                        item.getTag().setPosition(pair2.first);
-                        item.getTag().setState(pair2.second);
-                    }
-
-                    relocate(item, tag.getPosition(), tag, 0, swipeAnimation);
-                }
-
-                if (pair.second == State.HIDDEN || pair.second == State.STACKED_END) {
-                    setFirstVisibleIndex(getFirstVisibleIndex() + 1);
-                    break;
-                }
-            }
-        }
-
-        if (attachedPositionChanged && getModel().getCount() > 3) {
-            AbstractItemIterator iterator =
-                    builder.start(lastAddedItem.getIndex() + 1).reverse(false).create();
-            AbstractItem item;
-            float previousPosition = initialReferencePosition;
-            Tag previousTag = lastAddedItem.getTag();
-
-            while ((item = iterator.next()) != null &&
-                    item.getIndex() < getModel().getCount() - 1) {
-                float position =
-                        calculateSuccessorPosition(previousPosition, calculateMaxTabSpacing(item));
-                Pair<Float, State> pair =
-                        clipPosition(item.getIndex(), position, previousTag.getState());
-                Tag tag = item.getTag().clone();
-                tag.setPosition(pair.first);
-                tag.setState(pair.second);
-
-                if (!item.isInflated()) {
-                    Pair<Float, State> pair2 =
-                            calculatePositionAndStateWhenStackedAtStart(getModel().getCount(),
-                                    item.getIndex(), iterator.previous());
-                    item.getTag().setPosition(pair2.first);
-                    item.getTag().setState(pair2.second);
-                }
-
-                relocate(item, tag.getPosition(), tag, 0, swipeAnimation);
-                previousPosition = pair.first;
-                previousTag = tag;
-
-                if (pair.second == State.HIDDEN || pair.second == State.STACKED_START) {
-                    break;
-                }
-            }
-        }
-
-        return addedItems;
-    }
-
-    /**
-     * Relocates all neighboring tabs, when stacked tabs have been added to the tab switcher.
-     *
-     * @param start
-     *         True, if the added tab was part of the stack, which is located at the start, false,
-     *         if it was part of the stack, which is located at the end
-     * @param addedItems
-     *         An array, which contains the items, which correspond to the tabs, which have been
-     *         added, as an array of the type {@link AbstractItem}. The array may not be null
-     * @param swipeAnimation
-     *         The animation, which has been used to add the tabs, as an instance of the class
-     *         {@link SwipeAnimation}. The animation may not be null
-     * @return An array, which contains the items, which correspond to the tabs, which have been
-     * added, as an array of the type {@link AbstractItem}. The array may not be null
-     */
-    @NonNull
-    private AbstractItem[] relocateWhenAddingStackedTabs(final boolean start,
-                                                         @NonNull final AbstractItem[] addedItems,
-                                                         @NonNull final SwipeAnimation swipeAnimation) {
-        if (!start) {
-            setFirstVisibleIndex(getFirstVisibleIndex() + addedItems.length);
-        }
-
-        AbstractItem firstAddedItem = addedItems[0];
-        AbstractItem lastAddedItem = addedItems[addedItems.length - 1];
-        AbstractItemIterator iterator = new ItemIterator.Builder(getTabSwitcher(), tabViewRecycler)
-                .start(start ? lastAddedItem.getIndex() : firstAddedItem.getIndex()).reverse(start)
-                .create();
-        AbstractItem item;
-
-        while ((item = iterator.next()) != null &&
-                (item.getTag().getState() == State.STACKED_START ||
-                        item.getTag().getState() == State.STACKED_START_ATOP ||
-                        item.getTag().getState() == State.STACKED_END ||
-                        item.getTag().getState() == State.HIDDEN)) {
-            AbstractItem predecessor = start ? iterator.peek() : iterator.previous();
-            Pair<Float, State> pair = start ?
-                    calculatePositionAndStateWhenStackedAtStart(getModel().getCount(),
-                            item.getIndex(), predecessor) :
-                    calculatePositionAndStateWhenStackedAtEnd(item.getIndex());
-
-            if (start && predecessor != null && predecessor.getTag().getState() == State.FLOATING) {
-                float predecessorPosition = predecessor.getTag().getPosition();
-                float distance = predecessorPosition - pair.first;
-
-                if (distance > calculateMinTabSpacing()) {
-                    float position = calculateSuccessorPosition(item, predecessor);
-                    pair = clipPosition(item.getIndex(), position, predecessor);
-                }
-            }
-
-            if (item.getIndex() >= firstAddedItem.getIndex() &&
-                    item.getIndex() <= lastAddedItem.getIndex()) {
-                Tag tag = addedItems[item.getIndex() - firstAddedItem.getIndex()].getTag();
-                tag.setPosition(pair.first);
-                tag.setState(pair.second);
-            } else if (item.isInflated()) {
-                Tag tag = item.getTag().clone();
-                tag.setPosition(pair.first);
-                tag.setState(pair.second);
-                animateRelocate(item, tag.getPosition(), tag, 0,
-                        createRelocateAnimationListener(item), swipeAnimation);
-            } else {
-                break;
-            }
-        }
-
-        return addedItems;
-    }
-
-    /**
-     * Calculates the position and state of hidden tabs, which have been added to the tab switcher.
-     *
-     * @param addedItems
-     *         An array, which contains the items, which correspond to the tabs, which have been
-     *         added, as an array of the type {@link AbstractItem}. The array may not be null
-     * @param referenceItem
-     *         The item, which corresponds to the tab, which is used as a reference, as an instance
-     *         of the class {@link AbstractItem}. The item may not be null
-     * @return An array, which contains the items, which correspond to the tabs, which have been
-     * added, as an array of the type {@link AbstractItem}. The array may not be null
-     */
-    @NonNull
-    private AbstractItem[] relocateWhenAddingHiddenTabs(@NonNull final AbstractItem[] addedItems,
-                                                        @NonNull final AbstractItem referenceItem) {
-        boolean stackedAtStart = isStackedAtStart(referenceItem.getIndex());
-
-        for (AbstractItem item : addedItems) {
-            Pair<Float, State> pair;
-
-            if (stackedAtStart) {
-                AbstractItem predecessor = item.getIndex() > 0 ?
-                        TabItem.create(getTabSwitcher(), tabViewRecycler, item.getIndex() - 1) :
-                        null;
-                pair = calculatePositionAndStateWhenStackedAtStart(getModel().getCount(),
-                        item.getIndex(), predecessor);
-            } else {
-                pair = calculatePositionAndStateWhenStackedAtEnd(item.getIndex());
-            }
-
-            Tag tag = item.getTag();
-            tag.setPosition(pair.first);
-            tag.setState(pair.second);
-        }
-
-        return addedItems;
-    }
-
-    /**
-     * Relocates a specific tab. If its view is now yet inflated, it is inflated first.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, which should be relocated, as an instance of
-     *         the class {@link AbstractItem}. The item may not be null
-     * @param relocatePosition
-     *         The position, the tab should be moved to, in pixels as an {@link Float} value
-     * @param tag
-     *         The tag, which should be applied to the tab, once it has been relocated, as an
-     *         instance of the class {@link Tag} or null, if no tag should be applied
-     * @param delayMultiplier
-     *         The multiplier, which should be used to calculate the delay of the relocate
-     *         animation, by being multiplied with the default delay, as an {@link Integer} value
-     * @param swipeAnimation
-     *         The animation, which has been used to add or remove the tab, which caused the other
-     *         tabs to be relocated, as an instance of the class {@link SwipeAnimation}. The
-     *         animation may not be null
-     */
-    private void relocate(@NonNull final AbstractItem item, final float relocatePosition,
-                          @Nullable final Tag tag, final int delayMultiplier,
-                          @NonNull final SwipeAnimation swipeAnimation) {
-        if (item.isInflated()) {
-            animateRelocate(item, relocatePosition, tag, delayMultiplier,
-                    createRelocateAnimationListener(item), swipeAnimation);
-        } else {
-            inflateAndUpdateView(item, false,
-                    createRelocateLayoutListener(item, relocatePosition, tag, delayMultiplier,
-                            createRelocateAnimationListener(item), swipeAnimation));
-            item.getView().setVisibility(View.INVISIBLE);
-        }
-    }
-
-    /**
-     * Swipes a specific tab.
-     *
-     * @param item
-     *         The item, which corresponds to the tab, which should be swiped, as an instance of the
-     *         class {@link AbstractItem}. The item may not be null
-     * @param distance
-     *         The distance, the tab should be swiped by, in pixels as a {@link Float} value
-     */
-    private void swipe(@NonNull final AbstractItem item, final float distance) {
-        View view = item.getView();
-
-        if (!item.getTag().isClosing()) {
-            adaptStackOnSwipe(item, item.getIndex() + 1, getModel().getCount() - 1);
-        }
-
-        item.getTag().setClosing(true);
-        float dragDistance = distance;
-
-        if (!((TabItem) item).getTab().isCloseable()) {
-            dragDistance = (float) Math.pow(Math.abs(distance), 0.75);
-            dragDistance = distance < 0 ? dragDistance * -1 : dragDistance;
-        }
-
-        getArithmetics().setPivot(Axis.DRAGGING_AXIS, item,
-                getArithmetics().getPivot(Axis.DRAGGING_AXIS, item, DragState.SWIPE));
-        getArithmetics().setPivot(Axis.ORTHOGONAL_AXIS, item,
-                getArithmetics().getPivot(Axis.ORTHOGONAL_AXIS, item, DragState.SWIPE));
-        float scale = getArithmetics().getScale(item, true);
-        float ratio = 1 - (Math.abs(dragDistance) / calculateSwipePosition());
-        float scaledClosedTabScale = swipedTabScale * scale;
-        float targetScale = scaledClosedTabScale + ratio * (scale - scaledClosedTabScale);
-        getArithmetics().setScale(Axis.DRAGGING_AXIS, item, targetScale);
-        getArithmetics().setScale(Axis.ORTHOGONAL_AXIS, item, targetScale);
-        view.setAlpha(swipedTabAlpha + ratio * (1 - swipedTabAlpha));
-        getArithmetics().setPosition(Axis.ORTHOGONAL_AXIS, item, dragDistance);
-    }
-
-    /**
-     * Moves the first tab to overlap the other tabs, when overshooting at the start.
-     *
-     * @param position
-     *         The position of the first tab in pixels as a {@link Float} value
-     */
-    private void startOvershoot(final float position) {
-        ItemIterator iterator =
-                new ItemIterator.Builder(getTabSwitcher(), tabViewRecycler).create();
-        AbstractItem item;
-
-        while ((item = iterator.next()) != null) {
-            if (item.getIndex() == 0) {
-                getArithmetics().setPivot(Axis.DRAGGING_AXIS, item,
-                        getArithmetics().getPivot(Axis.DRAGGING_AXIS, item, DragState.NONE));
-                getArithmetics().setPivot(Axis.ORTHOGONAL_AXIS, item,
-                        getArithmetics().getPivot(Axis.ORTHOGONAL_AXIS, item, DragState.NONE));
-                getArithmetics().setPosition(Axis.DRAGGING_AXIS, item, position);
-            } else if (item.isInflated()) {
-                AbstractItem firstItem = iterator.first();
-                View view = item.getView();
-                view.setVisibility(getArithmetics().getPosition(Axis.DRAGGING_AXIS, firstItem) <=
-                        getArithmetics().getPosition(Axis.DRAGGING_AXIS, item) ? View.INVISIBLE :
-                        View.VISIBLE);
-            }
-        }
-    }
-
-    /**
-     * Tilts the tabs, when overshooting at the start.
-     *
-     * @param angle
-     *         The angle, the tabs should be rotated by, in degrees as a {@link Float} value
-     */
-    private void tiltOnStartOvershoot(final float angle) {
-        ItemIterator iterator =
-                new ItemIterator.Builder(getTabSwitcher(), tabViewRecycler).create();
-        AbstractItem item;
-
-        while ((item = iterator.next()) != null) {
-            View view = item.getView();
-
-            if (item.getIndex() == 0) {
-                view.setCameraDistance(maxCameraDistance);
-                getArithmetics().setPivot(Axis.DRAGGING_AXIS, item, getArithmetics()
-                        .getPivot(Axis.DRAGGING_AXIS, item, DragState.OVERSHOOT_START));
-                getArithmetics().setPivot(Axis.ORTHOGONAL_AXIS, item, getArithmetics()
-                        .getPivot(Axis.ORTHOGONAL_AXIS, item, DragState.OVERSHOOT_START));
-                getArithmetics().setRotation(Axis.ORTHOGONAL_AXIS, item, angle);
-            } else if (item.isInflated()) {
-                item.getView().setVisibility(View.INVISIBLE);
-            }
-        }
-    }
-
-    /**
-     * Tilts the tabs, when overshooting at the end.
-     *
-     * @param angle
-     *         The angle, the tabs should be rotated by, in degrees as a {@link Float} value
-     */
-    private void tiltOnEndOvershoot(final float angle) {
-        float minCameraDistance = maxCameraDistance / 2f;
-        int firstVisibleIndex = -1;
-        ItemIterator iterator =
-                new ItemIterator.Builder(getTabSwitcher(), tabViewRecycler).create();
-        AbstractItem item;
-
-        while ((item = iterator.next()) != null) {
-            if (item.isInflated()) {
-                View view = item.getView();
-
-                if (!iterator.hasNext()) {
-                    view.setCameraDistance(maxCameraDistance);
-                } else if (firstVisibleIndex == -1) {
-                    view.setCameraDistance(minCameraDistance);
-
-                    if (item.getTag().getState() == State.FLOATING) {
-                        firstVisibleIndex = item.getIndex();
-                    }
-                } else {
-                    int diff = item.getIndex() - firstVisibleIndex;
-                    float ratio =
-                            (float) diff / (float) (getModel().getCount() - firstVisibleIndex);
-                    view.setCameraDistance(
-                            minCameraDistance + (maxCameraDistance - minCameraDistance) * ratio);
-                }
-
-                getArithmetics().setPivot(Axis.DRAGGING_AXIS, item, getArithmetics()
-                        .getPivot(Axis.DRAGGING_AXIS, item, DragState.OVERSHOOT_END));
-                getArithmetics().setPivot(Axis.ORTHOGONAL_AXIS, item, getArithmetics()
-                        .getPivot(Axis.ORTHOGONAL_AXIS, item, DragState.OVERSHOOT_END));
-                getArithmetics().setRotation(Axis.ORTHOGONAL_AXIS, item, angle);
-            }
-        }
-    }
-
-    /**
-     * Creates a new layout, which implements the functionality of a {@link TabSwitcher} on
-     * smartphones.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, the layout belongs to, as an instance of the class {@link
-     *         TabSwitcher}. The tab switcher may not be null
-     * @param model
-     *         The model of the tab switcher, the layout belongs to, as an instance of the class
-     *         {@link TabSwitcherModel}. The model may not be null
-     * @param arithmetics
-     *         The arithmetics, which should be used by the layout, as an instance of the class
-     *         {@link PhoneArithmetics}. The arithmetics may not be null
-     * @param style
-     *         The style, which allows to retrieve style attributes of the tab switcher, as an
-     *         instance of the class {@link TabSwitcherStyle}. The style may not be null
-     * @param touchEventDispatcher
-     *         The dispatcher, which is used to dispatch touch events to event handlers, as an
-     *         instance of the class {@link TouchEventDispatcher}. The dispatcher may not be null
-     */
-    public PhoneTabSwitcherLayout(@NonNull final TabSwitcher tabSwitcher,
-                                  @NonNull final TabSwitcherModel model,
-                                  @NonNull final PhoneArithmetics arithmetics,
-                                  @NonNull final TabSwitcherStyle style,
-                                  @NonNull final TouchEventDispatcher touchEventDispatcher) {
-        super(tabSwitcher, model, arithmetics, style, touchEventDispatcher);
-        Resources resources = tabSwitcher.getResources();
-        stackedTabCount = resources.getInteger(R.integer.phone_stacked_tab_count);
-        tabInset = resources.getDimensionPixelSize(R.dimen.tab_inset);
-        tabBorderWidth = resources.getDimensionPixelSize(R.dimen.tab_border_width);
-        tabTitleContainerHeight =
-                resources.getDimensionPixelSize(R.dimen.tab_title_container_height);
-        maxCameraDistance = resources.getDimensionPixelSize(R.dimen.max_camera_distance);
-        TypedValue typedValue = new TypedValue();
-        resources.getValue(R.dimen.swiped_tab_scale, typedValue, true);
-        swipedTabScale = typedValue.getFloat();
-        resources.getValue(R.dimen.swiped_tab_alpha, typedValue, true);
-        swipedTabAlpha = typedValue.getFloat();
-        showSwitcherAnimationDuration =
-                resources.getInteger(R.integer.show_switcher_animation_duration);
-        hideSwitcherAnimationDuration =
-                resources.getInteger(R.integer.hide_switcher_animation_duration);
-        toolbarVisibilityAnimationDuration =
-                resources.getInteger(R.integer.toolbar_visibility_animation_duration);
-        toolbarVisibilityAnimationDelay =
-                resources.getInteger(R.integer.toolbar_visibility_animation_delay);
-        swipeAnimationDuration = resources.getInteger(R.integer.swipe_animation_duration);
-        relocateAnimationDuration = resources.getInteger(R.integer.relocate_animation_duration);
-        revertOvershootAnimationDuration =
-                resources.getInteger(R.integer.revert_overshoot_animation_duration);
-        revealAnimationDuration = resources.getInteger(R.integer.reveal_animation_duration);
-        peekAnimationDuration = resources.getInteger(R.integer.peek_animation_duration);
-        emptyViewAnimationDuration = resources.getInteger(R.integer.empty_view_animation_duration);
-        maxStartOvershootAngle = resources.getInteger(R.integer.max_start_overshoot_angle);
-        maxEndOvershootAngle = resources.getInteger(R.integer.max_end_overshoot_angle);
-        swipedTabDistance = resources.getDimensionPixelSize(R.dimen.swiped_tab_distance);
-        tabViewBottomMargin = -1;
-        toolbarAnimation = null;
-    }
-
-    @Override
-    public final AbstractDragTabsEventHandler<?> getDragHandler() {
-        return dragHandler;
-    }
-
-    @Override
-    protected final void onInflateLayout(@NonNull final LayoutInflater inflater,
-                                         final boolean tabsOnly) {
-        if (tabsOnly) {
-            toolbar = getTabSwitcher().findViewById(R.id.primary_toolbar);
-            tabContainer = getTabSwitcher().findViewById(R.id.tab_container);
-        } else {
-            toolbar = (Toolbar) inflater.inflate(R.layout.phone_toolbar, getTabSwitcher(), false);
-            getTabSwitcher().addView(toolbar);
-            tabContainer = new FrameLayout(getContext());
-            tabContainer.setId(R.id.tab_container);
-            getTabSwitcher().addView(tabContainer, FrameLayout.LayoutParams.MATCH_PARENT,
-                    FrameLayout.LayoutParams.MATCH_PARENT);
-        }
-
-        contentViewRecycler = new ViewRecycler<>(inflater);
-        tabRecyclerAdapter = new PhoneTabRecyclerAdapter(getTabSwitcher(), getModel(), getStyle(),
-                contentViewRecycler);
-        getModel().addListener(tabRecyclerAdapter);
-        tabViewRecycler = new AttachedViewRecycler<>(tabContainer, inflater,
-                Collections.reverseOrder(new ItemComparator(getTabSwitcher())));
-        tabViewRecycler.setAdapter(tabRecyclerAdapter);
-        tabRecyclerAdapter.setViewRecycler(tabViewRecycler);
-        dragHandler =
-                new PhoneDragTabsEventHandler(getTabSwitcher(), getArithmetics(), tabViewRecycler);
-        adaptDecorator();
-        adaptToolbarMargin();
-    }
-
-    @Nullable
-    @Override
-    protected final Pair<Integer, Float> onDetachLayout(final boolean tabsOnly) {
-        Pair<Integer, Float> result = null;
-
-        if (getTabSwitcher().isSwitcherShown() && getFirstVisibleIndex() != -1) {
-            TabItem tabItem =
-                    TabItem.create(getModel(), getTabViewRecycler(), getFirstVisibleIndex());
-            Tag tag = tabItem.getTag();
-
-            if (tag.getState() != State.HIDDEN) {
-                float position = tag.getPosition();
-                float draggingAxisSize =
-                        getArithmetics().getTabContainerSize(Axis.DRAGGING_AXIS, false);
-                float orthogonalAxisSize =
-                        getArithmetics().getTabContainerSize(Axis.ORTHOGONAL_AXIS, false);
-                result = Pair.create(getFirstVisibleIndex(),
-                        position / Math.max(draggingAxisSize, orthogonalAxisSize));
-            }
-        }
-
-        contentViewRecycler.removeAll();
-        contentViewRecycler.clearCache();
-        tabRecyclerAdapter.clearCachedPreviews();
-        detachEmptyView();
-
-        if (!tabsOnly) {
-            getModel().removeListener(tabRecyclerAdapter);
-        }
-
-        return result;
-    }
-
-    @Override
-    public final AbstractViewRecycler<Tab, Void> getContentViewRecycler() {
-        return contentViewRecycler;
-    }
-
-    @Override
-    protected final AttachedViewRecycler<AbstractItem, Integer> getTabViewRecycler() {
-        return tabViewRecycler;
-    }
-
-    @Override
-    protected final AbstractTabRecyclerAdapter getTabRecyclerAdapter() {
-        return tabRecyclerAdapter;
-    }
-
-    @Override
-    protected final void updateView(@NonNull final AbstractItem item, final boolean dragging) {
-        View view = item.getView();
-        view.setAlpha(1f);
-        view.setVisibility(View.VISIBLE);
-        getArithmetics().setPivot(Arithmetics.Axis.DRAGGING_AXIS, item, getArithmetics()
-                .getPivot(Arithmetics.Axis.DRAGGING_AXIS, item,
-                        AbstractDragTabsEventHandler.DragState.NONE));
-        getArithmetics().setPivot(Arithmetics.Axis.ORTHOGONAL_AXIS, item, getArithmetics()
-                .getPivot(Arithmetics.Axis.ORTHOGONAL_AXIS, item,
-                        AbstractDragTabsEventHandler.DragState.NONE));
-        super.updateView(item, dragging);
-        getArithmetics().setRotation(Arithmetics.Axis.ORTHOGONAL_AXIS, item, 0);
-    }
-
-    @Override
-    protected final float calculateAttachedPosition(final int count) {
-        float totalSpace = getArithmetics().getTabContainerSize(Axis.DRAGGING_AXIS, false);
-        float attachedPosition;
-
-        if (count == 3) {
-            attachedPosition = totalSpace * 0.66f;
-        } else if (count == 4) {
-            attachedPosition = totalSpace * 0.6f;
-        } else {
-            attachedPosition = totalSpace * 0.5f;
-        }
-
-        return attachedPosition;
-    }
-
-    @Override
-    protected final void inflateAndUpdateView(@NonNull final AbstractItem item,
-                                              final boolean dragging,
-                                              @Nullable final OnGlobalLayoutListener listener) {
-        inflateView(item, createInflateViewLayoutListener(item, dragging, listener),
-                tabViewBottomMargin);
-    }
-
-    @Override
-    protected final int getStackedTabCount() {
-        return stackedTabCount;
-    }
-
-    @NonNull
-    @Override
-    protected final Pair<Float, State> calculatePositionAndStateWhenStackedAtStart(final int count,
-                                                                                   final int index,
-                                                                                   @Nullable final State predecessorState) {
-        if ((count - index) <= getStackedTabCount()) {
-            float position = getStackedTabSpacing() * (count - (index + 1));
-            return Pair.create(position,
-                    (predecessorState == null || predecessorState == State.FLOATING) ?
-                            State.STACKED_START_ATOP : State.STACKED_START);
-        } else {
-            float position = getStackedTabSpacing() * getStackedTabCount();
-            return Pair.create(position,
-                    (predecessorState == null || predecessorState == State.FLOATING) ?
-                            State.STACKED_START_ATOP : State.HIDDEN);
-        }
-    }
-
-    @NonNull
-    @Override
-    protected final Pair<Float, State> calculatePositionAndStateWhenStackedAtEnd(final int index) {
-        float size = getArithmetics().getTabContainerSize(Axis.DRAGGING_AXIS, false);
-
-        if (index < getStackedTabCount()) {
-            float position = size - tabInset - (getStackedTabSpacing() * (index + 1));
-            return Pair.create(position, State.STACKED_END);
-        } else {
-            float position = size - tabInset - (getStackedTabSpacing() * getStackedTabCount());
-            return Pair.create(position, State.HIDDEN);
-        }
-    }
-
-    @Override
-    protected final boolean isOvershootingAtStart() {
-        if (getTabSwitcher().getCount() <= 1) {
-            return true;
-        } else {
-            AbstractItemIterator iterator =
-                    new ItemIterator.Builder(getTabSwitcher(), tabViewRecycler).create();
-            AbstractItem item = iterator.getItem(0);
-            return item.getTag().getState() == State.STACKED_START_ATOP;
-        }
-    }
-
-    @Override
-    protected final boolean isOvershootingAtEnd(@NonNull final DragState dragState,
-                                                @NonNull final AbstractItemIterator iterator) {
-        if (getTabSwitcher().getCount() <= 1) {
-            return dragState != DragState.DRAG_TO_START;
-        } else {
-            AbstractItem lastItem = iterator.getItem(getTabSwitcher().getCount() - 1);
-            AbstractItem predecessor = iterator.getItem(getTabSwitcher().getCount() - 2);
-            return Math.round(predecessor.getTag().getPosition()) >=
-                    Math.round(calculateMaxTabSpacing(lastItem));
-        }
-    }
-
-    @Override
-    protected final float calculateMaxEndPosition(final int index) {
-        float defaultMaxTabSpacing = calculateMaxTabSpacing(null);
-        int selectedTabIndex = getTabSwitcher().getSelectedTabIndex();
-
-        if (selectedTabIndex > index) {
-            AbstractItemIterator iterator =
-                    new ItemIterator.Builder(getTabSwitcher(), tabViewRecycler).create();
-            AbstractItem selectedItem = iterator.getItem(selectedTabIndex);
-            float selectedTabSpacing = calculateMaxTabSpacing(selectedItem);
-            return (getTabSwitcher().getCount() - 2 - index) * defaultMaxTabSpacing +
-                    selectedTabSpacing;
-        }
-
-        return (getTabSwitcher().getCount() - 1 - index) * defaultMaxTabSpacing;
-    }
-
-    @Override
-    protected final float calculateSuccessorPosition(@NonNull final AbstractItem item,
-                                                     @NonNull final AbstractItem predecessor) {
-        float predecessorPosition = predecessor.getTag().getPosition();
-        float maxTabSpacing = calculateMaxTabSpacing(item);
-        return calculateSuccessorPosition(predecessorPosition, maxTabSpacing);
-    }
-
-    @Override
-    protected final float calculatePredecessorPosition(@NonNull final AbstractItem item,
-                                                       @NonNull final AbstractItem successor) {
-        float successorPosition = successor.getTag().getPosition();
-        return successorPosition + calculateMaxTabSpacing(successor);
-    }
-
-    @Nullable
-    @Override
-    public final ViewGroup getTabContainer() {
-        return tabContainer;
-    }
-
-    @NonNull
-    @Override
-    public final Toolbar[] getToolbars() {
-        return toolbar != null ? new Toolbar[]{toolbar} : null;
-    }
-
-    @Override
-    public final void onDecoratorChanged(@NonNull final TabSwitcherDecorator decorator) {
-        adaptDecorator();
-        super.onDecoratorChanged(decorator);
-    }
-
-    @Override
-    public final void onSwitcherShown() {
-        getLogger().logInfo(getClass(), "Showed tab switcher");
-        animateShowSwitcher(-1, -1);
-    }
-
-    @Override
-    public final void onSwitcherHidden() {
-        getLogger().logInfo(getClass(), "Hid tab switcher");
-        animateHideSwitcher();
-    }
-
-    @Override
-    public final void onSelectionChanged(final int previousIndex, final int index,
-                                         @Nullable final Tab selectedTab,
-                                         final boolean switcherHidden) {
-        getLogger().logInfo(getClass(), "Selected tab at index " + index);
-
-        if (switcherHidden) {
-            animateHideSwitcher();
-        } else {
-            tabViewRecycler
-                    .remove(TabItem.create(getTabSwitcher(), tabViewRecycler, previousIndex));
-            tabViewRecycler.inflate(TabItem.create(getTabSwitcher(), tabViewRecycler, index));
-        }
-    }
-
-    @Override
-    public final void onTabAdded(final int index, @NonNull final Tab tab,
-                                 final int previousSelectedTabIndex, final int selectedTabIndex,
-                                 final boolean selectionChanged,
-                                 final boolean switcherVisibilityChanged,
-                                 @NonNull final Animation animation) {
-        getLogger().logInfo(getClass(),
-                "Added tab at index " + index + " using a " + animation.getClass().getSimpleName());
-
-        if (animation instanceof PeekAnimation && getModel().getCount() > 1) {
-            Condition.INSTANCE.ensureTrue(switcherVisibilityChanged,
-                    animation.getClass().getSimpleName() +
-                            " not supported when the tab switcher is shown");
-            PeekAnimation peekAnimation = (PeekAnimation) animation;
-            AbstractItem item = TabItem.create(getModel(), 0, tab);
-            inflateView(item, createPeekLayoutListener(item, peekAnimation));
-        } else if (animation instanceof RevealAnimation && switcherVisibilityChanged) {
-            AbstractItem item = TabItem.create(getModel(), 0, tab);
-            RevealAnimation revealAnimation = (RevealAnimation) animation;
-            inflateView(item, createRevealLayoutListener(item, revealAnimation));
-        } else {
-            addAllTabs(index, new Tab[]{tab}, animation);
-        }
-
-        adaptEmptyView(
-                getModel().isSwitcherShown() ? getModel().getEmptyViewAnimationDuration() : 0);
-    }
-
-    @Override
-    public final void onAllTabsAdded(final int index, @NonNull final Tab[] tabs,
-                                     final int previousSelectedTabIndex, final int selectedTabIndex,
-                                     final boolean selectionChanged,
-                                     @NonNull final Animation animation) {
-        Condition.INSTANCE.ensureTrue(animation instanceof SwipeAnimation,
-                animation.getClass().getSimpleName() + " not supported for adding multiple tabs");
-        getLogger().logInfo(getClass(),
-                "Added " + tabs.length + " tabs at index " + index + " using a " +
-                        animation.getClass().getSimpleName());
-        addAllTabs(index, tabs, animation);
-    }
-
-    @Override
-    public final void onTabRemoved(final int index, @NonNull final Tab tab,
-                                   final int previousSelectedTabIndex, final int selectedTabIndex,
-                                   final boolean selectionChanged,
-                                   @NonNull final Animation animation) {
-        Condition.INSTANCE.ensureTrue(animation instanceof SwipeAnimation,
-                animation.getClass().getSimpleName() + " not supported for removing tabs");
-        getLogger().logInfo(getClass(), "Removed tab at index " + index + " using a " +
-                animation.getClass().getSimpleName());
-        AbstractItem removedItem = TabItem.create(getModel(), tabViewRecycler, index, tab);
-
-        if (!getModel().isSwitcherShown()) {
-            tabViewRecycler.remove(removedItem);
-
-            if (getModel().isEmpty()) {
-                toolbar.setAlpha(getModel().areToolbarsShown() ? 1 : 0);
-            } else if (selectionChanged) {
-                tabViewRecycler.inflate(
-                        TabItem.create(getTabSwitcher(), tabViewRecycler, selectedTabIndex));
-            }
-        } else {
-            adaptStackOnSwipe(removedItem, removedItem.getIndex(), getModel().getCount());
-            removedItem.getTag().setClosing(true);
-            SwipeAnimation swipeAnimation =
-                    animation instanceof SwipeAnimation ? (SwipeAnimation) animation :
-                            new SwipeAnimation.Builder().create();
-
-            if (removedItem.isInflated()) {
-                animateRemove(removedItem, swipeAnimation);
-            } else {
-                boolean start = isStackedAtStart(index);
-                AbstractItem predecessor =
-                        TabItem.create(getTabSwitcher(), tabViewRecycler, index - 1);
-                Pair<Float, State> pair = start ?
-                        calculatePositionAndStateWhenStackedAtStart(getModel().getCount(), index,
-                                predecessor) : calculatePositionAndStateWhenStackedAtEnd(index);
-                removedItem.getTag().setPosition(pair.first);
-                removedItem.getTag().setState(pair.second);
-                inflateAndUpdateView(removedItem, false,
-                        createRemoveLayoutListener(removedItem, swipeAnimation));
-            }
-        }
-
-        adaptEmptyView(
-                getModel().isSwitcherShown() ? getModel().getEmptyViewAnimationDuration() : 0);
-    }
-
-    @Override
-    public final void onAllTabsRemoved(@NonNull final Tab[] tabs,
-                                       @NonNull final Animation animation) {
-        Condition.INSTANCE.ensureTrue(animation instanceof SwipeAnimation,
-                animation.getClass().getSimpleName() + " not supported for removing tabs ");
-        getLogger().logInfo(getClass(),
-                "Removed all tabs using a " + animation.getClass().getSimpleName());
-
-        if (!getModel().isSwitcherShown()) {
-            tabViewRecycler.removeAll();
-            toolbar.setAlpha(getModel().areToolbarsShown() ? 1 : 0);
-        } else {
-            SwipeAnimation swipeAnimation =
-                    animation instanceof SwipeAnimation ? (SwipeAnimation) animation :
-                            new SwipeAnimation.Builder().create();
-            AbstractItemIterator iterator =
-                    new ArrayItemIterator.Builder(getModel(), tabViewRecycler, tabs, 0)
-                            .reverse(true).create();
-            AbstractItem item;
-            int delayMultiplier = 0;
-
-            while ((item = iterator.next()) != null) {
-                AbstractItem previous = iterator.previous();
-
-                if (item.getTag().getState() == State.FLOATING ||
-                        (previous != null && previous.getTag().getState() == State.FLOATING)) {
-                    delayMultiplier++;
-                }
-
-                if (item.isInflated()) {
-                    animateSwipe(item, true, delayMultiplier, swipeAnimation,
-                            !iterator.hasNext() ? createClearAnimationListener() : null);
-                }
-            }
-        }
-
-        adaptEmptyView(
-                getModel().isSwitcherShown() ? getModel().getEmptyViewAnimationDuration() : 0);
-    }
-
-    @Override
-    public final void onPaddingChanged(final int left, final int top, final int right,
-                                       final int bottom) {
-        // TODO: Detach and re-inflate tabs
-        adaptToolbarMargin();
-    }
-
-    @Override
-    public final void onApplyPaddingToTabsChanged(final boolean applyPaddingToTabs) {
-
-    }
-
-    @Override
-    public final void onEmptyViewChanged(@Nullable final View view, final long animationDuration) {
-        if (getModel().isEmpty()) {
-            adaptEmptyView(0);
-        }
-    }
-
-    @Override
-    public final void onGlobalLayout() {
-        if (getModel().isSwitcherShown()) {
-            AbstractItem[] items = calculateInitialItems(getModel().getReferenceTabIndex(),
-                    getModel().getReferenceTabPosition());
-            AbstractItemIterator iterator = new InitialItemIteratorBuilder(items).create();
-            AbstractItem item;
-
-            while ((item = iterator.next()) != null) {
-                if (item.isVisible()) {
-                    inflateAndUpdateView(item, false, createBottomMarginLayoutListener(item));
-                }
-            }
-        } else if (getModel().getSelectedTab() != null) {
-            AbstractItem item = TabItem.create(getTabSwitcher(), tabViewRecycler,
-                    getModel().getSelectedTabIndex());
-            tabViewRecycler.inflate(item);
-        }
-
-        boolean showToolbar = getModel().areToolbarsShown() &&
-                (getModel().isEmpty() || getModel().isSwitcherShown());
-        toolbar.setAlpha(showToolbar ? 1 : 0);
-        toolbar.setVisibility(showToolbar ? View.VISIBLE : View.INVISIBLE);
-        adaptEmptyView(0);
-    }
-
-    @Override
-    public final void onRevertStartOvershoot() {
-        animateRevertStartOvershoot();
-        getLogger().logVerbose(getClass(), "Reverting overshoot at the start");
-    }
-
-    @Override
-    public final void onRevertEndOvershoot() {
-        animateRevertEndOvershoot();
-        getLogger().logVerbose(getClass(), "Reverting overshoot at the end");
-    }
-
-    public final void onStartOvershoot(final float position) {
-        startOvershoot(position);
-        getLogger().logVerbose(getClass(),
-                "Overshooting at the start using a position of " + position + " pixels");
-    }
-
-    @Override
-    public final void onTiltOnStartOvershoot(final float angle) {
-        tiltOnStartOvershoot(angle);
-        getLogger().logVerbose(getClass(),
-                "Tilting on start overshoot using an angle of " + angle + " degrees");
-    }
-
-    @Override
-    public final void onTiltOnEndOvershoot(final float angle) {
-        tiltOnEndOvershoot(angle);
-        getLogger().logVerbose(getClass(),
-                "Tilting on end overshoot using an angle of " + angle + " degrees");
-    }
-
-    @Override
-    public final void onSwipe(@NonNull final TabItem tabItem, final float distance) {
-        swipe(tabItem, distance);
-        getLogger().logVerbose(getClass(),
-                "Swiping tab at index " + tabItem.getIndex() + ". Current swipe distance is " +
-                        distance + " pixels");
-    }
-
-    @Override
-    public final void onSwipeEnded(@NonNull final TabItem tabItem, final boolean remove,
-                                   final float velocity) {
-        if (remove) {
-            SwipeDirection direction =
-                    getArithmetics().getPosition(Axis.ORTHOGONAL_AXIS, tabItem) < 0 ?
-                            SwipeDirection.LEFT_OR_TOP : SwipeDirection.RIGHT_OR_BOTTOM;
-            long animationDuration =
-                    velocity > 0 ? Math.round((calculateSwipePosition() / velocity) * 1000) : -1;
-            Animation animation = new SwipeAnimation.Builder().setDirection(direction)
-                    .setDuration(animationDuration).create();
-            getModel().removeTab(tabItem.getTab(), animation);
-        } else {
-            animateSwipe(tabItem, false, 0, new SwipeAnimation.Builder().create(),
-                    createSwipeAnimationListener(tabItem));
-        }
-
-        getLogger().logVerbose(getClass(),
-                "Ended swiping tab at index " + tabItem.getIndex() + ". Tab will " +
-                        (remove ? "" : "not ") + "be removed");
-    }
-
-    @Override
-    public final void onSwitchingBetweenTabs(final int selectedTabIndex, final float distance) {
-        TabItem tabItem = TabItem.create(getModel(), getTabViewRecycler(), selectedTabIndex);
-
-        if (distance == 0 || (distance > 0 && selectedTabIndex < getModel().getCount() - 1) ||
-                (distance < 0 && selectedTabIndex > 0)) {
-            getArithmetics().setPosition(Axis.X_AXIS, tabItem, distance);
-            float position = getArithmetics().getPosition(Axis.X_AXIS, tabItem);
-
-            if (distance != 0) {
-                TabItem neighbor = TabItem.create(getModel(), getTabViewRecycler(),
-                        position > 0 ? selectedTabIndex + 1 : selectedTabIndex - 1);
-
-                if (Math.abs(position) >= swipedTabDistance) {
-                    inflateView(neighbor, createSwipeNeighborLayoutListener(neighbor, distance));
-                } else {
-                    getTabViewRecycler().remove(neighbor);
-                }
-            }
-        } else {
-            float position = (float) Math.pow(Math.abs(distance), 0.75);
-            position = distance < 0 ? position * -1 : position;
-            getArithmetics().setPosition(Axis.X_AXIS, tabItem, position);
-        }
-
-        getLogger().logVerbose(getClass(), "Swiping content of tab at index " + selectedTabIndex +
-                ". Current swipe distance is " + distance + " pixels");
-    }
-
-    @Override
-    public final void onSwitchingBetweenTabsEnded(final int selectedTabIndex,
-                                                  final int previousSelectedTabIndex,
-                                                  final boolean selectionChanged,
-                                                  final float velocity,
-                                                  final long animationDuration) {
-        TabItem selectedTabItem =
-                TabItem.create(getModel(), getTabViewRecycler(), selectedTabIndex);
-        animateSwipe(selectedTabItem, 0, true, animationDuration, velocity);
-        TabItem neighbor = null;
-        boolean left = false;
-
-        if (selectionChanged) {
-            neighbor = TabItem.create(getModel(), getTabViewRecycler(), previousSelectedTabIndex);
-            left = selectedTabIndex < previousSelectedTabIndex;
-        } else if (getArithmetics().getPosition(Axis.X_AXIS, selectedTabItem) > 0) {
-            if (selectedTabIndex + 1 < getModel().getCount()) {
-                neighbor = TabItem.create(getModel(), getTabViewRecycler(), selectedTabIndex + 1);
-                left = true;
-            }
-        } else {
-            if (selectedTabIndex - 1 >= 0) {
-                neighbor = TabItem.create(getModel(), getTabViewRecycler(), selectedTabIndex - 1);
-                left = false;
-            }
-        }
-
-        if (neighbor != null && neighbor.isInflated()) {
-            float width = getArithmetics().getSize(Axis.X_AXIS, neighbor);
-            float targetPosition =
-                    left ? (width + swipedTabDistance) * -1 : width + swipedTabDistance;
-            animateSwipe(neighbor, targetPosition, false, animationDuration, velocity);
-        }
-    }
-
-    @Override
-    public final void onPulledDown() {
-        getModel().removeListener(this);
-        getModel().showSwitcher();
-        getModel().addListener(this);
-
-        if (getTabSwitcher().getLayout() == Layout.PHONE_LANDSCAPE) {
-            animateShowSwitcher(-1, -1);
-        } else {
-            animateShowSwitcher(getModel().getSelectedTabIndex(), 0);
-        }
-
-        getDragHandler().getDragHelper().reset();
-        getDragHandler().setPointerId(0);
-        getDragHandler().setDragState(DragState.PULLING_DOWN);
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PhoneTabViewHolder.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PhoneTabViewHolder.java
deleted file mode 100644
index d087b7c2..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PhoneTabViewHolder.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.layout.phone;
-
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.layout.AbstractTabViewHolder;
-
-/**
- * A view holder, which allows to store references to the views, a tab of a {@link TabSwitcher}
- * consists of, when using the smartphone layout.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public class PhoneTabViewHolder extends AbstractTabViewHolder {
-
-    /**
-     * The view group, which contains the view, which is associated with a tab.
-     */
-    public ViewGroup contentContainer;
-
-    /**
-     * The view, which is associated with a tab.F
-     */
-    public View content;
-
-    /**
-     * The image view, which is used to display the preview of a tab.
-     */
-    public ImageView previewImageView;
-
-    /**
-     * The view, which is used to display a border around the preview of a tab.
-     */
-    public View borderView;
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PreviewDataBinder.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PreviewDataBinder.java
deleted file mode 100644
index 8a12ed12..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/phone/PreviewDataBinder.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.layout.phone;
-
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.os.Looper;
-import android.view.View;
-import android.view.View.MeasureSpec;
-import android.view.ViewGroup;
-import android.view.animation.AccelerateDecelerateInterpolator;
-import android.widget.ImageView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.collection.LruCache;
-import androidx.core.util.Pair;
-import de.mrapp.android.tabswitcher.Tab;
-import de.mrapp.android.tabswitcher.model.Model;
-import de.mrapp.android.tabswitcher.model.TabItem;
-import de.mrapp.android.util.multithreading.AbstractDataBinder;
-import de.mrapp.android.util.view.ViewRecycler;
-import de.mrapp.util.Condition;
-
-/**
- * A data binder, which allows to asynchronously render preview images of tabs and display them
- * afterwards.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public class PreviewDataBinder extends AbstractDataBinder<Bitmap, Tab, ImageView, TabItem> {
-
-    /**
-     * The parent view of the tab switcher, the tabs belong to.
-     */
-    private final ViewGroup parent;
-
-    /**
-     * The view recycler, which is used to inflate the views, which are associated with tabs.
-     */
-    private final ViewRecycler<Tab, Void> contentViewRecycler;
-
-    /**
-     * The model of the tab switcher, the tabs belong to.
-     */
-    private final Model model;
-
-    /**
-     * Creates a new data binder, which allows to asynchronously render preview images of tabs and
-     * display them afterwards.
-     *
-     * @param parent
-     *         The parent view of the tab switcher, the tabs belong to, as an instance of the class
-     *         {@link ViewGroup}. The parent may not be null
-     * @param contentViewRecycler
-     *         The view recycler, which should be used to inflate the views, which are associated
-     *         with tabs, as an instance of the class ViewRecycler. The view recycler may not be
-     *         null
-     * @param model
-     *         The model of the tab switcher, the tabs belong to, as an instance of the type {@link
-     *         Model}. The model may not be null
-     */
-    public PreviewDataBinder(@NonNull final ViewGroup parent,
-                             @NonNull final ViewRecycler<Tab, Void> contentViewRecycler,
-                             @NonNull final Model model) {
-        super(parent.getContext().getApplicationContext(), new LruCache<Tab, Bitmap>(7));
-        Condition.INSTANCE.ensureNotNull(parent, "The parent may not be null");
-        Condition.INSTANCE
-                .ensureNotNull(contentViewRecycler, "The content view recycler may not be null");
-        this.parent = parent;
-        this.contentViewRecycler = contentViewRecycler;
-        this.model = model;
-    }
-
-    @Override
-    protected final void onPreExecute(@NonNull final ImageView view,
-                                      @NonNull final TabItem... params) {
-        TabItem tabItem = params[0];
-        PhoneTabViewHolder viewHolder = (PhoneTabViewHolder) tabItem.getViewHolder();
-        View content = viewHolder.content;
-        Tab tab = tabItem.getTab();
-
-        if (content == null) {
-            Pair<View, ?> pair = contentViewRecycler.inflate(tab, viewHolder.contentContainer);
-            content = pair.first;
-        } else {
-            contentViewRecycler.getAdapter().onShowView(getContext(), content, tab, false);
-        }
-
-        viewHolder.content = content;
-    }
-
-    @NonNull
-    @Override
-    protected final Bitmap doInBackground(@NonNull final Tab key,
-                                          @NonNull final TabItem... params) {
-        if (Looper.myLooper() == null) {
-            Looper.prepare();
-        }
-
-        TabItem tabItem = params[0];
-        PhoneTabViewHolder viewHolder = (PhoneTabViewHolder) tabItem.getViewHolder();
-        View content = viewHolder.content;
-        viewHolder.content = null;
-        int width = parent.getWidth();
-        int height = parent.getHeight();
-        content.measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
-                MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY));
-        content.layout(0, 0, content.getMeasuredWidth(), content.getMeasuredHeight());
-        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(bitmap);
-        content.draw(canvas);
-        return bitmap;
-    }
-
-    @Override
-    protected final void onPostExecute(@NonNull final ImageView view, @Nullable final Bitmap data,
-                                       final long duration, @NonNull final TabItem... params) {
-        view.setImageBitmap(data);
-
-        if (data != null) {
-            boolean useFadeAnimation = duration > model.getTabPreviewFadeThreshold();
-            view.setAlpha(useFadeAnimation ? 0f : 1f);
-            view.setVisibility(View.VISIBLE);
-
-            if (useFadeAnimation) {
-                view.animate().alpha(1f).setDuration(model.getTabPreviewFadeDuration())
-                        .setInterpolator(new AccelerateDecelerateInterpolator()).start();
-            }
-        } else {
-            view.setVisibility(View.INVISIBLE);
-        }
-
-        view.setVisibility(data != null ? View.VISIBLE : View.GONE);
-        TabItem tabItem = params[0];
-        contentViewRecycler.remove(tabItem.getTab());
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletArithmetics.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletArithmetics.java
deleted file mode 100644
index 118767b0..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletArithmetics.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.layout.tablet;
-
-import android.content.res.Resources;
-import android.view.Gravity;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewPropertyAnimator;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.Toolbar;
-import de.mrapp.android.tabswitcher.R;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.layout.AbstractArithmetics;
-import de.mrapp.android.tabswitcher.layout.AbstractDragTabsEventHandler.DragState;
-import de.mrapp.android.tabswitcher.model.AbstractItem;
-import de.mrapp.util.Condition;
-
-/**
- * Provides methods, which allow to calculate the position, size and rotation of a {@link
- * TabSwitcher}'s tabs, when using the tablet layout.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public class TabletArithmetics extends AbstractArithmetics {
-
-    /**
-     * The height of a tab in pixels.
-     */
-    private final int tabHeight;
-
-    /**
-     * The height of the container, which contains tabs, in pixels.
-     */
-    private final int tabContainerHeight;
-
-    /**
-     * The offset between two neighboring tabs in pixels.
-     */
-    private final int tabOffset;
-
-    /**
-     * The offset between a button, which allows to add a new tab, and a neighboring tab.
-     */
-    private final int addTabButtonOffset;
-
-    /**
-     * Creates a new class, which provides methods, which allow to calculate the position, size and
-     * rotation of a {@link TabSwitcher}'s tabs, when using the tablet layout.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, the arithmetics should be calculated for, as an instance of the
-     *         class {@link TabSwitcher}. The tab switcher may not be null
-     */
-    public TabletArithmetics(@NonNull final TabSwitcher tabSwitcher) {
-        super(tabSwitcher);
-        Resources resources = tabSwitcher.getResources();
-        tabHeight = resources.getDimensionPixelSize(R.dimen.tablet_tab_height);
-        tabContainerHeight = resources.getDimensionPixelSize(R.dimen.tablet_tab_container_height);
-        tabOffset = resources.getDimensionPixelSize(R.dimen.tablet_tab_offset);
-        addTabButtonOffset = resources.getDimensionPixelSize(R.dimen.tablet_add_tab_button_offset);
-    }
-
-    @Override
-    public final int getTabSwitcherPadding(@NonNull final Axis axis, final int gravity) {
-        Condition.INSTANCE.ensureNotNull(axis, "The axis may not be null");
-        Condition.INSTANCE
-                .ensureTrue(gravity == Gravity.START || gravity == Gravity.END, "Invalid gravity");
-        if (axis == Axis.DRAGGING_AXIS) {
-            return gravity == Gravity.START ? getTabSwitcher().getPaddingLeft() :
-                    getTabSwitcher().getPaddingRight();
-        } else {
-            return gravity == Gravity.START ? getTabSwitcher().getPaddingTop() :
-                    getTabSwitcher().getPaddingBottom();
-        }
-    }
-
-    @Override
-    public final float getTabContainerSize(@NonNull final Axis axis, final boolean includePadding) {
-        Condition.INSTANCE.ensureNotNull(axis, "The axis may not be null");
-
-        if (axis == Axis.DRAGGING_AXIS) {
-            ViewGroup tabContainer = getTabSwitcher().getTabContainer();
-            assert tabContainer != null;
-            float size = tabContainer.getWidth();
-            int padding = !includePadding ?
-                    getTabSwitcher().getPaddingRight() + getTabSwitcher().getPaddingLeft() : 0;
-            Toolbar[] toolbars = getTabSwitcher().getToolbars();
-            float primaryToolbarSize =
-                    !includePadding && getTabSwitcher().areToolbarsShown() && toolbars != null ?
-                            Math.max(0, toolbars[TabSwitcher.PRIMARY_TOOLBAR_INDEX].getWidth() -
-                                    tabOffset) : 0;
-            float secondaryToolbarSize =
-                    !includePadding && getTabSwitcher().areToolbarsShown() && toolbars != null ?
-                            Math.max(0, toolbars[TabSwitcher.SECONDARY_TOOLBAR_INDEX].getWidth() -
-                                    (getTabSwitcher().isAddTabButtonShown() ? addTabButtonOffset :
-                                            0)) : 0;
-            return size - padding - primaryToolbarSize - secondaryToolbarSize;
-        } else {
-            return tabContainerHeight;
-        }
-    }
-
-    @Override
-    public final float getTouchPosition(@NonNull final Axis axis,
-                                        @NonNull final MotionEvent event) {
-        Condition.INSTANCE.ensureNotNull(axis, "The axis may not be null");
-        Condition.INSTANCE.ensureNotNull(event, "The motion event may not be null");
-
-        if (axis == Axis.DRAGGING_AXIS) {
-            return event.getX();
-        } else {
-            return event.getY();
-        }
-    }
-
-    @Override
-    public final float getPosition(@NonNull final Axis axis, @NonNull final AbstractItem item) {
-        Condition.INSTANCE.ensureNotNull(axis, "The axis may not be null");
-        Condition.INSTANCE.ensureNotNull(item, "The view may not be null");
-        View view = item.getView();
-
-        if (axis == Axis.DRAGGING_AXIS) {
-            Toolbar[] toolbars = getTabSwitcher().getToolbars();
-            return view.getX() - (getTabSwitcher().areToolbarsShown() && toolbars != null ?
-                    Math.max(0,
-                            toolbars[TabSwitcher.PRIMARY_TOOLBAR_INDEX].getWidth() - tabOffset) :
-                    0);
-        } else {
-            return view.getY() - (tabContainerHeight - tabHeight);
-        }
-    }
-
-    @Override
-    public final void setPosition(@NonNull final Axis axis, @NonNull final AbstractItem item,
-                                  final float position) {
-        Condition.INSTANCE.ensureNotNull(axis, "The axis may not be null");
-        Condition.INSTANCE.ensureNotNull(item, "The item may not be null");
-        View view = item.getView();
-
-        if (axis == Axis.DRAGGING_AXIS) {
-            Toolbar[] toolbars = getTabSwitcher().getToolbars();
-            view.setX((getTabSwitcher().areToolbarsShown() && toolbars != null ? Math.max(0,
-                    toolbars[TabSwitcher.PRIMARY_TOOLBAR_INDEX].getWidth() - tabOffset) : 0) +
-                    position);
-        } else {
-            view.setY((tabContainerHeight - tabHeight) + position);
-        }
-    }
-
-    @Override
-    public final void animatePosition(@NonNull final Axis axis,
-                                      @NonNull final ViewPropertyAnimator animator,
-                                      @NonNull final AbstractItem item, final float position,
-                                      final boolean includePadding) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public final float getScale(@NonNull final AbstractItem item, final boolean includePadding) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public final void setScale(@NonNull final Axis axis, @NonNull final AbstractItem item,
-                               final float scale) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public final void animateScale(@NonNull final Axis axis,
-                                   @NonNull final ViewPropertyAnimator animator,
-                                   final float scale) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public final float getSize(@NonNull final Axis axis, @NonNull final AbstractItem item) {
-        View view = item.getView();
-
-        if (axis == Axis.DRAGGING_AXIS) {
-            return view.getWidth();
-        } else {
-            return view.getHeight();
-        }
-    }
-
-    @Override
-    public final float getPivot(@NonNull final Axis axis, @NonNull final AbstractItem item,
-                                @NonNull final DragState dragState) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void setPivot(@NonNull final Axis axis, @NonNull final AbstractItem item,
-                         final float pivot) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public final float getRotation(@NonNull final Axis axis, @NonNull final AbstractItem item) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public final void setRotation(@NonNull final Axis axis, @NonNull final AbstractItem item,
-                                  final float angle) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public final void animateRotation(@NonNull final Axis axis,
-                                      @NonNull final ViewPropertyAnimator animator,
-                                      final float angle) {
-        throw new UnsupportedOperationException();
-    }
-
-}
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletContentRecyclerAdapterWrapper.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletContentRecyclerAdapterWrapper.java
deleted file mode 100644
index 282fefdf..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletContentRecyclerAdapterWrapper.java
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.layout.tablet;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.MenuRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
-import de.mrapp.android.tabswitcher.Animation;
-import de.mrapp.android.tabswitcher.Tab;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.TabSwitcherDecorator;
-import de.mrapp.android.tabswitcher.layout.ContentRecyclerAdapter;
-import de.mrapp.android.tabswitcher.model.Model;
-import de.mrapp.android.tabswitcher.model.Restorable;
-import de.mrapp.android.tabswitcher.model.TabSwitcherStyle;
-import de.mrapp.android.util.logging.LogLevel;
-import de.mrapp.android.util.view.AbstractViewRecycler;
-import de.mrapp.android.util.view.AttachedViewRecycler;
-import de.mrapp.util.Condition;
-
-/**
- * A wrapper, which encapsulates a {@link ContentRecyclerAdapter}, which allows to inflate the
- * views, which are used to visualize the content views of the tabs of a {@link TabSwitcher}. The
- * wrapper enables to adapt the views for use with the tablet layout.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public class TabletContentRecyclerAdapterWrapper extends AbstractViewRecycler.Adapter<Tab, Void>
-        implements Restorable, Tab.Callback, Model.Listener {
-
-    /**
-     * The tab switcher, the recycler adapter belongs to.
-     */
-    private final TabSwitcher tabSwitcher;
-
-    /**
-     * The style, which allows to retrieve style attributes of the tab switcher.
-     */
-    private final TabSwitcherStyle style;
-
-    /**
-     * The view recycler, the recycler adapter is attached to.
-     */
-    private final AttachedViewRecycler<Tab, ?> viewRecycler;
-
-    /**
-     * The encapsulated view recycler adapter.
-     */
-    private final ContentRecyclerAdapter encapsulatedAdapter;
-
-    /**
-     * Adapts the background color of a specific tab's content.
-     *
-     * @param view
-     *         The view, which is used to visualize the tab's content, as an instance of the class
-     *         {@link View}. The view may not be null
-     * @param tab
-     *         The tab as an instance of the class {@link Tab}. The tab may not be null
-     */
-    private void adaptContentBackgroundColor(@NonNull final View view, @NonNull final Tab tab) {
-        int color = style.getTabContentBackgroundColor(tab);
-        view.setBackgroundColor(color);
-    }
-
-    /**
-     * Creates a new wrapper, which encapsulates a {@link ContentRecyclerAdapter}, which allows to
-     * inflate the views, which are used to visualize the content views of the tabs of a {@link
-     * TabSwitcher}.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, the recycler adapter belongs to, as an instance of the class {@link
-     *         TabSwitcher}. The tab switcher may not be null
-     * @param style
-     *         The style, which allows to retrieve style attributes of the tab switcher, as an
-     *         instance of the class {@link TabSwitcherStyle}. The style may not be null
-     * @param viewRecycler
-     *         The view recycler, the adapter is attached to, as an instance of the class
-     *         AttachedViewRecycler. The view recycler may not be null
-     * @param encapsulatedAdapter
-     *         The view recycler adapter, which should be encapsulated, as an instance of the class
-     *         {@link ContentRecyclerAdapter}. The recycler adapter may not be null
-     */
-    public TabletContentRecyclerAdapterWrapper(@NonNull final TabSwitcher tabSwitcher,
-                                               @NonNull final TabSwitcherStyle style,
-                                               @NonNull final AttachedViewRecycler<Tab, ?> viewRecycler,
-                                               @NonNull final ContentRecyclerAdapter encapsulatedAdapter) {
-        Condition.INSTANCE.ensureNotNull(tabSwitcher, "The tab switcher may not be null");
-        Condition.INSTANCE.ensureNotNull(style, "The style may not be null");
-        Condition.INSTANCE.ensureNotNull(viewRecycler, "The view recycler may not be null");
-        Condition.INSTANCE
-                .ensureNotNull(encapsulatedAdapter, "The recycler adapter may not be null");
-        this.tabSwitcher = tabSwitcher;
-        this.style = style;
-        this.viewRecycler = viewRecycler;
-        this.encapsulatedAdapter = encapsulatedAdapter;
-    }
-
-    @NonNull
-    @Override
-    public final View onInflateView(@NonNull final LayoutInflater inflater,
-                                    @Nullable final ViewGroup parent, @NonNull final Tab item,
-                                    final int viewType, @NonNull final Void... params) {
-        View view = encapsulatedAdapter.onInflateView(inflater, parent, item, viewType, params);
-        FrameLayout container = new FrameLayout(tabSwitcher.getContext());
-        container.setPadding(tabSwitcher.getPaddingLeft(), 0, tabSwitcher.getPaddingRight(),
-                tabSwitcher.getPaddingBottom());
-        container.setLayoutParams(
-                new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT,
-                        FrameLayout.LayoutParams.MATCH_PARENT));
-        container.addView(view);
-        return container;
-    }
-
-    @Override
-    public final void onShowView(@NonNull final Context context, @NonNull final View view,
-                                 @NonNull final Tab item, final boolean inflated,
-                                 @NonNull final Void... params) {
-        encapsulatedAdapter.onShowView(context, view, item, inflated, params);
-        item.addCallback(this);
-        adaptContentBackgroundColor(view, item);
-    }
-
-    @Override
-    public final void onRemoveView(@NonNull final View view, @NonNull final Tab item) {
-        encapsulatedAdapter.onRemoveView(view, item);
-        item.removeCallback(this);
-    }
-
-    @Override
-    public final int getViewTypeCount() {
-        return encapsulatedAdapter.getViewTypeCount();
-    }
-
-    @Override
-    public final int getViewType(@NonNull final Tab item) {
-        return encapsulatedAdapter.getViewType(item);
-    }
-
-    @Override
-    public final void saveInstanceState(@NonNull final Bundle outState) {
-        encapsulatedAdapter.saveInstanceState(outState);
-    }
-
-    @Override
-    public final void restoreInstanceState(@Nullable final Bundle savedInstanceState) {
-        encapsulatedAdapter.restoreInstanceState(savedInstanceState);
-    }
-
-    @Override
-    public final void onTitleChanged(@NonNull final Tab tab) {
-
-    }
-
-    @Override
-    public final void onIconChanged(@NonNull final Tab tab) {
-
-    }
-
-    @Override
-    public final void onCloseableChanged(@NonNull final Tab tab) {
-
-    }
-
-    @Override
-    public final void onCloseButtonIconChanged(@NonNull final Tab tab) {
-
-    }
-
-    @Override
-    public final void onBackgroundColorChanged(@NonNull final Tab tab) {
-
-    }
-
-    @Override
-    public final void onContentBackgroundColorChanged(@NonNull final Tab tab) {
-        View view = viewRecycler.getView(tab);
-
-        if (view != null) {
-            adaptContentBackgroundColor(view, tab);
-        }
-    }
-
-    @Override
-    public final void onTitleTextColorChanged(@NonNull final Tab tab) {
-
-    }
-
-    @Override
-    public final void onProgressBarVisibilityChanged(@NonNull final Tab tab) {
-
-    }
-
-    @Override
-    public final void onProgressBarColorChanged(@NonNull final Tab tab) {
-
-    }
-
-    @Override
-    public final void onLogLevelChanged(@NonNull final LogLevel logLevel) {
-
-    }
-
-    @Override
-    public final void onDecoratorChanged(@NonNull final TabSwitcherDecorator decorator) {
-
-    }
-
-    @Override
-    public final void onSwitcherShown() {
-
-    }
-
-    @Override
-    public final void onSwitcherHidden() {
-
-    }
-
-    @Override
-    public final void onSelectionChanged(final int previousIndex, final int index,
-                                         @Nullable final Tab selectedTab,
-                                         final boolean switcherHidden) {
-
-    }
-
-    @Override
-    public final void onTabAdded(final int index, @NonNull final Tab tab,
-                                 final int previousSelectedTabIndex, final int selectedTabIndex,
-                                 final boolean selectionChanged,
-                                 final boolean switcherVisibilityChanged,
-                                 @NonNull final Animation animation) {
-
-    }
-
-    @Override
-    public final void onAllTabsAdded(final int index, @NonNull final Tab[] tabs,
-                                     final int previousSelectedTabIndex, final int selectedTabIndex,
-                                     final boolean selectionChanged,
-                                     @NonNull final Animation animation) {
-
-    }
-
-    @Override
-    public final void onTabRemoved(final int index, @NonNull final Tab tab,
-                                   final int previousSelectedTabIndex, final int selectedTabIndex,
-                                   final boolean selectionChanged,
-                                   @NonNull final Animation animation) {
-
-    }
-
-    @Override
-    public final void onAllTabsRemoved(@NonNull final Tab[] tabs,
-                                       @NonNull final Animation animation) {
-
-    }
-
-    @Override
-    public final void onPaddingChanged(final int left, final int top, final int right,
-                                       final int bottom) {
-
-    }
-
-    @Override
-    public final void onApplyPaddingToTabsChanged(final boolean applyPaddingToTabs) {
-
-    }
-
-    @Override
-    public final void onTabIconChanged(@Nullable final Drawable icon) {
-
-    }
-
-    @Override
-    public final void onTabBackgroundColorChanged(@Nullable final ColorStateList colorStateList) {
-
-    }
-
-    @Override
-    public final void onTabContentBackgroundColorChanged(@ColorInt final int color) {
-        for (Tab tab : tabSwitcher) {
-            View view = viewRecycler.getView(tab);
-
-            if (view != null) {
-                adaptContentBackgroundColor(view, tab);
-            }
-        }
-    }
-
-    @Override
-    public final void onTabTitleColorChanged(@Nullable final ColorStateList colorStateList) {
-
-    }
-
-    @Override
-    public final void onTabCloseButtonIconChanged(@Nullable final Drawable icon) {
-
-    }
-
-    @Override
-    public final void onTabProgressBarColorChanged(@ColorInt final int color) {
-
-    }
-
-    @Override
-    public final void onAddTabButtonVisibilityChanged(final boolean visible) {
-
-    }
-
-    @Override
-    public final void onAddTabButtonColorChanged(@Nullable final ColorStateList colorStateList) {
-
-    }
-
-    @Override
-    public final void onToolbarVisibilityChanged(final boolean visible) {
-
-    }
-
-    @Override
-    public final void onToolbarTitleChanged(@Nullable final CharSequence title) {
-
-    }
-
-    @Override
-    public final void onToolbarNavigationIconChanged(@Nullable final Drawable icon,
-                                                     @Nullable final View.OnClickListener listener) {
-
-    }
-
-    @Override
-    public final void onToolbarMenuInflated(@MenuRes final int resourceId,
-                                            @Nullable final Toolbar.OnMenuItemClickListener listener) {
-
-    }
-
-    @Override
-    public final void onEmptyViewChanged(@Nullable final View view, final long animationDuration) {
-
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletDragTabsEventHandler.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletDragTabsEventHandler.java
deleted file mode 100644
index 2fb077b3..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletDragTabsEventHandler.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.layout.tablet;
-
-import android.content.res.Resources;
-import android.graphics.RectF;
-import android.view.Gravity;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
-import de.mrapp.android.tabswitcher.R;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.iterator.AbstractItemIterator;
-import de.mrapp.android.tabswitcher.iterator.ItemIterator;
-import de.mrapp.android.tabswitcher.layout.AbstractDragTabsEventHandler;
-import de.mrapp.android.tabswitcher.layout.Arithmetics;
-import de.mrapp.android.tabswitcher.layout.Arithmetics.Axis;
-import de.mrapp.android.tabswitcher.model.AbstractItem;
-import de.mrapp.android.tabswitcher.model.AddTabItem;
-import de.mrapp.android.tabswitcher.model.State;
-import de.mrapp.android.util.view.AttachedViewRecycler;
-import de.mrapp.util.Condition;
-
-/**
- * A drag handler, which allows to calculate the position and state of tabs on touch events, when
- * using the tablet layout.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public class TabletDragTabsEventHandler
-        extends AbstractDragTabsEventHandler<AbstractDragTabsEventHandler.Callback> {
-
-    /**
-     * The view recycler, which allows to inflate the views, which are used to visualize the tabs,
-     * whose positions and states are calculated by the drag handler.
-     */
-    private final AttachedViewRecycler<AbstractItem, ?> viewRecycler;
-
-    /**
-     * The offset between two neighboring tabs in pixels.
-     */
-    private final int tabOffset;
-
-    /**
-     * The height of the view group, which contains the tab switcher's tabs.
-     */
-    private final int tabContainerHeight;
-
-    /**
-     * Calculates and returns the position of a specific item, in relation to
-     * the position of the tab switcher.
-     *
-     * @param item
-     *         The item, whose position should be returned, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @return The position, which has been calculated, as a {@link Float} value
-     */
-    private float getViewPosition(@NonNull final AbstractItem item) {
-        Toolbar[] toolbars = getTabSwitcher().getToolbars();
-        float toolbarWidth = getTabSwitcher().areToolbarsShown() && toolbars != null ?
-                Math.max(0, toolbars[TabSwitcher.PRIMARY_TOOLBAR_INDEX].getWidth() - tabOffset) : 0;
-        return getArithmetics().getPosition(Axis.DRAGGING_AXIS, item) + toolbarWidth +
-                getArithmetics().getTabSwitcherPadding(Axis.DRAGGING_AXIS, Gravity.START);
-    }
-
-    /**
-     * Returns, whether a specific item is focusable, or not.
-     *
-     * @param item
-     *         The item, which should be checked, as an instance of the class {@link AbstractItem}.
-     *         The item may not be null
-     * @param selectedItemIndex
-     *         The index of the currently selected item as an {@link Integer} value
-     * @param successor
-     *         The successor of the given item as an instance of the class {@link AbstractItem} or
-     *         null, if the item does not have a successor
-     * @return True, if the given item is focusable, false otherwise
-     */
-    private boolean isItemFocusable(@NonNull final AbstractItem item, final int selectedItemIndex,
-                                    @Nullable final AbstractItem successor) {
-        return item instanceof AddTabItem || item.getIndex() == selectedItemIndex ||
-                item.getTag().getState() == State.FLOATING ||
-                item.getTag().getState() == State.STACKED_START_ATOP ||
-                (item.getTag().getState() == State.STACKED_END &&
-                        (successor == null || successor.getTag().getState() == State.FLOATING));
-    }
-
-    /**
-     * Creates a new drag handler, which allows to calculate the position and state of tabs on touch
-     * events, when using the tablet layout.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, whose tabs' positions and states should be calculated by the drag
-     *         handler, as an instance of the class {@link TabSwitcher}. The tab switcher may not be
-     *         null
-     * @param arithmetics
-     *         The arithmetics, which should be used to calculate the position, size and rotation of
-     *         tabs, as an instance of the type {@link Arithmetics}. The arithmetics may not be
-     *         null
-     * @param viewRecycler
-     *         The view recycler, which allows to inflate the views, which are used to visualize the
-     *         tabs, whose positions and states should be calculated by the tab switcher, as an
-     *         instance of the class AttachedViewRecycler. The view recycler may not be null
-     */
-    public TabletDragTabsEventHandler(@NonNull final TabSwitcher tabSwitcher,
-                                      @NonNull final Arithmetics arithmetics,
-                                      @NonNull final AttachedViewRecycler<AbstractItem, ?> viewRecycler) {
-        super(tabSwitcher, arithmetics, true);
-        Condition.INSTANCE.ensureNotNull(viewRecycler, "The view recycler may not be null");
-        this.viewRecycler = viewRecycler;
-        Resources resources = tabSwitcher.getResources();
-        this.tabOffset = resources.getDimensionPixelSize(R.dimen.tablet_tab_offset);
-        this.tabContainerHeight =
-                resources.getDimensionPixelSize(R.dimen.tablet_tab_container_height);
-    }
-
-    @NonNull
-    @Override
-    public final RectF getTouchableArea() {
-        float left = getTabSwitcher().getPaddingLeft();
-        float top = getTabSwitcher().getPaddingTop();
-        int right = getTabSwitcher().getPaddingRight();
-        return new RectF(left, top, getTabSwitcher().getWidth() - right, top + tabContainerHeight);
-    }
-
-    @Override
-    @Nullable
-    protected final AbstractItem getFocusedItem(final float position) {
-        int selectedItemIndex = getTabSwitcher().getSelectedTabIndex() +
-                (getTabSwitcher().isAddTabButtonShown() ? 1 : 0);
-        ItemIterator.Builder builder = new ItemIterator.Builder(getTabSwitcher(), viewRecycler);
-        AbstractItemIterator iterator = builder.start(selectedItemIndex).create();
-        AbstractItem item;
-
-        while ((item = iterator.next()) != null) {
-            if (isItemFocusable(item, selectedItemIndex, iterator.peek())) {
-                float viewPosition = getViewPosition(item);
-                float viewWidth = getArithmetics().getSize(Axis.DRAGGING_AXIS, item);
-
-                if (position > viewPosition + viewWidth) {
-                    break;
-                } else if (position >= viewPosition) {
-                    return item;
-                }
-            }
-        }
-
-        if (selectedItemIndex - 1 >= 0) {
-            iterator = builder.start(selectedItemIndex - 1).reverse(true).create();
-
-            while ((item = iterator.next()) != null) {
-                if (isItemFocusable(item, selectedItemIndex, iterator.previous())) {
-                    float viewPosition = getViewPosition(item);
-                    float viewWidth = getArithmetics().getSize(Axis.DRAGGING_AXIS, item);
-
-                    if (position >= viewPosition && position <= viewPosition + viewWidth) {
-                        return item;
-                    }
-                }
-            }
-        }
-
-        return null;
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletTabRecyclerAdapter.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletTabRecyclerAdapter.java
deleted file mode 100644
index c333e5f3..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletTabRecyclerAdapter.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.layout.tablet;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.StateListDrawable;
-import android.util.StateSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.CallSuper;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import de.mrapp.android.tabswitcher.Layout;
-import de.mrapp.android.tabswitcher.R;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.iterator.ItemIterator;
-import de.mrapp.android.tabswitcher.layout.AbstractTabRecyclerAdapter;
-import de.mrapp.android.tabswitcher.layout.AbstractTabViewHolder;
-import de.mrapp.android.tabswitcher.model.AbstractItem;
-import de.mrapp.android.tabswitcher.model.AddTabItem;
-import de.mrapp.android.tabswitcher.model.TabItem;
-import de.mrapp.android.tabswitcher.model.TabSwitcherModel;
-import de.mrapp.android.tabswitcher.model.TabSwitcherStyle;
-import de.mrapp.android.util.ViewUtil;
-
-/**
- * A view recycler adapter, which allows to inflate the views, which are used to visualize the tabs
- * of a {@link TabSwitcher}, when using the tablet layout.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public class TabletTabRecyclerAdapter extends AbstractTabRecyclerAdapter {
-
-    /**
-     * The view type of a button, which allows to add a new tab.
-     */
-    private static final int ADD_TAB_BUTTON_VIEW_TYPE = 1;
-
-    /**
-     * Returns the item, which corresponds to the button, which allows to add a new tab.
-     *
-     * @return The item, which corresponds to the button, which allows to add a new tab, as an
-     * instance of the class {@link AddTabItem} or null, if the button is not shown
-     */
-    @Nullable
-    private AddTabItem getAddTabItem() {
-        if (!getModel().isEmpty()) {
-            ItemIterator itemIterator =
-                    new ItemIterator.Builder(getModel(), getViewRecyclerOrThrowException())
-                            .create();
-            AbstractItem firstItem = itemIterator.getItem(0);
-
-            if (firstItem instanceof AddTabItem) {
-                return (AddTabItem) firstItem;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Adapts the color of a button, which allows to add a new tab.
-     *
-     * @param addTabItem
-     *         The add tab item, which corresponds to the button, whose color should be adapted, as
-     *         an instance of the class {@link AddTabItem}. The add tab item may not be null
-     */
-    private void adaptAddTabButtonColor(@NonNull final AddTabItem addTabItem) {
-        ColorStateList colorStateList = getStyle().getAddTabButtonColor();
-        int[] stateSet = new int[]{};
-        int color = colorStateList.getColorForState(stateSet, colorStateList.getDefaultColor());
-        View view = addTabItem.getView();
-        Drawable background = view.getBackground();
-        background.setColorFilter(color, PorterDuff.Mode.MULTIPLY);
-    }
-
-    /**
-     * Creates a new view recycler adapter, which allows to inflate the views, which are used to
-     * visualize the tabs of a {@link TabSwitcher}.
-     *
-     * @param tabSwitcher
-     *         The tab switcher as an instance of the class {@link TabSwitcher}. The tab switcher
-     *         may not be null
-     * @param model
-     *         The model, which belongs to the tab switcher, as an instance of the class {@link
-     *         TabSwitcherModel}. The model may not be null
-     * @param style
-     *         The style, which allows to retrieve style attributes of the tab switcher, as an
-     *         instance of the class {@link TabSwitcherStyle}. The style may not be null
-     */
-    public TabletTabRecyclerAdapter(@NonNull final TabSwitcher tabSwitcher,
-                                    @NonNull final TabSwitcherModel model,
-                                    @NonNull final TabSwitcherStyle style) {
-        super(tabSwitcher, model, style);
-    }
-
-    @Override
-    public final void onTabBackgroundColorChanged(@Nullable final ColorStateList colorStateList) {
-        super.onTabBackgroundColorChanged(colorStateList);
-        AddTabItem addTabItem = getAddTabItem();
-
-        if (addTabItem != null) {
-            adaptAddTabButtonColor(addTabItem);
-        }
-    }
-
-    @Override
-    public final void onAddTabButtonColorChanged(@Nullable final ColorStateList colorStateList) {
-        AddTabItem addTabItem = getAddTabItem();
-
-        if (addTabItem != null) {
-            adaptAddTabButtonColor(addTabItem);
-        }
-    }
-
-    @Override
-    public final int getViewTypeCount() {
-        return super.getViewTypeCount() + 1;
-    }
-
-    @Override
-    public final int getViewType(@NonNull final AbstractItem item) {
-        if (item instanceof AddTabItem) {
-            return ADD_TAB_BUTTON_VIEW_TYPE;
-        } else {
-            return super.getViewType(item);
-        }
-    }
-
-    @NonNull
-    @Override
-    public final View onInflateView(@NonNull final LayoutInflater inflater,
-                                    @Nullable final ViewGroup parent,
-                                    @NonNull final AbstractItem item, final int viewType,
-                                    @NonNull final Integer... params) {
-        if (viewType == ADD_TAB_BUTTON_VIEW_TYPE) {
-            View view = inflater.inflate(R.layout.tablet_add_tab_button, parent, false);
-            item.setView(view);
-            view.setTag(R.id.tag_properties, item.getTag());
-            return view;
-        } else {
-            return super.onInflateView(inflater, parent, item, viewType, params);
-        }
-    }
-
-    @Override
-    public final void onShowView(@NonNull final Context context, @NonNull final View view,
-                                 @NonNull final AbstractItem item, final boolean inflated,
-                                 @NonNull final Integer... params) {
-        if (item instanceof AddTabItem) {
-            adaptAddTabButtonColor((AddTabItem) item);
-        } else {
-            super.onShowView(context, view, item, inflated, params);
-        }
-    }
-
-    @CallSuper
-    @Override
-    public final void onRemoveView(@NonNull final View view, @NonNull final AbstractItem item) {
-        if (item instanceof AddTabItem) {
-            view.setTag(R.id.tag_properties, null);
-        } else {
-            super.onRemoveView(view, item);
-        }
-    }
-
-    @NonNull
-    @Override
-    protected final View onInflateTabView(@NonNull final LayoutInflater inflater,
-                                          @Nullable final ViewGroup parent,
-                                          @NonNull final AbstractTabViewHolder viewHolder) {
-        View view = inflater.inflate(R.layout.tablet_tab, parent, false);
-        StateListDrawable backgroundDrawable = new StateListDrawable();
-        Drawable defaultDrawable = ContextCompat
-                .getDrawable(getModel().getContext(), R.drawable.tablet_tab_background);
-        Drawable selectedDrawable = ContextCompat
-                .getDrawable(getModel().getContext(), R.drawable.tablet_tab_background_selected);
-        backgroundDrawable.addState(new int[]{android.R.attr.state_selected}, selectedDrawable);
-        backgroundDrawable.addState(StateSet.WILD_CARD, defaultDrawable);
-        ViewUtil.setBackground(view, backgroundDrawable);
-        return view;
-    }
-
-    @Override
-    protected final void onShowTabView(@NonNull final View view, @NonNull final TabItem tabItem,
-                                       @NonNull final Integer... params) {
-
-    }
-
-    @NonNull
-    @Override
-    protected final AbstractTabViewHolder onCreateTabViewHolder() {
-        return new TabletTabViewHolder();
-    }
-
-    @NonNull
-    @Override
-    protected final Layout getLayout() {
-        return Layout.TABLET;
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletTabSwitcherLayout.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletTabSwitcherLayout.java
deleted file mode 100644
index fe7525d2..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletTabSwitcherLayout.java
+++ /dev/null
@@ -1,1381 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.layout.tablet;
-
-import android.animation.Animator;
-import android.animation.Animator.AnimatorListener;
-import android.animation.AnimatorListenerAdapter;
-import android.content.res.ColorStateList;
-import android.content.res.Resources;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewPropertyAnimator;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
-import android.view.animation.AccelerateDecelerateInterpolator;
-import android.widget.FrameLayout;
-import android.widget.ImageButton;
-
-import java.util.Collections;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.util.Pair;
-import de.mrapp.android.tabswitcher.Animation;
-import de.mrapp.android.tabswitcher.R;
-import de.mrapp.android.tabswitcher.Tab;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.gesture.TouchEventDispatcher;
-import de.mrapp.android.tabswitcher.iterator.AbstractItemIterator;
-import de.mrapp.android.tabswitcher.iterator.ItemIterator;
-import de.mrapp.android.tabswitcher.layout.AbstractDragTabsEventHandler;
-import de.mrapp.android.tabswitcher.layout.AbstractTabRecyclerAdapter;
-import de.mrapp.android.tabswitcher.layout.AbstractTabSwitcherLayout;
-import de.mrapp.android.tabswitcher.layout.AbstractTabViewHolder;
-import de.mrapp.android.tabswitcher.layout.Arithmetics;
-import de.mrapp.android.tabswitcher.layout.Arithmetics.Axis;
-import de.mrapp.android.tabswitcher.model.AbstractItem;
-import de.mrapp.android.tabswitcher.model.AddTabItem;
-import de.mrapp.android.tabswitcher.model.ItemComparator;
-import de.mrapp.android.tabswitcher.model.State;
-import de.mrapp.android.tabswitcher.model.TabItem;
-import de.mrapp.android.tabswitcher.model.TabSwitcherModel;
-import de.mrapp.android.tabswitcher.model.TabSwitcherStyle;
-import de.mrapp.android.tabswitcher.model.Tag;
-import de.mrapp.android.util.view.AbstractViewRecycler;
-import de.mrapp.android.util.view.AttachedViewRecycler;
-import de.mrapp.util.Condition;
-
-import static de.mrapp.android.util.DisplayUtil.dpToPixels;
-
-/**
- * A layout, which implements the functionality of a {@link TabSwitcher} on tablets.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public class TabletTabSwitcherLayout extends AbstractTabSwitcherLayout implements Tab.Callback {
-
-    /**
-     * A comparator, which allows to compare two instances of the class {@link AbstractItem}. The
-     * item, which corresponds to the currently selected tab, is always sorted before all other
-     * items.
-     */
-    private static class TabletItemComparator extends ItemComparator {
-
-        /**
-         * Creates a new comparator, which allows to compare two instances of the class {@link
-         * AbstractItem}. The item, which corresponds to the currently selected tab, is always
-         * sorted before all other items.
-         *
-         * @param tabSwitcher
-         *         The tab switcher, the items, which should be compared by the comparator, belong
-         *         to, as a instance of the class {@link TabSwitcher}. The tab switcher may not be
-         *         null
-         */
-        TabletItemComparator(@NonNull final TabSwitcher tabSwitcher) {
-            super(tabSwitcher);
-        }
-
-        @Override
-        public int compare(final AbstractItem o1, final AbstractItem o2) {
-            if (o1 instanceof AddTabItem && o2 instanceof AddTabItem) {
-                return 0;
-            } else if (o1 instanceof AddTabItem) {
-                return -1;
-            } else if (o2 instanceof AddTabItem) {
-                return 1;
-            } else {
-                TabItem tabItem1 = (TabItem) o1;
-                TabItem tabItem2 = (TabItem) o2;
-                Tab tab1 = tabItem1.getTab();
-                Tab tab2 = tabItem2.getTab();
-                int index1 = getTabSwitcher().indexOf(tab1);
-                index1 = index1 == -1 ? o1.getIndex() : index1;
-                int index2 = getTabSwitcher().indexOf(tab2);
-                index2 = index2 == -1 ? o2.getIndex() : index2;
-                Condition.INSTANCE.ensureNotEqual(index1, -1,
-                        "Tab " + tab1 + " not contained by tab switcher", RuntimeException.class);
-                Condition.INSTANCE.ensureNotEqual(index2, -1,
-                        "Tab " + tab2 + " not contained by tab switcher", RuntimeException.class);
-                int selectedTabIndex = getTabSwitcher().getSelectedTabIndex();
-
-                if (index1 < selectedTabIndex) {
-                    if (index2 == selectedTabIndex) {
-                        return 1;
-                    } else if (index2 > selectedTabIndex) {
-                        return -1;
-                    } else {
-                        return index1 >= index2 ? -1 : 1;
-                    }
-                } else if (index1 > selectedTabIndex) {
-                    if (index2 == selectedTabIndex) {
-                        return 1;
-                    } else if (index2 > selectedTabIndex) {
-                        return index1 < index2 ? -1 : 1;
-                    } else {
-                        return 1;
-                    }
-                } else {
-                    return -1;
-                }
-            }
-        }
-    }
-
-    /**
-     * The number of tabs, which are contained by a stack.
-     */
-    private final int stackedTabCount;
-
-    /**
-     * The maximum width of a tab in pixels.
-     */
-    private final int maxTabWidth;
-
-    /**
-     * The minimum width of a tab in pixels.
-     */
-    private final int minTabWidth;
-
-    /**
-     * The offset between two neighboring tabs in pixels.
-     */
-    private final int tabOffset;
-
-    /**
-     * The width of a button, which allows to add a new tab.
-     */
-    private final int addTabButtonWidth;
-
-    /**
-     * The offset between a button, which allows to add a new tab, and a neighboring tab.
-     */
-    private final int addTabButtonOffset;
-
-    /**
-     * The distance between two neighboring tabs when being swiped in pixels.
-     */
-    private final int swipedTabDistance;
-
-    /**
-     * The duration of the animation, which is used to show or hide the close button of tabs.
-     */
-    private final long closeButtonVisibilityAnimationDuration;
-
-    /**
-     * The drag handler, which is used by the layout.
-     */
-    private TabletDragTabsEventHandler dragHandler;
-
-    /**
-     * The view recycler, which allows to recycle the views, which are associated with tabs.
-     */
-    private AttachedViewRecycler<Tab, Void> contentViewRecycler;
-
-    /**
-     * The adapter, which allows to inflate the views, which are used to visualize tabs.
-     */
-    private TabletTabRecyclerAdapter tabRecyclerAdapter;
-
-    /**
-     * The view recycler, which allows to recycle the views, which are used to visualize tabs.
-     */
-    private AttachedViewRecycler<AbstractItem, Integer> tabViewRecycler;
-
-    /**
-     * The layout's primary toolbar.
-     */
-    private Toolbar primaryToolbar;
-
-    /**
-     * The layout's secondary toolbar.
-     */
-    private Toolbar secondaryToolbar;
-
-    /**
-     * The view group, which contains the tab switcher's tabs.
-     */
-    private ViewGroup tabContainer;
-
-    /**
-     * The view, which is used to display a border below the tab switcher's tabs.
-     */
-    private View borderView;
-
-    /**
-     * Adapts the margins of the tab container and the toolbars.
-     */
-    private void adaptTabContainerAndToolbarMargins() {
-        FrameLayout.LayoutParams tabContainerLayoutParams =
-                (FrameLayout.LayoutParams) tabContainer.getLayoutParams();
-        tabContainerLayoutParams.setMargins(getModel().getPaddingLeft(), getModel().getPaddingTop(),
-                getModel().getPaddingRight(), 0);
-        FrameLayout.LayoutParams primaryToolbarLayoutParams =
-                (FrameLayout.LayoutParams) primaryToolbar.getLayoutParams();
-        primaryToolbarLayoutParams
-                .setMargins(getModel().getPaddingLeft(), 0, getModel().getPaddingRight(), 0);
-        FrameLayout.LayoutParams secondaryToolbarLayoutParams =
-                (FrameLayout.LayoutParams) secondaryToolbar.getLayoutParams();
-        secondaryToolbarLayoutParams
-                .setMargins(getModel().getPaddingLeft(), 0, getModel().getPaddingRight(), 0);
-    }
-
-    /**
-     * Adapts the color of the border, which is shown below the tab switcher's tabs.
-     */
-    private void adaptBorderColor() {
-        Tab selectedTab = getModel().getSelectedTab();
-        ColorStateList colorStateList = getStyle().getTabBackgroundColor(selectedTab);
-        int[] stateSet = new int[]{android.R.attr.state_selected};
-        int color = colorStateList.getColorForState(stateSet, colorStateList.getDefaultColor());
-        Drawable background = borderView.getBackground();
-        background.setColorFilter(color, PorterDuff.Mode.MULTIPLY);
-    }
-
-    /**
-     * Adapts the visibility of the close button of a specific tab.
-     *
-     * @param tabItem
-     *         The item, which corresponds to the tab, whose close button should be adapted, as an
-     *         instance of the class {@link TabItem}. The item may not be null
-     */
-    private void adaptCloseButtonVisibility(@NonNull final TabItem tabItem) {
-        if (tabItem.getIndex() > (getModel().isAddTabButtonShown() ? 1 : 0)) {
-            TabItem predecessor = TabItem.create(getModel(), getTabViewRecycler(),
-                    tabItem.getIndex() - (getModel().isAddTabButtonShown() ? 2 : 1));
-            AbstractTabViewHolder viewHolder = tabItem.getViewHolder();
-
-            if (predecessor.isInflated()) {
-                adaptCloseButtonVisibility(viewHolder, tabItem, predecessor);
-            } else {
-                animateCloseButtonVisibility(viewHolder, true);
-            }
-        }
-    }
-
-    /**
-     * Adapts the visibility of the close button of a specific tab's predecessor.
-     *
-     * @param tabItem
-     *         The item, which corresponds to the tab, whose predecessor's close button should be
-     *         adapted, as an instance of the class {@link TabItem}. The tab item may not be null
-     */
-    private void adaptPredecessorPaddingAndCloseButtonVisibility(@NonNull final TabItem tabItem) {
-        if (tabItem.getIndex() > (getModel().isAddTabButtonShown() ? 1 : 0)) {
-            TabItem predecessor = TabItem.create(getModel(), getTabViewRecycler(),
-                    tabItem.getIndex() - (getModel().isAddTabButtonShown() ? 2 : 1));
-
-            if (predecessor.isInflated()) {
-                AbstractTabViewHolder viewHolder = predecessor.getViewHolder();
-                float offset = adaptCloseButtonVisibility(viewHolder, tabItem, predecessor);
-                View titleContainer = viewHolder.titleContainer;
-                titleContainer.setPadding(Math.round(offset), 0, 0, 0);
-            }
-        }
-    }
-
-    /**
-     * Adapts the visibility of the close button of a specific tab, depending on the positions of
-     * two successive tabs.
-     *
-     * @param viewHolder
-     *         The view holder, which holds a reference to the close button, whose visibility should
-     *         be adapted, as an instance of the class {@link AbstractTabViewHolder}. The view
-     *         holder may not be null
-     * @param successor
-     *         The item, which corresponds to the rear one of both successive tabs, as an item of
-     *         the class {@link AbstractItem}. The item may not be null
-     * @param predecessor
-     *         The item, which corresponds to the front one of both successive tabs, as an item of
-     *         the class {@link AbstractItem}. The item may not be null
-     * @return The offset between the two successive tabs in pixels as a {@link Float} value
-     */
-    private float adaptCloseButtonVisibility(@NonNull final AbstractTabViewHolder viewHolder,
-                                             @NonNull final AbstractItem successor,
-                                             @NonNull final AbstractItem predecessor) {
-        float predecessorPosition = getArithmetics().getPosition(Axis.DRAGGING_AXIS, predecessor);
-        float successorPosition = getArithmetics().getPosition(Axis.DRAGGING_AXIS, successor);
-        float successorWidth = getArithmetics().getSize(Axis.DRAGGING_AXIS, successor);
-        float offset = successorPosition + successorWidth - tabOffset - predecessorPosition;
-        animateCloseButtonVisibility(viewHolder, offset <= dpToPixels(getContext(), 8));
-        return offset;
-    }
-
-    /**
-     * Animates the visibility of a tab's close button.
-     *
-     * @param viewHolder
-     *         The view holder, which holds a reference to the close button, whose visibility should
-     *         be animated, as an instance of the class {@link AbstractTabViewHolder}. The view
-     *         holder may not be null
-     * @param show
-     *         True, if the close button should be shown, false otherwise
-     */
-    private void animateCloseButtonVisibility(@NonNull final AbstractTabViewHolder viewHolder,
-                                              final boolean show) {
-        ImageButton closeButton = viewHolder.closeButton;
-        Boolean visible = (Boolean) closeButton.getTag(R.id.tag_visibility);
-
-        if (visible == null || visible != show) {
-            closeButton.setTag(R.id.tag_visibility, show);
-
-            if (closeButton.getAnimation() != null) {
-                closeButton.getAnimation().cancel();
-            }
-
-            ViewPropertyAnimator animation = closeButton.animate();
-            animation.setListener(createCloseButtonVisibilityAnimationListener(viewHolder, show));
-            animation.alpha(show ? 1 : 0);
-            animation.setStartDelay(0);
-            animation.setDuration(closeButtonVisibilityAnimationDuration);
-            animation.start();
-        }
-    }
-
-    /**
-     * Creates and returns a listener, which allows to observe the progress of the animation, which
-     * is used to animate the visibility of a tab's close button.
-     *
-     * @param viewHolder
-     *         The view holder, which holds a reference to the close button, whose visibility is
-     *         animated, as an instance of the class {@link AbstractTabViewHolder}. The view holder
-     *         may not be null
-     * @param show
-     *         True, if the animation shows the close button, false otherwise
-     * @return The listener, which has been created, as an instance of the class {@link
-     * AnimatorListener}. The listener may not be null
-     */
-    @NonNull
-    private AnimatorListener createCloseButtonVisibilityAnimationListener(
-            @NonNull final AbstractTabViewHolder viewHolder, final boolean show) {
-        return new AnimatorListenerAdapter() {
-
-            @Override
-            public void onAnimationStart(Animator animation) {
-                super.onAnimationStart(animation);
-
-                if (show) {
-                    viewHolder.closeButton.setVisibility(View.VISIBLE);
-                }
-            }
-
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                super.onAnimationEnd(animation);
-
-                if (!show) {
-                    viewHolder.closeButton.setVisibility(View.GONE);
-                }
-            }
-
-        };
-    }
-
-    /**
-     * Inflates the content, which is associated with a specific tab.
-     *
-     * @param tab
-     *         The tab, whose content should be inflated, as an instance of the class {@link Tab}.
-     *         The tab may not be null
-     * @param listener
-     *         The layout listener, which should be notified, when the view has been inflated, as an
-     *         instance of the type {@link OnGlobalLayoutListener} or null, if no listener should be
-     *         notified
-     */
-    private void inflateContent(@NonNull final Tab tab,
-                                @Nullable final OnGlobalLayoutListener listener) {
-        Pair<View, Boolean> pair = contentViewRecycler.inflate(tab);
-        View view = pair.first;
-
-        if (listener != null) {
-            boolean inflated = pair.second;
-
-            if (inflated) {
-                view.getViewTreeObserver()
-                        .addOnGlobalLayoutListener(new LayoutListenerWrapper(view, listener));
-            } else {
-                listener.onGlobalLayout();
-            }
-        }
-    }
-
-    /**
-     * Calculates and returns the width of the tabs, depending on the total number of tabs, which
-     * are currently contained by the tab switcher.
-     *
-     * @return The width, which has been calculated, in pixels as an {@link Integer} value
-     */
-    private int calculateTabWidth() {
-        return maxTabWidth;
-    }
-
-    /**
-     * Calculates and returns the space between two neighboring tabs.
-     *
-     * @return The space, which has been calculated, in pixels as an {@link Integer} value
-     */
-    private int calculateTabSpacing() {
-        return calculateTabWidth() - tabOffset;
-    }
-
-    /**
-     * Calculates and returns the space between a button, which allows to add a new tab, and a
-     * neighboring tab.
-     *
-     * @return The space, which has been calculated, in pixels as an {@link Integer} value
-     */
-    private int calculateAddTabButtonSpacing() {
-        return getModel().isAddTabButtonShown() ? addTabButtonWidth + addTabButtonOffset : 0;
-    }
-
-    /**
-     * Returns, whether the tab container is large enough to take up all tabs, or not.
-     *
-     * @return True, if the tab container is large enough to take up all tabs, false otherwise
-     */
-    private boolean areTabsFittingIntoTabContainer() {
-        int thresholdPosition = getModel().getCount() * calculateTabSpacing() +
-                (getModel().isAddTabButtonShown() ? calculateAddTabButtonSpacing() : 0);
-        float tabContainerSize = getArithmetics().getTabContainerSize(Axis.DRAGGING_AXIS, false);
-        return thresholdPosition <= tabContainerSize;
-    }
-
-    /**
-     * Calculates and returns the items when the tab switcher is shown initially.
-     *
-     * @param referenceTabIndex
-     *         The index of the tab, which is used as a reference, when restoring the positions of
-     *         tabs, as an {@link Integer} value or -1, if the positions of tabs should not be
-     *         restored
-     * @param referenceTabPosition
-     *         The position of tab, which is used as a reference, when restoring the positions of
-     *         tabs, in relation to the available space as a {@link Float} value or -1, if the
-     *         positions of tabs should not be restored
-     * @return An array, which contains the tab items, as an array of the type {@link AbstractItem}.
-     * The array may not be null
-     */
-    @NonNull
-    private AbstractItem[] calculateInitialItems(final int referenceTabIndex,
-                                                 final float referenceTabPosition) {
-        dragHandler.reset();
-        setFirstVisibleIndex(-1);
-        AbstractItem[] items = new AbstractItem[getItemCount()];
-
-        if (items.length > 0) {
-
-            if (referenceTabIndex != -1 && referenceTabPosition != -1) {
-                float referencePosition = referenceTabPosition *
-                        getArithmetics().getTabContainerSize(Axis.DRAGGING_AXIS, false);
-                referencePosition = Math.max(calculateMinStartPosition(referenceTabIndex),
-                        Math.min(calculateMaxEndPosition(referenceTabIndex), referencePosition));
-                AbstractItemIterator iterator =
-                        new InitialItemIteratorBuilder(items).start(referenceTabIndex).create();
-                AbstractItem item;
-
-                while ((item = iterator.next()) != null) {
-                    float position;
-
-                    if (item.getIndex() == referenceTabIndex) {
-                        position = referencePosition;
-                    } else {
-                        position = referencePosition -
-                                (calculateTabSpacing() * (item.getIndex() - referenceTabIndex));
-                    }
-
-                    Pair<Float, State> pair =
-                            clipPosition(item.getIndex(), position, iterator.previous());
-                    item.getTag().setPosition(pair.first);
-                    item.getTag().setState(pair.second);
-
-                    if (item.getIndex() == referenceTabIndex) {
-                        referencePosition = pair.first;
-                    }
-
-                    if (getFirstVisibleIndex() == -1 && pair.second == State.FLOATING) {
-                        setFirstVisibleIndex(item.getIndex());
-                    }
-                }
-
-                iterator = new InitialItemIteratorBuilder(items).create();
-                int firstVisibleIndex = -1;
-
-                while ((item = iterator.next()) != null && item.getIndex() < referenceTabIndex) {
-                    float position;
-
-                    if (item instanceof AddTabItem) {
-                        position = calculateMaxEndPosition(item.getIndex());
-                    } else {
-                        position = referencePosition +
-                                (calculateTabSpacing() * (referenceTabIndex - item.getIndex()));
-                    }
-
-                    Pair<Float, State> pair =
-                            clipPosition(item.getIndex(), position, iterator.previous());
-                    item.getTag().setPosition(pair.first);
-                    item.getTag().setState(pair.second);
-
-                    if (firstVisibleIndex == -1 && pair.second == State.FLOATING) {
-                        firstVisibleIndex = item.getIndex();
-                    }
-                }
-
-                if (firstVisibleIndex != -1) {
-                    setFirstVisibleIndex(firstVisibleIndex);
-                }
-            } else {
-                AbstractItemIterator iterator =
-                        new InitialItemIteratorBuilder(items).start(0).create();
-                AbstractItem item;
-
-                while ((item = iterator.next()) != null) {
-                    AbstractItem predecessor = iterator.previous();
-                    float position = calculateMaxEndPosition(item.getIndex());
-                    Pair<Float, State> pair = clipPosition(item.getIndex(), position, predecessor);
-                    item.getTag().setPosition(pair.first);
-                    item.getTag().setState(pair.second);
-
-                    if (getFirstVisibleIndex() == -1 && pair.second == State.FLOATING) {
-                        setFirstVisibleIndex(item.getIndex());
-                    }
-                }
-
-            }
-
-            secondLayoutPass(new InitialItemIteratorBuilder(items).start(0));
-        }
-
-        dragHandler.setCallback(this);
-        return items;
-    }
-
-    /**
-     * Animates a tab to be swiped horizontally.
-     *
-     * @param tabItem
-     *         The tab item, which corresponds to the tab, which should be swiped, as an instance of
-     *         the class {@link TabItem}. The tab item may not be null
-     * @param targetPosition
-     *         The position on the x-axis, the tab should be moved to, in pixels as a {@link Float}
-     *         value
-     * @param selected
-     *         True, if the tab should become the selected one, false otherwise
-     * @param animationDuration
-     *         The duration of the animation in milliseconds as a {@link Long} value
-     * @param velocity
-     *         The velocity of the drag gesture, which caused the tab to be swiped, in pixels per
-     *         second as a {@link Float} value
-     */
-    private void animateSwipe(@NonNull final TabItem tabItem, final float targetPosition,
-                              final boolean selected, final long animationDuration,
-                              final float velocity) {
-        View view = contentViewRecycler.getView(tabItem.getTab());
-
-        if (view != null) {
-            float currentPosition = view.getX();
-            float distance = Math.abs(targetPosition - currentPosition);
-            float maxDistance = getTabSwitcher().getWidth() + swipedTabDistance;
-            long duration = velocity > 0 ? Math.round((distance / velocity) * 1000) :
-                    Math.round(animationDuration * (distance / maxDistance));
-            ViewPropertyAnimator animation = view.animate();
-            animation.setListener(new AnimationListenerWrapper(
-                    selected ? createSwipeSelectedTabAnimationListener(tabItem) :
-                            createSwipeNeighborAnimationListener(tabItem)));
-            animation.setInterpolator(new AccelerateDecelerateInterpolator());
-            animation.setDuration(duration);
-            animation.setStartDelay(0);
-            animation.x(targetPosition);
-            animation.start();
-        }
-    }
-
-    /**
-     * Creates and returns an animation listener, which allows to adapt the currently selected tab,
-     * when swiping the tabs horizontally has been ended.
-     *
-     * @param tabItem
-     *         The tab item, which corresponds to the tab, which should be selected, as an instance
-     *         of the class {@link TabItem}. The tab item may not be null
-     * @return The animation listener, which has been created, as an instance of the type {@link
-     * AnimatorListener}. The listener may not be null
-     */
-    @NonNull
-    private AnimatorListener createSwipeSelectedTabAnimationListener(
-            @NonNull final TabItem tabItem) {
-        return new AnimatorListenerAdapter() {
-
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                super.onAnimationEnd(animation);
-                Tab tab = tabItem.getTab();
-
-                if (getModel().getSelectedTab() != tab) {
-                    getModel().selectTab(tab);
-                }
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns an animation listener, which allows to remove the view, which is used to
-     * visualize a specific tab, when swiping the tabs horizontally has been ended.
-     *
-     * @param tabItem
-     *         The tab item, which corresponds to the tab, whose view should be removed, as an
-     *         instance of the class {@link TabItem}. The tab item may not be null
-     * @return The animation listener, which has been created, as an instance of the type {@link
-     * AnimatorListener}. The listener may not be null
-     */
-    @NonNull
-    private AnimatorListener createSwipeNeighborAnimationListener(@NonNull final TabItem tabItem) {
-        return new AnimatorListenerAdapter() {
-
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                super.onAnimationEnd(animation);
-                contentViewRecycler.remove(tabItem.getTab());
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns a layout listener, which allows to adapt the size and position of an
-     * item, once its view has been inflated.
-     *
-     * @param item
-     *         The item, whose view should be adapted, as an instance of the class {@link
-     *         AbstractItem}. The item may not be null
-     * @param dragging
-     *         True, if the item is currently being dragged, false otherwise
-     * @param layoutListener
-     *         The layout lister, which should be notified, when the created listener is invoked, as
-     *         an instance of the type {@link OnGlobalLayoutListener} or null, if no listener should
-     *         be notified
-     * @return The layout listener, which has been created, as an instance of the type {@link
-     * OnGlobalLayoutListener}. The layout listener may not be null
-     */
-    @NonNull
-    private OnGlobalLayoutListener createInflateViewLayoutListener(@NonNull final AbstractItem item,
-                                                                   final boolean dragging,
-                                                                   @Nullable final OnGlobalLayoutListener layoutListener) {
-        return new OnGlobalLayoutListener() {
-
-            @Override
-            public void onGlobalLayout() {
-                updateView(item, dragging);
-
-                if (layoutListener != null) {
-                    layoutListener.onGlobalLayout();
-                }
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns a layout listener, which allows to position the content of a tab, after
-     * it has been inflated.
-     *
-     * @param tab
-     *         The tab, whose content has been inflated, as an instance of the class {@link Tab}.
-     *         The tab may not be null
-     * @return The layout listener, which has been created, as an instance of the type {@link
-     * OnGlobalLayoutListener}. The listener may not be null
-     */
-    @NonNull
-    private OnGlobalLayoutListener createContentLayoutListener(@NonNull final Tab tab) {
-        return new OnGlobalLayoutListener() {
-
-            @Override
-            public void onGlobalLayout() {
-                View view = contentViewRecycler.getView(tab);
-
-                if (view != null) {
-                    view.setX(0);
-                }
-            }
-
-        };
-    }
-
-    /**
-     * Creates and returns a layout listener, which allows to position a tab, which is a neighbor of
-     * the currently selected tab, when swiping horizontally.
-     *
-     * @param neighbor
-     *         The tab item, which corresponds to the neighboring tab, as an instance of the class
-     *         {@link TabItem}. The tab item may not be null
-     * @param dragDistance
-     *         The distance of the swipe gesture in pixels as a {@link Float} value
-     * @return The layout listener, which has been created, as an instance of the type {@link
-     * OnGlobalLayoutListener}. The layout listener may not be null
-     */
-    @NonNull
-    private OnGlobalLayoutListener createSwipeNeighborLayoutListener(
-            @NonNull final TabItem neighbor, final float dragDistance) {
-        return new OnGlobalLayoutListener() {
-
-            @Override
-            public void onGlobalLayout() {
-                View view = contentViewRecycler.getView(neighbor.getTab());
-
-                if (view != null) {
-                    float position;
-
-                    if (dragDistance > 0) {
-                        position = -getTabSwitcher().getWidth() + dragDistance - swipedTabDistance;
-                    } else {
-                        position = getTabSwitcher().getWidth() + dragDistance + swipedTabDistance;
-                    }
-
-                    view.setX(position);
-                }
-            }
-
-        };
-    }
-
-    /**
-     * Creates a new layout, which implements the functionality of a {@link TabSwitcher} on
-     * tablets.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, the layout belongs to, as an instance of the class {@link
-     *         TabSwitcher}. The tab switcher may not be null
-     * @param model
-     *         The model of the tab switcher, the layout belongs to, as an instance of the class
-     *         {@link TabSwitcherModel}. The model may not be null
-     * @param arithmetics
-     *         The arithmetics, which should be used by the layout, as an instance of the type
-     *         {@link Arithmetics}. The arithmetics may not be null
-     * @param style
-     *         The style, which allows to retrieve style attributes of the tab switcher, as an
-     *         instance of the class {@link TabSwitcherStyle}. The style may not be null
-     * @param touchEventDispatcher
-     *         The dispatcher, which is used to dispatch touch events to event handlers, as an
-     *         instance of the class {@link TouchEventDispatcher}. The dispatcher may not be null
-     */
-    public TabletTabSwitcherLayout(@NonNull final TabSwitcher tabSwitcher,
-                                   @NonNull final TabSwitcherModel model,
-                                   @NonNull final Arithmetics arithmetics,
-                                   @NonNull final TabSwitcherStyle style,
-                                   @NonNull final TouchEventDispatcher touchEventDispatcher) {
-        super(tabSwitcher, model, arithmetics, style, touchEventDispatcher);
-        Resources resources = tabSwitcher.getResources();
-        stackedTabCount = resources.getInteger(R.integer.tablet_stacked_tab_count);
-        maxTabWidth = resources.getDimensionPixelSize(R.dimen.tablet_tab_max_width);
-        minTabWidth = resources.getDimensionPixelSize(R.dimen.tablet_tab_min_width);
-        tabOffset = resources.getDimensionPixelSize(R.dimen.tablet_tab_offset);
-        addTabButtonWidth = resources.getDimensionPixelSize(R.dimen.tablet_add_tab_button_width);
-        addTabButtonOffset = resources.getDimensionPixelSize(R.dimen.tablet_add_tab_button_offset);
-        swipedTabDistance = resources.getDimensionPixelSize(R.dimen.swiped_tab_distance);
-        closeButtonVisibilityAnimationDuration =
-                resources.getInteger(android.R.integer.config_shortAnimTime);
-    }
-
-    @Override
-    public final AbstractDragTabsEventHandler<?> getDragHandler() {
-        return dragHandler;
-    }
-
-    @Override
-    protected final void onInflateLayout(@NonNull final LayoutInflater inflater,
-                                         final boolean tabsOnly) {
-        if (!tabsOnly) {
-            inflater.inflate(R.layout.tablet_layout, getTabSwitcher(), true);
-        }
-
-        primaryToolbar = getTabSwitcher().findViewById(R.id.primary_toolbar);
-        secondaryToolbar = getTabSwitcher().findViewById(R.id.secondary_toolbar);
-        tabContainer = getTabSwitcher().findViewById(R.id.tab_container);
-        borderView = getTabSwitcher().findViewById(R.id.border_view);
-        ViewGroup contentContainer = getTabSwitcher().findViewById(R.id.content_container);
-        contentViewRecycler = new AttachedViewRecycler<>(contentContainer, inflater);
-        tabRecyclerAdapter = new TabletTabRecyclerAdapter(getTabSwitcher(), getModel(), getStyle());
-        getModel().addListener(tabRecyclerAdapter);
-        tabViewRecycler = new AttachedViewRecycler<>(tabContainer, inflater,
-                Collections.reverseOrder(new TabletItemComparator(getTabSwitcher())));
-        tabViewRecycler.setAdapter(tabRecyclerAdapter);
-        tabRecyclerAdapter.setViewRecycler(tabViewRecycler);
-        dragHandler =
-                new TabletDragTabsEventHandler(getTabSwitcher(), getArithmetics(), tabViewRecycler);
-        adaptTabContainerAndToolbarMargins();
-        adaptBorderColor();
-    }
-
-    @Nullable
-    @Override
-    protected final Pair<Integer, Float> onDetachLayout(final boolean tabsOnly) {
-        // TODO: contentViewRecycler.removeAll();
-        // TODO: contentViewRecycler.clearCache();
-        Pair<Integer, Float> result = null;
-        ItemIterator iterator =
-                new ItemIterator.Builder(getModel(), getTabViewRecycler()).start(getItemCount() - 1)
-                        .reverse(true).create();
-        AbstractItem item;
-
-        if (!areTabsFittingIntoTabContainer()) {
-            while ((item = iterator.next()) != null) {
-                if (item.getTag().getState() == State.FLOATING) {
-                    float position = item.getTag().getPosition();
-                    float tabContainerSize =
-                            getArithmetics().getTabContainerSize(Axis.DRAGGING_AXIS, false);
-                    result = Pair.create(item.getIndex(), position / tabContainerSize);
-                    break;
-                }
-            }
-        }
-
-        if (!tabsOnly) {
-            getModel().removeListener(tabRecyclerAdapter);
-            AttachedViewRecycler.Adapter<Tab, Void> contentViewRecyclerAdapter =
-                    contentViewRecycler.getAdapter();
-
-            if (contentViewRecyclerAdapter instanceof TabletContentRecyclerAdapterWrapper) {
-                getModel().removeListener(
-                        (TabletContentRecyclerAdapterWrapper) contentViewRecyclerAdapter);
-            }
-        }
-
-        return result;
-    }
-
-    @Override
-    public final AbstractViewRecycler<Tab, Void> getContentViewRecycler() {
-        return contentViewRecycler;
-    }
-
-    @Override
-    protected final AttachedViewRecycler<AbstractItem, Integer> getTabViewRecycler() {
-        return tabViewRecycler;
-    }
-
-    @Override
-    protected final AbstractTabRecyclerAdapter getTabRecyclerAdapter() {
-        return tabRecyclerAdapter;
-    }
-
-    @Override
-    protected final void inflateAndUpdateView(@NonNull final AbstractItem item,
-                                              final boolean dragging,
-                                              @Nullable final OnGlobalLayoutListener listener) {
-        inflateView(item, createInflateViewLayoutListener(item, dragging, listener));
-    }
-
-    @Override
-    protected final int getStackedTabCount() {
-        return stackedTabCount;
-    }
-
-    @NonNull
-    @Override
-    protected final Pair<Float, State> calculatePositionAndStateWhenStackedAtStart(final int count,
-                                                                                   final int index,
-                                                                                   @Nullable final State predecessorState) {
-        int selectedItemIndex =
-                getModel().getSelectedTabIndex() + (getModel().isAddTabButtonShown() ? 1 : 0);
-        float position;
-        State state;
-
-        if (index == 0 && getModel().isAddTabButtonShown()) {
-            position = getStackedTabSpacing() * Math.min(count - 2, getStackedTabCount()) +
-                    calculateTabSpacing() + addTabButtonOffset;
-            state = State.FLOATING;
-        } else if (index == selectedItemIndex) {
-            position = getStackedTabSpacing() * Math.min(count - (index + 1), getStackedTabCount());
-            state = State.STACKED_START_ATOP;
-        } else if (index < selectedItemIndex) {
-            if ((selectedItemIndex - index) < getStackedTabCount()) {
-                position = (getStackedTabSpacing() *
-                        Math.min(count - (selectedItemIndex + 1), getStackedTabCount())) +
-                        (getStackedTabSpacing() * (selectedItemIndex - index));
-                state = State.STACKED_END;
-            } else {
-                position = (getStackedTabSpacing() *
-                        Math.min(count - (selectedItemIndex + 1), getStackedTabCount())) +
-                        (getStackedTabSpacing() * getStackedTabCount());
-                state = State.HIDDEN;
-            }
-        } else {
-            if ((count - index) <= getStackedTabCount()) {
-                position = getStackedTabSpacing() * (count - (index + 1));
-                state = predecessorState == null || predecessorState == State.FLOATING ?
-                        State.STACKED_START_ATOP : State.STACKED_START;
-            } else {
-                position = getStackedTabSpacing() * getStackedTabCount();
-                state = predecessorState == null || predecessorState == State.FLOATING ?
-                        State.STACKED_START_ATOP : State.HIDDEN;
-            }
-        }
-
-        return Pair.create(position, state);
-    }
-
-    @NonNull
-    @Override
-    protected final Pair<Float, State> calculatePositionAndStateWhenStackedAtEnd(final int index) {
-        float tabContainerWidth = getArithmetics().getTabContainerSize(Axis.DRAGGING_AXIS, false);
-        int selectedTabIndex = getModel().getSelectedTabIndex();
-        int selectedItemIndex = selectedTabIndex + (getModel().isAddTabButtonShown() ? 1 : 0);
-        int i = getModel().isAddTabButtonShown() ? index - 1 : index;
-        float position;
-        State state;
-
-        if (index == 0 && getModel().isAddTabButtonShown()) {
-            position = tabContainerWidth - addTabButtonWidth;
-            state = State.STACKED_END;
-        } else if (index == selectedItemIndex) {
-            position = tabContainerWidth - calculateAddTabButtonSpacing() - calculateTabSpacing() -
-                    (getStackedTabSpacing() * Math.min(getStackedTabCount(), i));
-            state = State.STACKED_END;
-        } else if (index < selectedItemIndex) {
-            if (i < getStackedTabCount()) {
-                position =
-                        tabContainerWidth - calculateAddTabButtonSpacing() - calculateTabSpacing() -
-                                (getStackedTabSpacing() * i);
-                state = State.STACKED_END;
-            } else {
-                position =
-                        tabContainerWidth - calculateAddTabButtonSpacing() - calculateTabSpacing() -
-                                (getStackedTabSpacing() * getStackedTabCount());
-                state = State.STACKED_END;
-            }
-        } else {
-            float selectedItemPosition =
-                    tabContainerWidth - calculateAddTabButtonSpacing() - calculateTabSpacing() -
-                            (getStackedTabSpacing() *
-                                    Math.min(getStackedTabCount(), selectedTabIndex));
-
-            if (index <= selectedItemIndex + getStackedTabCount()) {
-                position = selectedItemPosition -
-                        (getStackedTabSpacing() * (index - selectedItemIndex));
-                state = State.STACKED_END;
-            } else {
-                position = selectedItemPosition - (getStackedTabSpacing() * getStackedTabCount());
-                state = State.HIDDEN;
-            }
-        }
-
-        return Pair.create(position, state);
-    }
-
-    @Override
-    protected final float calculateMinStartPosition(final int index) {
-        if (areTabsFittingIntoTabContainer()) {
-            return calculateMaxEndPosition(index);
-        } else {
-            float tabContainerSize =
-                    getArithmetics().getTabContainerSize(Axis.DRAGGING_AXIS, false);
-
-            if (index == 0 && getModel().isAddTabButtonShown()) {
-                return tabContainerSize - addTabButtonWidth;
-            } else {
-                int i = getModel().isAddTabButtonShown() ? index : index + 1;
-                return tabContainerSize - calculateAddTabButtonSpacing() -
-                        (calculateTabSpacing() * i);
-            }
-        }
-    }
-
-    @Override
-    protected final float calculateMaxEndPosition(final int index) {
-        if (index == 0 && getModel().isAddTabButtonShown()) {
-            return getModel().getCount() * calculateTabSpacing() + addTabButtonOffset;
-        } else {
-            int i = getModel().isAddTabButtonShown() ? index : index + 1;
-            return (getModel().getCount() - i) * calculateTabSpacing();
-        }
-    }
-
-    @Override
-    protected final float calculateSuccessorPosition(@NonNull final AbstractItem item,
-                                                     @NonNull final AbstractItem predecessor) {
-        float predecessorPosition = predecessor.getTag().getPosition();
-
-        if (predecessor instanceof AddTabItem) {
-            return predecessorPosition - addTabButtonOffset - calculateTabSpacing();
-        } else {
-            return predecessorPosition - calculateTabSpacing();
-        }
-    }
-
-    @Override
-    protected final float calculatePredecessorPosition(@NonNull final AbstractItem item,
-                                                       @NonNull final AbstractItem successor) {
-        float successorPosition = successor.getTag().getPosition();
-        return successorPosition + calculateTabSpacing();
-    }
-
-    @Override
-    protected final void secondLayoutPass(
-            @NonNull final AbstractItemIterator.AbstractBuilder builder) {
-        int selectedItemIndex =
-                getModel().getSelectedTabIndex() + (getModel().isAddTabButtonShown() ? 1 : 0);
-        int stackedTabCount = getStackedTabCount() + (getModel().isAddTabButtonShown() ? 1 : 0);
-        AbstractItemIterator iterator =
-                builder.start(getModel().isAddTabButtonShown() ? 1 : 0).create();
-        AbstractItem item;
-
-        while ((item = iterator.next()) != null && item.getIndex() < selectedItemIndex) {
-            Tag tag = item.getTag();
-
-            if (tag.getState() == State.STACKED_END && item.getIndex() >= stackedTabCount) {
-                AbstractItem successor = iterator.peek();
-
-                if (successor != null && successor.getTag().getState() == State.STACKED_END) {
-                    tag.setState(State.HIDDEN);
-                    inflateOrRemoveView(item, false);
-                }
-            } else if (tag.getState() == State.FLOATING) {
-                return;
-            }
-        }
-    }
-
-    @NonNull
-    @Override
-    protected final AttachedViewRecycler.Adapter<Tab, Void> onCreateContentRecyclerAdapter() {
-        AttachedViewRecycler.Adapter<Tab, Void> adapter = contentViewRecycler.getAdapter();
-
-        if (adapter instanceof TabletContentRecyclerAdapterWrapper) {
-            getModel().removeListener((TabletContentRecyclerAdapterWrapper) adapter);
-        }
-
-        TabletContentRecyclerAdapterWrapper recyclerAdapter =
-                new TabletContentRecyclerAdapterWrapper(getTabSwitcher(), getStyle(),
-                        contentViewRecycler, getModel().getContentRecyclerAdapter());
-        getModel().addListener(recyclerAdapter);
-        return recyclerAdapter;
-    }
-
-    @Override
-    public final void onGlobalLayout() {
-        AbstractItem[] items = calculateInitialItems(getModel().getReferenceTabIndex(),
-                getModel().getReferenceTabPosition());
-        AbstractItemIterator iterator = new InitialItemIteratorBuilder(items).create();
-        AbstractItem item;
-
-        while ((item = iterator.next()) != null) {
-            if (item.isVisible()) {
-                inflateAndUpdateView(item, true, null);
-            }
-        }
-
-        Tab selectedTab = getModel().getSelectedTab();
-
-        if (selectedTab != null) {
-            inflateContent(selectedTab, createContentLayoutListener(selectedTab));
-        }
-    }
-
-    @Nullable
-    @Override
-    public final ViewGroup getTabContainer() {
-        return tabContainer;
-    }
-
-    @Nullable
-    @Override
-    public final Toolbar[] getToolbars() {
-        return primaryToolbar != null && secondaryToolbar != null ?
-                new Toolbar[]{primaryToolbar, secondaryToolbar} : null;
-    }
-
-    @Override
-    public final void onSelectionChanged(final int previousIndex, final int index,
-                                         @Nullable final Tab selectedTab,
-                                         final boolean switcherHidden) {
-        contentViewRecycler.removeAll();
-
-        if (selectedTab != null) {
-            inflateContent(selectedTab, createContentLayoutListener(selectedTab));
-            tabViewRecycler.setComparator(
-                    Collections.reverseOrder(new TabletItemComparator(getTabSwitcher())));
-            int tabSpacing = calculateTabSpacing();
-            int previousSelectedItemIndex = previousIndex +
-                    (previousIndex != -1 && getModel().isAddTabButtonShown() ? 1 : 0);
-            int selectedItemIndex = index + (getModel().isAddTabButtonShown() ? 1 : 0);
-            TabItem selectedTabItem = TabItem.create(getModel(), tabViewRecycler, index);
-            float referencePosition;
-
-            if (selectedTabItem.isInflated()) {
-                referencePosition = selectedTabItem.getTag().getPosition();
-            } else if (isStackedAtStart(selectedTabItem.getIndex())) {
-                Pair<Float, State> pair =
-                        calculatePositionAndStateWhenStackedAtStart(getModel().getCount(),
-                                selectedTabItem.getIndex(), selectedTabItem);
-                referencePosition = pair.first;
-            } else {
-                Pair<Float, State> pair =
-                        calculatePositionAndStateWhenStackedAtEnd(selectedTabItem.getIndex());
-                referencePosition = pair.first;
-            }
-
-            AbstractItemIterator iterator =
-                    new ItemIterator.Builder(getModel(), getTabViewRecycler())
-                            .start(getModel().isAddTabButtonShown() ? 1 : 0).create();
-            AbstractItem item;
-
-            while ((item = iterator.next()) != null) {
-                float position = -1;
-
-                if (item.getIndex() == selectedItemIndex) {
-                    position = referencePosition;
-                } else if (item.getIndex() < selectedItemIndex) {
-                    position = referencePosition +
-                            ((selectedItemIndex - item.getIndex()) * tabSpacing);
-                } else if (item.getIndex() == previousSelectedItemIndex) {
-                    position = item.getTag().getPosition();
-                } else if (item.getTag().getState() == State.STACKED_END ||
-                        (item.getTag().getState() == State.HIDDEN &&
-                                item.getIndex() < (selectedItemIndex + getStackedTabCount()))) {
-                    position = referencePosition;
-                }
-
-                if (position != -1) {
-                    Pair<Float, State> pair =
-                            clipPosition(item.getIndex(), position, iterator.previous());
-                    item.getTag().setPosition(pair.first);
-                    item.getTag().setState(pair.second);
-                    inflateOrRemoveView(item, false);
-                }
-            }
-
-            secondLayoutPass(new ItemIterator.Builder(getTabSwitcher(), getTabViewRecycler()));
-        }
-    }
-
-    @Override
-    protected final void updateView(@NonNull final AbstractItem item, final boolean dragging) {
-        super.updateView(item, dragging);
-
-        if (dragging && item instanceof TabItem && item.isInflated()) {
-            TabItem tabItem = (TabItem) item;
-
-            if (tabItem.getTab().isCloseable()) {
-                int selectedItemIndex = getModel().getSelectedTabIndex() +
-                        (getModel().isAddTabButtonShown() ? 1 : 0);
-
-                if (item.getIndex() == selectedItemIndex) {
-                    animateCloseButtonVisibility(tabItem.getViewHolder(), true);
-                    adaptPredecessorPaddingAndCloseButtonVisibility(tabItem);
-                } else if (item.getIndex() >= selectedItemIndex) {
-                    adaptCloseButtonVisibility(tabItem);
-                } else {
-                    adaptPredecessorPaddingAndCloseButtonVisibility(tabItem);
-                }
-            }
-        }
-    }
-
-    @Override
-    public final void onTabAdded(final int index, @NonNull final Tab tab,
-                                 final int previousSelectedTabIndex, final int selectedTabIndex,
-                                 final boolean selectionChanged,
-                                 final boolean switcherVisibilityChanged,
-                                 @NonNull final Animation animation) {
-        tab.addCallback(this);
-        // TODO: Implement
-    }
-
-    @Override
-    public final void onAllTabsAdded(final int index, @NonNull final Tab[] tabs,
-                                     final int previousSelectedTabIndex, final int selectedTabIndex,
-                                     final boolean selectionChanged,
-                                     @NonNull final Animation animation) {
-        for (Tab tab : tabs) {
-            tab.addCallback(this);
-        }
-        // TODO: Implement
-    }
-
-    @Override
-    public final void onTabRemoved(final int index, @NonNull final Tab tab,
-                                   final int previousSelectedTabIndex, final int selectedTabIndex,
-                                   final boolean selectionChanged,
-                                   @NonNull final Animation animation) {
-        tab.removeCallback(this);
-        // TODO: Implement
-    }
-
-    @Override
-    public final void onAllTabsRemoved(@NonNull final Tab[] tabs,
-                                       @NonNull final Animation animation) {
-        for (Tab tab : tabs) {
-            tab.removeCallback(this);
-        }
-        // TODO: Implement
-    }
-
-    @Override
-    public final void onPaddingChanged(final int left, final int top, final int right,
-                                       final int bottom) {
-        adaptTabContainerAndToolbarMargins();
-    }
-
-    @Override
-    public final void onApplyPaddingToTabsChanged(final boolean applyPaddingToTabs) {
-
-    }
-
-    @Override
-    public void onTabBackgroundColorChanged(@Nullable final ColorStateList colorStateList) {
-        adaptBorderColor();
-    }
-
-    @Override
-    public final void onAddTabButtonVisibilityChanged(final boolean visible) {
-        // TODO: Implement
-    }
-
-    @Override
-    public final void onEmptyViewChanged(@Nullable final View view, final long animationDuration) {
-        if (getModel().isEmpty()) {
-            // TODO: Adapt empty view
-        }
-    }
-
-    @Override
-    public final void onSwitchingBetweenTabs(final int selectedTabIndex, final float distance) {
-        TabItem tabItem = TabItem.create(getModel(), getTabViewRecycler(), selectedTabIndex);
-        View view = contentViewRecycler.getView(tabItem.getTab());
-
-        if (view != null) {
-            if (distance == 0 || (distance > 0 && selectedTabIndex < getModel().getCount() - 1) ||
-                    (distance < 0 && selectedTabIndex > 0)) {
-                view.setX(distance);
-
-                if (distance != 0) {
-                    TabItem neighbor = TabItem.create(getModel(), getTabViewRecycler(),
-                            distance > 0 ? selectedTabIndex + 1 : selectedTabIndex - 1);
-
-                    if (Math.abs(distance) >= swipedTabDistance) {
-                        inflateContent(neighbor.getTab(),
-                                createSwipeNeighborLayoutListener(neighbor, distance));
-                    } else {
-                        contentViewRecycler.remove(neighbor.getTab());
-                    }
-                }
-            } else {
-                float position = (float) Math.pow(Math.abs(distance), 0.75);
-                position = distance < 0 ? position * -1 : position;
-                view.setX(position);
-            }
-
-            getLogger().logVerbose(getClass(),
-                    "Swiping content of tab at index " + selectedTabIndex +
-                            ". Current swipe distance is " + distance + " pixels");
-        }
-    }
-
-    @Override
-    public final void onSwitchingBetweenTabsEnded(final int selectedTabIndex,
-                                                  final int previousSelectedTabIndex,
-                                                  final boolean selectionChanged,
-                                                  final float velocity,
-                                                  final long animationDuration) {
-        TabItem selectedTabItem =
-                TabItem.create(getModel(), getTabViewRecycler(), selectedTabIndex);
-        animateSwipe(selectedTabItem, 0, true, animationDuration, velocity);
-        TabItem neighbor = null;
-        boolean left = false;
-
-        if (selectionChanged) {
-            neighbor = TabItem.create(getModel(), getTabViewRecycler(), previousSelectedTabIndex);
-            left = selectedTabIndex < previousSelectedTabIndex;
-        } else {
-            View view = contentViewRecycler.getView(selectedTabItem.getTab());
-
-            if (view != null) {
-                if (view.getX() > 0) {
-                    if (selectedTabIndex + 1 < getModel().getCount()) {
-                        neighbor = TabItem.create(getModel(), getTabViewRecycler(),
-                                selectedTabIndex + 1);
-                        left = true;
-                    }
-                } else {
-                    if (selectedTabIndex - 1 >= 0) {
-                        neighbor = TabItem.create(getModel(), getTabViewRecycler(),
-                                selectedTabIndex - 1);
-                        left = false;
-                    }
-                }
-            }
-        }
-
-        if (neighbor != null) {
-            View neighborView = contentViewRecycler.getView(neighbor.getTab());
-
-            if (neighborView != null) {
-                float width = neighborView.getWidth();
-                float targetPosition =
-                        left ? (width + swipedTabDistance) * -1 : width + swipedTabDistance;
-                animateSwipe(neighbor, targetPosition, false, animationDuration, velocity);
-            }
-        }
-    }
-
-    @Override
-    public final void onTitleChanged(@NonNull final Tab tab) {
-
-    }
-
-    @Override
-    public final void onIconChanged(@NonNull final Tab tab) {
-
-    }
-
-    @Override
-    public final void onCloseableChanged(@NonNull final Tab tab) {
-
-    }
-
-    @Override
-    public final void onCloseButtonIconChanged(@NonNull final Tab tab) {
-
-    }
-
-    @Override
-    public final void onBackgroundColorChanged(@NonNull final Tab tab) {
-        if (getModel().getSelectedTab() == tab) {
-            adaptBorderColor();
-        }
-    }
-
-    @Override
-    public final void onContentBackgroundColorChanged(@NonNull final Tab tab) {
-
-    }
-
-    @Override
-    public final void onTitleTextColorChanged(@NonNull final Tab tab) {
-
-    }
-
-    @Override
-    public final void onProgressBarVisibilityChanged(@NonNull final Tab tab) {
-
-    }
-
-    @Override
-    public final void onProgressBarColorChanged(@NonNull final Tab tab) {
-
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletTabViewHolder.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletTabViewHolder.java
deleted file mode 100644
index 7b95d87d..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/layout/tablet/TabletTabViewHolder.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.layout.tablet;
-
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.layout.AbstractTabViewHolder;
-
-/**
- * A view holder, which allows to store references to the views, a tab of a {@link TabSwitcher}
- * consists of, when using the tablet layout.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public class TabletTabViewHolder extends AbstractTabViewHolder {
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/AbstractItem.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/AbstractItem.java
deleted file mode 100644
index 52076c08..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/AbstractItem.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.model;
-
-import android.view.View;
-
-import androidx.annotation.CallSuper;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.util.Condition;
-
-/**
- * An item, which contains information about a child view of a {@link TabSwitcher}.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public abstract class AbstractItem {
-
-    /**
-     * The index of the item.
-     */
-    private final int index;
-
-    /**
-     * The view, which is used to visualize the item.
-     */
-    private View view;
-
-    /**
-     * The tag, which is associated with the item.
-     */
-    private Tag tag;
-
-    /**
-     * Creates a new item, which contains information about a child view of a {@link TabSwitcher}.
-     *
-     * @param index
-     *         The index of the item as an {@link Integer} value. The index must be at least 0
-     */
-    public AbstractItem(final int index) {
-        Condition.INSTANCE.ensureAtLeast(index, 0, "The index must be at least 0");
-        this.index = index;
-        this.view = null;
-        this.tag = new Tag();
-    }
-
-    /**
-     * Returns the index of the item. The index allows to identify the item's view among all child
-     * views, which are contained by the tab switcher.
-     *
-     * @return The index of the item as an {@link Integer} value. The index must be at least 0
-     */
-    public final int getIndex() {
-        return index;
-    }
-
-    /**
-     * Returns the view, which is used to visualize the item.
-     *
-     * @return The view, which is used to visualize the item, as an instance of the class {@link
-     * View} or null, if no such view is currently inflated
-     */
-    public final View getView() {
-        return view;
-    }
-
-    /**
-     * Sets the view, which is used to visualize the item.
-     *
-     * @param view
-     *         The view, which should be set, as an instance of the class {@link View} or null, if
-     *         no view should be set
-     */
-    public final void setView(@Nullable final View view) {
-        this.view = view;
-    }
-
-    /**
-     * Returns the tag, which is associated with the item.
-     *
-     * @return The tag as an instance of the class {@link Tag}. The tag may not be null
-     */
-    @NonNull
-    public final Tag getTag() {
-        return tag;
-    }
-
-    /**
-     * Sets the tag, which is associated with the item.
-     *
-     * @param tag
-     *         The tag, which should be set, as an instance of the class {@link Tag}. The tag may
-     *         not be null
-     */
-    public final void setTag(@NonNull final Tag tag) {
-        Condition.INSTANCE.ensureNotNull(tag, "The tag may not be null");
-        this.tag = tag;
-    }
-
-    /**
-     * Returns, whether the item is currently visible, or not.
-     *
-     * @return True, if the item is currently visible, false otherwise
-     */
-    public final boolean isVisible() {
-        return tag.getState() != State.HIDDEN || tag.isClosing();
-    }
-
-    /**
-     * Returns, whether a view, which is used to visualize the item, is currently inflated, or not.
-     *
-     * @return True, if a view, which is used to visualize the item, is currently inflated, false
-     * otherwise
-     */
-    @CallSuper
-    public boolean isInflated() {
-        return view != null;
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/AddTabItem.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/AddTabItem.java
deleted file mode 100644
index d7a9e378..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/AddTabItem.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.model;
-
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import de.mrapp.android.tabswitcher.R;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.util.view.AttachedViewRecycler;
-
-/**
- * An item, which contains information about a button a {@link TabSwitcher}, which allows to add a
- * new tab.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public class AddTabItem extends AbstractItem {
-
-    /**
-     * Creates a new item, which contains information about a button of a {@link TabSwitcher}, which
-     * allows to add a new tab. By default, the item is neither associated with a view, nor with a
-     * view holder.
-     *
-     * @param index
-     *         The index of the item as an {@link Integer} value. The index must be at least 0
-     */
-    private AddTabItem(final int index) {
-        super(index);
-    }
-
-    /**
-     * Creates a new item, which contains information about a button of a {@link TabSwitcher}, which
-     * allows to add a new tab.
-     *
-     * @param viewRecycler
-     *         The view recycler, which is used to reuse the views, which are used to visualize
-     *         tabs, as an instance of the class AttachedViewRecycler. The view recycler may not be
-     *         null
-     * @return The item, which has been created, as an instance of the class {@link AddTabItem}. The
-     * item may not be null
-     */
-    @NonNull
-    public static AddTabItem create(
-            @NonNull final AttachedViewRecycler<AbstractItem, ?> viewRecycler) {
-        AddTabItem addTabItem = new AddTabItem(0);
-        View view = viewRecycler.getView(addTabItem);
-
-        if (view != null) {
-            addTabItem.setView(view);
-            Tag tag = (Tag) view.getTag(R.id.tag_properties);
-
-            if (tag != null) {
-                addTabItem.setTag(tag);
-            }
-        }
-
-        return addTabItem;
-    }
-
-    @Override
-    public final String toString() {
-        return "AddTabItem [index = " + getIndex() + "]";
-    }
-
-    @Override
-    public final int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + getIndex();
-        return result;
-    }
-
-    @Override
-    public final boolean equals(final Object obj) {
-        if (obj == null)
-            return false;
-        if (obj.getClass() != getClass())
-            return false;
-        AddTabItem other = (AddTabItem) obj;
-        return getIndex() == other.getIndex();
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/ItemComparator.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/ItemComparator.java
deleted file mode 100644
index 95c7195c..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/ItemComparator.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.model;
-
-import java.util.Comparator;
-
-import androidx.annotation.NonNull;
-import de.mrapp.android.tabswitcher.Tab;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.util.Condition;
-
-/**
- * A comparator, which allows to compare two instances of the class {@link AbstractItem}.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public class ItemComparator implements Comparator<AbstractItem> {
-
-    /**
-     * The tab switcher, the items, which are compared by the comparator, belong to.
-     */
-    private final TabSwitcher tabSwitcher;
-
-    /**
-     * Returns the tab switcher, the items, which are compared by the comparator, belong to.
-     *
-     * @return The tab switcher, the items, which are compared by the comparator, belong to, as an
-     * instance of the class {@link TabSwitcher}. The tab switcher may not be null
-     */
-    @NonNull
-    protected final TabSwitcher getTabSwitcher() {
-        return tabSwitcher;
-    }
-
-    /**
-     * Creates a new comparator, which allows to compare two instances of the class {@link
-     * AbstractItem}.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, the tab items, which should be compared by the comparator, belong
-     *         to, as a instance of the class {@link TabSwitcher}. The tab switcher may not be null
-     */
-    public ItemComparator(@NonNull final TabSwitcher tabSwitcher) {
-        Condition.INSTANCE.ensureNotNull(tabSwitcher, "The tab switcher may not be null");
-        this.tabSwitcher = tabSwitcher;
-    }
-
-    @Override
-    public int compare(final AbstractItem o1, final AbstractItem o2) {
-        if (o1 instanceof AddTabItem && o2 instanceof AddTabItem) {
-            return 0;
-        } else if (o1 instanceof AddTabItem) {
-            return -1;
-        } else if (o2 instanceof AddTabItem) {
-            return 1;
-        } else if (o1 instanceof TabItem && o2 instanceof TabItem) {
-            TabItem item1 = (TabItem) o1;
-            TabItem item2 = (TabItem) o2;
-            Tab tab1 = item1.getTab();
-            Tab tab2 = item2.getTab();
-            int index1 = tabSwitcher.indexOf(tab1);
-            index1 = index1 == -1 ? item1.getIndex() : index1;
-            int index2 = tabSwitcher.indexOf(tab2);
-            index2 = index2 == -1 ? item2.getIndex() : index2;
-            Condition.INSTANCE
-                    .ensureNotEqual(index1, -1, "Tab " + tab1 + " not contained by tab switcher",
-                            RuntimeException.class);
-            Condition.INSTANCE
-                    .ensureNotEqual(index2, -1, "Tab " + tab2 + " not contained by tab switcher",
-                            RuntimeException.class);
-            return index1 < index2 ? -1 : 1;
-        } else {
-            throw new RuntimeException("Unknown item types");
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/Model.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/Model.java
deleted file mode 100644
index 88286e60..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/Model.java
+++ /dev/null
@@ -1,1351 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.model;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.graphics.Bitmap;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
-import android.view.View;
-import android.view.View.OnClickListener;
-
-import java.util.Collection;
-import java.util.NoSuchElementException;
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.LayoutRes;
-import androidx.annotation.MenuRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener;
-import de.mrapp.android.tabswitcher.AddTabButtonListener;
-import de.mrapp.android.tabswitcher.Animation;
-import de.mrapp.android.tabswitcher.SwipeAnimation;
-import de.mrapp.android.tabswitcher.SwipeAnimation.SwipeDirection;
-import de.mrapp.android.tabswitcher.Tab;
-import de.mrapp.android.tabswitcher.TabCloseListener;
-import de.mrapp.android.tabswitcher.TabPreviewListener;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.TabSwitcherDecorator;
-import de.mrapp.android.util.logging.LogLevel;
-
-/**
- * Defines the interface, a class, which implements the model of a {@link TabSwitcher} must
- * implement.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public interface Model extends Iterable<Tab> {
-
-    /**
-     * Defines the interface, a class, which should be notified about the model's events, must
-     * implement.
-     */
-    interface Listener {
-
-        /**
-         * The method, which is invoked, when the log level has been changed.
-         *
-         * @param logLevel
-         *         The log level, which has been set, as a value of the enum LogLevel. The log level
-         *         may not be null
-         */
-        void onLogLevelChanged(@NonNull LogLevel logLevel);
-
-        /**
-         * The method, which is invoked, when the decorator has been changed.
-         *
-         * @param decorator
-         *         The decorator, which has been set, as an instance of the class {@link
-         *         TabSwitcherDecorator}. The decorator may not be null
-         */
-        void onDecoratorChanged(@NonNull TabSwitcherDecorator decorator);
-
-        /**
-         * The method, which is invoked, when the tab switcher has been shown.
-         */
-        void onSwitcherShown();
-
-        /**
-         * The method, which is invoked, when the tab switcher has been hidden.
-         */
-        void onSwitcherHidden();
-
-        /**
-         * The method, which is invoked, when the currently selected tab has been changed.
-         *
-         * @param previousIndex
-         *         The index of the previously selected tab as an {@link Integer} value or -1, if no
-         *         tab was previously selected
-         * @param index
-         *         The index of the currently selected tab as an {@link Integer} value or -1, if the
-         *         tab switcher does not contain any tabs
-         * @param selectedTab
-         *         The currently selected tab as an instance of the class {@link Tab} or null, if
-         *         the tab switcher does not contain any tabs
-         * @param switcherHidden
-         *         True, if selecting the tab caused the tab switcher to be hidden, false otherwise
-         */
-        void onSelectionChanged(int previousIndex, int index, @Nullable Tab selectedTab,
-                                boolean switcherHidden);
-
-        /**
-         * The method, which is invoked, when a tab has been added to the model.
-         *
-         * @param index
-         *         The index of the tab, which has been added, as an {@link Integer} value
-         * @param tab
-         *         The tab, which has been added, as an instance of the class {@link Tab}. The tab
-         *         may not be null
-         * @param previousSelectedTabIndex
-         *         The index of the previously selected tab as an {@link Integer} value or -1, if no
-         *         tab was selected
-         * @param selectedTabIndex
-         *         The index of the currently selected tab as an {@link Integer} value or -1, if the
-         *         tab switcher does not contain any tabs
-         * @param selectionChanged
-         *         True, if the selection has changed, false otherwise
-         * @param switcherVisibilityChanged
-         *         True, if adding the tab caused the visibility of the tab switcher to be changed,
-         *         false otherwise
-         * @param animation
-         *         The animation, which has been used to add the tab, as an instance of the class
-         *         {@link Animation}. The animation may not be null
-         */
-        void onTabAdded(int index, @NonNull Tab tab, int previousSelectedTabIndex,
-                        int selectedTabIndex, boolean selectionChanged,
-                        boolean switcherVisibilityChanged, @NonNull Animation animation);
-
-        /**
-         * The method, which is invoked, when multiple tabs have been added to the model.
-         *
-         * @param index
-         *         The index of the first tab, which has been added, as an {@link Integer} value
-         * @param tabs
-         *         An array, which contains the tabs, which have been added, as an array of the type
-         *         {@link Tab} or an empty array, if no tabs have been added
-         * @param previousSelectedTabIndex
-         *         The index of the previously selected tab as an {@link Integer} value or -1, if no
-         *         tab was selected
-         * @param selectionChanged
-         *         True, if the selection has changed, false otherwise
-         * @param selectedTabIndex
-         *         The index of the currently selected tab as an {@link Integer} value or -1, if the
-         *         tab switcher does not contain any tabs
-         * @param animation
-         *         The animation, which has been used to add the tabs, as an instance of the class
-         *         {@link Animation}. The animation may not be null
-         */
-        void onAllTabsAdded(int index, @NonNull Tab[] tabs, int previousSelectedTabIndex,
-                            int selectedTabIndex, boolean selectionChanged,
-                            @NonNull Animation animation);
-
-        /**
-         * The method, which is invoked, when a tab has been removed from the model.
-         *
-         * @param index
-         *         The index of the tab, which has been removed, as an {@link Integer} value
-         * @param tab
-         *         The tab, which has been removed, as an instance of the class {@link Tab}. The tab
-         *         may not be null
-         * @param previousSelectedTabIndex
-         *         The index of the previously selected tab as an {@link Integer} value or -1, if no
-         *         tab was selected
-         * @param selectedTabIndex
-         *         The index of the currently selected tab as an {@link Integer} value or -1, if the
-         *         tab switcher does not contain any tabs
-         * @param selectionChanged
-         *         True, if the selection changed, false otherwise
-         * @param animation
-         *         The animation, which has been used to remove the tab, as an instance of the class
-         *         {@link Animation}. The animation may not be null
-         */
-        void onTabRemoved(int index, @NonNull Tab tab, int previousSelectedTabIndex,
-                          int selectedTabIndex, boolean selectionChanged,
-                          @NonNull Animation animation);
-
-        /**
-         * The method, which is invoked, when all tabs have been removed from the tab switcher.
-         *
-         * @param tabs
-         *         An array, which contains the tabs, which have been removed, as an array of the
-         *         type {@link Tab} or an empty array, if no tabs have been removed
-         * @param animation
-         *         The animation, which has been used to remove the tabs, as an instance of the
-         *         class {@link Animation}. The animation may not be null
-         */
-        void onAllTabsRemoved(@NonNull Tab[] tabs, @NonNull Animation animation);
-
-        /**
-         * The method, which is invoked, when the padding has been changed.
-         *
-         * @param left
-         *         The left padding, which has been set, in pixels as an {@link Integer} value
-         * @param top
-         *         The top padding, which has been set, in pixels as an {@link Integer} value
-         * @param right
-         *         The right padding, which has been set, in pixels as an {@link Integer} value
-         * @param bottom
-         *         The bottom padding, which has been set, in pixels as an {@link Integer} value
-         */
-        void onPaddingChanged(int left, int top, int right, int bottom);
-
-        /**
-         * The method, which is invoked, when it has been changed, whether the padding of the tab
-         * switcher is applied to the content of its tabs, or not.
-         *
-         * @param applyPaddingToTabs
-         *         True, if the padding of the tab switcher is applied to the content of its tabs,
-         *         false otherwise
-         */
-        void onApplyPaddingToTabsChanged(boolean applyPaddingToTabs);
-
-        /**
-         * The method, which is invoked, when the default icon of a tab has been changed.
-         *
-         * @param icon
-         *         The icon, which has been set, as an instance of the class {@link Drawable} or
-         *         null, if no icon is set
-         */
-        void onTabIconChanged(@Nullable Drawable icon);
-
-        /**
-         * The method, which is invoked, when the background color of a tab has been changed.
-         *
-         * @param colorStateList
-         *         The color state list, which has been set, as an instance of the class {@link
-         *         ColorStateList} or null, if the default color should be used
-         */
-        void onTabBackgroundColorChanged(@Nullable ColorStateList colorStateList);
-
-        /**
-         * The method, which is invoked, when the background color of a tab's content has been
-         * changed.
-         *
-         * @param color
-         *         The color, which has been set, as an {@link Integer} value or -1, if the default
-         *         color should be used
-         */
-        void onTabContentBackgroundColorChanged(@ColorInt int color);
-
-        /**
-         * The method, which is invoked, when the text color of a tab's title has been changed.
-         *
-         * @param colorStateList
-         *         The color state list, which has been set, as an instance of the class {@link
-         *         ColorStateList} or null, if the default color should be used
-         */
-        void onTabTitleColorChanged(@Nullable ColorStateList colorStateList);
-
-        /**
-         * The method, which is invoked, when the icon of a tab's close button has been changed.
-         *
-         * @param icon
-         *         The icon, which has been set, as an instance of the class {@link Drawable} or
-         *         null, if the default icon should be used
-         */
-        void onTabCloseButtonIconChanged(@Nullable Drawable icon);
-
-        /**
-         * The method, which is invoked, when the color of a tab's progress bar has been changed.
-         *
-         * @param color
-         *         The color, which has been set, as an {@link Integer} value or -1, if the default
-         *         color should be used
-         */
-        void onTabProgressBarColorChanged(@ColorInt int color);
-
-        /**
-         * The method, which is invoked, when it has been changed, whether the button, which allows
-         * to add a new tab, should be shown, or not.
-         *
-         * @param visible
-         *         True, if the button, which allows to add a new tab, should be shown, false
-         *         otherwise
-         */
-        void onAddTabButtonVisibilityChanged(boolean visible);
-
-        /**
-         * The method, which is invoked, when the color of the button, which allows to add a new
-         * tab, has been changed.
-         *
-         * @param colorStateList
-         *         The color, which has been set, as an instance of the class {@link ColorStateList}
-         *         or null, if the default color should be used
-         */
-        void onAddTabButtonColorChanged(@Nullable ColorStateList colorStateList);
-
-        /**
-         * The method, which is invoked, when it has been changed, whether the toolbars should be
-         * shown, when the tab switcher is shown, or not.
-         *
-         * @param visible
-         *         True, if the toolbars should be shown, when the tab switcher is shown, false
-         *         otherwise
-         */
-        void onToolbarVisibilityChanged(boolean visible);
-
-        /**
-         * The method, which is invoked, when the title of the toolbar, which is shown, when the tab
-         * switcher is shown, has been changed.
-         *
-         * @param title
-         *         The title, which has been set, as an instance of the type {@link CharSequence} or
-         *         null, if no title is set
-         */
-        void onToolbarTitleChanged(@Nullable CharSequence title);
-
-        /**
-         * The method, which is invoked, when the navigation icon of the toolbar, which is shown,
-         * when the tab switcher is shown, has been changed.
-         *
-         * @param icon
-         *         The navigation icon, which has been set, as an instance of the class {@link
-         *         Drawable} or null, if no navigation icon is set
-         * @param listener
-         *         The listener, which should be notified, when the navigation item has been
-         *         clicked, as an instance of the type {@link OnClickListener} or null, if no
-         *         listener should be notified
-         */
-        void onToolbarNavigationIconChanged(@Nullable Drawable icon,
-                                            @Nullable OnClickListener listener);
-
-        /**
-         * The method, which is invoked, when the menu of the toolbar, which is shown, when the tab
-         * switcher is shown, has been inflated.
-         *
-         * @param resourceId
-         *         The resource id of the menu, which has been inflated, as an {@link Integer}
-         *         value. The resource id must correspond to a valid menu resource
-         * @param listener
-         *         The listener, which has been registered to be notified, when an item of the menu
-         *         has been clicked, as an instance of the type OnMenuItemClickListener or null, if
-         *         no listener should be notified
-         */
-        void onToolbarMenuInflated(@MenuRes int resourceId,
-                                   @Nullable OnMenuItemClickListener listener);
-
-        /**
-         * The method, which is invoked, when the view, which is shown, when the tab switcher is
-         * empty, has been changed.
-         *
-         * @param view
-         *         The view, which has been set, as an instance of the class {@link View} or null,
-         *         if no view should be shown, when the tab switcher is empty
-         * @param animationDuration
-         *         The duration of the fade animation, which is used to show or hide the view, in
-         *         milliseconds as a {@link Long} value. The duration must be at least 0 or -1, if
-         *         the default duration should be used
-         */
-        void onEmptyViewChanged(@Nullable View view, long animationDuration);
-
-    }
-
-    /**
-     * Returns the context, which is used by the tab switcher.
-     *
-     * @return The context, which is used by the tab switcher, as an instance of the class {@link
-     * Context}. The context may not be null
-     */
-    Context getContext();
-
-    /**
-     * Sets the decorator, which allows to inflate the views, which correspond to the tabs of the
-     * tab switcher.
-     *
-     * @param decorator
-     *         The decorator, which should be set, as an instance of the class {@link
-     *         TabSwitcherDecorator}. The decorator may not be null
-     */
-    void setDecorator(@NonNull TabSwitcherDecorator decorator);
-
-    /**
-     * Returns the decorator, which allows to inflate the views, which correspond to the tabs of the
-     * tab switcher.
-     *
-     * @return The decorator as an instance of the class {@link TabSwitcherDecorator} or null, if no
-     * decorator has been set
-     */
-    TabSwitcherDecorator getDecorator();
-
-    /**
-     * Returns the log level, which is used for logging.
-     *
-     * @return The log level, which is used for logging, as a value of the enum LogLevel. The log
-     * level may not be null
-     */
-    @NonNull
-    LogLevel getLogLevel();
-
-    /**
-     * Sets the log level, which should be used for logging.
-     *
-     * @param logLevel
-     *         The log level, which should be set, as a value of the enum LogLevel. The log level
-     *         may not be null
-     */
-    void setLogLevel(@NonNull LogLevel logLevel);
-
-    /**
-     * Returns, whether the tab switcher is empty, or not.
-     *
-     * @return True, if the tab switcher is empty, false otherwise
-     */
-    boolean isEmpty();
-
-    /**
-     * Returns the number of tabs, which are contained by the tab switcher.
-     *
-     * @return The number of tabs, which are contained by the tab switcher, as an {@link Integer}
-     * value
-     */
-    int getCount();
-
-    /**
-     * Returns the tab at a specific index.
-     *
-     * @param index
-     *         The index of the tab, which should be returned, as an {@link Integer} value. The
-     *         index must be at least 0 and at maximum <code>getCount() - 1</code>, otherwise a
-     *         {@link IndexOutOfBoundsException} will be thrown
-     * @return The tab, which corresponds to the given index, as an instance of the class {@link
-     * Tab}. The tab may not be null
-     */
-    @NonNull
-    Tab getTab(int index);
-
-    /**
-     * Returns the index of a specific tab.
-     *
-     * @param tab
-     *         The tab, whose index should be returned, as an instance of the class {@link Tab}. The
-     *         tab may not be null
-     * @return The index of the given tab as an {@link Integer} value or -1, if the given tab is not
-     * contained by the tab switcher
-     */
-    int indexOf(@NonNull Tab tab);
-
-    /**
-     * Adds a new tab to the tab switcher. By default, the tab is added at the end. If the switcher
-     * is currently shown, the tab is added by using an animation. By default, a {@link
-     * SwipeAnimation} with direction {@link SwipeDirection#RIGHT_OR_BOTTOM} is used. If an
-     * animation is currently running, the tab will be added once all previously started animations
-     * have been finished.
-     *
-     * @param tab
-     *         The tab, which should be added, as an instance of the class {@link Tab}. The tab may
-     *         not be null
-     */
-    void addTab(@NonNull Tab tab);
-
-    /**
-     * Adds a new tab to the tab switcher at a specific index. If the switcher is currently shown,
-     * the tab is added by using an animation. By default, a {@link SwipeAnimation} with direction
-     * {@link SwipeDirection#RIGHT_OR_BOTTOM} is used. If an animation is currently running, the tab
-     * will be added once all previously started animations have been finished.
-     *
-     * @param tab
-     *         The tab, which should be added, as an instance of the class {@link Tab}. The tab may
-     *         not be null
-     * @param index
-     *         The index, the tab should be added at, as an {@link Integer} value. The index must be
-     *         at least 0 and at maximum <code>getCount()</code>, otherwise an {@link
-     *         IndexOutOfBoundsException} will be thrown
-     */
-    void addTab(@NonNull Tab tab, int index);
-
-    /**
-     * Adds a new tab to the tab switcher at a specific index. If the switcher is currently shown,
-     * the tab is added by using a specific animation. If an animation is currently running, the tab
-     * will be added once all previously started animations have been finished.
-     *
-     * @param tab
-     *         The tab, which should be added, as an instance of the class {@link Tab}. The tab may
-     *         not be null
-     * @param index
-     *         The index, the tab should be added at, as an {@link Integer} value. The index must be
-     *         at least 0 and at maximum <code>getCount()</code>, otherwise an {@link
-     *         IndexOutOfBoundsException} will be thrown
-     * @param animation
-     *         The animation, which should be used to add the tab, as an instance of the class
-     *         {@link Animation}. The animation may not be null
-     */
-    void addTab(@NonNull Tab tab, int index, @NonNull Animation animation);
-
-    /**
-     * Adds all tabs, which are contained by a collection, to the tab switcher. By default, the tabs
-     * are added at the end. If the switcher is currently shown, the tabs are added by using an
-     * animation. By default, a {@link SwipeAnimation} with direction {@link
-     * SwipeDirection#RIGHT_OR_BOTTOM} is used. If an animation is currently running, the tabs will
-     * be added once all previously started animations have been finished.
-     *
-     * @param tabs
-     *         A collection, which contains the tabs, which should be added, as an instance of the
-     *         type {@link Collection} or an empty collection, if no tabs should be added
-     */
-    void addAllTabs(@NonNull Collection<? extends Tab> tabs);
-
-    /**
-     * Adds all tabs, which are contained by a collection, to the tab switcher, starting at a
-     * specific index. If the switcher is currently shown, the tabs are added by using an animation.
-     * By default, a {@link SwipeAnimation} with direction {@link SwipeDirection#RIGHT_OR_BOTTOM} is
-     * used. If an animation is currently running, the tabs will be added once all previously
-     * started animations have been finished.
-     *
-     * @param tabs
-     *         A collection, which contains the tabs, which should be added, as an instance of the
-     *         type {@link Collection} or an empty collection, if no tabs should be added
-     * @param index
-     *         The index, the first tab should be started at, as an {@link Integer} value. The index
-     *         must be at least 0 and at maximum <code>getCount()</code>, otherwise an {@link
-     *         IndexOutOfBoundsException} will be thrown
-     */
-    void addAllTabs(@NonNull Collection<? extends Tab> tabs, int index);
-
-    /**
-     * Adds all tabs, which are contained by a collection, to the tab switcher, starting at a
-     * specific index. If the switcher is currently shown, the tabs are added by using a specific
-     * animation. If an animation is currently running, the tabs will be added once all previously
-     * started animations have been finished.
-     *
-     * @param tabs
-     *         A collection, which contains the tabs, which should be added, as an instance of the
-     *         type {@link Collection} or an empty collection, if no tabs should be added
-     * @param index
-     *         The index, the first tab should be started at, as an {@link Integer} value. The index
-     *         must be at least 0 and at maximum <code>getCount()</code>, otherwise an {@link
-     *         IndexOutOfBoundsException} will be thrown
-     * @param animation
-     *         The animation, which should be used to add the tabs, as an instance of the class
-     *         {@link Animation}. The animation may not be null
-     */
-    void addAllTabs(@NonNull Collection<? extends Tab> tabs, int index,
-                    @NonNull Animation animation);
-
-    /**
-     * Adds all tabs, which are contained by an array, to the tab switcher. By default, the tabs are
-     * added at the end. If the switcher is currently shown, the tabs are added by using an
-     * animation. By default, a {@link SwipeAnimation} with direction {@link
-     * SwipeDirection#RIGHT_OR_BOTTOM} is used. If an animation is currently running, the tabs will
-     * be added once all previously started animations have been finished.
-     *
-     * @param tabs
-     *         An array, which contains the tabs, which should be added, as an array of the type
-     *         {@link Tab} or an empty array, if no tabs should be added
-     */
-    void addAllTabs(@NonNull Tab[] tabs);
-
-    /**
-     * Adds all tabs, which are contained by an array, to the tab switcher, starting at a specific
-     * index. If the switcher is currently shown, the tabs are added by using an animation. By
-     * default, a {@link SwipeAnimation} with direction {@link SwipeDirection#RIGHT_OR_BOTTOM} is
-     * used. If an animation is currently running, the tabs will be added once all previously
-     * started animations have been finished.
-     *
-     * @param tabs
-     *         An array, which contains the tabs, which should be added, as an array of the type
-     *         {@link Tab} or an empty array, if no tabs should be added
-     * @param index
-     *         The index, the first tab should be started at, as an {@link Integer} value. The index
-     *         must be at least 0 and at maximum <code>getCount()</code>, otherwise an {@link
-     *         IndexOutOfBoundsException} will be thrown
-     */
-    void addAllTabs(@NonNull Tab[] tabs, int index);
-
-    /**
-     * Adds all tabs, which are contained by an array, to the tab switcher, starting at a specific
-     * index. If the switcher is currently shown, the tabs are added by using a specific animation.
-     * If an animation is currently running, the tabs will be added once all previously started
-     * animations have been finished.
-     *
-     * @param tabs
-     *         An array, which contains the tabs, which should be added, as an array of the type
-     *         {@link Tab} or an empty array, if no tabs should be added
-     * @param index
-     *         The index, the first tab should be started at, as an {@link Integer} value. The index
-     *         must be at least 0 and at maximum <code>getCount()</code>, otherwise an {@link
-     *         IndexOutOfBoundsException} will be thrown
-     * @param animation
-     *         The animation, which should be used to add the tabs, as an instance of the class
-     *         {@link Animation}. The animation may not be null
-     */
-    void addAllTabs(@NonNull Tab[] tabs, int index, @NonNull Animation animation);
-
-    /**
-     * Removes a specific tab from the tab switcher. If the switcher is currently shown, the tab is
-     * removed by using an animation. By default, a {@link SwipeAnimation} with direction {@link
-     * SwipeDirection#RIGHT_OR_BOTTOM} is used. If an animation is currently running, the tab will
-     * be removed once all previously started animations have been finished.
-     *
-     * @param tab
-     *         The tab, which should be removed, as an instance of the class {@link Tab}. The tab
-     *         may not be null
-     */
-    void removeTab(@NonNull Tab tab);
-
-    /**
-     * Removes a specific tab from the tab switcher. If the switcher is currently shown, the tab is
-     * removed by using a specific animation. If an animation is currently running, the tab will be
-     * removed once all previously started animations have been finished.
-     *
-     * @param tab
-     *         The tab, which should be removed, as an instance of the class {@link Tab}. The tab
-     *         may not be null
-     * @param animation
-     *         The animation, which should be used to remove the tabs, as an instance of the class
-     *         {@link Animation}. The animation may not be null
-     */
-    void removeTab(@NonNull Tab tab, @NonNull Animation animation);
-
-    /**
-     * Removes all tabs from the tab switcher. If the switcher is currently shown, the tabs are
-     * removed by using an animation. By default, a {@link SwipeAnimation} with direction {@link
-     * SwipeDirection#RIGHT_OR_BOTTOM} is used. If an animation is currently running, the tabs will
-     * be removed once all previously started animations have been finished.
-     */
-    void clear();
-
-    /**
-     * Removes all tabs from the tab switcher. If the switcher is currently shown, the tabs are
-     * removed by using a specific animation. If an animation is currently running, the tabs will be
-     * removed once all previously started animations have been finished.
-     *
-     * @param animation
-     *         The animation, which should be used to remove the tabs, as an instance of the class
-     *         {@link Animation}. The animation may not be null
-     */
-    void clear(@NonNull Animation animation);
-
-    /**
-     * Returns, whether the tab switcher is currently shown.
-     *
-     * @return True, if the tab switcher is currently shown, false otherwise
-     */
-    boolean isSwitcherShown();
-
-    /**
-     * Shows the tab switcher by using an animation, if it is not already shown.
-     */
-    void showSwitcher();
-
-    /**
-     * Hides the tab switcher by using an animation, if it is currently shown.
-     */
-    void hideSwitcher();
-
-    /**
-     * Toggles the visibility of the tab switcher by using an animation, i.e. if the switcher is
-     * currently shown, it is hidden, otherwise it is shown.
-     */
-    void toggleSwitcherVisibility();
-
-    /**
-     * Returns the currently selected tab.
-     *
-     * @return The currently selected tab as an instance of the class {@link Tab} or null, if no tab
-     * is currently selected
-     */
-    @Nullable
-    Tab getSelectedTab();
-
-    /**
-     * Returns the index of the currently selected tab.
-     *
-     * @return The index of the currently selected tab as an {@link Integer} value or -1, if no tab
-     * is currently selected
-     */
-    int getSelectedTabIndex();
-
-    /**
-     * Selects a specific tab.
-     *
-     * @param tab
-     *         The tab, which should be selected, as an instance of the class {@link Tab}. The tab
-     *         may not be null. If the tab is not contained by the tab switcher, a {@link
-     *         NoSuchElementException} will be thrown
-     */
-    void selectTab(@NonNull Tab tab);
-
-    /**
-     * Selects the tab as a specific index.
-     *
-     * @param index
-     *         The index of the tab, which should be selected, as an {@link Integer} value. The
-     *         index must be at least 0 and at maximum <code>getCount() - 1</code>, otherwise a
-     *         {@link IndexOutOfBoundsException} will be thrown
-     */
-    void selectTab(int index);
-
-    /**
-     * Sets the padding of the tab switcher.
-     *
-     * @param left
-     *         The left padding, which should be set, in pixels as an {@link Integer} value
-     * @param top
-     *         The top padding, which should be set, in pixels as an {@link Integer} value
-     * @param right
-     *         The right padding, which should be set, in pixels as an {@link Integer} value
-     * @param bottom
-     *         The bottom padding, which should be set, in pixels as an {@link Integer} value
-     */
-    void setPadding(int left, int top, int right, int bottom);
-
-    /**
-     * Returns the left padding of the tab switcher.
-     *
-     * @return The left padding of the tab switcher in pixels as an {@link Integer} value
-     */
-    int getPaddingLeft();
-
-    /**
-     * Returns the top padding of the tab switcher.
-     *
-     * @return The top padding of the tab switcher in pixels as an {@link Integer} value
-     */
-    int getPaddingTop();
-
-    /**
-     * Returns the right padding of the tab switcher.
-     *
-     * @return The right padding of the tab switcher in pixels as an {@link Integer} value
-     */
-    int getPaddingRight();
-
-    /**
-     * Returns the bottom padding of the tab switcher.
-     *
-     * @return The bottom padding of the tab switcher in pixels as an {@link Integer} value
-     */
-    int getPaddingBottom();
-
-    /**
-     * Returns the start padding of the tab switcher. This corresponds to the right padding, if a
-     * right-to-left layout is used, or to the left padding otherwise.
-     *
-     * @return The start padding of the tab switcher in pixels as an {@link Integer} value
-     */
-    int getPaddingStart();
-
-    /**
-     * Returns the end padding of the tab switcher. This corresponds ot the left padding, if a
-     * right-to-left layout is used, or to the right padding otherwise.
-     *
-     * @return The end padding of the tab switcher in pixels as an {@link Integer} value
-     */
-    int getPaddingEnd();
-
-    /**
-     * Sets, whether the padding of the tab switcher should be applied to the content of its tabs,
-     * or not. When set to <code>false</code> the padding is still taken into account for
-     * positioning tabs and the tab switcher's toolbars.
-     *
-     * @param applyPaddingToTabs
-     *         True, if the padding of the tab switcher should be applied to the content of its
-     *         tabs, false otherwise
-     */
-    void applyPaddingToTabs(boolean applyPaddingToTabs);
-
-    /**
-     * Returns, whether the padding of the tab switcher is applied to the content of its tabs, or
-     * not.
-     *
-     * @return True, if the padding of the tab switcher is applied to the content of its tabs, false
-     * otherwise
-     */
-    boolean isPaddingAppliedToTabs();
-
-    /**
-     * Returns the default icon of a tab.
-     *
-     * @return The default icon of a tab as an instance of the class {@link Drawable} or null, if no
-     * icon is set
-     */
-    @Nullable
-    Drawable getTabIcon();
-
-    /**
-     * Sets the default icon of a tab.
-     *
-     * @param resourceId
-     *         The resource id of the icon, which should be set, as an {@link Integer} value. The
-     *         resource id must correspond to a valid drawable resource
-     */
-    void setTabIcon(@DrawableRes int resourceId);
-
-    /**
-     * Sets the default icon of a tab.
-     *
-     * @param icon
-     *         The icon, which should be set, as an instance of the class {@link Bitmap} or null, if
-     *         no icon should be set
-     */
-    void setTabIcon(@Nullable Bitmap icon);
-
-    /**
-     * Returns the color state list, which is used to tint the icon of a tab.
-     *
-     * @return The color state list, which is used to tint the icon of a tab, as an instance of the
-     * class {@link ColorStateList} or null, if the icon is not tinted
-     */
-    ColorStateList getTabIconTintList();
-
-    /**
-     * Sets the color, which should be used to tint the icon of a tab.
-     *
-     * @param color
-     *         The color, which should be set, as an {@link Integer} value
-     */
-    void setTabIconTint(@ColorInt int color);
-
-    /**
-     * Sets the color state list, which should be used to tint the icon of a tab.
-     *
-     * @param tintList
-     *         The color state list, which should be set, as an instance of the class {@link
-     *         ColorStateList} or null, if the icon should not be tinted
-     */
-    void setTabIconTintList(@Nullable ColorStateList tintList);
-
-    /**
-     * Returns the mode, which is used to tint the icon of a tab.
-     *
-     * @return The mode, which is used to tint the icon of a tab, as a value of the enum {@link
-     * PorterDuff.Mode} or null, if the default mode is used
-     */
-    PorterDuff.Mode getTabIconTintMode();
-
-    /**
-     * Sets the mode, which should be used to tint the icon of a tab.
-     *
-     * @param mode
-     *         The mode, which should be set, as a value of enum {@link PorterDuff.Mode} or null, if
-     *         the default mode should be used
-     */
-    void setTabIconTintMode(@Nullable PorterDuff.Mode mode);
-
-    /**
-     * Returns the color state list, which is used to tint the close button of a tab.
-     *
-     * @return The color state list, which is used to tint the close button of a tab, as an instance
-     * of the class {@link ColorStateList} or null, if the close button is not tinted
-     */
-    ColorStateList getTabCloseButtonIconTintList();
-
-    /**
-     * Sets the color, which should be used to tint the close button of a tab.
-     *
-     * @param color
-     *         The color, which should be set, as an {@link Integer} value
-     */
-    void setTabCloseButtonIconTint(@ColorInt int color);
-
-    /**
-     * Sets the color state list, which should be used to tint the close button of a tab.
-     *
-     * @param tintList
-     *         The color state list, which should be set, as an instance of the class {@link
-     *         ColorStateList} or null, if the close button should not be tinted
-     */
-    void setTabCloseButtonIconTintList(@Nullable ColorStateList tintList);
-
-    /**
-     * Returns the mode, which is used to tint the close button of a tab.
-     *
-     * @return The mode, which is used to tint the close button of a tab, as a value of the enum
-     * {@link PorterDuff.Mode} or null, if the default mode is used
-     */
-    PorterDuff.Mode getTabCloseButtonIconTintMode();
-
-    /**
-     * Sets the mode, which should be used to tint the close button of a tab.
-     *
-     * @param mode
-     *         The mode, which should be set, as a value of enum {@link PorterDuff.Mode} or null, if
-     *         the default mode should be used
-     */
-    void setTabCloseButtonIconTintMode(@Nullable PorterDuff.Mode mode);
-
-    /**
-     * Returns the default background color of a tab.
-     *
-     * @return The default background color of a tab as an instance of the class {@link
-     * ColorStateList} or null, if the default color is used
-     */
-    @Nullable
-    ColorStateList getTabBackgroundColor();
-
-    /**
-     * Sets the default background color of a tab.
-     *
-     * @param color
-     *         The color, which should be set, as an {@link Integer} value or -1, if the default
-     *         color should be used
-     */
-    void setTabBackgroundColor(@ColorInt int color);
-
-    /**
-     * Sets the default background color of a tab.
-     *
-     * @param colorStateList
-     *         The color, which should be set, as an instance of the class {@link ColorStateList} or
-     *         null, if the default color should be used
-     */
-    void setTabBackgroundColor(@Nullable ColorStateList colorStateList);
-
-    /**
-     * Returns the default background color of a tab's content.
-     *
-     * @return The default background color of a tab's content as an {@link Integer} value
-     */
-    @ColorInt
-    int getTabContentBackgroundColor();
-
-    /**
-     * Sets the default background color of a tab's content.
-     *
-     * @param color
-     *         The color, which should be set, as an {@link Integer} value or -1, if the default
-     *         color should be used
-     */
-    void setTabContentBackgroundColor(@ColorInt int color);
-
-    /**
-     * Returns the default text color of a tab's title.
-     *
-     * @return The default text color of a tab's title as an instance of the class {@link
-     * ColorStateList} or null, if the default color is used
-     */
-    @Nullable
-    ColorStateList getTabTitleTextColor();
-
-    /**
-     * Sets the default text color of a tab's title.
-     *
-     * @param color
-     *         The color, which should be set, as an {@link Integer} value or -1, if the default
-     *         color should be used
-     */
-    void setTabTitleTextColor(@ColorInt int color);
-
-    /**
-     * Sets the default text color of a tab's title.
-     *
-     * @param colorStateList
-     *         The color state list, which should be set, as an instance of the class {@link
-     *         ColorStateList} or null, if the default color should be used
-     */
-    void setTabTitleTextColor(@Nullable ColorStateList colorStateList);
-
-    /**
-     * Returns the default icon of a tab's close button.
-     *
-     * @return The default icon of a tab's close button as an instance of the class {@link Drawable}
-     * or null, if the default icon is used
-     */
-    @Nullable
-    Drawable getTabCloseButtonIcon();
-
-    /**
-     * Returns the color of a tab's progress bar.
-     *
-     * @return The color of a tab's progress bar as an {@link Integer} value or -1, if the default
-     * color is used
-     */
-    @ColorInt
-    int getTabProgressBarColor();
-
-    /**
-     * Sets the color of a tab's progress bar.
-     *
-     * @param color
-     *         The color, which should be set, as an {@link Integer} value or -1, if the default
-     *         color should be used
-     */
-    void setTabProgressBarColor(@ColorInt int color);
-
-    /**
-     * Sets the default icon of a tab's close button.
-     *
-     * @param resourceId
-     *         The resource id of the icon, which should be set, as an {@link Integer} value. The
-     *         resource id must correspond to a valid drawable resource
-     */
-    void setTabCloseButtonIcon(@DrawableRes int resourceId);
-
-    /**
-     * Sets the default icon of a tab's close button.
-     *
-     * @param icon
-     *         The icon, which should be set, as an instance of the class {@link Bitmap} or null, if
-     *         the default icon should be used
-     */
-    void setTabCloseButtonIcon(@Nullable final Bitmap icon);
-
-    /**
-     * Returns, whether a button, which allows to add a new tab, is shown. When using the smartphone
-     * layout, such a button is never shown. When using the tablet layout, the button is shown next
-     * to the tabs.
-     *
-     * @return True, if a button, which allows to add a new tab, is shown, false otherwise
-     */
-    boolean isAddTabButtonShown();
-
-    /**
-     * Sets, whether a button, which allows to add a new tab, should be shown. This method does not
-     * have any effect when using the smartphone layout. When using the tablet layout, the button is
-     * shown next to the tabs.
-     *
-     * @param listener
-     *         The listener, which should be notified, when the button has been clicked, as an
-     *         instance of the type {@link AddTabButtonListener} or null, if the button should not
-     *         be shown
-     */
-    void showAddTabButton(@Nullable AddTabButtonListener listener);
-
-    /**
-     * Returns the color of the button, which allows to add a new tab. When using the smartphone
-     * layout, such a button is never shown. When using the tablet layout, the button is shown next
-     * to the tabs.
-     *
-     * @return The color of the button, which allows to add a new tab, as an instance of the class
-     * {@link ColorStateList} or null, if the default color is used
-     */
-    @Nullable
-    ColorStateList getAddTabButtonColor();
-
-    /**
-     * Sets the color of the button, which allows to add a new tab. This method does not have any
-     * effect when using the smartphone layout. When using the tablet layout, the button is shown
-     * next to the tabs.
-     *
-     * @param color
-     *         The color, which should be set, as an {@link Integer} value or -1, if the default
-     *         color should be used
-     */
-    void setAddTabButtonColor(@ColorInt int color);
-
-    /**
-     * Sets the color of the button, which allows to add a new tab. This method does not have any
-     * effect when using the smartphone layout. When using the tablet layout, the button is shown
-     * next to the tabs.
-     *
-     * @param colorStateList
-     *         The color, which should be set, as an instance of the class {@link ColorStateList} or
-     *         null, if the default color should be used
-     */
-    void setAddTabButtonColor(@Nullable ColorStateList colorStateList);
-
-    /**
-     * Returns, whether the toolbars are shown, when the tab switcher is shown, or not. When using
-     * the tablet layout, the toolbars are always shown.
-     *
-     * @return True, if the toolbars are shown, false otherwise
-     */
-    boolean areToolbarsShown();
-
-    /**
-     * Sets, whether the toolbars should be shown, when the tab switcher is shown, or not. This
-     * method does not have any effect when using the tablet layout.
-     *
-     * @param show
-     *         True, if the toolbars should be shown, false otherwise
-     */
-    void showToolbars(boolean show);
-
-    /**
-     * Returns the title of the toolbar, which is shown, when the tab switcher is shown. When using
-     * the tablet layout, the title corresponds to the primary toolbar.
-     *
-     * @return The title of the toolbar, which is shown, when the tab switcher is shown, as an
-     * instance of the type {@link CharSequence} or null, if no title is set
-     */
-    @Nullable
-    CharSequence getToolbarTitle();
-
-    /**
-     * Sets the title of the toolbar, which is shown, when the tab switcher is shown. When using the
-     * tablet layout, the title is set to the primary toolbar.
-     *
-     * @param resourceId
-     *         The resource id of the title, which should be set, as an {@link Integer} value. The
-     *         resource id must correspond to a valid string resource
-     */
-    void setToolbarTitle(@StringRes int resourceId);
-
-    /**
-     * Sets the title of the toolbar, which is shown, when the tab switcher is shown. When using the
-     * tablet layout, the title is set to the primary toolbar.
-     *
-     * @param title
-     *         The title, which should be set, as an instance of the type {@link CharSequence} or
-     *         null, if no title should be set
-     */
-    void setToolbarTitle(@Nullable CharSequence title);
-
-    /**
-     * Returns the navigation icon of the toolbar, which is shown, when the tab switcher is shown.
-     * When using the tablet layout, the icon corresponds to the primary toolbar.
-     *
-     * @return The icon of the toolbar, which is shown, when the tab switcher is shown, as an
-     * instance of the class {@link Drawable} or null, if no icon is set
-     */
-    @Nullable
-    Drawable getToolbarNavigationIcon();
-
-    /**
-     * Sets the navigation icon of the toolbar, which is shown, when the tab switcher is shown. When
-     * using the tablet layout, the icon is set to the primary toolbar.
-     *
-     * @param resourceId
-     *         The resource id of the icon, which should be set, as an {@link Integer} value. The
-     *         resource id must correspond to a valid drawable resource
-     * @param listener
-     *         The listener, which should be notified, when the navigation item has been clicked, as
-     *         an instance of the type {@link OnClickListener} or null, if no listener should be
-     *         notified
-     */
-    void setToolbarNavigationIcon(@DrawableRes int resourceId, @Nullable OnClickListener listener);
-
-    /**
-     * Sets the navigation icon of the toolbar, which is shown, when the tab switcher is shown. When
-     * using the tablet layout, the icon is set to the primary toolbar.
-     *
-     * @param icon
-     *         The icon, which should be set, as an instance of the class {@link Drawable} or null,
-     *         if no icon should be set
-     * @param listener
-     *         The listener, which should be notified, when the navigation item has been clicked, as
-     *         an instance of the type {@link OnClickListener} or null, if no listener should be
-     *         notified
-     */
-    void setToolbarNavigationIcon(@Nullable Drawable icon, @Nullable OnClickListener listener);
-
-    /**
-     * Returns the color state list, which is used to tint the navigation icon of the toolbar, which
-     * is shown, when the tab switcher is shown.
-     *
-     * @return The color state list, which is used to tint the navigation icon of the toolbar, which
-     * is shown, when the tab switcher is shown, as an instance of the class {@link ColorStateList}
-     * or null, if the navigation icon is not tinted
-     */
-    ColorStateList getToolbarNavigationIconTintList();
-
-    /**
-     * Sets the color, which should be used to tint the navigation icon of the toolbar, which is
-     * shown, when the tab switcher is shown.
-     *
-     * @param color
-     *         The color, which should be set, as an {@link Integer} value
-     */
-    void setToolbarNavigationIconTint(@ColorInt int color);
-
-    /**
-     * Sets the color state list, which should be used to tint the navigation icon of the toolbar,
-     * which is shown, when the tab switcher is shown.
-     *
-     * @param tintList
-     *         The color state list, which should be set, as an instance of the class {@link
-     *         ColorStateList} or null, if the navigation icon should not be tinted
-     */
-    void setToolbarNavigationIconTintList(@Nullable ColorStateList tintList);
-
-    /**
-     * Returns the mode, which is used to tint the navigation icon of the toolbar, which is shown,
-     * when the tab switcher is shown.
-     *
-     * @return The mode, which is used to tint the navigation icon of the toolbar, which is shown,
-     * when the tab switcher is shown, as a value of the enum {@link PorterDuff.Mode} or null, if
-     * the default mode is used
-     */
-    PorterDuff.Mode getToolbarNavigationIconTintMode();
-
-    /**
-     * Sets the mode, which should be used to tint the navigation icon of the toolbar, which is
-     * shown, when the tab switcher is shown.
-     *
-     * @param mode
-     *         The mode, which should be set, as a value of the enum {@link PorterDuff.Mode} or
-     *         null, if the default mode should be used
-     */
-    void setToolbarNavigationIconTintMode(@Nullable PorterDuff.Mode mode);
-
-    /**
-     * Inflates the menu of the toolbar, which is shown, when the tab switcher is shown. When using
-     * the tablet layout, the menu is inflated into the secondary toolbar. If another menu has
-     * already been inflated, its items will be removed.
-     *
-     * @param resourceId
-     *         The resource id of the menu, which should be inflated, as an {@link Integer} value.
-     *         The resource id must correspond to a valid menu resource
-     * @param listener
-     *         The listener, which should be notified, when an menu item has been clicked, as an
-     *         instance of the type OnMenuItemClickListener or null, if no listener should be
-     *         notified
-     */
-    void inflateToolbarMenu(@MenuRes int resourceId, @Nullable OnMenuItemClickListener listener);
-
-    /**
-     * Returns the duration, which must be reached when loading the preview of a tab to use a fade
-     * animation.
-     *
-     * @return The duration, which must be reached when loading the preview of a tab to use a fade
-     * animation, in milliseconds as a {@link Long} value
-     */
-    long getTabPreviewFadeThreshold();
-
-    /**
-     * Sets the duration, which must be reached when loading the preview of a tab to use a fade
-     * animation. Previews are only shown when using the smartphone layout.
-     *
-     * @param threshold
-     *         The duration, which should be set, in milliseconds as a {@link Long} value. The
-     *         duration must be at least 0
-     */
-    void setTabPreviewFadeThreshold(long threshold);
-
-    /**
-     * Returns the duration of the fade animation, which is used to show the preview of tabs.
-     *
-     * @return The duration of the fade animation, which is used to show the preview of tabs, in
-     * milliseconds as a {@link Long} value
-     */
-    long getTabPreviewFadeDuration();
-
-    /**
-     * Sets the duration of the fade animation, which is used to show the preview of tabs. Previews
-     * are only shown when using the smartphone layout.
-     *
-     * @param duration
-     *         The duration, which should be set, in milliseconds as a {@link Long} value. The
-     *         duration must be at least 0
-     */
-    void setTabPreviewFadeDuration(long duration);
-
-    /**
-     * Returns the view, which is shown, when the tab switcher is empty.
-     *
-     * @return The view, which is shown, when the tab switcher is empty, as an instance of the class
-     * {@link View} or null, if no view is shown
-     */
-    @Nullable
-    View getEmptyView();
-
-    /**
-     * Sets the view, which should be shown, when the tab switcher is empty.
-     *
-     * @param view
-     *         The view, which should be set, as an instance of the class {@link View} or null, if
-     *         no view should be shown, when the tab switcher is empty
-     */
-    void setEmptyView(@Nullable View view);
-
-    /**
-     * Sets the view, which should be shown, when the tab switcher is empty.
-     *
-     * @param view
-     *         The view, which should be set, as an instance of the class {@link View} or null, if
-     *         no view should be shown, when the tab switcher is empty
-     * @param animationDuration
-     *         The duration of the fade animation, which is used to show or hide the view, in
-     *         milliseconds as a {@link Long} value. The duration must be at least 0 or -1, if the
-     *         default duration should be used
-     */
-    void setEmptyView(@Nullable View view, long animationDuration);
-
-    /**
-     * Sets the view, which should be shown, when the tab switcher is empty.
-     *
-     * @param resourceId
-     *         The resource id of the view, which should be set, as an {@link Integer} value. The
-     *         resource id must correspond to a valid layout resource
-     */
-    void setEmptyView(@LayoutRes int resourceId);
-
-    /**
-     * Sets the view, which should be shown, when the tab switcher is empty.
-     *
-     * @param resourceId
-     *         The resource id of the view, which should be set, as an {@link Integer} value. The
-     *         resource id must correspond to a valid layout resource
-     * @param animationDuration
-     *         The duration of the fade animation, which is used to show or hide the view, in
-     *         milliseconds as a {@link Long} value. The duration must be at least 0 or -1, if the
-     *         default duration should be used
-     */
-    void setEmptyView(@LayoutRes int resourceId, long animationDuration);
-
-    /**
-     * Returns, whether saved states of tabs are cleared when the corresponding tabs are removed
-     * from the tab switcher, or not.
-     *
-     * @return True, if saved states of tabs are cleared when the corresponding tabs are removed
-     * from the tab switcher, false otherwise
-     */
-    boolean areSavedStatesClearedWhenRemovingTabs();
-
-    /**
-     * Sets, whether saved states of tabs should be cleared when the corresponding tabs are removed,
-     * or not.
-     *
-     * @param clear
-     *         True, if the saved states of tabs should be cleared when the corresponding tabs are
-     *         removed, false otherwise
-     */
-    void clearSavedStatesWhenRemovingTabs(boolean clear);
-
-    /**
-     * Adds a new listener, which should be notified, when a tab is about to be closed by clicking
-     * its close button.
-     *
-     * @param listener
-     *         The listener, which should be added, as an instance of the type {@link
-     *         TabCloseListener}. The listener may not be null
-     */
-    void addCloseTabListener(@NonNull TabCloseListener listener);
-
-    /**
-     * Removes a specific listener, which should not be notified, when a tab is about to be closed
-     * by clicking its close button, anymore.
-     *
-     * @param listener
-     *         The listener, which should be removed, as an instance of the type {@link
-     *         TabCloseListener}. The listener may not be null
-     */
-    void removeCloseTabListener(@NonNull TabCloseListener listener);
-
-    /**
-     * Adds a new listener, which should be notified, when the preview of a tab is about to be
-     * loaded. Previews are only loaded when using the smartphone layout.
-     *
-     * @param listener
-     *         The listener, which should be added, as an instance of the type {@link
-     *         TabPreviewListener}. The listener may not be null
-     */
-    void addTabPreviewListener(@NonNull TabPreviewListener listener);
-
-    /**
-     * Removes a specific listener, which should not be notified, when the preview of a tab is about
-     * to be loaded.
-     *
-     * @param listener
-     *         The listener, which should be removed, as an instance of the type {@link
-     *         TabPreviewListener}. The listener may not be null
-     */
-    void removeTabPreviewListener(@NonNull TabPreviewListener listener);
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/Restorable.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/Restorable.java
deleted file mode 100644
index 736d3f39..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/Restorable.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.model;
-
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-/**
- * Defines the interface, a class, whose state should be stored and restored, must implement.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public interface Restorable {
-
-    /**
-     * Saves the current state.
-     *
-     * @param outState
-     *         The bundle, which should be used to store the saved state, as an instance of the
-     *         class {@link Bundle}. The bundle may not be null
-     */
-    void saveInstanceState(@NonNull Bundle outState);
-
-    /**
-     * Restores a previously saved state.
-     *
-     * @param savedInstanceState
-     *         The saved state as an instance of the class {@link Bundle} or null, if no saved state
-     *         is available
-     */
-    void restoreInstanceState(@Nullable Bundle savedInstanceState);
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/State.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/State.java
deleted file mode 100644
index 920cca39..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/State.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.model;
-
-/**
- * Contains all possible states of a tab, while the switcher is shown.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public enum State {
-
-    /**
-     * When the tab is part of the stack, which is located at the start of the switcher.
-     */
-    STACKED_START,
-
-    /**
-     * When the tab is displayed atop of the stack, which is located at the start of the switcher.
-     */
-    STACKED_START_ATOP,
-
-    /**
-     * When the tab is floating and freely movable.
-     */
-    FLOATING,
-
-    /**
-     * When the tab is part of the stack, which is located at the end of the switcher.
-     */
-    STACKED_END,
-
-    /**
-     * When the tab is currently not visible, i.e. if no view is inflated to visualize it.
-     */
-    HIDDEN
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/TabItem.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/TabItem.java
deleted file mode 100644
index b71f0532..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/TabItem.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.model;
-
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import de.mrapp.android.tabswitcher.R;
-import de.mrapp.android.tabswitcher.Tab;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.layout.AbstractTabViewHolder;
-import de.mrapp.android.util.view.AttachedViewRecycler;
-import de.mrapp.util.Condition;
-
-/**
- * An item, which contains information about a tab of a {@link TabSwitcher}.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public class TabItem extends AbstractItem {
-
-    /**
-     * The tab.
-     */
-    private final Tab tab;
-
-    /**
-     * The view holder, which stores references the views, which belong to the tab.
-     */
-    private AbstractTabViewHolder viewHolder;
-
-    /**
-     * Creates a new item, which contains information about a tab of a {@link TabSwitcher}. By
-     * default, the item is neither associated with a view, nor with a view holder.
-     *
-     * @param index
-     *         The index of the item as an {@link Integer} value. The index must be at least 0
-     * @param tab
-     *         The tab as an instance of the class {@link Tab}. The tab may not be null
-     */
-    private TabItem(final int index, @NonNull final Tab tab) {
-        super(index);
-        Condition.INSTANCE.ensureNotNull(tab, "The tab may not be null");
-        this.tab = tab;
-        this.viewHolder = null;
-    }
-
-    /**
-     * Creates a new item, which contains information about a tab of a tab switcher.
-     *
-     * @param model
-     *         The model, the tab belongs to, as an instance of the type {@link Model}. The model
-     *         may not be null
-     * @param index
-     *         The index of the tab as an {@link Integer} value. The index must be at least 0
-     * @param tab
-     *         The tab as an instance of the class {@link Tab}. The tab may not be null
-     * @return The item, which has been created, as an instance of the class {@link TabItem}. The
-     * item may not be null
-     */
-    @NonNull
-    public static TabItem create(@NonNull final Model model, final int index,
-                                 @NonNull final Tab tab) {
-        return new TabItem(index + (model.isAddTabButtonShown() ? 1 : 0), tab);
-    }
-
-    /**
-     * Creates a new item, which contains information about a tab of a tab switcher.
-     *
-     * @param model
-     *         The model, the tab belongs to, as an instance of the type {@link Model}. The model
-     *         may not be null
-     * @param viewRecycler
-     *         The view recycler, which is used to reuse the views, which are used to visualize
-     *         tabs, as an instance of the class AttachedViewRecycler. The view recycler may not be
-     *         null
-     * @param index
-     *         The index of the tab as an {@link Integer} value. The index must be at least 0
-     * @return The item, which has been created, as an instance of the class {@link TabItem}. The
-     * item may not be null
-     */
-    @NonNull
-    public static TabItem create(@NonNull final Model model,
-                                 @NonNull final AttachedViewRecycler<AbstractItem, ?> viewRecycler,
-                                 final int index) {
-        Tab tab = model.getTab(index);
-        return create(model, viewRecycler, index, tab);
-    }
-
-    /**
-     * Creates a new item, which contains information about a specific tab.
-     *
-     * @param model
-     *         The model, the tab belongs to, as an instance of the type {@link Model}. The model
-     *         may not be null
-     * @param viewRecycler
-     *         The view recycler, which is used to reuse the views, which are used to visualize
-     *         tabs, as an instance of the class AttachedViewRecycler. The view recycler may not be
-     *         null
-     * @param index
-     *         The index of the tab as an {@link Integer} value. The index must be at least 0
-     * @param tab
-     *         The tab as an instance of the class {@link Tab}. The tab may not be null
-     * @return The item, which has been created, as an instance of the class {@link TabItem}. The
-     * item may not be null
-     */
-    @NonNull
-    public static TabItem create(@NonNull final Model model,
-                                 @NonNull final AttachedViewRecycler<AbstractItem, ?> viewRecycler,
-                                 final int index, @NonNull final Tab tab) {
-        TabItem tabItem = new TabItem(index + (model.isAddTabButtonShown() ? 1 : 0), tab);
-        View view = viewRecycler.getView(tabItem);
-
-        if (view != null) {
-            tabItem.setView(view);
-            tabItem.setViewHolder((AbstractTabViewHolder) view.getTag(R.id.tag_view_holder));
-            Tag tag = (Tag) view.getTag(R.id.tag_properties);
-
-            if (tag != null) {
-                tabItem.setTag(tag);
-            }
-        }
-
-        return tabItem;
-    }
-
-    /**
-     * Returns the tab.
-     *
-     * @return The tab as an instance of the class {@link Tab}. The tab may not be null
-     */
-    @NonNull
-    public final Tab getTab() {
-        return tab;
-    }
-
-    /**
-     * Returns the view holder, which stores references to the views, which belong to the tab.
-     *
-     * @return The view holder as an instance of the class {@link AbstractTabViewHolder} or null, if
-     * no view is is currently inflated to visualize the tab
-     */
-    public final AbstractTabViewHolder getViewHolder() {
-        return viewHolder;
-    }
-
-    /**
-     * Sets the view holder, which stores references to the views, which belong to the tab.
-     *
-     * @param viewHolder
-     *         The view holder, which should be set, as an instance of the class {@link
-     *         AbstractTabViewHolder} or null, if no view holder should be set
-     */
-    public final void setViewHolder(@Nullable final AbstractTabViewHolder viewHolder) {
-        this.viewHolder = viewHolder;
-    }
-
-    @Override
-    public final boolean isInflated() {
-        return super.isInflated() && viewHolder != null;
-    }
-
-    @Override
-    public final String toString() {
-        return "TabItem [index = " + getIndex() + "]";
-    }
-
-    @Override
-    public final int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + tab.hashCode();
-        return result;
-    }
-
-    @Override
-    public final boolean equals(final Object obj) {
-        if (obj == null)
-            return false;
-        if (obj.getClass() != getClass())
-            return false;
-        TabItem other = (TabItem) obj;
-        return tab.equals(other.tab);
-    }
-
-}
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/TabSwitcherModel.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/TabSwitcherModel.java
deleted file mode 100644
index ba5c81da..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/TabSwitcherModel.java
+++ /dev/null
@@ -1,1859 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.model;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.graphics.Bitmap;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.LayoutRes;
-import androidx.annotation.MenuRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.appcompat.content.res.AppCompatResources;
-import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener;
-import de.mrapp.android.tabswitcher.AddTabButtonListener;
-import de.mrapp.android.tabswitcher.Animation;
-import de.mrapp.android.tabswitcher.Layout;
-import de.mrapp.android.tabswitcher.PeekAnimation;
-import de.mrapp.android.tabswitcher.RevealAnimation;
-import de.mrapp.android.tabswitcher.SwipeAnimation;
-import de.mrapp.android.tabswitcher.Tab;
-import de.mrapp.android.tabswitcher.TabCloseListener;
-import de.mrapp.android.tabswitcher.TabPreviewListener;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.TabSwitcherDecorator;
-import de.mrapp.android.tabswitcher.layout.ContentRecyclerAdapter;
-import de.mrapp.android.util.logging.LogLevel;
-import de.mrapp.util.Condition;
-import de.mrapp.util.datastructure.ListenerList;
-
-/**
- * The model of a {@link TabSwitcher}.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public class TabSwitcherModel implements Model, Restorable {
-
-    /**
-     * The name of the extra, which is used to store the index of the tab, which is used as a
-     * reference, when restoring the positions of tabs, within a bundle.
-     */
-    public static final String REFERENCE_TAB_INDEX_EXTRA =
-            TabSwitcherModel.class.getName() + "::ReferenceTabIndex";
-
-    /**
-     * The name of the extra, which is used to store the position of the tab, which is used as a
-     * reference, when restoring the positions of tabs, within a bundle.
-     */
-    public static final String REFERENCE_TAB_POSITION_EXTRA =
-            TabSwitcherModel.class.getName() + "::ReferenceTabPosition";
-
-    /**
-     * The name of the extra, which is used to store the log level within a bundle.
-     */
-    private static final String LOG_LEVEL_EXTRA = TabSwitcherModel.class.getName() + "::LogLevel";
-
-    /**
-     * The name of the extra, which is used to store the tabs within a bundle.
-     */
-    private static final String TABS_EXTRA = TabSwitcherModel.class.getName() + "::Tabs";
-
-    /**
-     * The name of the extra, which is used to store, whether the tab switcher is shown, or not,
-     * within a bundle.
-     */
-    private static final String SWITCHER_SHOWN_EXTRA =
-            TabSwitcherModel.class.getName() + "::SwitcherShown";
-
-    /**
-     * The name of the extra, which is used to store the index of the selected tab within a bundle.
-     */
-    private static final String SELECTED_TAB_INDEX_EXTRA =
-            TabSwitcherModel.class.getName() + "::SelectedTabIndex";
-
-    /**
-     * The name of the extra, which is used to store the padding within a bundle.
-     */
-    private static final String PADDING_EXTRA = TabSwitcherModel.class.getName() + "::Padding";
-
-    /**
-     * The name of the extra, which is used to store, whether the padding of the tab switcher is
-     * applied to the content of its tabs, or not, within a bundle.
-     */
-    private static final String APPLY_PADDING_TO_TABS_EXTRA =
-            TabSwitcherModel.class.getName() + "::ApplyPaddingToTabs";
-
-    /**
-     * The name of the extra, which is used to store the resource id of a tab's icon within a
-     * bundle.
-     */
-    private static final String TAB_ICON_ID_EXTRA =
-            TabSwitcherModel.class.getName() + "::TabIconId";
-
-    /**
-     * The name of the extra, which is used to store the bitmap of a tab's icon within a bundle.
-     */
-    private static final String TAB_ICON_BITMAP_EXTRA =
-            TabSwitcherModel.class.getName() + "::TabIconBitmap";
-
-    /**
-     * The name of the extra, which is used to store the tint list, which is used to tint a tab's
-     * icon, within a bundle.
-     */
-    private static final String TAB_ICON_TINT_LIST_EXTRA =
-            TabSwitcherModel.class.getName() + "::TabIconTintList";
-
-    /**
-     * The name of the extra, which is used to store the mode, which is used to tint a tab's icon,
-     * within a bundle.
-     */
-    private static final String TAB_ICON_TINT_MODE_EXTRA =
-            TabSwitcherModel.class.getName() + "::TabIconTintMode";
-
-    /**
-     * The name of the extra, which is used to store the background color of a tab within a bundle.
-     */
-    private static final String TAB_BACKGROUND_COLOR_EXTRA =
-            TabSwitcherModel.class.getName() + "::TabBackgroundColor";
-
-    /**
-     * The name of the extra, which is used to store the background color of a tab's content within
-     * a bundle.
-     */
-    private static final String TAB_CONTENT_BACKGROUND_COLOR_EXTRA =
-            TabSwitcherModel.class.getName() + "::TabContentBackgroundColor";
-
-    /**
-     * The name of the extra, which is used to store the text color of a tab's title within a
-     * bundle.
-     */
-    private static final String TAB_TITLE_TEXT_COLOR_EXTRA =
-            TabSwitcherModel.class.getName() + "::TabTitleTextColor";
-
-    /**
-     * The name of the extra, which is used to store the resource id of a tab's icon within a
-     * bundle.
-     */
-    private static final String TAB_CLOSE_BUTTON_ICON_ID_EXTRA =
-            TabSwitcherModel.class.getName() + "::TabCloseButtonIconId";
-
-    /**
-     * The name of the extra, which is used to store the bitmap of a tab's icon within a bundle.
-     */
-    private static final String TAB_CLOSE_BUTTON_ICON_BITMAP_EXTRA =
-            TabSwitcherModel.class.getName() + "::TabCloseButtonIconBitmap";
-
-    /**
-     * The name of the extra, which is used to store the tint list, which is used to tint a tab's
-     * close button, within a bundle.
-     */
-    private static final String TAB_CLOSE_BUTTON_ICON_TINT_LIST_EXTRA =
-            TabSwitcherModel.class.getName() + "::TabCloseButtonIconTintList";
-
-    /**
-     * The name of the extra, which is used to store the mode, which is used to tint a tab's close
-     * button, within a bundle.
-     */
-    private static final String TAB_CLOSE_BUTTON_ICON_TINT_MODE_EXTRA =
-            TabSwitcherModel.class.getName() + "::TabCloseButtonIconTintMode";
-
-    /**
-     * The name of the extra, which is used to store the color of a tab's progress bar within a
-     * bundle.
-     */
-    private static final String TAB_PROGRESS_BAR_COLOR_EXTRA =
-            TabSwitcherModel.class.getName() + "::TabProgressBarColor";
-
-    /**
-     * The name of the extra, which is used to store, whether the toolbars are shown, or not, within
-     * a bundle.
-     */
-    private static final String SHOW_TOOLBARS_EXTRA =
-            TabSwitcherModel.class.getName() + "::ShowToolbars";
-
-    /**
-     * The name of the extra, which is used to store the title of the toolbar within a bundle.
-     */
-    private static final String TOOLBAR_TITLE_EXTRA =
-            TabSwitcherModel.class.getName() + "::ToolbarTitle";
-
-    /**
-     * The name of the extra, which is used to store the color state list, which is used to tint the
-     * navigation icon fof the toolbar, within a bundle.
-     */
-    private static final String TOOLBAR_NAVIGATION_ICON_TINT_LIST_EXTRA =
-            TabSwitcherModel.class.getName() + "::ToolbarNavigationIconTintList";
-
-    /**
-     * The name of the extra, which is used to store the mode, which is used to tint the navigation
-     * icon fof the toolbar, within a bundle.
-     */
-    private static final String TOOLBAR_NAVIGATION_ICON_TINT_MODE_EXTRA =
-            TabSwitcherModel.class.getName() + "::ToolbarNavigationIconTintMode";
-
-    /**
-     * The name of the extra, which is used to store the duration, which must be reached when
-     * loading the preview of tabs to use a fade animation, within a bundle.
-     */
-    private static final String TAB_PREVIEW_FADE_THRESHOLD_EXTRA =
-            TabSwitcherModel.class.getName() + "::TabPreviewFadeThreshold";
-
-    /**
-     * The name of the extra, which is used to store the duration of the fade animation, which is
-     * used to show the preview of tabs, within a bundle.
-     */
-    private static final String TAB_PREVIEW_FADE_DURATION =
-            TabSwitcherModel.class.getName() + "::TabPreviewFadeDuration";
-
-    /**
-     * The name of the extra, which is used to store, whether saved states of tabs are cleared when
-     * removing the corresponding tabs from the tabs switcher, or not, within a bundle.
-     */
-    private static final String CLEAR_SAVED_STATES_WHEN_REMOVING_TABS_EXTRA =
-            TabSwitcherModel.class.getName() + "::ClearSavedStatesWhenRemovingTabs";
-
-    /**
-     * The tab switcher, the model belongs to.
-     */
-    private final TabSwitcher tabSwitcher;
-
-    /**
-     * A set, which contains the listeners, which are notified about the model's events.
-     */
-    private final Set<Listener> listeners;
-
-    /**
-     * The index of the tab, which is used as a reference, when restoring the positions of tabs.
-     */
-    private int referenceTabIndex;
-
-    /**
-     * The position of the tab, which is used as a reference, when restoring the positions of tabs.
-     */
-    private float referenceTabPosition;
-
-    /**
-     * The log level, which is used for logging.
-     */
-    private LogLevel logLevel;
-
-    /**
-     * A list, which contains the tabs, which are contained by the tab switcher.
-     */
-    private ArrayList<Tab> tabs;
-
-    /**
-     * True, if the tab switcher is currently shown, false otherwise.
-     */
-    private boolean switcherShown;
-
-    /**
-     * The currently selected tab.
-     */
-    private Tab selectedTab;
-
-    /**
-     * The decorator, which allows to inflate the views, which correspond to the tab switcher's
-     * tabs.
-     */
-    private TabSwitcherDecorator decorator;
-
-    /**
-     * The adapter, which allows to inflate the views, which are associated with tabs.
-     */
-    private ContentRecyclerAdapter contentRecyclerAdapter;
-
-    /**
-     * An array, which contains the left, top, right and bottom padding of the tab switcher.
-     */
-    private int[] padding;
-
-    /**
-     * True, if the padding of tab switcher should is applied to the content of its tabs, false
-     * otherwise.
-     */
-    private boolean applyPaddingToTabs;
-
-    /**
-     * The resource id of a tab's icon.
-     */
-    private int tabIconId;
-
-    /**
-     * The bitmap of a tab's icon.
-     */
-    private Bitmap tabIconBitmap;
-
-    /**
-     * The color state list, which is used to tint the icon of a tab.
-     */
-    private ColorStateList tabIconTintList;
-
-    /**
-     * The mode, which is used to tint the icon of a tab.
-     */
-    private PorterDuff.Mode tabIconTintMode;
-
-    /**
-     * The background color of a tab;
-     */
-    private ColorStateList tabBackgroundColor;
-
-    /**
-     * The background color of a tab's content.
-     */
-    private int tabContentBackgroundColor;
-
-    /**
-     * The text color of a tab's title.
-     */
-    private ColorStateList tabTitleTextColor;
-
-    /**
-     * The resource id of the icon of a tab's close button.
-     */
-    private int tabCloseButtonIconId;
-
-    /**
-     * The bitmap of the icon of a tab's close button.
-     */
-    private Bitmap tabCloseButtonIconBitmap;
-
-    /**
-     * The color state list, which is used to tint the close button of a tab.
-     */
-    private ColorStateList tabCloseButtonIconTintList;
-
-    /**
-     * The mode, which is used to tint the close button of a tab.
-     */
-    private PorterDuff.Mode tabCloseButtonIconTintMode;
-
-    /**
-     * The color of a tab's progress bar.
-     */
-    private int tabProgressBarColor;
-
-    /**
-     * The listener, which is notified, when the button, which allows to add a tab, has been
-     * clicked.
-     */
-    private AddTabButtonListener addTabButtonListener;
-
-    /**
-     * The color of the button, which allows to add a new tab.
-     */
-    private ColorStateList addTabButtonColor;
-
-    /**
-     * True, if the toolbars should be shown, when the tab switcher is shown, false otherwise.
-     */
-    private boolean showToolbars;
-
-    /**
-     * The title of the toolbar, which is shown, when the tab switcher is shown.
-     */
-    private CharSequence toolbarTitle;
-
-    /**
-     * The navigation icon of the toolbar, which is shown, when the tab switcher is shown.
-     */
-    private Drawable toolbarNavigationIcon;
-
-    /**
-     * The color state list, which is used to tint the navigation icon of the toolbar, which is
-     * shown, when the tab switcher is shown.
-     */
-    private ColorStateList toolbarNavigationIconTintList;
-
-    /**
-     * The mode, which is used to tint the navigation icon of the toolbar, which is shown, when the
-     * tab switcher is shown.
-     */
-    private PorterDuff.Mode toolbarNavigationIconTintMode;
-
-    /**
-     * The listener, which is notified, when the navigation icon of the toolbar, which is shown,
-     * when the tab switcher is shown, has been clicked.
-     */
-    private OnClickListener toolbarNavigationIconListener;
-
-    /**
-     * The resource id of the menu of the toolbar, which is shown, when the tab switcher is shown.
-     */
-    private int toolbarMenuId;
-
-    /**
-     * The duration, which must be reached when loading the preview of a tab to use a fade
-     * animation.
-     */
-    private long tabPreviewFadeThreshold;
-
-    /**
-     * The duration of the fade animation, which is used to show the preview of tabs.
-     */
-    private long tabPreviewFadeDuration;
-
-    /**
-     * The view, which is shown, when the tab switcher is empty.
-     */
-    private View emptyView;
-
-    /**
-     * The duration of the fade animation, which is used to show or hide the view, which is shown,
-     * when the tab switcher is empty.
-     */
-    private long emptyViewAnimationDuration;
-
-    /**
-     * True, if the saved states of tabs are cleared when the corresponding tabs are removed from
-     * the tab switcher, false otherwise.
-     */
-    private boolean clearSavedStatesWhenRemovingTabs;
-
-    /**
-     * The listener, which is notified, when an item of the menu of the toolbar, which is shown,
-     * when the tab switcher is shown, is clicked.
-     */
-    private OnMenuItemClickListener toolbarMenuItemListener;
-
-    /**
-     * A set, which contains the listeners, which should be notified, when a tab is about to be
-     * closed by clicking its close button.
-     */
-    private final ListenerList<TabCloseListener> tabCloseListeners;
-
-    /**
-     * A set, which contains the listeners, which should be notified, when the previews of tabs are
-     * about to be loaded.
-     */
-    private final ListenerList<TabPreviewListener> tabPreviewListeners;
-
-    /**
-     * Returns the index of a specific tab or throws a {@link NoSuchElementException}, if the model
-     * does not contain the given tab.
-     *
-     * @param tab
-     *         The tab, whose index should be returned, as an instance of the class {@link Tab}. The
-     *         tab may not be null
-     * @return The index of the given tab as an {@link Integer} value
-     */
-    private int indexOfOrThrowException(@NonNull final Tab tab) {
-        int index = indexOf(tab);
-        Condition.INSTANCE
-                .ensureNotEqual(index, -1, "No such tab: " + tab, NoSuchElementException.class);
-        return index;
-    }
-
-    /**
-     * Sets, whether the tab switcher is currently shown, or not.
-     *
-     * @param shown
-     *         True, if the tab switcher is currently shown, false otherwise
-     * @return True, if the visibility of the tab switcher has been changed, false otherwise
-     */
-    private boolean setSwitcherShown(final boolean shown) {
-        if (switcherShown != shown) {
-            switcherShown = shown;
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Notifies the listeners, that the log level has been changed.
-     *
-     * @param logLevel
-     *         The log level, which has been set, as a value of the enum {@link LogLevel}. The log
-     *         level may not be null
-     */
-    private void notifyOnLogLevelChanged(@NonNull final LogLevel logLevel) {
-        for (Listener listener : listeners) {
-            listener.onLogLevelChanged(logLevel);
-        }
-    }
-
-    /**
-     * Notifies the listeners, that the decorator has been changed.
-     *
-     * @param decorator
-     *         The decorator, which has been set, as an instance of the class {@link
-     *         TabSwitcherDecorator}. The decorator may not be null
-     */
-    private void notifyOnDecoratorChanged(@NonNull final TabSwitcherDecorator decorator) {
-        for (Listener listener : listeners) {
-            listener.onDecoratorChanged(decorator);
-        }
-    }
-
-    /**
-     * Notifies the listeners, that the tab switcher has been shown.
-     */
-    private void notifyOnSwitcherShown() {
-        for (Listener listener : listeners) {
-            listener.onSwitcherShown();
-        }
-    }
-
-    /**
-     * Notifies the listeners, that the tab switcher has been shown.
-     */
-    private void notifyOnSwitcherHidden() {
-        for (Listener listener : listeners) {
-            listener.onSwitcherHidden();
-        }
-    }
-
-    /**
-     * Notifies the listeners, that the currently selected tab has been changed.
-     *
-     * @param previousIndex
-     *         The index of the previously selected tab as an {@link Integer} value or -1, if no tab
-     *         was selected
-     * @param index
-     *         The index of the tab, which has been selected, as an {@link Integer} value or -1, if
-     *         no tab has been selected
-     * @param tab
-     *         The tab, which has been selected, as an instance of the class {@link Tab} or null, if
-     *         no tab has been selected
-     * @param switcherHidden
-     *         True, if selecting the tab caused the tab switcher to be hidden, false otherwise
-     */
-    private void notifyOnSelectionChanged(final int previousIndex, final int index,
-                                          @Nullable final Tab tab, final boolean switcherHidden) {
-        for (Listener listener : listeners) {
-            listener.onSelectionChanged(previousIndex, index, tab, switcherHidden);
-        }
-    }
-
-    /**
-     * Notifies the listeners, that a specific tab has been added to the model.
-     *
-     * @param index
-     *         The index, the tab has been added at, as an {@link Integer} value
-     * @param tab
-     *         The tab, which has been added, as an instance of the class {@link Tab}. The tab may
-     *         not be null
-     * @param previousSelectedTabIndex
-     *         The index of the previously selected tab as an {@link Integer} value or -1, if no tab
-     *         was selected
-     * @param selectedTabIndex
-     *         The index of the currently selected tab as an {@link Integer} value or -1, if the tab
-     *         switcher does not contain any tabs
-     * @param selectionChanged
-     *         True, if the selection has changed, false otherwise
-     * @param switcherVisibilityChanged
-     *         True, if adding the tab caused the visibility of the tab switcher to be changed,
-     *         false otherwise
-     * @param animation
-     *         The animation, which has been used to add the tab, as an instance of the class {@link
-     *         Animation}. The animation may not be null
-     */
-    private void notifyOnTabAdded(final int index, @NonNull final Tab tab,
-                                  final int previousSelectedTabIndex, final int selectedTabIndex,
-                                  final boolean selectionChanged,
-                                  final boolean switcherVisibilityChanged,
-                                  @NonNull final Animation animation) {
-        for (Listener listener : listeners) {
-            listener.onTabAdded(index, tab, previousSelectedTabIndex, selectedTabIndex,
-                    selectionChanged, switcherVisibilityChanged, animation);
-        }
-    }
-
-    /**
-     * Notifies the listeners, that multiple tabs have been added to the model.
-     *
-     * @param index
-     *         The index of the tab, which has been added, as an {@link Integer} value
-     * @param tabs
-     *         An array, which contains the tabs, which have been added, as an array of the type
-     *         {@link Tab}. The array may not be null
-     * @param previousSelectedTabIndex
-     *         The index of the previously selected tab as an {@link Integer} value or -1, if no tab
-     *         was selected
-     * @param selectedTabIndex
-     *         The index of the currently selected tab as an {@link Integer} value or -1, if the tab
-     *         switcher does not contain any tabs
-     * @param selectionChanged
-     *         True, if the selection has changed, false otherwise
-     * @param animation
-     *         The animation, which has been used to add the tabs, as an instance of the class
-     *         {@link Animation}. The animation may not be null
-     */
-    private void notifyOnAllTabsAdded(final int index, @NonNull final Tab[] tabs,
-                                      final int previousSelectedTabIndex,
-                                      final int selectedTabIndex, final boolean selectionChanged,
-                                      @NonNull final Animation animation) {
-        for (Listener listener : listeners) {
-            listener.onAllTabsAdded(index, tabs, previousSelectedTabIndex, selectedTabIndex,
-                    selectionChanged, animation);
-        }
-    }
-
-    /**
-     * Notifies the listeners, that a tab has been removed from the model.
-     *
-     * @param index
-     *         The index of the tab, which has been removed, as an {@link Integer} value
-     * @param tab
-     *         The tab, which has been removed, as an instance of the class {@link Tab}. The tab may
-     *         not be null
-     * @param previousSelectedTabIndex
-     *         The index of the previously selected tab as an {@link Integer} value or -1, if no tab
-     *         was selected
-     * @param selectedTabIndex
-     *         The index of the currently selected tab as an {@link Integer} value or -1, if the tab
-     *         switcher does not contain any tabs
-     * @param selectionChanged
-     *         True, if the selection has changed, false otherwiseF
-     * @param animation
-     *         The animation, which has been used to remove the tab, as an instance of the class
-     *         {@link Animation}. The animation may not be null
-     */
-    private void notifyOnTabRemoved(final int index, @NonNull final Tab tab,
-                                    final int previousSelectedTabIndex, final int selectedTabIndex,
-                                    final boolean selectionChanged,
-                                    @NonNull final Animation animation) {
-        for (Listener listener : listeners) {
-            listener.onTabRemoved(index, tab, previousSelectedTabIndex, selectedTabIndex,
-                    selectionChanged, animation);
-        }
-    }
-
-    /**
-     * Notifies the listeners, that all tabs have been removed.
-     *
-     * @param tabs
-     *         An array, which contains the tabs, which have been removed, as an array of the type
-     *         {@link Tab} or an empty array, if no tabs have been removed
-     * @param animation
-     *         The animation, which has been used to remove the tabs, as an instance of the class
-     *         {@link Animation}. The animation may not be null
-     */
-    private void notifyOnAllTabsRemoved(@NonNull final Tab[] tabs,
-                                        @NonNull final Animation animation) {
-        for (Listener listener : listeners) {
-            listener.onAllTabsRemoved(tabs, animation);
-        }
-    }
-
-    /**
-     * Notifies the listeners, that the padding has been changed.
-     *
-     * @param left
-     *         The left padding, which has been set, in pixels as an {@link Integer} value
-     * @param top
-     *         The top padding, which has been set, in pixels as an {@link Integer} value
-     * @param right
-     *         The right padding, which has been set, in pixels as an {@link Integer} value
-     * @param bottom
-     *         The bottom padding, which has been set, in pixels as an {@link Integer} value
-     */
-    private void notifyOnPaddingChanged(final int left, final int top, final int right,
-                                        final int bottom) {
-        for (Listener listener : listeners) {
-            listener.onPaddingChanged(left, top, right, bottom);
-        }
-    }
-
-    /**
-     * Notifies the listeners, that it has been changed, whether the padding of the tab switcher is
-     * applied to the content of its tabs, or not.
-     *
-     * @param applyPaddingToTabs
-     *         True, if the padding of the tab switcher is applied to the content of its tabs, false
-     *         otherwise
-     */
-    private void notifyOnApplyPaddingToTabsChanged(final boolean applyPaddingToTabs) {
-        for (Listener listener : listeners) {
-            listener.onApplyPaddingToTabsChanged(applyPaddingToTabs);
-        }
-    }
-
-    /**
-     * Notifies the listeners, that the default icon of a tab has been changed.
-     *
-     * @param icon
-     *         The icon, which has been set, as an instance of the class {@link Drawable} or null,
-     *         if no icon is set
-     */
-    private void notifyOnTabIconChanged(@Nullable final Drawable icon) {
-        for (Listener listener : listeners) {
-            listener.onTabIconChanged(icon);
-        }
-    }
-
-    /**
-     * Notifies the listeners, that the default background color of a tab has been changed.
-     *
-     * @param colorStateList
-     *         The color state list, which has been set, as an instance of the class {@link
-     *         ColorStateList} or null, if the default color should be used
-     */
-    private void notifyOnTabBackgroundColorChanged(@Nullable final ColorStateList colorStateList) {
-        for (Listener listener : listeners) {
-            listener.onTabBackgroundColorChanged(colorStateList);
-        }
-    }
-
-    /**
-     * Notifies the listeners, the the default background color of a tab's content has been
-     * changed.
-     *
-     * @param color
-     *         The color, which has been set, as an {@link Integer} value
-     */
-    private void notifyOnTabContentBackgroundColorChanged(@ColorInt final int color) {
-        for (Listener listener : listeners) {
-            listener.onTabContentBackgroundColorChanged(color);
-        }
-    }
-
-    /**
-     * Notifies the listeners, that the default text color of a tab's title has been changed.
-     *
-     * @param colorStateList
-     *         The color state list, which has been set, as an instance of the class {@link
-     *         ColorStateList} or null, if the default color should be used
-     */
-    private void notifyOnTabTitleColorChanged(@Nullable final ColorStateList colorStateList) {
-        for (Listener listener : listeners) {
-            listener.onTabTitleColorChanged(colorStateList);
-        }
-    }
-
-    /**
-     * Notifies the listeners, that the icon of a tab's close button has been changed.
-     *
-     * @param icon
-     *         The icon, which has been set, as an instance of the class {@link Drawable} or null,
-     *         if the default icon should be used
-     */
-    private void notifyOnTabCloseButtonIconChanged(@Nullable final Drawable icon) {
-        for (Listener listener : listeners) {
-            listener.onTabCloseButtonIconChanged(icon);
-        }
-    }
-
-    /**
-     * Notifies the listeners, that the color of a tab's progress bar has been changed.
-     *
-     * @param color
-     *         The color, which has been set, as an {@link Integer} value or -1, if the default
-     *         color should be used
-     */
-    private void notifyOnTabProgressBarColorChanged(@ColorInt final int color) {
-        for (Listener listener : listeners) {
-            listener.onTabProgressBarColorChanged(color);
-        }
-    }
-
-    /**
-     * Notifies the listeners, that is has been changed, whether the button, which allows to add a
-     * new tab, should be shown, or not.
-     *
-     * @param visible
-     *         True, if the button, which allows to add a new tab, should be shown, false otherwise
-     */
-    private void notifyOnAddTabButtonVisibilityChanged(final boolean visible) {
-        for (Listener listener : listeners) {
-            listener.onAddTabButtonVisibilityChanged(visible);
-        }
-    }
-
-    /**
-     * Notifies the listeners, that the color of the button, which allows to add a new tab, has been
-     * changed.
-     *
-     * @param colorStateList
-     *         The color, which has been set, as an instance of the class {@link ColorStateList} or
-     *         null, if the default color should be used
-     */
-    private void notifyOnAddTabButtonColorChanged(@Nullable final ColorStateList colorStateList) {
-        for (Listener listener : listeners) {
-            listener.onAddTabButtonColorChanged(colorStateList);
-        }
-    }
-
-    /**
-     * Notifies the listeners, that it has been changed, whether the toolbars should be shown, when
-     * the tab switcher is shown, or not.
-     *
-     * @param visible
-     *         True, if the toolbars should be shown, when the tab switcher is shown, false
-     *         otherwise
-     */
-    private void notifyOnToolbarVisibilityChanged(final boolean visible) {
-        for (Listener listener : listeners) {
-            listener.onToolbarVisibilityChanged(visible);
-        }
-    }
-
-    /**
-     * Notifies the listeners, that the title of the toolbar, which is shown, when the tab switcher
-     * is shown, has been changed.
-     *
-     * @param title
-     *         The title, which has been set, as an instance of the type {@link CharSequence} or
-     *         null, if no title is set
-     */
-    private void notifyOnToolbarTitleChanged(@Nullable final CharSequence title) {
-        for (Listener listener : listeners) {
-            listener.onToolbarTitleChanged(title);
-        }
-    }
-
-    /**
-     * Notifies the listeners, that the menu of the toolbar, which is shown, when the tab switcher
-     * is shown, has been inflated.
-     *
-     * @param resourceId
-     *         The resource id of the menu, which has been inflated, as an {@link Integer} value.
-     *         The resource id must correspond to a valid menu resource
-     * @param menuItemClickListener
-     *         The listener, which has been registered to be notified, when an item of the menu has
-     *         been clicked, as an instance of the type OnMenuItemClickListener or null, if no
-     *         listener should be notified
-     */
-    private void notifyOnToolbarMenuInflated(@MenuRes final int resourceId,
-                                             @Nullable final OnMenuItemClickListener menuItemClickListener) {
-        for (Listener listener : listeners) {
-            listener.onToolbarMenuInflated(resourceId, menuItemClickListener);
-        }
-    }
-
-    /**
-     * Notifies the listeners, that the navigation icon of the toolbar, which is shown, when the tab
-     * switcher is shown, has been changed.
-     *
-     * @param icon
-     *         The navigation icon, which has been set, as an instance of the class {@link Drawable}
-     *         or null, if no navigation icon is set
-     * @param clickListener
-     *         The listener, which should be notified, when the navigation item has been clicked, as
-     *         an instance of the type {@link OnClickListener} or null, if no listener should be
-     *         notified
-     */
-    private void notifyOnToolbarNavigationIconChanged(@Nullable final Drawable icon,
-                                                      @Nullable final OnClickListener clickListener) {
-        for (Listener listener : listeners) {
-            listener.onToolbarNavigationIconChanged(icon, clickListener);
-        }
-    }
-
-    /**
-     * Notifies the listeners, that the view, which is shown, when the tab switcher is empty, has
-     * been changed.
-     *
-     * @param view
-     *         The view, which has been set, as an instance of the class {@link View} or null, if no
-     *         view should be shown, when the tab switcher is empty
-     * @param animationDuration
-     *         The duration of the fade animation, which is used to show or hide the view, in
-     *         milliseconds as a {@link Long} value. The duration must be at least 0 or -1, if the
-     *         default duration should be used
-     */
-    private void notifyOnEmptyViewChanged(@Nullable final View view, final long animationDuration) {
-        for (Listener listener : listeners) {
-            listener.onEmptyViewChanged(view, animationDuration);
-        }
-    }
-
-    /**
-     * Creates a new model of a {@link TabSwitcher}.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, the model belongs to, as an instance of the class {@link
-     *         ViewGroup}. The parent may not be null
-     */
-    public TabSwitcherModel(@NonNull final TabSwitcher tabSwitcher) {
-        Condition.INSTANCE.ensureNotNull(tabSwitcher, "The tab switcher may not be null");
-        this.tabSwitcher = tabSwitcher;
-        this.listeners = new LinkedHashSet<>();
-        this.referenceTabIndex = -1;
-        this.referenceTabPosition = -1;
-        this.logLevel = LogLevel.INFO;
-        this.tabs = new ArrayList<>();
-        this.switcherShown = false;
-        this.selectedTab = null;
-        this.decorator = null;
-        this.contentRecyclerAdapter = null;
-        this.padding = new int[]{0, 0, 0, 0};
-        this.applyPaddingToTabs = true;
-        this.tabIconId = -1;
-        this.tabIconBitmap = null;
-        this.tabBackgroundColor = null;
-        this.tabContentBackgroundColor = -1;
-        this.tabTitleTextColor = null;
-        this.tabCloseButtonIconId = -1;
-        this.tabCloseButtonIconBitmap = null;
-        this.tabProgressBarColor = -1;
-        this.addTabButtonListener = null;
-        this.addTabButtonColor = null;
-        this.showToolbars = false;
-        this.toolbarTitle = null;
-        this.tabPreviewFadeThreshold = 200;
-        this.tabPreviewFadeDuration =
-                getContext().getResources().getInteger(android.R.integer.config_longAnimTime);
-        this.clearSavedStatesWhenRemovingTabs = true;
-        this.toolbarNavigationIcon = null;
-        this.toolbarNavigationIconListener = null;
-        this.toolbarMenuId = -1;
-        this.toolbarMenuItemListener = null;
-        this.tabCloseListeners = new ListenerList<>();
-        this.tabPreviewListeners = new ListenerList<>();
-    }
-
-    /**
-     * Adds a new listener, which should be notified about the model's events.
-     *
-     * @param listener
-     *         The listener, which should be added, as an instance of the type {@link Listener}. The
-     *         listener may not be null
-     */
-    public final void addListener(@NonNull final Listener listener) {
-        Condition.INSTANCE.ensureNotNull(listener, "The listener may not be null");
-        listeners.add(listener);
-    }
-
-    /**
-     * Removes a specific listener, which should not be notified about the model's events, anymore.
-     *
-     * @param listener
-     *         The listener, which should be removed, as an instance of the type {@link Listener}.
-     *         The listener may not be null
-     */
-    public final void removeListener(@NonNull final Listener listener) {
-        Condition.INSTANCE.ensureNotNull(listener, "The listener may not be null");
-        listeners.remove(listener);
-    }
-
-    /**
-     * Returns the index of the tab, which is used as a reference, when restoring the positions of
-     * tabs.
-     *
-     * @return The index of the tab, which is used as a reference, when restoring the positions of
-     * tabs, as an {@link Integer} value or -1, if the positions of tabs should not be restored
-     */
-    public final int getReferenceTabIndex() {
-        return referenceTabIndex;
-    }
-
-    /**
-     * Sets the index of the tab, which should be used as a reference, when restoring the positions
-     * of tabs.
-     *
-     * @param referenceTabIndex
-     *         The index, which should be set, as an {@link Integer} value or -1, if the positions
-     *         of tabs should not be restored
-     */
-    public final void setReferenceTabIndex(final int referenceTabIndex) {
-        this.referenceTabIndex = referenceTabIndex;
-    }
-
-    /**
-     * Returns the position of the tab, which is used as a reference, when restoring the positions
-     * of tabs.
-     *
-     * @return The position of the tab, which is used as a reference, when restoring the positions
-     * of tabs, in relation to the available space as a {@link Float} value or -1, if the positions
-     * of tabs should not be restored
-     */
-    public final float getReferenceTabPosition() {
-        return referenceTabPosition;
-    }
-
-    /**
-     * Sets the position of the tab, which should be used as a reference, when restoring the
-     * positions of tabs.
-     *
-     * @param referenceTabPosition
-     *         The position, which should be set, in relation to the available space as a {@link
-     *         Float} value or -1, if the position of tabs should not be restored
-     */
-    public final void setReferenceTabPosition(final float referenceTabPosition) {
-        this.referenceTabPosition = referenceTabPosition;
-    }
-
-    /**
-     * Returns the listener, which is notified, when the button, which allows to add a new tab, has
-     * been clicked.
-     *
-     * @return The listener, which is notified, when the button, which allows to add a new tab, has
-     * been clicked, as an instance of the type {@link AddTabButtonListener} or null, if the button
-     * is not shown
-     */
-    @Nullable
-    public final AddTabButtonListener getAddTabButtonListener() {
-        return addTabButtonListener;
-    }
-
-    /**
-     * Returns the listener, which is notified, when the navigation icon of the toolbar, which is
-     * shown, when the tab switcher is shown, has been clicked.
-     *
-     * @return The listener, which is notified, when the navigation icon of the toolbar, which is
-     * shown, when the tab switcher is shown, has been clicked as an instance of the type {@link
-     * OnClickListener} or null, if no listener should be notified
-     */
-    @Nullable
-    public final OnClickListener getToolbarNavigationIconListener() {
-        return toolbarNavigationIconListener;
-    }
-
-    /**
-     * Returns the resource id of the menu of the toolbar, which is shown, when the tab switcher is
-     * shown.
-     *
-     * @return The resource id of the menu of the toolbar, which is shown, when the tab switcher is
-     * shown, as an {@link Integer} value. The resource id must correspond to a valid menu resource
-     */
-    @MenuRes
-    public final int getToolbarMenuId() {
-        return toolbarMenuId;
-    }
-
-    /**
-     * Returns the listener, which is notified, when an item of the menu of the toolbar, which is
-     * shown, when the tab switcher is shown, has been clicked.
-     *
-     * @return The listener, which is notified, when an item of the menu of the toolbar, which is
-     * shown, when the tab switcher is shown, has been clicked as an instance of the type
-     * OnMenuItemClickListener or null, if no listener should be notified
-     */
-    @Nullable
-    public final OnMenuItemClickListener getToolbarMenuItemListener() {
-        return toolbarMenuItemListener;
-    }
-
-    /**
-     * Returns the duration of the fade animation, which should be used to show or hide the view,
-     * which is shown, when the tab switcher is empty.
-     *
-     * @return The duration of the fade animation, which should be used to show or hide the view,
-     * which is shown, when the tab switcher is empty, in milliseconds as a {@link Long} value
-     */
-    public final long getEmptyViewAnimationDuration() {
-        return emptyViewAnimationDuration;
-    }
-
-    /**
-     * Returns the listeners, which should be notified, when a tab is about to be closed by clicking
-     * its close button.
-     *
-     * @return A list, which contains the listeners, which should be notified, when a tab is about
-     * to be closed by clicking its close button, as an instance of the type ListenerList or an
-     * empty list, if no listeners should be notified
-     */
-    @NonNull
-    public final ListenerList<TabCloseListener> getTabCloseListeners() {
-        return tabCloseListeners;
-    }
-
-    /**
-     * Returns the listeners, which should be notified, when the previews of tabs are about to be
-     * loaded.
-     *
-     * @return A list, which contains the listeners, which should be notified, when the previews of
-     * tabs are about to be loaded, as an instance of the type ListenerList or an empty list, if no
-     * listeners should be notified
-     */
-    @NonNull
-    public final ListenerList<TabPreviewListener> getTabPreviewListeners() {
-        return tabPreviewListeners;
-    }
-
-    /**
-     * Returns the adapter, which allows to inflate the views, which are associated with tabs.
-     *
-     * @return The adapter, which allows to inflate the views, which are associated with tabs, as an
-     * instance of the class {@link ContentRecyclerAdapter}
-     */
-    public final ContentRecyclerAdapter getContentRecyclerAdapter() {
-        Condition.INSTANCE.ensureNotNull(contentRecyclerAdapter, "No decorator has been set",
-                IllegalStateException.class);
-        return contentRecyclerAdapter;
-    }
-
-    @NonNull
-    @Override
-    public final Context getContext() {
-        return tabSwitcher.getContext();
-    }
-
-    @Override
-    public final void setDecorator(@NonNull final TabSwitcherDecorator decorator) {
-        Condition.INSTANCE.ensureNotNull(decorator, "The decorator may not be null");
-        this.decorator = decorator;
-        this.contentRecyclerAdapter = new ContentRecyclerAdapter(tabSwitcher, decorator);
-        notifyOnDecoratorChanged(decorator);
-    }
-
-    @Override
-    public final TabSwitcherDecorator getDecorator() {
-        return decorator;
-    }
-
-    @NonNull
-    @Override
-    public final LogLevel getLogLevel() {
-        return logLevel;
-    }
-
-    @Override
-    public final void setLogLevel(@NonNull final LogLevel logLevel) {
-        Condition.INSTANCE.ensureNotNull(logLevel, "The log level may not be null");
-        this.logLevel = logLevel;
-        notifyOnLogLevelChanged(logLevel);
-    }
-
-    @Override
-    public final boolean isEmpty() {
-        return tabs.isEmpty();
-    }
-
-    @Override
-    public final int getCount() {
-        return tabs.size();
-    }
-
-    @NonNull
-    @Override
-    public final Tab getTab(final int index) {
-        return tabs.get(index);
-    }
-
-    @Override
-    public final int indexOf(@NonNull final Tab tab) {
-        Condition.INSTANCE.ensureNotNull(tab, "The tab may not be null");
-        return tabs.indexOf(tab);
-    }
-
-    @Override
-    public final void addTab(@NonNull Tab tab) {
-        addTab(tab, getCount());
-    }
-
-    @Override
-    public final void addTab(@NonNull final Tab tab, final int index) {
-        addTab(tab, index, new SwipeAnimation.Builder().create());
-    }
-
-    @Override
-    public final void addTab(@NonNull final Tab tab, final int index,
-                             @NonNull final Animation animation) {
-        Condition.INSTANCE.ensureNotNull(tab, "The tab may not be null");
-        Condition.INSTANCE.ensureNotNull(animation, "The animation may not be null");
-        tabs.add(index, tab);
-        int previousSelectedTabIndex = getSelectedTabIndex();
-        int selectedTabIndex = previousSelectedTabIndex;
-        boolean selectionChanged = false;
-        boolean switcherVisibilityChanged = false;
-
-        if (previousSelectedTabIndex == -1) {
-            selectedTab = tab;
-            selectedTabIndex = index;
-            selectionChanged = true;
-        }
-
-        if (animation instanceof RevealAnimation) {
-            selectedTab = tab;
-            selectedTabIndex = index;
-            selectionChanged = true;
-            switcherVisibilityChanged = setSwitcherShown(false);
-        }
-
-        if (animation instanceof PeekAnimation && getCount() > 1) {
-            switcherVisibilityChanged = setSwitcherShown(true);
-        }
-
-        notifyOnTabAdded(index, tab, previousSelectedTabIndex, selectedTabIndex, selectionChanged,
-                switcherVisibilityChanged, animation);
-    }
-
-    @Override
-    public final void addAllTabs(@NonNull final Collection<? extends Tab> tabs) {
-        addAllTabs(tabs, getCount());
-    }
-
-    @Override
-    public final void addAllTabs(@NonNull final Collection<? extends Tab> tabs, final int index) {
-        addAllTabs(tabs, index, new SwipeAnimation.Builder().create());
-    }
-
-    @Override
-    public final void addAllTabs(@NonNull final Collection<? extends Tab> tabs, final int index,
-                                 @NonNull final Animation animation) {
-        Condition.INSTANCE.ensureNotNull(tabs, "The collection may not be null");
-        Tab[] array = new Tab[tabs.size()];
-        tabs.toArray(array);
-        addAllTabs(array, index, animation);
-    }
-
-    @Override
-    public final void addAllTabs(@NonNull final Tab[] tabs) {
-        addAllTabs(tabs, getCount());
-    }
-
-    @Override
-    public final void addAllTabs(@NonNull final Tab[] tabs, final int index) {
-        addAllTabs(tabs, index, new SwipeAnimation.Builder().create());
-    }
-
-    @Override
-    public final void addAllTabs(@NonNull final Tab[] tabs, final int index,
-                                 @NonNull final Animation animation) {
-        Condition.INSTANCE.ensureNotNull(tabs, "The array may not be null");
-        Condition.INSTANCE.ensureNotNull(animation, "The animation may not be null");
-
-        if (tabs.length > 0) {
-            int previousSelectedTabIndex = getSelectedTabIndex();
-            int selectedTabIndex = previousSelectedTabIndex;
-            boolean selectionChanged = false;
-
-            for (int i = 0; i < tabs.length; i++) {
-                Tab tab = tabs[i];
-                this.tabs.add(index + i, tab);
-            }
-
-            if (previousSelectedTabIndex == -1) {
-                selectedTabIndex = 0;
-                selectedTab = tabs[selectedTabIndex];
-                selectionChanged = true;
-            }
-
-            notifyOnAllTabsAdded(index, tabs, previousSelectedTabIndex, selectedTabIndex,
-                    selectionChanged, animation);
-        }
-    }
-
-    @Override
-    public final void removeTab(@NonNull final Tab tab) {
-        removeTab(tab, new SwipeAnimation.Builder().create());
-    }
-
-    @Override
-    public final void removeTab(@NonNull final Tab tab, @NonNull final Animation animation) {
-        Condition.INSTANCE.ensureNotNull(tab, "The tab may not be null");
-        Condition.INSTANCE.ensureNotNull(animation, "The animation may not be null");
-        int index = indexOfOrThrowException(tab);
-        int previousSelectedTabIndex = getSelectedTabIndex();
-        int selectedTabIndex = previousSelectedTabIndex;
-        boolean selectionChanged = false;
-        tabs.remove(index);
-
-        if (isEmpty()) {
-            selectedTabIndex = -1;
-            selectedTab = null;
-            selectionChanged = true;
-        } else if (index == previousSelectedTabIndex) {
-            if (index > 0) {
-                selectedTabIndex = index - 1;
-            }
-
-            selectedTab = getTab(selectedTabIndex);
-            selectionChanged = true;
-        }
-
-        notifyOnTabRemoved(index, tab, previousSelectedTabIndex, selectedTabIndex, selectionChanged,
-                animation);
-
-    }
-
-    @Override
-    public final void clear() {
-        clear(new SwipeAnimation.Builder().create());
-    }
-
-    @Override
-    public final void clear(@NonNull final Animation animation) {
-        Condition.INSTANCE.ensureNotNull(animation, "The animation may not be null");
-        Tab[] result = new Tab[tabs.size()];
-        tabs.toArray(result);
-        tabs.clear();
-        notifyOnAllTabsRemoved(result, animation);
-        selectedTab = null;
-    }
-
-    @Override
-    public final boolean isSwitcherShown() {
-        return tabSwitcher.getLayout() == Layout.TABLET || switcherShown;
-    }
-
-    @Override
-    public final void showSwitcher() {
-        setSwitcherShown(true);
-        notifyOnSwitcherShown();
-    }
-
-    @Override
-    public final void hideSwitcher() {
-        setSwitcherShown(false);
-        notifyOnSwitcherHidden();
-    }
-
-    @Override
-    public final void toggleSwitcherVisibility() {
-        if (isSwitcherShown()) {
-            hideSwitcher();
-        } else {
-            showSwitcher();
-        }
-    }
-
-    @Nullable
-    @Override
-    public final Tab getSelectedTab() {
-        return selectedTab;
-    }
-
-    @Override
-    public final int getSelectedTabIndex() {
-        return selectedTab != null ? indexOf(selectedTab) : -1;
-    }
-
-    @Override
-    public final void selectTab(@NonNull final Tab tab) {
-        Condition.INSTANCE.ensureNotNull(tab, "The tab may not be null");
-        int previousIndex = getSelectedTabIndex();
-        int index = indexOfOrThrowException(tab);
-        selectedTab = tab;
-        boolean switcherHidden = setSwitcherShown(false);
-        notifyOnSelectionChanged(previousIndex, index, tab, switcherHidden);
-    }
-
-    @Override
-    public final void selectTab(final int index) {
-        selectTab(getTab(index));
-    }
-
-    @Override
-    public final Iterator<Tab> iterator() {
-        return tabs.iterator();
-    }
-
-    @Override
-    public final void setPadding(final int left, final int top, final int right, final int bottom) {
-        padding = new int[]{left, top, right, bottom};
-        notifyOnPaddingChanged(left, top, right, bottom);
-    }
-
-    @Override
-    public final int getPaddingLeft() {
-        return padding[0];
-    }
-
-    @Override
-    public final int getPaddingTop() {
-        return padding[1];
-    }
-
-    @Override
-    public final int getPaddingRight() {
-        return padding[2];
-    }
-
-    @Override
-    public final int getPaddingBottom() {
-        return padding[3];
-    }
-
-    @Override
-    public final int getPaddingStart() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            return tabSwitcher.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL ?
-                    getPaddingRight() : getPaddingLeft();
-        }
-
-        return getPaddingLeft();
-    }
-
-    @Override
-    public final int getPaddingEnd() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            return tabSwitcher.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL ?
-                    getPaddingLeft() : getPaddingRight();
-        }
-
-        return getPaddingRight();
-    }
-
-    @Override
-    public final void applyPaddingToTabs(final boolean applyPaddingToTabs) {
-        this.applyPaddingToTabs = applyPaddingToTabs;
-        notifyOnApplyPaddingToTabsChanged(applyPaddingToTabs);
-    }
-
-    @Override
-    public final boolean isPaddingAppliedToTabs() {
-        return applyPaddingToTabs;
-    }
-
-    @Nullable
-    @Override
-    public final Drawable getTabIcon() {
-        if (tabIconId != -1) {
-            return AppCompatResources.getDrawable(getContext(), tabIconId);
-        } else {
-            return tabIconBitmap != null ?
-                    new BitmapDrawable(getContext().getResources(), tabIconBitmap) : null;
-        }
-    }
-
-    @Override
-    public final void setTabIcon(@DrawableRes final int resourceId) {
-        this.tabIconId = resourceId;
-        this.tabIconBitmap = null;
-        notifyOnTabIconChanged(getTabIcon());
-    }
-
-    @Override
-    public final void setTabIcon(@Nullable final Bitmap icon) {
-        this.tabIconId = -1;
-        this.tabIconBitmap = icon;
-        notifyOnTabIconChanged(getTabIcon());
-    }
-
-    @Override
-    public final ColorStateList getTabIconTintList() {
-        return tabIconTintList;
-    }
-
-    @Override
-    public final void setTabIconTint(@ColorInt final int color) {
-        setTabIconTintList(ColorStateList.valueOf(color));
-    }
-
-    @Override
-    public final void setTabIconTintList(@Nullable final ColorStateList tintList) {
-        this.tabIconTintList = tintList;
-        notifyOnTabIconChanged(getTabIcon());
-    }
-
-    @Override
-    public final PorterDuff.Mode getTabIconTintMode() {
-        return tabIconTintMode;
-    }
-
-    @Override
-    public final void setTabIconTintMode(@Nullable final PorterDuff.Mode mode) {
-        this.tabIconTintMode = mode;
-        notifyOnTabIconChanged(getTabIcon());
-    }
-
-    @Nullable
-    @Override
-    public final ColorStateList getTabBackgroundColor() {
-        return tabBackgroundColor;
-    }
-
-    @Override
-    public final void setTabBackgroundColor(@ColorInt final int color) {
-        setTabBackgroundColor(color != -1 ? ColorStateList.valueOf(color) : null);
-    }
-
-    @Override
-    public final void setTabBackgroundColor(@Nullable final ColorStateList colorStateList) {
-        this.tabBackgroundColor = colorStateList;
-        notifyOnTabBackgroundColorChanged(colorStateList);
-    }
-
-    @ColorInt
-    @Override
-    public final int getTabContentBackgroundColor() {
-        return tabContentBackgroundColor;
-    }
-
-    @Override
-    public final void setTabContentBackgroundColor(@ColorInt final int color) {
-        this.tabContentBackgroundColor = color;
-        notifyOnTabContentBackgroundColorChanged(color);
-    }
-
-    @Nullable
-    @Override
-    public final ColorStateList getTabTitleTextColor() {
-        return tabTitleTextColor;
-    }
-
-    @Override
-    public final void setTabTitleTextColor(@ColorInt final int color) {
-        setTabTitleTextColor(color != -1 ? ColorStateList.valueOf(color) : null);
-    }
-
-    @Override
-    public final void setTabTitleTextColor(@Nullable final ColorStateList colorStateList) {
-        this.tabTitleTextColor = colorStateList;
-        notifyOnTabTitleColorChanged(colorStateList);
-    }
-
-    @Nullable
-    @Override
-    public final Drawable getTabCloseButtonIcon() {
-        if (tabCloseButtonIconId != -1) {
-            return AppCompatResources.getDrawable(getContext(), tabCloseButtonIconId);
-        } else {
-            return tabCloseButtonIconBitmap != null ?
-                    new BitmapDrawable(getContext().getResources(), tabCloseButtonIconBitmap) :
-                    null;
-        }
-    }
-
-    @Override
-    public final int getTabProgressBarColor() {
-        return tabProgressBarColor;
-    }
-
-    @Override
-    public final void setTabProgressBarColor(@ColorInt final int color) {
-        this.tabProgressBarColor = color;
-        notifyOnTabProgressBarColorChanged(color);
-    }
-
-    @Override
-    public final void setTabCloseButtonIcon(@DrawableRes final int resourceId) {
-        tabCloseButtonIconId = resourceId;
-        tabCloseButtonIconBitmap = null;
-        notifyOnTabCloseButtonIconChanged(getTabCloseButtonIcon());
-    }
-
-    @Override
-    public final void setTabCloseButtonIcon(@Nullable final Bitmap icon) {
-        tabCloseButtonIconId = -1;
-        tabCloseButtonIconBitmap = icon;
-        notifyOnTabCloseButtonIconChanged(getTabCloseButtonIcon());
-    }
-
-    @Override
-    public final ColorStateList getTabCloseButtonIconTintList() {
-        return tabCloseButtonIconTintList;
-    }
-
-    @Override
-    public final void setTabCloseButtonIconTint(@ColorInt final int color) {
-        setTabCloseButtonIconTintList(ColorStateList.valueOf(color));
-    }
-
-    @Override
-    public final void setTabCloseButtonIconTintList(@Nullable final ColorStateList tintList) {
-        this.tabCloseButtonIconTintList = tintList;
-    }
-
-    @Override
-    public final PorterDuff.Mode getTabCloseButtonIconTintMode() {
-        return tabCloseButtonIconTintMode;
-    }
-
-    @Override
-    public final void setTabCloseButtonIconTintMode(@Nullable final PorterDuff.Mode mode) {
-        this.tabCloseButtonIconTintMode = mode;
-        notifyOnTabIconChanged(getTabIcon());
-    }
-
-    @Override
-    public final boolean isAddTabButtonShown() {
-        return tabSwitcher.getLayout() == Layout.TABLET && addTabButtonListener != null;
-    }
-
-    @Override
-    public final void showAddTabButton(@Nullable final AddTabButtonListener listener) {
-        this.addTabButtonListener = listener;
-        notifyOnAddTabButtonVisibilityChanged(listener != null);
-    }
-
-    @Nullable
-    @Override
-    public final ColorStateList getAddTabButtonColor() {
-        return addTabButtonColor;
-    }
-
-    @Override
-    public final void setAddTabButtonColor(@ColorInt final int color) {
-        setAddTabButtonColor(color != -1 ? ColorStateList.valueOf(color) : null);
-    }
-
-    @Override
-    public final void setAddTabButtonColor(@Nullable final ColorStateList colorStateList) {
-        this.addTabButtonColor = colorStateList;
-        notifyOnAddTabButtonColorChanged(colorStateList);
-    }
-
-    @Override
-    public final boolean areToolbarsShown() {
-        return showToolbars;
-    }
-
-    @Override
-    public final void showToolbars(final boolean show) {
-        this.showToolbars = show;
-        notifyOnToolbarVisibilityChanged(show);
-    }
-
-    @Nullable
-    @Override
-    public final CharSequence getToolbarTitle() {
-        return toolbarTitle;
-    }
-
-    @Override
-    public void setToolbarTitle(@StringRes final int resourceId) {
-        setToolbarTitle(getContext().getText(resourceId));
-    }
-
-    @Override
-    public final void setToolbarTitle(@Nullable final CharSequence title) {
-        this.toolbarTitle = title;
-        notifyOnToolbarTitleChanged(title);
-    }
-
-    @Nullable
-    @Override
-    public final Drawable getToolbarNavigationIcon() {
-        return toolbarNavigationIcon;
-    }
-
-    @Override
-    public final void setToolbarNavigationIcon(@DrawableRes final int resourceId,
-                                               @Nullable final OnClickListener listener) {
-        setToolbarNavigationIcon(AppCompatResources.getDrawable(getContext(), resourceId),
-                listener);
-    }
-
-    @Override
-    public final void setToolbarNavigationIcon(@Nullable final Drawable icon,
-                                               @Nullable final OnClickListener listener) {
-        this.toolbarNavigationIcon = icon;
-        this.toolbarNavigationIconListener = listener;
-        notifyOnToolbarNavigationIconChanged(icon, listener);
-    }
-
-    @Override
-    public final ColorStateList getToolbarNavigationIconTintList() {
-        return toolbarNavigationIconTintList;
-    }
-
-    @Override
-    public final void setToolbarNavigationIconTint(@ColorInt final int color) {
-        setToolbarNavigationIconTintList(ColorStateList.valueOf(color));
-    }
-
-    @Override
-    public final void setToolbarNavigationIconTintList(@Nullable final ColorStateList tintList) {
-        this.toolbarNavigationIconTintList = tintList;
-        notifyOnToolbarNavigationIconChanged(toolbarNavigationIcon, toolbarNavigationIconListener);
-    }
-
-    @Override
-    public final PorterDuff.Mode getToolbarNavigationIconTintMode() {
-        return toolbarNavigationIconTintMode;
-    }
-
-    @Override
-    public final void setToolbarNavigationIconTintMode(@Nullable final PorterDuff.Mode mode) {
-        this.toolbarNavigationIconTintMode = mode;
-        notifyOnToolbarNavigationIconChanged(toolbarNavigationIcon, toolbarNavigationIconListener);
-    }
-
-    @Override
-    public final void inflateToolbarMenu(@MenuRes final int resourceId,
-                                         @Nullable final OnMenuItemClickListener listener) {
-        this.toolbarMenuId = resourceId;
-        this.toolbarMenuItemListener = listener;
-        notifyOnToolbarMenuInflated(resourceId, listener);
-    }
-
-    @Override
-    public final long getTabPreviewFadeThreshold() {
-        return tabPreviewFadeThreshold;
-    }
-
-    @Override
-    public final void setTabPreviewFadeThreshold(final long threshold) {
-        Condition.INSTANCE.ensureAtLeast(threshold, 0, "The threshold must be at least 0");
-        this.tabPreviewFadeThreshold = threshold;
-    }
-
-    @Override
-    public final long getTabPreviewFadeDuration() {
-        return tabPreviewFadeDuration;
-    }
-
-    @Override
-    public final void setTabPreviewFadeDuration(final long duration) {
-        Condition.INSTANCE.ensureAtLeast(duration, 0, "The duration must be at least 0");
-        this.tabPreviewFadeDuration = duration;
-    }
-
-    @Nullable
-    @Override
-    public final View getEmptyView() {
-        return emptyView;
-    }
-
-    @Override
-    public final void setEmptyView(@Nullable final View view) {
-        setEmptyView(view, -1);
-    }
-
-    @Override
-    public final void setEmptyView(@Nullable final View view, final long animationDuration) {
-        this.emptyView = view;
-        this.emptyViewAnimationDuration = view != null ? animationDuration : -1;
-        notifyOnEmptyViewChanged(emptyView, animationDuration);
-    }
-
-    @Override
-    public final void setEmptyView(@LayoutRes final int resourceId) {
-        setEmptyView(resourceId, -1);
-    }
-
-    @Override
-    public final void setEmptyView(@LayoutRes final int resourceId, final long animationDuration) {
-        LayoutInflater inflater = LayoutInflater.from(getContext());
-        setEmptyView(inflater.inflate(resourceId, tabSwitcher, false), animationDuration);
-    }
-
-    @Override
-    public final boolean areSavedStatesClearedWhenRemovingTabs() {
-        return clearSavedStatesWhenRemovingTabs;
-    }
-
-    @Override
-    public final void clearSavedStatesWhenRemovingTabs(final boolean clear) {
-        this.clearSavedStatesWhenRemovingTabs = clear;
-    }
-
-    @Override
-    public final void addCloseTabListener(@NonNull final TabCloseListener listener) {
-        Condition.INSTANCE.ensureNotNull(listener, "The listener may not be null");
-        tabCloseListeners.add(listener);
-    }
-
-    @Override
-    public final void removeCloseTabListener(@NonNull final TabCloseListener listener) {
-        Condition.INSTANCE.ensureNotNull(listener, "The listener may not be null");
-        tabCloseListeners.remove(listener);
-    }
-
-    @Override
-    public final void addTabPreviewListener(@NonNull final TabPreviewListener listener) {
-        Condition.INSTANCE.ensureNotNull(listener, "The listener may not be null");
-        tabPreviewListeners.add(listener);
-    }
-
-    @Override
-    public final void removeTabPreviewListener(@NonNull final TabPreviewListener listener) {
-        Condition.INSTANCE.ensureNotNull(listener, "The listener may not be null");
-        tabPreviewListeners.remove(listener);
-    }
-
-    @Override
-    public final void saveInstanceState(@NonNull final Bundle outState) {
-        outState.putSerializable(LOG_LEVEL_EXTRA, logLevel);
-        outState.putParcelableArrayList(TABS_EXTRA, tabs);
-        outState.putBoolean(SWITCHER_SHOWN_EXTRA, switcherShown);
-        outState.putInt(SELECTED_TAB_INDEX_EXTRA, selectedTab != null ? indexOf(selectedTab) : -1);
-        outState.putIntArray(PADDING_EXTRA, padding);
-        outState.putBoolean(APPLY_PADDING_TO_TABS_EXTRA, applyPaddingToTabs);
-        outState.putInt(TAB_ICON_ID_EXTRA, tabIconId);
-        outState.putParcelable(TAB_ICON_BITMAP_EXTRA, tabIconBitmap);
-        outState.putParcelable(TAB_ICON_TINT_LIST_EXTRA, tabIconTintList);
-        outState.putSerializable(TAB_ICON_TINT_MODE_EXTRA, tabIconTintMode);
-        outState.putParcelable(TAB_BACKGROUND_COLOR_EXTRA, tabBackgroundColor);
-        outState.putInt(TAB_CONTENT_BACKGROUND_COLOR_EXTRA, tabContentBackgroundColor);
-        outState.putParcelable(TAB_TITLE_TEXT_COLOR_EXTRA, tabTitleTextColor);
-        outState.putInt(TAB_CLOSE_BUTTON_ICON_ID_EXTRA, tabCloseButtonIconId);
-        outState.putParcelable(TAB_CLOSE_BUTTON_ICON_BITMAP_EXTRA, tabCloseButtonIconBitmap);
-        outState.putParcelable(TAB_CLOSE_BUTTON_ICON_TINT_LIST_EXTRA, tabCloseButtonIconTintList);
-        outState.putSerializable(TAB_CLOSE_BUTTON_ICON_TINT_MODE_EXTRA, tabCloseButtonIconTintMode);
-        outState.putInt(TAB_PROGRESS_BAR_COLOR_EXTRA, tabProgressBarColor);
-        outState.putBoolean(SHOW_TOOLBARS_EXTRA, showToolbars);
-        outState.putCharSequence(TOOLBAR_TITLE_EXTRA, toolbarTitle);
-        outState.putParcelable(TOOLBAR_NAVIGATION_ICON_TINT_LIST_EXTRA,
-                toolbarNavigationIconTintList);
-        outState.putSerializable(TOOLBAR_NAVIGATION_ICON_TINT_MODE_EXTRA,
-                toolbarNavigationIconTintMode);
-        outState.putLong(TAB_PREVIEW_FADE_THRESHOLD_EXTRA, tabPreviewFadeThreshold);
-        outState.putLong(TAB_PREVIEW_FADE_DURATION, tabPreviewFadeDuration);
-        outState.putBoolean(CLEAR_SAVED_STATES_WHEN_REMOVING_TABS_EXTRA,
-                clearSavedStatesWhenRemovingTabs);
-        getContentRecyclerAdapter().saveInstanceState(outState);
-    }
-
-    @Override
-    public final void restoreInstanceState(@Nullable final Bundle savedInstanceState) {
-        if (savedInstanceState != null) {
-            referenceTabIndex = savedInstanceState.getInt(REFERENCE_TAB_INDEX_EXTRA, -1);
-            referenceTabPosition = savedInstanceState.getFloat(REFERENCE_TAB_POSITION_EXTRA, -1);
-            logLevel = (LogLevel) savedInstanceState.getSerializable(LOG_LEVEL_EXTRA);
-            tabs = savedInstanceState.getParcelableArrayList(TABS_EXTRA);
-            switcherShown = savedInstanceState.getBoolean(SWITCHER_SHOWN_EXTRA);
-            int selectedTabIndex = savedInstanceState.getInt(SELECTED_TAB_INDEX_EXTRA);
-            selectedTab = selectedTabIndex != -1 ? tabs.get(selectedTabIndex) : null;
-            padding = savedInstanceState.getIntArray(PADDING_EXTRA);
-            applyPaddingToTabs = savedInstanceState.getBoolean(APPLY_PADDING_TO_TABS_EXTRA);
-            tabIconId = savedInstanceState.getInt(TAB_ICON_ID_EXTRA);
-            tabIconBitmap = savedInstanceState.getParcelable(TAB_ICON_BITMAP_EXTRA);
-            tabIconTintList = savedInstanceState.getParcelable(TAB_ICON_TINT_LIST_EXTRA);
-            tabIconTintMode =
-                    (PorterDuff.Mode) savedInstanceState.getSerializable(TAB_ICON_TINT_MODE_EXTRA);
-            tabBackgroundColor = savedInstanceState.getParcelable(TAB_BACKGROUND_COLOR_EXTRA);
-            tabContentBackgroundColor =
-                    savedInstanceState.getInt(TAB_CONTENT_BACKGROUND_COLOR_EXTRA);
-            tabTitleTextColor = savedInstanceState.getParcelable(TAB_TITLE_TEXT_COLOR_EXTRA);
-            tabCloseButtonIconId = savedInstanceState.getInt(TAB_CLOSE_BUTTON_ICON_ID_EXTRA);
-            tabCloseButtonIconBitmap =
-                    savedInstanceState.getParcelable(TAB_CLOSE_BUTTON_ICON_BITMAP_EXTRA);
-            tabCloseButtonIconTintList =
-                    savedInstanceState.getParcelable(TAB_CLOSE_BUTTON_ICON_TINT_LIST_EXTRA);
-            tabCloseButtonIconTintMode = (PorterDuff.Mode) savedInstanceState
-                    .getSerializable(TAB_CLOSE_BUTTON_ICON_TINT_MODE_EXTRA);
-            tabProgressBarColor = savedInstanceState.getInt(TAB_PROGRESS_BAR_COLOR_EXTRA, -1);
-            showToolbars = savedInstanceState.getBoolean(SHOW_TOOLBARS_EXTRA);
-            toolbarTitle = savedInstanceState.getCharSequence(TOOLBAR_TITLE_EXTRA);
-            toolbarNavigationIconTintList =
-                    savedInstanceState.getParcelable(TOOLBAR_NAVIGATION_ICON_TINT_LIST_EXTRA);
-            toolbarNavigationIconTintMode = (PorterDuff.Mode) savedInstanceState
-                    .getSerializable(TOOLBAR_NAVIGATION_ICON_TINT_MODE_EXTRA);
-            tabPreviewFadeThreshold = savedInstanceState.getLong(TAB_PREVIEW_FADE_THRESHOLD_EXTRA);
-            tabPreviewFadeDuration = savedInstanceState.getLong(TAB_PREVIEW_FADE_DURATION);
-            clearSavedStatesWhenRemovingTabs =
-                    savedInstanceState.getBoolean(CLEAR_SAVED_STATES_WHEN_REMOVING_TABS_EXTRA);
-            getContentRecyclerAdapter().restoreInstanceState(savedInstanceState);
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/TabSwitcherStyle.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/TabSwitcherStyle.java
deleted file mode 100644
index 6c8e7e52..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/TabSwitcherStyle.java
+++ /dev/null
@@ -1,476 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.model;
-
-import android.content.res.ColorStateList;
-import android.content.res.Resources.NotFoundException;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
-import android.text.TextUtils;
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.graphics.drawable.DrawableCompat;
-import de.mrapp.android.tabswitcher.R;
-import de.mrapp.android.tabswitcher.Tab;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.util.ThemeHelper;
-import de.mrapp.util.Condition;
-
-/**
- * Allows to retrieve the style attributes of a {@link TabSwitcher}.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public class TabSwitcherStyle {
-
-    /**
-     * The tab switcher, whose style attributes are retrieved.
-     */
-    private final TabSwitcher tabSwitcher;
-
-    /**
-     * The model of the tab switcher, whose style attributes are retrieved.
-     */
-    private final Model model;
-
-    /**
-     * The theme helper, which allows to retrieve resources, depending on the tab switcher's theme.
-     */
-    private final ThemeHelper themeHelper;
-
-    /**
-     * Return the color state list, which should be used to tint the icon of tabs.
-     *
-     * @param tab
-     *         The tab, the color state list should be returned for, as an instance of the class
-     *         {@link Tab} or null, if the color state list should not be returned for a specific
-     *         tab
-     * @return The color state list, which should be used to tint the icon of tabs, as an instance
-     * of the class {@link ColorStateList} or null, if the icon should not be tinted
-     */
-    @Nullable
-    private ColorStateList getTabIconTintList(@Nullable final Tab tab) {
-        ColorStateList tintList = tab != null ? tab.getCloseButtonIconTintList() : null;
-
-        if (tintList == null) {
-            tintList = model.getTabCloseButtonIconTintList();
-
-            if (tintList == null) {
-                try {
-                    tintList = themeHelper.getColorStateList(tabSwitcher.getLayout(),
-                            R.attr.tabSwitcherTabIconTint);
-                } catch (NotFoundException e) {
-                    tintList = null;
-                }
-
-            }
-        }
-
-        return tintList;
-    }
-
-    /**
-     * Returns the mode, which should be used to tint the icon of tabs.
-     *
-     * @param tab
-     *         The tab, the mode should be returned for, as an instance of the class {@link Tab} or
-     *         null, if the mode should not be returned for a specific tab
-     * @return The mode, which should be used to tint the icon of tabs, as a value of the enum
-     * {@link PorterDuff.Mode}. The mode may not be null
-     */
-    @NonNull
-    private PorterDuff.Mode getTabIconTintMode(@Nullable final Tab tab) {
-        PorterDuff.Mode tintMode = tab != null ? tab.getIconTintMode() : null;
-
-        if (tintMode == null) {
-            tintMode = model.getTabIconTintMode();
-        }
-
-        return tintMode != null ? tintMode : PorterDuff.Mode.SRC_ATOP;
-    }
-
-    /**
-     * Return the color state list, which should be used to tint the close button of tabs.
-     *
-     * @param tab
-     *         The tab, the color state list should be returned for, as an instance of the class
-     *         {@link Tab} or null, if the color state list should not be returned for a specific
-     *         tab
-     * @return The color state list, which should be used to tint the close button of tabs, as an
-     * instance of the class {@link ColorStateList} or null, if the close button should not be
-     * tinted
-     */
-    @Nullable
-    private ColorStateList getTabCloseButtonIconTintList(@Nullable final Tab tab) {
-        ColorStateList tintList = tab != null ? tab.getCloseButtonIconTintList() : null;
-
-        if (tintList == null) {
-            tintList = model.getTabCloseButtonIconTintList();
-
-            if (tintList == null) {
-                try {
-                    tintList = themeHelper.getColorStateList(tabSwitcher.getLayout(),
-                            R.attr.tabSwitcherTabCloseButtonIconTint);
-                } catch (NotFoundException e) {
-                    tintList = null;
-                }
-
-            }
-        }
-
-        return tintList;
-    }
-
-    /**
-     * Returns the mode, which should be used to tint the close button of tabs.
-     *
-     * @param tab
-     *         The tab, the mode should be returned for, as an instance of the class {@link Tab} or
-     *         null, if the mode should not be returned for a specific tab
-     * @return The mode, which should be used to tint the close button of tabs, as a value of the
-     * enum {@link PorterDuff.Mode}. The mode may not be null
-     */
-    @NonNull
-    private PorterDuff.Mode getTabCloseButtonIconTintMode(@Nullable final Tab tab) {
-        PorterDuff.Mode tintMode = tab != null ? tab.getCloseButtonIconTintMode() : null;
-
-        if (tintMode == null) {
-            tintMode = model.getTabCloseButtonIconTintMode();
-        }
-
-        return tintMode != null ? tintMode : PorterDuff.Mode.SRC_ATOP;
-    }
-
-    /**
-     * Return the color state list, which should be used to tint the navigation icon of the toolbar,
-     * which is shown, when the tab switcher is shown.
-     *
-     * @return The color state list, which should be used to tint the navigation icon of the
-     * toolbar, which is shown, then the tab switcher is shown, as an instance of the class {@link
-     * ColorStateList} or null, if the navigation icon should not be tinted
-     */
-    @Nullable
-    private ColorStateList getToolbarNavigationIconTintList() {
-        ColorStateList tintList = model.getTabCloseButtonIconTintList();
-
-        if (tintList == null) {
-            try {
-                tintList = themeHelper.getColorStateList(tabSwitcher.getLayout(),
-                        R.attr.tabSwitcherToolbarNavigationIconTint);
-            } catch (NotFoundException e) {
-                tintList = null;
-            }
-
-        }
-
-        return tintList;
-    }
-
-    /**
-     * Returns the mode, which should be used to tint the navigation icon of the toolbar, which is
-     * shown, when the tab switcher is shown.
-     *
-     * @return The mode, which should be used to tint the navigation icon of the toolbar, which is
-     * shown, when the tab switcher is shown, as a value of the enum {@link PorterDuff.Mode}. The
-     * mode may not be null
-     */
-    @NonNull
-    private PorterDuff.Mode getToolbarNavigationIconTintMode() {
-        PorterDuff.Mode tintMode = model.getToolbarNavigationIconTintMode();
-        return tintMode != null ? tintMode : PorterDuff.Mode.SRC_ATOP;
-    }
-
-    /**
-     * Creates a new class, which allows to retrieve the style attributes of a {@link TabSwitcher}.
-     *
-     * @param tabSwitcher
-     *         The tab switcher, whose style attributes are retrieved, as an instance of the type
-     *         {@link TabSwitcher}. The tab switcher may not be null
-     * @param model
-     *         The model of the tab switcher, whose style attributes are retrieved, as an instance
-     *         of the class {@link TabSwitcher}. The model may not be null
-     * @param themeHelper
-     *         The theme helper, which allows to retrieve resources, depending on the tab switcher's
-     *         theme, as an instance of the class {@link ThemeHelper}. The theme helper may not be
-     *         null
-     */
-    public TabSwitcherStyle(@NonNull final TabSwitcher tabSwitcher, @NonNull final Model model,
-                            @NonNull final ThemeHelper themeHelper) {
-        Condition.INSTANCE.ensureNotNull(tabSwitcher, "The tab switcher may not be null");
-        Condition.INSTANCE.ensureNotNull(model, "The model may not be null");
-        Condition.INSTANCE.ensureNotNull(themeHelper, "The theme helper may not be null");
-        this.tabSwitcher = tabSwitcher;
-        this.model = model;
-        this.themeHelper = themeHelper;
-    }
-
-    /**
-     * Returns the theme helper, which allows to retrieve resources, depending on the tab switcher's
-     * theme.
-     *
-     * @return The theme helper, which allows to retrieve resources, depending on the tab switcher's
-     * theme, as an instance of the class {@link ThemeHelper}. The theme helper may not be null
-     */
-    @NonNull
-    public final ThemeHelper getThemeHelper() {
-        return themeHelper;
-    }
-
-    /**
-     * Returns the icon of tabs.
-     *
-     * @param tab
-     *         The tab, the icon should be returned for, as an instance of the class {@link Tab} or
-     *         null, if the icon should not be returned for a specific tab
-     * @return The icon of tabs as an instance of the class {@link Drawable} or null, if no icon is
-     * set
-     */
-    @Nullable
-    public final Drawable getTabIcon(@Nullable final Tab tab) {
-        Drawable icon = tab != null ? tab.getIcon(model.getContext()) : null;
-
-        if (icon == null) {
-            icon = model.getTabIcon();
-
-            if (icon == null) {
-                try {
-                    icon = themeHelper
-                            .getDrawable(tabSwitcher.getLayout(), R.attr.tabSwitcherTabIcon);
-                } catch (NotFoundException e) {
-                    icon = null;
-                }
-            }
-        }
-
-        if (icon != null) {
-            ColorStateList tintList = getTabIconTintList(tab);
-
-            if (tintList != null) {
-                PorterDuff.Mode tintMode = getTabIconTintMode(tab);
-                DrawableCompat.setTintList(icon, tintList);
-                DrawableCompat.setTintMode(icon, tintMode);
-            }
-        }
-
-        return icon;
-    }
-
-    /**
-     * Returns the background color of tabs.
-     *
-     * @param tab
-     *         The tab, the background color should be returned for, as an instance of the class
-     *         {@link Tab} or null, if the background color should not be returned for a specific
-     *         tab
-     * @return The background color of tabs as an instance of the class {@link ColorStateList}
-     */
-    public final ColorStateList getTabBackgroundColor(@Nullable final Tab tab) {
-        ColorStateList colorStateList = tab != null ? tab.getBackgroundColor() : null;
-
-        if (colorStateList == null) {
-            colorStateList = model.getTabBackgroundColor();
-
-            if (colorStateList == null) {
-                colorStateList = themeHelper.getColorStateList(tabSwitcher.getLayout(),
-                        R.attr.tabSwitcherTabBackgroundColor);
-            }
-        }
-
-        return colorStateList;
-    }
-
-    /**
-     * Returns the content background color of tabs.
-     *
-     * @param tab
-     *         The tab, the background color should be returned for, as an instance of the class
-     *         {@link Tab} or null, if the background color should not be returned for a specific
-     *         tab
-     * @return The content background color of tabs as an {@link Integer} value
-     */
-    @ColorInt
-    public final int getTabContentBackgroundColor(@Nullable final Tab tab) {
-        int color = tab != null ? tab.getContentBackgroundColor() : -1;
-
-        if (color == -1) {
-            color = model.getTabContentBackgroundColor();
-
-            if (color == -1) {
-                color = themeHelper.getColor(tabSwitcher.getLayout(),
-                        R.attr.tabSwitcherTabContentBackgroundColor);
-            }
-        }
-
-        return color;
-    }
-
-    /**
-     * Returns the title text color of tabs.
-     *
-     * @param tab
-     *         The tab, the text color should be returned for, as an instance of the class {@link
-     *         Tab} or null, if the text color should not be returned for a specific tab
-     * @return The title text color of tabs as an instance of the class {@link ColorStateList}
-     */
-    public final ColorStateList getTabTitleTextColor(@Nullable final Tab tab) {
-        ColorStateList colorStateList = tab != null ? tab.getTitleTextColor() : null;
-
-        if (colorStateList == null) {
-            colorStateList = model.getTabTitleTextColor();
-
-            if (colorStateList == null) {
-                colorStateList = themeHelper.getColorStateList(tabSwitcher.getLayout(),
-                        R.attr.tabSwitcherTabTitleTextColor);
-            }
-        }
-
-        return colorStateList;
-    }
-
-    /**
-     * Returns the close button icon of tabs.
-     *
-     * @param tab
-     *         The tab, the icon should be returned for, as an instance of the class {@link Tab} or
-     *         null, if the icon should not be returned for a specific tab
-     * @return The close button icon of tabs as an instance of the class {@link Drawable}
-     */
-    public final Drawable getTabCloseButtonIcon(@Nullable final Tab tab) {
-        Drawable icon = tab != null ? tab.getCloseButtonIcon(model.getContext()) : null;
-
-        if (icon == null) {
-            icon = model.getTabCloseButtonIcon();
-
-            if (icon == null) {
-                icon = themeHelper
-                        .getDrawable(tabSwitcher.getLayout(), R.attr.tabSwitcherTabCloseButtonIcon);
-            }
-        }
-
-        if (icon != null) {
-            ColorStateList tintList = getTabCloseButtonIconTintList(tab);
-
-            if (tintList != null) {
-                PorterDuff.Mode tintMode = getTabCloseButtonIconTintMode(tab);
-                DrawableCompat.setTintList(icon, tintList);
-                DrawableCompat.setTintMode(icon, tintMode);
-            }
-        }
-
-        return icon;
-    }
-
-    /**
-     * Returns the progress bar color of tabs.
-     *
-     * @param tab
-     *         The tab, the color should be returned for, as an instance of the class {@link Tab} or
-     *         null, if the color should not be returned for a specific tab
-     * @return The progress bar color of tabs as an {@link Integer} value
-     */
-    @ColorInt
-    public final int getTabProgressBarColor(@Nullable final Tab tab) {
-        int color = tab != null ? tab.getProgressBarColor() : -1;
-
-        if (color == -1) {
-            color = model.getTabProgressBarColor();
-
-            if (color == -1) {
-                color = themeHelper
-                        .getColor(tabSwitcher.getLayout(), R.attr.tabSwitcherTabProgressBarColor);
-            }
-        }
-
-        return color;
-    }
-
-    /**
-     * Returns the color of the button, which allows to add a new tab. When using the smartphone
-     * layout, such a button is never shown. When using the tablet layout, the button is shown next
-     * to the tabs.
-     *
-     * @return The color of the button, which allows to add a new tab, as an instance of the class
-     * {@link ColorStateList} or null, if the default color is used
-     */
-    public final ColorStateList getAddTabButtonColor() {
-        ColorStateList colorStateList = model.getAddTabButtonColor();
-
-        if (colorStateList == null) {
-            colorStateList = themeHelper.getColorStateList(tabSwitcher.getLayout(),
-                    R.attr.tabSwitcherAddTabButtonColor);
-        }
-
-        return colorStateList;
-    }
-
-    /**
-     * Returns the title of the toolbar, which is shown, when the tab switcher is shown. When using
-     * the tablet layout, the title corresponds to the primary toolbar.
-     *
-     * @return The title of the toolbar, which is shown, when the tab switcher is shown, as an
-     * instance of the type {@link CharSequence} or null, if no title is set
-     */
-    @Nullable
-    public final CharSequence getToolbarTitle() {
-        CharSequence title = model.getToolbarTitle();
-
-        if (TextUtils.isEmpty(title)) {
-            try {
-                title = themeHelper
-                        .getText(tabSwitcher.getLayout(), R.attr.tabSwitcherToolbarTitle);
-            } catch (NotFoundException e) {
-                title = null;
-            }
-        }
-
-        return title;
-    }
-
-    /**
-     * Returns the navigation icon of the toolbar, which is shown, when the tab switcher is shown.
-     * When using the tablet layout, the icon corresponds to the primary toolbar.
-     *
-     * @return The icon of the toolbar, which is shown, when the tab switcher is shown, as an
-     * instance of the class {@link Drawable} or null, if no icon is set
-     */
-    @Nullable
-    public final Drawable getToolbarNavigationIcon() {
-        Drawable icon = model.getToolbarNavigationIcon();
-
-        if (icon == null) {
-            try {
-                themeHelper.getDrawable(tabSwitcher.getLayout(),
-                        R.attr.tabSwitcherToolbarNavigationIcon);
-            } catch (NotFoundException e) {
-                icon = null;
-            }
-        }
-
-        if (icon != null) {
-            ColorStateList tintList = getToolbarNavigationIconTintList();
-
-            if (tintList != null) {
-                PorterDuff.Mode tintMode = getToolbarNavigationIconTintMode();
-                DrawableCompat.setTintList(icon, tintList);
-                DrawableCompat.setTintMode(icon, tintMode);
-            }
-        }
-
-        return icon;
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/Tag.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/Tag.java
deleted file mode 100644
index 4b17b223..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/model/Tag.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.model;
-
-import androidx.annotation.NonNull;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.util.Condition;
-
-/**
- * A tag, which allows to store the properties of the tabs of a {@link TabSwitcher}.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public class Tag implements Cloneable {
-
-    /**
-     * The position of the tab on the dragging axis.
-     */
-    private float position;
-
-    /**
-     * The state of the tab.
-     */
-    private State state;
-
-    /**
-     * True, if the tab is currently being closed, false otherwise
-     */
-    private boolean closing;
-
-    /**
-     * Creates a new tag, which allows to store the properties of the tabs of a {@link
-     * TabSwitcher}.
-     */
-    public Tag() {
-        setPosition(Float.NaN);
-        setState(State.HIDDEN);
-        setClosing(false);
-    }
-
-    /**
-     * Returns the position of the tab on the dragging axis.
-     *
-     * @return The position of the tab as a {@link Float} value
-     */
-    public final float getPosition() {
-        return position;
-    }
-
-    /**
-     * Sets the position of the tab on the dragging axis.
-     *
-     * @param position
-     *         The position, which should be set, as a {@link Float} value
-     */
-    public final void setPosition(final float position) {
-        this.position = position;
-    }
-
-    /**
-     * Returns the state of the tab.
-     *
-     * @return The state of the tab as a value of the enum {@link State}. The state may not be null
-     */
-    @NonNull
-    public final State getState() {
-        return state;
-    }
-
-    /**
-     * Sets the state of the tab.
-     *
-     * @param state
-     *         The state, which should be set, as a value of the enum {@link State}. The state may
-     *         not be null
-     */
-    public final void setState(@NonNull final State state) {
-        Condition.INSTANCE.ensureNotNull(state, "The state may not be null");
-        this.state = state;
-    }
-
-    /**
-     * Returns, whether the tab is currently being closed, or not.
-     *
-     * @return True, if the tab is currently being closed, false otherwise
-     */
-    public final boolean isClosing() {
-        return closing;
-    }
-
-    /**
-     * Sets, whether the tab is currently being closed, or not.
-     *
-     * @param closing
-     *         True, if the tab is currently being closed, false otherwise
-     */
-    public final void setClosing(final boolean closing) {
-        this.closing = closing;
-    }
-
-    @Override
-    public final Tag clone() {
-        Tag clone;
-
-        try {
-            clone = (Tag) super.clone();
-        } catch (ClassCastException | CloneNotSupportedException e) {
-            clone = new Tag();
-        }
-
-        clone.position = position;
-        clone.state = state;
-        clone.closing = closing;
-        return clone;
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/util/ThemeHelper.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/util/ThemeHelper.java
deleted file mode 100644
index 704993ab..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/util/ThemeHelper.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.util;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.content.res.Resources.NotFoundException;
-import android.graphics.drawable.Drawable;
-
-import androidx.annotation.AttrRes;
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
-import de.mrapp.android.tabswitcher.Layout;
-import de.mrapp.android.tabswitcher.R;
-import de.mrapp.android.util.ThemeUtil;
-import de.mrapp.util.Condition;
-
-/**
- * A helper class, which allows to retrieve resources, depending on a tab switcher's theme.
- *
- * @author Michael Rapp
- * @since 1.0.0
- */
-public class ThemeHelper {
-
-    /**
-     * The context, which is used by the tab switcher.
-     */
-    private final Context context;
-
-    /**
-     * The resource id of the theme, which is used regardless of the used layout.
-     */
-    private final int globalTheme;
-
-    /**
-     * The resource id of the theme, which is used, when using the smartphone layout.
-     */
-    private final int phoneTheme;
-
-    /**
-     * The resource id of the theme, which is used, when using the tablet layout.
-     */
-    private final int tabletTheme;
-
-    /**
-     * Returns the resource id of the theme, which is used when using a specific layout. The theme
-     * is obtained from the tab switcher's XML attributes. If the theme is not specified, a {@link
-     * NotFoundException} will be thrown.
-     *
-     * @param layout
-     *         The layout as a value of the enum {@link Layout}. The layout may not be null
-     * @return The resource id of the theme, which is used when using the given layout, as an {@link
-     * Integer} value
-     */
-    private int obtainThemeFromXmlAttributes(@NonNull final Layout layout) {
-        int result = layout == Layout.TABLET ? tabletTheme : phoneTheme;
-
-        if (result == 0) {
-            result = globalTheme;
-        }
-
-        if (result != 0) {
-            return result;
-        }
-
-        throw new NotFoundException();
-    }
-
-    /**
-     * Returns the resource id of the theme, which is used when using a specific layout. The theme
-     * is obtained from a theme's attributes. If the theme is not specified, the resource id of the
-     * default theme is returned.
-     *
-     * @param layout
-     *         The layout as a value of the enum {@link Layout}. The layout may not be null
-     * @param themeResourceId
-     *         The resource id of the theme, the resource id should be obtained from, as an {@link
-     *         Integer} value or -1, if the global app theme should be used
-     * @return The resource id of the theme, which is used when using the given layout, as an {@link
-     * Integer} value
-     */
-    private int obtainThemeFromThemeAttributes(@NonNull final Layout layout,
-                                               final int themeResourceId) {
-        int resourceId = layout == Layout.TABLET ? R.attr.tabSwitcherThemeTablet :
-                R.attr.tabSwitcherThemePhone;
-        int result = ThemeUtil.getResId(context, themeResourceId, resourceId, 0);
-
-        if (result == 0) {
-            result = ThemeUtil.getResId(context, R.attr.tabSwitcherThemeGlobal, 0);
-
-            if (result == 0) {
-                result = R.style.TabSwitcher_Light;
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Creates a new helper class, which allows to retrieve resources, depending on a tab switcher's
-     * theme.
-     *
-     * @param context
-     *         The context, which is used by the tab switcher, as an instance of the class {@link
-     *         Context}. The context may not be null
-     * @param globalTheme
-     *         The resource id of the theme, which should be used regardless of the used layout, as
-     *         an {@link Integer} value or 0, if the theme is not specified
-     * @param phoneTheme
-     *         The resource id of the theme, which should be used, when using the smartphone layout,
-     *         as an {@link Integer} value or 0, if the theme is not specified
-     * @param tabletTheme
-     *         The resource id of the theme, which should be used, when using the tablet layout, as
-     *         an {@link Integer} value or 0, if the theme is not specified
-     */
-    public ThemeHelper(@NonNull final Context context, final int globalTheme, final int phoneTheme,
-                       final int tabletTheme) {
-        Condition.INSTANCE.ensureNotNull(context, "The context may not be null");
-        this.context = context;
-        this.globalTheme = globalTheme;
-        this.phoneTheme = phoneTheme;
-        this.tabletTheme = tabletTheme;
-    }
-
-    /**
-     * Returns the resource id of the theme, which is used when using a specific layout.
-     *
-     * @param layout
-     *         The layout as a value of the enum {@link Layout}. The layout may not be null
-     * @return The resource id of the theme as an {@link Integer} value
-     */
-    public final int getThemeResourceId(@NonNull final Layout layout) {
-        int themeResourceId;
-
-        try {
-            themeResourceId = obtainThemeFromXmlAttributes(layout);
-        } catch (NotFoundException e) {
-            themeResourceId = obtainThemeFromThemeAttributes(layout, -1);
-        }
-
-        return themeResourceId;
-    }
-
-    /**
-     * Returns the color, which corresponds to a specific theme attribute, regarding the theme,
-     * which is used when using a specific layout.
-     *
-     * @param layout
-     *         The layout as a value of the enum {@link Layout}. The layout may not be null
-     * @param resourceId
-     *         The resource id of the theme attribute, the color should be obtained from, as an
-     *         {@link Integer} value. The resource id must correspond to a valid theme attribute
-     * @return The color, which has been obtained, as an {@link Integer} value
-     */
-    @ColorInt
-    public int getColor(@NonNull final Layout layout, @AttrRes final int resourceId) {
-        try {
-            return ThemeUtil.getColor(context, resourceId);
-        } catch (NotFoundException e1) {
-            int themeResourceId = getThemeResourceId(layout);
-
-            try {
-                return ThemeUtil.getColor(context, themeResourceId, resourceId);
-            } catch (NotFoundException e) {
-                themeResourceId = obtainThemeFromThemeAttributes(layout, themeResourceId);
-                return ThemeUtil.getColor(context, themeResourceId, resourceId);
-            }
-        }
-    }
-
-    /**
-     * Returns the color state list, which corresponds to a specific theme attribute, regarding the
-     * theme, which is used when using a specific layout.
-     *
-     * @param layout
-     *         The layout as a value of the enum {@link Layout}. The layout may not be null
-     * @param resourceId
-     *         The resource id of the theme attribute, the color state list should be obtained from,
-     *         as an {@link Integer} value. The resource id must correspond to a valid theme
-     *         attribute
-     * @return The color state list, which has been obtained, as an instance of the class {@link
-     * ColorStateList}
-     */
-    public ColorStateList getColorStateList(@NonNull final Layout layout,
-                                            @AttrRes final int resourceId) {
-        try {
-            return ThemeUtil.getColorStateList(context, resourceId);
-        } catch (NotFoundException e1) {
-            int themeResourceId = getThemeResourceId(layout);
-
-            try {
-                return ThemeUtil.getColorStateList(context, themeResourceId, resourceId);
-            } catch (NotFoundException e) {
-                themeResourceId = obtainThemeFromThemeAttributes(layout, themeResourceId);
-                return ThemeUtil.getColorStateList(context, themeResourceId, resourceId);
-            }
-        }
-    }
-
-    /**
-     * Returns the drawable, which corresponds to a specific theme attribute, regarding the theme,
-     * which is used when using a specific layout.
-     *
-     * @param layout
-     *         The layout as a value of the enum {@link Layout}. The layout may not be null
-     * @param resourceId
-     *         The resource id of the theme attribute, the drawable should be obtained from, as an
-     *         {@link Integer} value. The resource id must correspond to a valid theme attribute
-     * @return The color state list, which has been obtained, as an instance of the class {@link
-     * ColorStateList}
-     */
-    public Drawable getDrawable(@NonNull final Layout layout, @AttrRes final int resourceId) {
-        try {
-            return ThemeUtil.getDrawable(context, resourceId);
-        } catch (NotFoundException e1) {
-            int themeResourceId = getThemeResourceId(layout);
-
-            try {
-                return ThemeUtil.getDrawable(context, themeResourceId, resourceId);
-            } catch (NotFoundException e) {
-                themeResourceId = obtainThemeFromThemeAttributes(layout, themeResourceId);
-                return ThemeUtil.getDrawable(context, themeResourceId, resourceId);
-            }
-        }
-    }
-
-    /**
-     * Returns the text, which corresponds to a specific theme attribute, regarding the theme, which
-     * is used when using a specific layout.
-     *
-     * @param layout
-     *         The layout as a value of the enum {@link Layout}. The layout may not be null
-     * @param resourceId
-     *         The resource id of the theme attribute, the text should be obtained from, as an
-     *         {@link Integer} value. The resource id must correspond to a valid theme attribute
-     * @return The text, which has been obtained, as an instance of the type {@link CharSequence}
-     */
-    public CharSequence getText(@NonNull final Layout layout, @AttrRes final int resourceId) {
-        try {
-            return ThemeUtil.getText(context, resourceId);
-        } catch (NotFoundException e1) {
-            int themeResourceId = getThemeResourceId(layout);
-
-            try {
-                return ThemeUtil.getText(context, themeResourceId, resourceId);
-            } catch (NotFoundException e) {
-                themeResourceId = obtainThemeFromThemeAttributes(layout, themeResourceId);
-                return ThemeUtil.getText(context, themeResourceId, resourceId);
-            }
-        }
-    }
-
-    /**
-     * Returns the resource id, which corresponds to a specific theme attribute, regarding the
-     * theme, which is used when using a specific layout.
-     *
-     * @param layout
-     *         The layout as a value of the enum {@link Layout}. The layout may not be null
-     * @param resourceId
-     *         The resource id of the theme attribute, the resource id should be obtained from, as
-     *         an {@link Integer} value. The resource id must correspond to a valid theme attribute
-     * @param defaultValue
-     *         The default value, which should be returned, if the given resource id is invalid, as
-     *         an {@link Integer} value
-     * @return The resource id, which has been obtained, as an {@link Integer} value
-     */
-    public int getResourceId(@NonNull final Layout layout, @AttrRes final int resourceId,
-                             final int defaultValue) {
-        int result = ThemeUtil.getResId(context, resourceId, 0);
-
-        if (result == 0) {
-            int themeResourceId = getThemeResourceId(layout);
-            result = ThemeUtil.getResId(context, themeResourceId, resourceId, 0);
-
-            if (result == 0) {
-                themeResourceId = obtainThemeFromThemeAttributes(layout, themeResourceId);
-                return ThemeUtil.getResId(context, themeResourceId, resourceId, defaultValue);
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Returns the integer value, which corresponds to a specific theme attribute, regarding the
-     * theme, which is used when using a specific layout.
-     *
-     * @param layout
-     *         The layout as a value of the enum {@link Layout}. The layout may not be null
-     * @param resourceId
-     *         The resource id of the theme attribute, the integer value should be obtained from, as
-     *         an {@link Integer} value. The resource id must correspond to a valid theme attribute
-     * @param defaultValue
-     *         The default value, which should be returned, if the given resource id is invalid, as
-     *         an {@link Integer} value
-     * @return The integer value, which has been obtained, as an {@link Integer} value
-     */
-    public int getInteger(@NonNull final Layout layout, @AttrRes final int resourceId,
-                          final int defaultValue) {
-        int result = ThemeUtil.getInt(context, resourceId, 0);
-
-        if (result == 0) {
-            int themeResourceId = getThemeResourceId(layout);
-            result = ThemeUtil.getInt(context, themeResourceId, resourceId, 0);
-
-            if (result == 0) {
-                themeResourceId = obtainThemeFromThemeAttributes(layout, themeResourceId);
-                return ThemeUtil.getInt(context, themeResourceId, resourceId, defaultValue);
-            }
-        }
-
-        return result;
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/view/TabSwitcherButton.java b/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/view/TabSwitcherButton.java
deleted file mode 100644
index 605ccd6b..00000000
--- a/chromiumTabs/src/main/java/de/mrapp/android/tabswitcher/view/TabSwitcherButton.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright 2016 - 2020 Michael Rapp
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.mrapp.android.tabswitcher.view;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-import androidx.annotation.AttrRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.AppCompatImageButton;
-import de.mrapp.android.tabswitcher.Animation;
-import de.mrapp.android.tabswitcher.R;
-import de.mrapp.android.tabswitcher.Tab;
-import de.mrapp.android.tabswitcher.TabSwitcher;
-import de.mrapp.android.tabswitcher.TabSwitcherListener;
-import de.mrapp.android.tabswitcher.drawable.TabSwitcherDrawable;
-import de.mrapp.android.util.ThemeUtil;
-import de.mrapp.android.util.ViewUtil;
-
-/**
- * An image button, which allows to display the number of tabs, which are currently contained by a
- * {@link TabSwitcher} by using a {@link TabSwitcherDrawable}. It must be registered at a {@link
- * TabSwitcher} instance in order to keep the displayed count up to date. It therefore implements
- * the interface {@link TabSwitcherListener}.
- *
- * @author Michael Rapp
- * @since 0.1.0
- */
-public class TabSwitcherButton extends AppCompatImageButton implements TabSwitcherListener {
-
-    /**
-     * The drawable, which is used by the image button.
-     */
-    private TabSwitcherDrawable drawable;
-
-    /**
-     * Initializes the view.
-     */
-    private void initialize() {
-        drawable = new TabSwitcherDrawable(getContext());
-        setImageDrawable(drawable);
-        ViewUtil.setBackground(this,
-                ThemeUtil.getDrawable(getContext(), R.attr.selectableItemBackgroundBorderless));
-        setContentDescription(null);
-        setClickable(true);
-        setFocusable(true);
-    }
-
-    /**
-     * Creates a new image button, which allows to display the number of tabs, which are currently
-     * contained by a {@link TabSwitcher}.
-     *
-     * @param context
-     *         The context, which should be used by the view, as an instance of the class {@link
-     *         Context}. The context may not be null
-     */
-    public TabSwitcherButton(@NonNull final Context context) {
-        this(context, null);
-    }
-
-    /**
-     * Creates a new image button, which allows to display the number of tabs, which are currently
-     * contained by a {@link TabSwitcher}.
-     *
-     * @param context
-     *         The context, which should be used by the view, as an instance of the class {@link
-     *         Context}. The context may not be null
-     * @param attributeSet
-     *         The attribute set, the view's attributes should be obtained from, as an instance of
-     *         the type {@link AttributeSet} or null, if no attributes should be obtained
-     */
-    public TabSwitcherButton(@NonNull final Context context,
-                             @Nullable final AttributeSet attributeSet) {
-        super(context, attributeSet);
-        initialize();
-    }
-
-    /**
-     * Creates a new image button, which allows to display the number of tabs, which are currently
-     * contained by a {@link TabSwitcher}.
-     *
-     * @param context
-     *         The context, which should be used by the view, as an instance of the class {@link
-     *         Context}. The context may not be null
-     * @param attributeSet
-     *         The attribute set, the view's attributes should be obtained from, as an instance of
-     *         the type {@link AttributeSet} or null, if no attributes should be obtained
-     * @param defaultStyle
-     *         The default style to apply to this view. If 0, no style will be applied (beyond what
-     *         is included in the theme). This may either be an attribute resource, whose value will
-     *         be retrieved from the current theme, or an explicit style resource
-     */
-    public TabSwitcherButton(@NonNull final Context context,
-                             @Nullable final AttributeSet attributeSet,
-                             @AttrRes final int defaultStyle) {
-        super(context, attributeSet, defaultStyle);
-        initialize();
-    }
-
-    /**
-     * Updates the image button to display a specific value.
-     *
-     * @param count
-     *         The value, which should be displayed, as an {@link Integer} value. The value must be
-     *         at least 0
-     */
-    public final void setCount(final int count) {
-        drawable.setCount(count);
-    }
-
-    @Override
-    public final void onSwitcherShown(@NonNull final TabSwitcher tabSwitcher) {
-        drawable.onSwitcherShown(tabSwitcher);
-    }
-
-    @Override
-    public final void onSwitcherHidden(@NonNull final TabSwitcher tabSwitcher) {
-        drawable.onSwitcherHidden(tabSwitcher);
-    }
-
-    @Override
-    public final void onSelectionChanged(@NonNull final TabSwitcher tabSwitcher,
-                                         final int selectedTabIndex,
-                                         @Nullable final Tab selectedTab) {
-        drawable.onSelectionChanged(tabSwitcher, selectedTabIndex, selectedTab);
-    }
-
-    @Override
-    public final void onTabAdded(@NonNull final TabSwitcher tabSwitcher, final int index,
-                                 @NonNull final Tab tab, @NonNull final Animation animation) {
-        drawable.onTabAdded(tabSwitcher, index, tab, animation);
-    }
-
-    @Override
-    public final void onTabRemoved(@NonNull final TabSwitcher tabSwitcher, final int index,
-                                   @NonNull final Tab tab, @NonNull final Animation animation) {
-        drawable.onTabRemoved(tabSwitcher, index, tab, animation);
-    }
-
-    @Override
-    public final void onAllTabsRemoved(@NonNull final TabSwitcher tabSwitcher,
-                                       @NonNull final Tab[] tabs,
-                                       @NonNull final Animation animation) {
-        drawable.onAllTabsRemoved(tabSwitcher, tabs, animation);
-    }
-
-}
\ No newline at end of file
diff --git a/chromiumTabs/src/main/res/color/tablet_add_tab_button_dark.xml b/chromiumTabs/src/main/res/color/tablet_add_tab_button_dark.xml
deleted file mode 100644
index 606a9d26..00000000
--- a/chromiumTabs/src/main/res/color/tablet_add_tab_button_dark.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2016 - 2020 Michael Rapp
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing permissions and limitations under the
-License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:color="@color/add_tab_button_color_pressed" android:state_pressed="true"/>
-    <item android:color="@color/tablet_tab_background_color_dark"/>
-
-</selector>
\ No newline at end of file
diff --git a/chromiumTabs/src/main/res/color/tablet_add_tab_button_light.xml b/chromiumTabs/src/main/res/color/tablet_add_tab_button_light.xml
deleted file mode 100644
index eeb8d29f..00000000
--- a/chromiumTabs/src/main/res/color/tablet_add_tab_button_light.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2016 - 2020 Michael Rapp
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing permissions and limitations under the
-License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:color="@color/add_tab_button_color_pressed" android:state_pressed="true"/>
-    <item android:color="@color/tablet_tab_background_color_light"/>
-
-</selector>
\ No newline at end of file
diff --git a/chromiumTabs/src/main/res/color/tablet_tab_background_dark.xml b/chromiumTabs/src/main/res/color/tablet_tab_background_dark.xml
deleted file mode 100644
index 0e04fecc..00000000
--- a/chromiumTabs/src/main/res/color/tablet_tab_background_dark.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2016 - 2020 Michael Rapp
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing permissions and limitations under the
-License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:color="@color/tablet_tab_background_color_dark_selected" android:state_selected="true"/>
-    <item android:color="@color/tablet_tab_background_color_dark"/>
-
-</selector>
\ No newline at end of file
diff --git a/chromiumTabs/src/main/res/color/tablet_tab_background_light.xml b/chromiumTabs/src/main/res/color/tablet_tab_background_light.xml
deleted file mode 100644
index f670162e..00000000
--- a/chromiumTabs/src/main/res/color/tablet_tab_background_light.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2016 - 2020 Michael Rapp
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing permissions and limitations under the
-License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:color="@color/tablet_tab_background_color_light_selected" android:state_selected="true"/>
-    <item android:color="@color/tablet_tab_background_color_light"/>
-
-</selector>
\ No newline at end of file
diff --git a/chromiumTabs/src/main/res/drawable-hdpi/phone_tab_background.9.png b/chromiumTabs/src/main/res/drawable-hdpi/phone_tab_background.9.png
deleted file mode 100644
index 2f4bf055087e9eacb7e8a92f1a15f13ba2cf5b81..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2409
zcma);XH-+!9>o(N1OfrU1f)bFMFDBjq8K5Glz`F#3W!pJ5YYt2P#nrYcnks$CL#<)
zBfTn3M5+u*l_f$#lo}PV1f>@#QYJ9V=UZ?2;eEL0u6y@B`}}V?zjNa4Y%HJ<SqK0C
zfLh{B3A}U4?ja<|Yb(NTCj$V&I+mtb$Iy|PtT`J87gz^et+w_N2=WSd#kJ~!h`Lww
zzIKU20s`4r?pkDJWX#J>hIdFuQ6|Bx;jRaatF~m<)UYsFm!mG(A0DhUecLRpBilb=
zBRmrFB-gmA2}pZ^ctt$SjIK&El~Cqg!mxRfwsi8q=@kk;D<?LYS#1P!=6LeKYUfW<
zAGD}nR1zncgih1CP8D<ghx=-zFIoa$A*3+II{Q0GlTFLE!<T*aR)A+@OUNnv)&bU`
zt;Ba4;gqQBD0a**%uW5irh^xsL?!Gm8p6shJ=PZKzr>$RJEr!s4K%6988kfFOJPN&
zujD+$3~N$|m;{<C1R3kg!sw~olj>_#34OgJzr~5v%1Zx;N;)eds1aKxZ5Q~IZ7r$D
zz(DBF^84!pdM3aDW@vHk{)qAu=gvm@5X%D893iPTCCVNNpaQpjKF6*s2_ozIzX`R1
z2yheFU<Wi*!Yxm!eBIA2i0Euq1Sg_>qk8far{Ny5>Uevwzk(tIH*lasyvh#L70ZH|
zNYu64c3fM~ZN^z#SRyIaNa<cxbO8ASGyC%R88*ge?ZNX%<dpv6A@zwwRc}$J1&~2?
zsC1{^LfKm3T3Wr5TO0~ad1LqOgr6~j_*GKI_;isbaSZcuiR&TASkvh^mev?}R*A!6
z4aHs0d5d%0Z}LphscK$~HX=z$3~8sdQ^qg#&5=vC<n^;r-B;yg$ch8!h-0{q2I570
zMm;%toQVoOUWRRc*w7!v3vt>WY{O#-?(h6Za6(%2h=u4iyG^%n4dZB&eiP^GC(O^s
zb(0lbW|5;oM2`8_AgaAN>IM})=$HUfW|%h?T6?;`wtO%3@UB(iYa3hJoyPk5wbjMN
zMb~sIQ!Ur$Yl*}yrcd%r1?ljBh7n6sYle~bJA_b4DsUZ%nC>G#dd#7<L~d=w8;Cpk
z`ub)A9ON!JGLy)GTSbIC<Vu#gj9$`59do&%VkeHWSGni=!~0)aYf^RpNT#a$cx6~s
zM-`xIn^8$w$Crb~N_+}EsgaS}ptyNB)vK8BX6zj;`aQ+pthwxbK)wI?nW2eH)#*%O
zZ~((9i0X**-To>is{CYe^x8FvIP|K@bk)nMXV)rXY^0dC$dnD34wc@CrY}D(a*8}f
zH0c`c)VeP!#?opGC5v%3U^#Vl@i$is+OaG-SEGsW_xC<2e0hBMjd$8p?1<jzs5kX}
z_HEW+eM1LdiZSlb`B58aSanlyOR)Im2fD}cV6GRG!|p%#9Bm`WujYeM4+YN@uOYf;
zdgFHGIPL_zu^K!}1FFFx%HQ^tRt`haQ4MVzg$bqeGV%pVR3;V$UFx}}aM%K({G_^k
zay8p~SMa7*lgVTyFhOii!Wb`CuX(qs=N*!flb9q#Pv8a+F)UPp3Qd0zshL?<a7&N`
znv<H{83^~_RlO0VWypkL^MoYL=t7cMMZ7@#E&-4d$~05njXex}7kF6s$FM8zvSH7(
z$B8{NPvpVkd&(X>ek2)uMg|G*4)9ZpF`lrCo$vPlC-XlA@CN+f@_!_i$O*F^hMsOd
zYV65-S|hBq9QSeoHVfXDC@swDj(K#m;<ANsLD&RN0RLs8ZsPmvJP0HJ5y|p+XrSwu
z#LgjOuief#X#{oPfB~H)Sddb$Sdo~W;2s~+{^Qe?=HE{Nsv#f+f&7Gnzp?oPt;ZxQ
z<J}X*oqYo6V*MSmjitHwB^w>+ou_H39SV9%E!vT)ks5ArO8n}s<!gV3dgBdVMg5ly
zVR-K~izD+EXA_D$d;-sH;y2~zq?&gBk|yqiOk-)@eG)a@EPb-*Z9BGcCOY-$N?=d3
z%2aPJVm5d;E4V-Q&CoKG1mXCg>Et+oC53D@*UDkd%<$%^+!s-$=i4SV<+aT*!OXEC
zS~M{muz5X2j$w`N3enQiYN=xB7@3&tfCv0Q3`eDx7WPg%xiP7oes}dp@3b6=$hImj
zE>>_M9f;W8T({LrTHeCf)ml>14;td_QFX#|o-7-ckShOTLTPPHO^xk?p!$>-JHf+~
z5{tJ`Nf3$Ak;<{53J`(q*ppRSP&sDs?*X4WBr220jvUWaW9l(c>D6~kqx@tL>;S_o
zg8@~!HvI&s@^9)NdL3H%#6qmY;o9?IeNtq}+12a_bVkGA;Og2XuD~{C$D{Yd0T+Z~
zQv|Ug=IY7r#-!;lTwLYmI&i>`i=3M2y_fdO<;0_Ro-Yf1TZVj{7JFkj_N-3gnVi6)
z6h-0nPZ3JBGjzT1@}%7QoW*G%so#;MS;2kk*x^|jZ>BXF{X%n7B@+DE!>fGqFSPT|
zAP(oZXI>=*TIUa89{Q>%6!Do)X+(~?v@V4sb{cv#*My~ZVELgkZn?Y#=g}<}5gEf<
zBm_Vcx#U8%yBXDeFNqe#_E%rm`B0@`JD!-)R-Q|XJr8yM?=`Aq-jTi_ubYhnHwfLF
z$S|*tW{VeziUk=lU?q}L7doAm0KgY*B2;&O8~AN^nan>$F-Eboxrx|)AmEg`PGK*V
zkh3UQM$))2uI>qQ?PI>3`9#p|e}Oy`dxQdDsioQo<vC+MgB-MTbOp=q0?&*Sq^DXQ
zyL^BiKf!NXB#sHhr3&G<f#GOARgpAWVZh4u+24P)({kZYj_m^bHFrJzm5BKac7WMI
zUi}N4&S&n<A&F-R^V_lotoZVrv5o3>A?T{`R<3(Z_9w<6VCn(<lc>eq1X^NCOTKOk
z1Br=`VT+ew1DJo!Vs9KNY{zc6RB=O3X+ROmpI7&YvPY_a_AYxkkWjv|h72NY$hNGQ
Yv{@#}`_!<ud0QxerJ0Rs1<r%^H<X+?#{d8T

diff --git a/chromiumTabs/src/main/res/drawable-hdpi/phone_tab_border.9.png b/chromiumTabs/src/main/res/drawable-hdpi/phone_tab_border.9.png
deleted file mode 100644
index a85f0f1f4a110e4798731bd014e434f460d1b9c8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 465
zcmeAS@N?(olHy`uVBq!ia0vp^Ng&L@1|(N6W#eODV4UIU;uunK>+SXXUWW=Kjz5g`
zy|Hn6!uF|U8-r&U2tQmtvHsfcLoy!hb9-7p)I4BMt-A0%Q#$nO=WBlp=Y24LrM<M|
z_S<jOn{VE^_PX?WPkqwu?8_$0Z~Q8|U;E?m$^2W}bUz-mIlXJ0_{YYb#{W*{CO;0%
zlbtOurx2uGFOXlg(!{gT==9mepBV(Fp9)vlGdum(r&Aqozcahs+x}^i;n^);`x{O(
zT(oz2wru8~Zzkv8IyMM!2rw}^DL8Pja5OR~3MjBJwK#wT6&xBEu!#c|Pj)VW%eMSi
zhUq{U!^p$}Gyqc^Y&=NHq2WS)N5#Xa>t7F<To&WV-}#r}qKR*(`1EBnWgaPSv*#07
zIwgBggj0Ijypws}>o@*1+_s-rAoj|(w~B_3)_gLX`dvT$&*a<BrcQ`{U$*=Foqvo<
z+;fX#wAz0hP?c9Y_d|VqZ}0bwUtjL~&2X{);h*~}>ljWaOmm7)@Q4FO6@#a%pUXO@
GgeCymslj6a

diff --git a/chromiumTabs/src/main/res/drawable-hdpi/phone_tab_close_button_icon_dark.png b/chromiumTabs/src/main/res/drawable-hdpi/phone_tab_close_button_icon_dark.png
deleted file mode 100644
index a2570a978f9ddc7b30935f5dccefee62b6f1cdae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 266
zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i1|)m0d<g|oEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zh^c}wqi2xH2cV#2iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0xRo-U3d
z9-VKmp5;8Cz|)p^Jd=N2vU=gOCht9aBRHJ0r@YX-?;9ZBT(4MRW6WqIz<%6C;k*Nb
zD|gt6D}_}877fwdOwT?3XBLzsUS1%1W%dObp#^vTFva-ZW)oVlrX_U(LvZub&<pcU
zZF?&zFJ5+Z<NsR8GY8~S*s>IbC(K>HkKy|Nbh-1h*-hX6=g(j6#{qN_gQu&X%Q~lo
FCIDutTV?<N

diff --git a/chromiumTabs/src/main/res/drawable-hdpi/phone_tab_close_button_icon_light.png b/chromiumTabs/src/main/res/drawable-hdpi/phone_tab_close_button_icon_light.png
deleted file mode 100644
index b3faed4b166c7d650bd668f04b1feda785b9cef8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 395
zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i1|)m0d<g|oEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zh#UrCM$rOaC!nBYiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$QVa}?9G)(Y
zAs(G?uiARCI102qbUz#ZSoQ|<434H3sy2;{6)eGl${%^EHCe^Y3{4Dz0?dt!XXMG0
zJzpNh^W2xM?N#0H+3S)dB!4O|pCP(#=F-x&Z@zS#E9g<LVROB1amak$b?$A}Vs;Oh
zCvQ0zaEL2><v(rNg64H8+BT~uzkTIzaa8x)q!)bps+(3A=txcC<?MD5j1<$Glrd>u
z{th2@j?M&ah0`XJQw}L5oix(k^LWX}yuQ?u=5^Qdle<1|Ef?ovv!9i->|e{zzGpYS
zSGO-b*ndLnYl8Xg#FcV?PRO*Siso(EUVicc|EXUtGnEpj>nLf7m6bkD446`Rw070}
m2MG)6n(P11@9p{WiTPV)(BG$Q+$(?q$KdJe=d#Wzp$Pzp&74R8

diff --git a/chromiumTabs/src/main/res/drawable-hdpi/tab_switcher_drawable_background.png b/chromiumTabs/src/main/res/drawable-hdpi/tab_switcher_drawable_background.png
deleted file mode 100644
index 579ba2d979d237f711dde96d995b8c5590b956bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 496
zcmV<M0T2F(P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00004b3#c}2nYxW
zd<bNS00009a7bBm000&x000&x0ZCFM@Bjb+8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10c}Y{K~z|U?U%t$0x=MV|C&II%AJEqxa-v@gm@KvDFX6nuy_-E
z0K(A|Bxqvv@O!YBp_XmC+r&%%WRqsvnfYeB$<6>tN#&$`4w0+^xCPJza2%N91HcME
zrj+^&^!)=;BRM9yVR>yxj!2#rg}EU45&^{2f@I@RUh9?VDl!0<!kp>nE3mfRb>9fv
z0zg|S_3jmc<fEu)P4Yev!WOfqW9>Bbb*ys#n<)(=V)u<gD?Uzl!f6@{M#P_q_+4}V
z$l}u!>*zoLCSu((H*G*Qv3`q=18fiE0$>OFS0x~q5|B#?$fX42QUY?x1|<JA#oEn$
z$^X~Z+_V9$#JUq5XFulBdD_yT^<t5bd<bsPwByKd>_>u;E$qN{F0aX-0=N?9CvAHT
zWT^va1GpBpIe?CLldqu~B<JP~6G6`;&jXA4g*qiUG+uR4tw|0@p5*299i=PynX6hT
mHcBr6%#>20GhI?ru)YD^Z$050ov8T$0000<MNUMnLSTZ1n$c$f

diff --git a/chromiumTabs/src/main/res/drawable-hdpi/tablet_add_tab_button.9.png b/chromiumTabs/src/main/res/drawable-hdpi/tablet_add_tab_button.9.png
deleted file mode 100644
index 56a9b6ec0ca1e732b01b78abd3399a900010e7a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 508
zcmV<Y0R#StP)<h;3K|Lk000e1NJLTq002(_001@!1^@s6h8e_<0005QNkl<Zc-rmU
z!7D^j6bA4aGHRk^BMVu|Kfsm^MaqK3Z00|ptk{VqHY_PC%8D&J##Sjy*-Tcl5k=v?
z<1>%Fr}=L4zRs<Cn%$ZCb<f;8@1CYmh&QZ>vt>q0y_p;hb3Dg$JjZi9ACBjEj^}tj
zvf`Q9l38+zd6naNVHWoBStc=yQSgvx7Ku%3h9iVh1iY}Nht~jHje)nLiI+Sfl-Xrl
z5yiu_DjTm0iJnCPYY}$auqV9whS^7zQC+;SNk1eb(X}YxBSI$`&lZJCcaDwMgG8^Q
zfT#4|w)lQH6vYb&gJe7#7v4D5*my-Gx)lYyM`))$l0t$N;f-U8jn{`n@1lUm^oOBH
zaw3ZNfzVIJvuWYdU1sC8AyHiv@GirX=KtMcU~69&UVUR^JR3lwPth~q0sZz2iOxh<
z-y1?N8PDd0OLu{dS3;r(QNSDerMK?wT4VK%knwB?i4xI`W0&4;@zYJ9xcXiYy2*G}
z6)xQh8?T&RB1@L;HoZ&gyL~|vZzBSpb)*e6a%DRctv?URCel`}<UHpsX|+Ebl)bsp
yJ3}4M@f^>G<2jz=Ii3&4Yck&N3!fSPB;pIQ*Fl>X*X(!z0000<MNUMnLSTaK*y<?&

diff --git a/chromiumTabs/src/main/res/drawable-hdpi/tablet_tab_background.9.png b/chromiumTabs/src/main/res/drawable-hdpi/tablet_tab_background.9.png
deleted file mode 100644
index ff21b2c0aebec9a0713d7df2446a9ed392acb956..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1055
zcmV+)1mOFLP)<h;3K|Lk000e1NJLTq002(_001@!1^@s6h8e_<000B#Nkl<Zc-rln
zO-R#W9LF_77wq7|priza@~}WCZwoI{i~<j%OFPV7@a3ZDNw)$O-*!<dyl6IeN<}Ay
zde{OLnjRX(ETK(2Y&C}qr74=Wx2OMar!MOMW&1zBXX^{kZ9Kp4^WkCq_t`%u2VV$}
zg{o}2lXs8H#Kgqc)zwwv^Z7_H7(8`tZEf-T9PH<Iy9w;C)oSm;Jh`}~9bS2PdF9;P
zTwrf+kEAoO|LpAS515xJ@Xndd=25sIa%6LJlfXQfn+fo)a<{>sNF-!|2Xp4<=f4*e
z6kKB+UT$M!W3$KOA#w)h)z{ZI!+e(ET^Jb|d4F(lAS*nW$IW$c^NW~;r&g;qD=RC%
z35CGiii(O`tisFh>gsw4U*I$n2n0xHXXgv(!6Lj;o6Y8p#bQ+8#p7`@Gc)6X9?Zeh
z>-7)U*47Bkz<h(j@R&7ts-dBwce}g0RN=uxGuPuS*Qbyfc*VuVH<p%`!URE}M_E}}
zB`fgqOeRyG-|xr3F8RB+y}iAU>vfg|cvr^9$3I6R5ft#E(J0~ieBydtMh~y1rbg#>
zyW<2=xIPJ;PIn(WJmtW^z?+?&9Zc-V_VzY`UeFIMJf%{pw%hF?f-nw;<EKicx{ejz
znby`;)5gXIMs@^xK|kn;5#A-M)#^MvJVXia=;(+*Kd$FRbnvRGs_wX4t|&nqu3xOW
zx>}13p2BQ4zYc{$nAs)&6G@?EP8mE|Z7~wdoDz6cY%v1MoDz6cY%v1MEFB(ATTIz9
zONN&Zww9JHmSUMZIy#<9w9Jy>l}=AjduZ8Wv4Oreo9&xK%Pb9^UavRMw#8B`b8T(y
zBU<nZ!P3&U#S|^GczBp>vDhpwE{01=N^Z&xFKLUx(y|<hmRU4BRJNFsWflhyqb;Uj
znMJ`vX^SaXX5sKK+hUn5vtW3rZLt)~+|trw6lj?R!$WP0C0gbW0xh#Jcp8o7w#()E
zLozVjxguc0(*+M~@hEm%EX6YS_xHaNV3`HM16%CFZi{8K%)H^{HZ(Lev0{s*SmwIA
zx+b2MnK!&5u&?|3`xy-nEc5X2u$`x6<_C{OTP!xq%gcN%GcR~aTMYI!8zR6m^Mc2u
zEtbJDpAL^@TbyRgd@4MqZL!#d!(l#_`DA!tix(CaevvE;56gTaygZ}P*vq;tmSUOP
z+S+<gu*}E9Qz#UrlarHQShvMu1LubG0|%k-&JPX_TGrRsNjAsp^@1pcx2jaf!ke0!
z(pfB)2OO{`Jv}|otX8Xwdss|9^T68x*}CBTPN$QMjg5Wm?(TjHe1H@1`uEb2|4Z=7
Z`3o9^AYVapILrV5002ovPDHLkV1fl32QdHu

diff --git a/chromiumTabs/src/main/res/drawable-hdpi/tablet_tab_background_selected.9.png b/chromiumTabs/src/main/res/drawable-hdpi/tablet_tab_background_selected.9.png
deleted file mode 100644
index 50a718f9c571062b9e2caf7c632949631501f25d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1049
zcmV+!1m^pRP)<h;3K|Lk000e1NJLTq002(_001@!1^@s6h8e_<000BvNkl<Zc-rlo
zPe_wt9LN0=ZqW`d49ZGSC=UySrKgo0q!<MrMyDNS1^&4xdeZHp9@Jfw3Q;r*PpRM}
znI5)4h0@C?X9;b?!&XyVC{59{{d;<UqeGYG`)7Nf-!uEda~tpP`+RuW_I&m(CkI~$
zkA<pirj!4G%jD$b=e4yp;`jT>*4EaEYkPZ}*X!VVZnvAj_4RuFeV8W~w~WIpFE6j0
zo0|*n@9&dL2Ci?n+rPoQY=L*yYPF8R9U@0IH#Z5)gSpuN?;3YE1QLmaEbw5?{QUe^
zg+g(ib$Gc=O-(HxkB7(^nAgzI&;s*WhIe6fboA}v;i0VXU>-Nu$;~ff7M@0<(XFhk
z{3H|tb1Nz;Zm|llpu4;KIlO_>NH7>AU0q$zpa+ZaN^LfqHx`RgfftX*$;`}*2YN6E
z&uBD0T3=r$Gz0TZCestv;Hd`(2WR*8_Nc;xFU?$!H(Z}WX5bYU7i*W6mcj%<phsC*
zStTp*@+}riZy*rBz%F_2?da&}<$9fA0p8V#iHVPqNCXAEXf#T=J|DPVSJ1<&t*te<
z-R?L+6s}LgU@$zy4o}tJ-~W1dcNY^ova_>8pcnK*3s0p|X&eqmh#-v9>HMx%t8ZY1
zm)F+TX4%--z{rk3FX#t7F~YkvK0f~b=;#O~yyN3z0{yt27tz71uCBi4a=D@eakzf5
znwlCtHh4;_)%r3N3SnlK{7oc{mN{+kWVOXeEOT1mQL)7cEOT1mQL)7cEVFcYG;J|u
z%PbjQ0oYnvwpfZ~?(FP*D$z1ahF3a0J?)`oi^T@|+HAHj5-qbdct)eqMB5fivCMUK
zb&qMmD+EhR+ZI!_%;Mo;vc+PvxVRWDDJi)rH@u`R220CwBwA+C@KD)eN|sq1JdC!O
zf@Ky352Y=pV3~!(!)%LXw#<Uzp|-_REOTpXt689B77P!yEtY7R-wCwL!r<w2y1Ooy
z>lewwaQljY4bK!ju*GB8ZLt)~+}GFlLV#r!1P^SnAG<A<(K7Rfm)qFb*vyJ8mSUOf
z>+73&T4vtxiom`e92{gdJh03oBO?x;mYE+s7HzTEEH5wfwamQWC2cX-*V7OImYEkk
zCT+0{mic6OEZgD?TjmqtF>Q;*CL9j)vCOIAfh}HGSolFsVR%^Pl<@M+W^)hgwpfZ~
zZf|ezNnx4)4Ns|5mQGDgePZ1fiw*1>_75C{!aF}OF!0Lf^O4gWuh$Er6rQS5r-BC_
z>m0W(S5;Nr86F<C!{5%c^&BhYyt}%(N`{7pX0=-FZTJ}Y!zu6Yn~wZnf>+LOavmhs
T0<*^S00000NkvXXu0mjf*=zp_

diff --git a/chromiumTabs/src/main/res/drawable-hdpi/tablet_tab_close_button_icon_dark.png b/chromiumTabs/src/main/res/drawable-hdpi/tablet_tab_close_button_icon_dark.png
deleted file mode 100644
index 14b052f21c68339b67a436c48f7b93e286559c47..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 404
zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i1|)m0d<g|oEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zh^c}wqi2xH2cV#2iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$QVa}?f}Spp
zAs(G?uNrzCaS%E7@&9K&#{LIlFWaV=aVI@wv}sA&I{n7A;E3BD8@RR^2j8q<Q7oTv
z{*cb@2P!jJ#B@GQJ^AFXQRQb2ok%0~d%t}-7S8+R!?Ez&z5HMA=6`iO5O!&u2#?~G
zNo5DN@t;Xb`^Hnl9Lgz?9OGHVs<ps$^Yom%jplnNeBql@&U)?K&htB8vu&K@6uclX
zXT^h%6&$Y*)PB}pFtsE<tzV|fgiAD8wqnoZ+AhTxmc2VIp6^q!m5HBR63%t7{!Zle
z&Ha2?s&|=mTZ<!lQrXJxnw*_HGu9~aL*f(TV-n$-OU?ak(~~dA7<5l{3O<-~KFG^_
wslcDU)|s(|7ADu7U;lq1@_)0cH`{0Cj3a+Vrg?|814EF()78&qol`;+04U+2lmGw#

diff --git a/chromiumTabs/src/main/res/drawable-hdpi/tablet_tab_close_button_icon_light.png b/chromiumTabs/src/main/res/drawable-hdpi/tablet_tab_close_button_icon_light.png
deleted file mode 100644
index 545aa5b4bbf8b4975b222d8072ca9f981ff18514..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 440
zcmV;p0Z0CcP)<h;3K|Lk000e1NJLTq000{R000{Z1^@s6jnwp200004b3#c}2nYxW
zd<bNS00009a7bBm000&x000&x0ZCFM@Bjb+8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10X0cPK~zYI?Uk`k!!Qtrf178h#3Rt5uYi(NLJSNYKw@TR>>9`R
z#>!JLvs9HzECybHg`EWvX13h1Bod@f;zTM_zAf?jK3(iz0VXEKptW8bV-`d97-JS%
z>vh}uQJaXF@0j^ANs>*T=bs@WBH961#c}-YoO@~3NZ&?gegyCVU`9l{z6q_hb0XRT
zm;oq+5F1~eXlsyV*$IFgz%hVAO1Vta^mS}qr!1t=5K*tJtKm>lkPP^9`1P6GGV^`?
z93l#q0echH1dD){tM9`(_Z3CaJAkWSuWyu6d1#M+oy?oFCRNU!D^VeYxCT%lFo(gi
zW?-e1OQqBUfKv<zKG5?St+n&AET3@bob`#u2)(jU(NLlH%!ueBR8+~{q?Bi<E)6rE
ich&E4i2vEdL?=I}w9+g4h74f<0000<MNUMnLSTX$yS5wv

diff --git a/chromiumTabs/src/main/res/drawable-mdpi/phone_tab_background.9.png b/chromiumTabs/src/main/res/drawable-mdpi/phone_tab_background.9.png
deleted file mode 100644
index ffc021c490677672156c823b4f1dd46063b48252..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1055
zcmeAS@N?(olHy`uVBq!ia0vp^Ng&L@1|(N6W#eODV1DN5;uunK>+Rf&eo~GiZO3;t
zFljAllh~~i>ZHLdu5wJ{-i#{|&HUkSoi*PFzLhR`{e|c6_L)A@w|d{btM_~Ull}Am
z*A%Cve|sde^pmue6VI_rv%4Gxc$ySA*c=5~g0d~c^&Ix3J-XYa;TiF3EyE4&xbi1!
zJ7VIy6_&CcVogxr!!mW@sV>bAqCdXK7@TIhc-m=0dHqSRUu_w|A);4Zz6#_%bxF)#
zfAF^2o-iGQ*NUQ(I5@U**>E3F6U*dz(=lt&v<&fEr*|^R>sH)uye_qe-C@s!R~{@a
z+=>hvdRb?=Zg*v0<b1JuqW-HVF?M@o4n<4H&Hf<Az}ft9nZlc_4T>{jFABU(ZcIBU
z?-Cp6e?`1jgx6($(JDrpFArC8_uJXLS7wjq>#+!3IDI9Xw3G1e!#b}dx@EiE771Tm
z`NF3}PwIKd^A81F{>l|^4sY(4F_D!hT;+6pZJW@!!?RcyHqSLW;-v2~eUbJ>@r%6~
zO1sXkRQr&yr>1Q?cZKYs>f=p;&V62ntDN+sd2efYZkDdPnpOJc$B!SmX0vUx*T#Q&
zb-eqd)m*>#z2yf!Oq~2yb(NAB$N80Q%u}9SaJazA`?0S7l!cq$n^hksF$5mETgh$C
zCjb0N=bJuxS60P)^9y{wPMmD}B;&B<ynmc71^Za}w`;w-kb6hwjGu(~6N{({pNEU>
zT>NgG2)tVLV(+)P7Yg_Df7^KFDDR^nahnf}@`~!;K8E-Sxp4E(mh<}5rSQ!Bi13pq
z0+y?e{z!OjA^*zg-}X0;rrtb$_tz|iE2c#k-Sf&OuKpBXx1scobTGrA<Jp&OO7b|8
z{++XM_N(D`QPmXq)|=T7{=7xuS^vJ`Cr9>Ks`4#r{%?@n^n*94XHLl`rb2Il&+&>Z
zjsirXiP{3Q6gYrM4T0Vxv600w*$Kf@QXEpQiL~Z6{bQM!HCw^#92fh<tj9XrCPnio
zZ4E2RStr4(H1%0mc8>Wkt&Wgey_*>GOO{+}xNbLZQB;t<_|&F~|LcM>JY~y@H}x-9
z4*j6^mY<)$d_|k`)S$`VPHbeo{PN2=6P@cvC8Iy6%-g@rcAG-Z1b1gw{!a$Z`dwxx
z7B3W%d9rbZ)~l|?xpyv_l}>$-A-!G8hMle5_V1}iUd4@x{&}GVe<Ix;pTD!}fx`hF
zcBWkh7D~p81!wB<@b#W8$jA{9=nM3#>?slv;1fG9a3uP`ulrL=masJe!|x!_#|Z*Q
hvKlUgEDN${{CF;F<^zQ&D`3WF@O1TaS?83{1OVUJ!Po!*

diff --git a/chromiumTabs/src/main/res/drawable-mdpi/phone_tab_border.9.png b/chromiumTabs/src/main/res/drawable-mdpi/phone_tab_border.9.png
deleted file mode 100644
index 12b73aba3d8ef5cea58192d61318d6f4cb5f59d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 315
zcmeAS@N?(olHy`uVBq!ia0vp^P9V&|1|%PcFuY)3U}W-iaSW-r_4bY-Uz3AC>%+`1
z|F*_;PKy&P3-38w#4yKm${NliY)vQsOx`o^d*B4$8KO7KkIj7Z!^Fz+dAirjb)9~b
zwiM^zT`r!$q1aL!8p>X1bS>0+{+8-l3O>h$ojL`RbG$kf{M;4SIWRD?2*8LVvjpat
zHZU-8D8PsgU4=aP4neR$$9;isS6@J7k_xv}b0c&DS!*~iG9sA;6v<%_^y+v}sJd(2
z>&3cfyf>=+-_Tm<FVU7Tw>|NNddK&zoZGbT-~9O}KDqutrk?iFz?N^XZ?VkWf8kK@
a6V?aot=eoZH}(Mog~8L+&t;ucLK6UK%W(7n

diff --git a/chromiumTabs/src/main/res/drawable-mdpi/phone_tab_close_button_icon_dark.png b/chromiumTabs/src/main/res/drawable-mdpi/phone_tab_close_button_icon_dark.png
deleted file mode 100644
index 19452e3d8621a5b88abb3d0d4c650363477201c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 226
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|mSQK*5Dp-y;YjHK@;M7UB8wRq
z_>O=u<5X=vX`rBFiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0xVo-U3d
z7QIg=TQeOH5O6v9bjQpPnV*^(K`n~2wPt!5-aGTl;=4TK!8eRbzNwEi?+T0R^d=lw
z*`$&qwjg0={+a7v#hxr{%_*|+x{;GC?<;HeAY9?Fc3j)uzY1^TpG2=(vf$#^xvE!E
QfmShiy85}Sb4q9e0F&fQ?f?J)

diff --git a/chromiumTabs/src/main/res/drawable-mdpi/phone_tab_close_button_icon_light.png b/chromiumTabs/src/main/res/drawable-mdpi/phone_tab_close_button_icon_light.png
deleted file mode 100644
index 70bbbf36fba9e93b6b6eaad8f46e6a1e828e322f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 292
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|mSQK*5Dp-y;YjHK@;M7UB8!3Q
zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt&5ZT^vI!
zdY@j}&3ni}#O0#09cQh;Zhmf;9CkfErWFkhdOaCUQXC2!bk97B<$TDYc4uz6>HEX+
zn$m|SKWxx?xH9TIcaGGIbu*HCSzkTae}v0@PLRS5mjqTb-4toDvq~So>*~DU`_#}w
zCvf?$={Yl-4yZ8x^4NGSW83Aehc}-+7-AUkuvX3d?1sel>ir2BZc87&ZMkjZ?)0F$
gx#!@q4}ZGkf_mj#{%|gl13H$$)78&qol`;+05&XZ+5i9m

diff --git a/chromiumTabs/src/main/res/drawable-mdpi/tab_switcher_drawable_background.png b/chromiumTabs/src/main/res/drawable-mdpi/tab_switcher_drawable_background.png
deleted file mode 100644
index 9937cb137f03454cd957d042360815f055824560..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 351
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1U<c)B=-
zcyzv<x|jEmfk5m0mp2+(3<YGFQU%%=1ZOa%Ip#FDv>LH3;&*Bi`4ITv(4*siOsR3n
zufNp2<C?#ejd6y*tHMN+iB~3H;j4&INu3mSY(}nuU<5<?s>gh1oSt>6#x;s`c$tVW
z7BARvYhnMMjdzzE47B&>+wg5--?S?$1uty8)!aXYImER53&YOn?5n2Q-D(Rsf7Bm{
ztg`#R%FW?=od3RtGxHv=V(e4<eTu>D+@{&gg(pNi-pXk;NE>i)rrED~{c`pF?fmH)
rnOZB?7s;QCyL3rnGq>-Z2fX|_S0tAFO$}28`jf%a)z4*}Q$iB}f~$p0

diff --git a/chromiumTabs/src/main/res/drawable-mdpi/tablet_add_tab_button.9.png b/chromiumTabs/src/main/res/drawable-mdpi/tablet_add_tab_button.9.png
deleted file mode 100644
index 20cdc2216b8a2c5dd3f728ca26be7e6024b309b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 366
zcmV-!0g?WRP)<h;3K|Lk000e1NJLTq001=r001Ni1^@s6DQt310003sNkl<Zc-rlm
zu}%U}5JeY6x=jorB*tGL{(?4IY0GCw1r0Wah7XYjEBy~?jfo*K;Tu3>;BsHKv*a#t
zL*^xS%DeAmX7|0B%`$yqOYL;+`~iDj2&jMxsDRoI3cw|>8d9SJ>WTa4Q1z0a)^iFb
zdS}QbC>os7Xl(?Al(jN4HT8l@m4ll4PIb+oDBP(~XEa)vfxXI~bk_0M4C;^JLWIJ#
zVF?c8!<R-MW?(ahstAR?VYY5ms3whm%)ln{-H#?OW>CKjEfEU0h9%fjp(-@`G6VZe
z`;uA@8ax_i>q><>FAhJeOYXDWB+}^3EL%&4h6sgw!xDT@p=xH$W71TfQ4}q<6;ui*
zA{6qXy|#h+E@hgO1|h{jBxUWOgP9@s(T=%aKm}Al1=Rnah&Uo;8@9PJcy7ohoB#j-
M07*qoM6N<$f^RjMYybcN

diff --git a/chromiumTabs/src/main/res/drawable-mdpi/tablet_tab_background.9.png b/chromiumTabs/src/main/res/drawable-mdpi/tablet_tab_background.9.png
deleted file mode 100644
index ca9da317afcc135289e0781dbb12daa7302f5f95..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 739
zcmV<90v!E`P)<h;3K|Lk000e1NJLTq001=r001Ni1^@s6DQt3100082Nkl<Zc-qz3
zONdfY7zc3eMVSSG1(gu9nOfB<2XZsvCd9k4z@>@c!di*dW(*X3;2;W92m=$k(2W)-
z6uKxkxfy5Fg~EWBG%P_w&>2R2<kva7Am`EboO|#5;V$oYzMqT3<*!6SKXAZ9{m^-G
z%IEXFuGj06>2wNQg5SgMd%a!<nkOaUnG3bBuyCtbEOvlE@Ekl(a1{D=U-f!D5+>;P
z`{40-UJ8x6m`<njKrm?DS2R~H7|LigE;kyD2}u;1_uFJLJroKh4Tr<;Mxzl)6O6}W
zKyx?dxG=b*6bi+SLZR>zC<M)IDV55byrWz$*Yj?-OTz?suG8s!#y9GGB9Zt46q8IQ
zKcjOl@P=X-=03}^Lz<{stv1r@^-FxAq-$$yZ-+ywCcyJUq0k!+7X~NP)qFnB0uMpw
ze3Q%N*QldbR#r@%PKOT@wA*cPI2=!Dqt3-*u}@q-T)BMc#^dpi_*`lzjYe~KXJ=<0
zcnmskpwsE@Q9}iT!PWhJUQI9<3?L8)tkObV$>nlY5FqH>3O=7W%4V}YZnauMm;j$^
zx7(kPMxBX9qaXOXAZA?{kx1k{+T$!SluD&qtX8W%5HOWWrLR`2ZxciL{eI`}?yis~
z*xTC!yay@NrEE644I)S;li5Q1T%H?cu~;58o6V^hP<Rik)vBErb$We$JvNz4#9#uv
z2i^zo#TkX`s#2-c1`(xPF8?~BMmrpZ>nc+97pdSH&Fyx-;EEz%fALhK9gLz;f03-w
z%x3fQ|DtgHwL!Z6;;BZPjgrY^*Ecsezk`TVC=`C+n(o*rTu;%ezj&z8W}>LqUzBUK
ze^Ca5;Q`CCqmzKbd*Xc$LrEEixsytzw#D)VahwYS?YpJbY8U^yG~lSeFi+wm`2$G(
V{o9xUB|iWF002ovPDHLkV1ig?Tu1-_

diff --git a/chromiumTabs/src/main/res/drawable-mdpi/tablet_tab_background_selected.9.png b/chromiumTabs/src/main/res/drawable-mdpi/tablet_tab_background_selected.9.png
deleted file mode 100644
index 8f4e174f1c3989f226d21048aae96540712ff0ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 738
zcmV<80v-K{P)<h;3K|Lk000e1NJLTq001=r001Ni1^@s6DQt3100081Nkl<Zc-qz3
zONdfY7zc3eMVSSG1=T>fnOfB<2XZqpn-E=DFw02<7uHIwHX11Sz(Eu&280P+=tc`1
zC}tMrCO0~xE))j5q+tmff)5lQ`E|}N$ZWcvbFTA;yS(4|el8A|zakO+z?6r{q4VT~
z+wFc?E|<rX$prWWzlYy<xm;E>PfWry7fLRd-^gaO4ImIa2hS56g?`-^tyYVK3EJ&8
zIGxVtLZi;_?Chj~V9>nJXs%Q+)W*ifYNb*clSH9;KXp3YeW6g|t*xy$!{Lym2}Yw4
zpt;*~Tp0XOGMVgJCX@LN6oTf~mX?;TGe_C&_NUEelZFZKT$|1Igf;4HEEf9&6cdlf
zKcaKaF+*uIn!6mw4QQfDrP5HV)vmBYi35Sa>%oAk3GjTs-~Woog~1DTIh9Irz#!<H
zFH))W3U!plV$n4k4HhP-*Xv-lS|8I!ory#uANYQ_^7+t>Mx*cXxztc=YiqX;4-b35
zFzCF#TCKiA4dwIsHhVp$Cg}J3;PrYpX`wD9lgT0o5Oi(<pHCcRGMOIMYBeEDfX_9X
z&5uZ<PKCqacdRamX%|K)6ncyHI86+tP$-s*#bOHtOrcO{E0xNd#84iO$JXg|gfv07
z+XcJ_Db$6%y}biifb8z>?xTG!&W$n{3=gW+>SPg6cn_n|sG1jbG8ha-#^doKm;mpA
z_rZJdM&Y_Dm&?^*fs)VXfBd6Hn~lPC6{-4*RB(;va5$dvMG>#R7}aQhN71OiNY-e2
zy?*t7QMmrvCS89qs?nySBofKhbUOVN7C4zq<{Pf*j*P<f6s`J;L5(&QMZNx_T%-Mo
zT3=tk$8p^7IH2&Jc;8tlu|}i0l}IEG7Uc`#C>I9WcVDGaE&q0Dz^uP8kLx4)1?ac@
U+%jdf6951J07*qoM6N<$f*P$~!vFvP

diff --git a/chromiumTabs/src/main/res/drawable-mdpi/tablet_tab_close_button_icon_dark.png b/chromiumTabs/src/main/res/drawable-mdpi/tablet_tab_close_button_icon_dark.png
deleted file mode 100644
index 7b4241ab4f26b41ce8b94b8282ea561c1b317da8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 280
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|mSQK*5Dp-y;YjHK@;M7UB8wRq
z_>O=u<5X=vX`rBFiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0vhJzX3_
zEP9_#-Yv*v$m4ST`sAzwZ)bGyDIA(oZ2G1zdXnb{o`W~POD;+_?tQX+edGT?&8I~w
zX}`=o+{)*xK9zF`D*HY&MJ7$Ta(c-0gh_I?_tS1@Ffz0_a{DuII#kbKNHO01j%llw
z6UX-cpGKRnbkD8o+xsgryE{s{Y;CE<q%hC&qq7rL9^ablaca`5SB`RjmDI0E*O~Rd
UFi@K^4d_4yPgg&ebxsLQ08P_nY5)KL

diff --git a/chromiumTabs/src/main/res/drawable-mdpi/tablet_tab_close_button_icon_light.png b/chromiumTabs/src/main/res/drawable-mdpi/tablet_tab_close_button_icon_light.png
deleted file mode 100644
index 011fe69ab84dfb24988cabc177b13d7cb0f75d02..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 341
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|mSQK*5Dp-y;YjHK@;M7UB8wRq
z_>O=u<5X=vX`rBFiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0wQJY5_^
zEP9_#Hq1NZAmA#0VTrN(EIm8Fo()qz?e^00Y2Lx*(q*FB{vmeGq3n}Vdt7$-)R|jv
z_W%4n`{Dl;nX|5|8o$m|T>0krKc$st9aXkwE}Jtie_8A9^0aSEZ_ehtes`VWC(E}3
zftNJ7y*9kJoUw%efvw}Jiu|t!4l%B1xR}PeWl~x3=g5E?O?T85U)y<X^RDW}C(YOw
zq-`i;)-u*kV&Hc?8FV%w{rS7=A`Wwze*6-hqO{LjeMzLt4K)X^2QrF`+gR_NdGqYu
j-8sq$KgE9@{>AucXLgb5r^5+A-!XW)`njxgN@xNAz9EbC

diff --git a/chromiumTabs/src/main/res/drawable-xhdpi/phone_tab_background.9.png b/chromiumTabs/src/main/res/drawable-xhdpi/phone_tab_background.9.png
deleted file mode 100644
index 20bc872e213a693cb59d9f300bc572bb09e86aab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3516
zcmc&%c{JPG_D>?iw?f36(h%IXxmOKsQQ{#9iYj7EO>O$~=xq#DL#Y}g)Ns+>@>ER?
zdL==)YRILki4K0My<D^uCDp+cqE|_^^u=56pSRw6f4o0_>$ldK_gVYwz0cmCeNHaL
z-APeiOCAIQDY`g2c*%O<ZUx}7R$GKUEL+cXaUl65z7m&Ddihc{vd7p^Wf&Ot7FS=e
z4+>?-*TDA|=gr@U>zcv)9%vq_Tx^K@cz|BkP}kgZaWg3R8(Ygfd`0eh`{t|0)#k0$
ziP*0*TCsyxR<ZDQud!Yl6HT8$$m<bld(aRl69m>H5&`tT4OxW<(IH!3I22NZRB&!r
z6{ex8<u&)_(T9a+F6i|Nu?r>{b3Tlr2&s4e<sD=)xH_k|4*m@EhdYKVhTJ|a)rNi6
zUjdFm7WkAnGoS$HoMopj<@KMLBU|&R^4HYV#0=J}6Tl)Eebo+ir8D_^kxmd$PY;RD
z*W<t(j}qh5fOecS_?moLg4+7i=RMD<(X8e0kWYD}1)iLv5$<C)>y<H(jF`_8&ZuVD
z2F^CbR8Q%C){1JFOFC8A7)4cyPQ-VqU~5WDeI{Wf8&Fd4e991lfq19)VTq64F#naH
z=x`geug48Ed_pF3_5(TEnH@{1#)h__Phjwoovf-U^iyj1y@h^hS|Ad%xQjA=)KvH_
zgQ5hPfyvHI5OvNL@mq>uMF<b5$3SOAeRSY*I4!=6()4)WcLpeh%o@8z^nGhHq`ip5
zMr5o)QnpTDKz#xH!<t(Wg8IyJjB}YE-sb(~Okd|(Zr2M!Ahyx?E_bYrelGeaPDdXq
zCww4%6;(jP9|GFDNcXTufH%goU`&FjdRQ31)?{dAmNH5+SNje3G`|U|2ncWJYo*_1
z2TWf|AGE|jHo(1Ep_$foxLl6QqE}7d-V4B|HGVvqZ`Ncoa8D!FCBH)btdTTIk|a4U
z36mUq9>~A55#GzW)!1-6oI8OXizb;@`W77Yjh#HAsH2)K%ot*8O9j#x2xJN3jY@aa
z+=(}e>5yzPbfFgzt5Cb*gm+H-J00<zgk`pcl23!tSkyG>*ZK6DG1Ge4q8KychY59e
zHD*AdzLKB>V3fbIc5g^AX7}(GmRj#PP7gEeP&*chCerhgyR#{utv|?BG;9Y<ZrORe
zZTQqa;Z79N`FC#dIFFIs&uvH0ebM_FtYHn#5bj}Mjjb5bq>6#6r+n|X{>c>7nw4Aw
zdreiYLi7Tudy_F=e~{v(@xlv|TtfR}C$4}+|423`P@Zl0^aUdxcF}v-ub!AH;0@O_
zI3Yy#OGVxybGB<EYYxTO-~Rkrb?VlFuC86`SMf-_N19*5*zdk^0qa%`=h@<ByB+D=
zOnYcR0S!a7;29cH%je~@5P}4`-u+rHu9@9=antDG;^5%m##JTV9k<g1tj*P#Zxv%x
z0@M2LoWr3HFI-=Y&myN&!UKJpwWmgN1&tfI{`pf-#>a)}?gYE=s8gOAVI>8_@L*A0
zr_<QIPRCS>mMB_a&1FTmrHM;9r;5EV%-r8TeYCIj$l1W}mgH0Y`opjI*z5roBlDN*
z`nv?|C3rr8G`_XHIg@6f^3Lbx-kn--l3ST`Jj|LzZ?ho;euws&)VKb=b%J*K+<<@J
z6v}=yE!V+Ho&N3WijGAP^`@8KGL$pC!It2pk;6HK{b6moL1U$~%~<qx{DP;~wL-tn
z;#^qhU&&=_leOebnw%@$wq>M7uhZz($i;==N<%w6)Vsf}?A5`mx(?(-7G>9r)F!%H
z=4MzOLobh;*&2PEtZ|zr*zT9VgAj3ATR0Kp8}ngtNq>F9#)28T#dDu&0VXQcb&6ql
z?iUBvI&RqzIfK{kEGZeSKr0PqLG)}7w~{8Re8zv}JVS&h6_@llS>bk>5&ik~5#trK
zC+v;4Liqa|_fI`lXG(WyWTy}d-Km#zjURT|{e`Nr(rtCtuWYZo!XOqw?zNV&yX>!t
zpG>;;>1TYg4zqMX*wHFNyjR|wsxct)uUQh>RSo1=`e=&?%Jb7kDp`MIM$f~;x;@yI
z=xlxT*Z=i&$}r_3eAN^FXPt6k{EV_}gXDz2<e-y!Xjt0~(mV$&Oooy#1w=cjolp{9
zZ<Ux5$Zi=!Bj<7B+O-&HTHF>EheI&z$OR<6-<(%d2(jg9TLA9ffnBZITdzSxVe3-f
z9O>qXpkKfcE=(wXDE`QS2y`ZG{%{=7uAwBMU*nNQQ*+itVmb%_&>%1vg2NF(P$-a|
z4g$;Oy9JE{K_Jlou;u@PH~=QA{}-nw#$Ek?kP-yQO!f~e{fh}0R7UTf*NQvFQgctd
z4bWVY6&xD!&MY(9Fi{6hxq%xrJX#NDvSx?1aLWkY-7Al-J5)!+_+}F{n6GDdpg;oS
zSf(xnl1EHrM@+e-4>g~RR|87v>6BbzqQ=*}T~DJ92n*#{UUE#=N(G^_q%L(TMv|Sn
zJ~C^+d#9+9ENp0qzkiv}C4xNj&#k^LeKZ^k#0p#mOM*$k6@f`Ed4ZJ3ITT^2?K+T`
zVT#EZy3<&>s)pWLH^|OB$T;`OU==>2v|}N)+STFrlB_QSk84_wu$C2maK-KshHkIP
zZ5^Hy92Fo1;Q|@7pVRz)H$?W~k(<Q@u+Y$;iM^D+8EayhvC6>oR&Dd5(-feCta1<H
zidAJAw^Z{_mivW8;q9p<oE3l>>j)Fo?2PMdudRt&?a15T9-Ndpyey{0^Je#b?{iPa
zcawgT;fkwy8gmixKEgzblkVA-%%eD~d-(Qpk-K;4d0Bv0slG87wM~dI6TOFCN$&h&
zm19}#?JsUOYJGCaLiZ$Jwf6qQ;q!D`S*GMz2`&`1`ti3HM(XYUiDQLs;++Q_j-1c8
zYl%6Cuy4}m9Zq)%`cK_~4%^hPQp4-`dfQ~FB)>~=%i5wn@_JfCsa7!(Oztrll|H-P
z>w$Th`{3Sv(9$l}Ryh}Y+kKVv&BWz~P19as%eNvu>9&@+wIiws*6;>?OkE=`sAFws
z`%87M<8SLL)7@!w*S4BNbzP*|NKZYY<;cU0{%Re6YK#9_cX4!lSXh`g<^)X8d*I-~
zPIH{e56I5qg0q{AZ}O}y!~-ntw<vNC&-6`)vwEgpcVK^q%h@pLe(jo8dzgM~5-O+l
zR@l*u4*PNxBX3frz-%6lm5I$8TB-_~qI@aOp`98|z3BR3pqmi#dPF>z@%qlaA^RqK
z8<EW)X;zO?Gd)H*=C)pnDBl~J+~Ev*N4?ex_m@EK+6kzDdE{cB4QD=bNRa?%@(ra%
zUJ88`8@W$q*(92{{G*=k(#025Q3loLf8G4locjLX(zP7TzCGBl>4OSdYUEiPMR7*U
za$RD+TAwMe?5y8GM1I$~Q)4efypfkZ^1GT~src1_qG;F1rKtFE&qy7%Um$n7i+<Uu
zy^`8g@AC!2NOT=#YpX$+#}ni=RRilV*~*G8H@3(aG_ot^82&|^VlS`x=`T9;vd(B%
z@yk?ibAM{Viy&#KkE<Llpk2pX90I&C8h*5I1r-1hUZi1$qRp1O`s(g$9Hm#Q_c#X)
zX@<IpKNa5lS@Og4N1XN!!l4F>eC}A}Sd@Evg;!(~QlVi(?g{gD3vP5#o^x41Ybj%S
z9E4^nqeEU<YpIO{4Eh^2g1v@I54@X{Is}JT8X8Mtxx+uv!$j2-HycnUH>J9Kj{;*f
z=$g~9ek}92>G&Wz0U;;sI9Z!iX#I;xuHY~y_S~OpQTZu~2ZHCH_}(q&vLZ7S()q~o
zlavP4w_}PiFqX1HYWl{sAf5mIHYSFq5KdA=XF@w?YK<iZ+!9z?f7Z8Kat{)~c9>&G
zk{(IgU>fH{Jau(`gz<=m*=LVZnM(a~OW^=xruo(uYG|&D*p2IlG3Oo(0YIjZkR=d-
z*KW^lSn-^ykv%D&uLK7#frscoj2z1!lbj$SCgK%-!W5oH>@hA(iA<iq5@gdIT-hD8
zZNd*~Q(*+jp1Jl$I6CPpEz#0=KT#l#=UPmAO1wqQ2%;fQrnH(uLAvuUIjsOG=AYJF
zV)pujp1;32GDZ3k4p(we$U+#v0At=<S7o#EP8i6tJob1XglvP;B6%VU=e8g_`e_SW
z_4Fhj2-F5+CYg>hYLsz&DUUjG{IX?i0Lc=i_Uu81^^<2Wy0LUaAPpv;Oqh;RheJVn
vlJs;m4hIDQFogV{hLnRDlt=uBwtw1HEr5RBM{S#t{mMWtj_wXTGL7+fh8Xv{

diff --git a/chromiumTabs/src/main/res/drawable-xhdpi/phone_tab_border.9.png b/chromiumTabs/src/main/res/drawable-xhdpi/phone_tab_border.9.png
deleted file mode 100644
index 9190ab917ab3201ddfb0e85ec44672dedb246b3c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 651
zcmeAS@N?(olHy`uVBq!ia0vp^O(4v{1|++f1^zNHFa>$KIEGZ*dV9;!@3w<T!$TRy
zK7Ph4q18;A-h}FSckb<+>l<*FE$5lyZQoN&j-gA^_Qh8TxtvV9x4cj#Lg!P~j{_+s
zR_>*-<|e+zS4wSj%%qFmgspq;9_#C$eek$`?S1~-+jhP3RUY!c<~_Te?i(5!f4Ro+
z{p>BPcYm#_{d#T5_t@p%?;p=gKAw5K{l-si4tI`q-HUcaywK^syG&MJokv~Z(W)5&
z7OQM#860_+&hhb%hyJ^}EI&i0JxzUM^Y-6!9>skwOP(J;_3=sQuXh`~cK<hZmXPP(
z-lw+v_+j5S|NJ?;-6!AeEnsbO5a3{PRN!D~R1jc6=6sP9`14qcL!p6z2}B@Ep{hHt
zc%-|JjYYtLfe}QYnkC<A05yOK)tX=29RFUhfQ?3z!Ri_mEAeu`u8>e%5@|JSkC*j+
z%f^7~rSYLx_bxv9&Mji;-T!SDOnmQf{9dG?C*v<SHMMeP**}5Z^A$^C%`0r4{EX<h
zdtRU|<o33H;kFBpR-F5#R^hne_FKM<zlAw!@3XfZ?nsnB-|rxJU+3(9`^S38%YWY}
ztWx>YF?WBHfoQmE)#cz{LWXw*p82Si?Yf({`^LvY<Cc%?li%yiV{AL8nlk-gpFIN*
Nc)I$ztaD0e0svKp^iKc)

diff --git a/chromiumTabs/src/main/res/drawable-xhdpi/phone_tab_close_button_icon_dark.png b/chromiumTabs/src/main/res/drawable-xhdpi/phone_tab_close_button_icon_dark.png
deleted file mode 100644
index 6bd880b50d244952e9b5cf302a9a7f77f536922c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 348
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBSc;uILpXq-h9ji|$mcBZh%9Dc
zkZlKH#{Q=tQ-Ok#C9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6ey^mK6y
ziD-R0%~9yE0*9-o-rdyQZ&+{TB(49oyHINKBMqfK?teaIKPm-O6pMDo2y+}TI+eWE
zpi1B(-vWu~hDyeYZB>5~3N*GjFh(%!5uR_hB4f*AoxtS`Yb5)(2_~#s{cg&$obqJj
z8BR_7(-n^8r5OmVNHj1FIGiY?@$Om6k0n8G^)yAUuiQ9S&|zi5me2xjzrS~dwT%zd
zH`{Tg&0Bb`MD4+jZ=t6z%RCcG=AY_$<er-68p|HbDaUqLi>Uo|+?}~P*{U?ZX{W==
od-Y69n>~5cKNReYvHilj!fRrZcAn@@peGqTUHx3vIVCg!04X<w82|tP

diff --git a/chromiumTabs/src/main/res/drawable-xhdpi/phone_tab_close_button_icon_light.png b/chromiumTabs/src/main/res/drawable-xhdpi/phone_tab_close_button_icon_light.png
deleted file mode 100644
index f7a2aa1b2f96fcff8cb420feaaeb90b88f7e6224..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 467
zcmV;^0WAKBP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10Z>UqK~z|U?Uy}n!axv4UjU^;DVzg<QgDEr07bb06=ezz#Tjyg
z6gdGu5)~aCO>%)WP~epoSntlv8kAzc#`1bSdY+k`PllqRqW__Xd&TGo_Dq18G++eg
z1DK{Zb_FmKU<g#eG6Uuv7y*yKrfG985vcO+$Mtm%9277!?_Gd?y&jB_%Fq&c0$%ES
zO{QFC-n_MM5+9TT0$3ZM{4$AQq(Dtj&%mNh7!6PeY7l_Rg3$t{pt4~sKn|+nR5k}y
z0k0?<xGf+EpT42@+ys*Y1lQ%uh5?y%XqDxA)(nLj*l9rXNVo}*vxCb9-f`XNYVXqm
z#q3~#e0a73B$+dk;n@n1X6S{W#O0F!SthW>kVQZ_c3^^v0X3Z_&Ct8FnIu$fFdl$?
z28@d_2fn<u-&l-P$+o~B@MD1S<;u4LK8-QXbhqE2qN1W(>j-*IUK9+o1=0Wj002ov
JPDHLkV1ft>x2OOB

diff --git a/chromiumTabs/src/main/res/drawable-xhdpi/tab_switcher_drawable_background.png b/chromiumTabs/src/main/res/drawable-xhdpi/tab_switcher_drawable_background.png
deleted file mode 100644
index 37eef21ff673c5fa2c530542ab2597e5b1801594..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 585
zcmV-P0=E5$P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm0013_0013_0gvVJWdHyG8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10mey0K~!jg?U}tw13?sp@7P%Q(~3TVAh9qp$xCQ&XQ3$Qv-s19
zPocdC8br}bMC?@*TM>-0_$(47-t3Oqo!Jb+eBCUQd(OEtyJTlYB9TZWBqr+*fVzk*
zibz>RCPZY|(Zh#`yoku9h#VMW&K>I|15|-Cil+foe4AeZS_3fu%_p$w%l!HPjce9i
z%~w0!=;j^R0xH0WhX#!R^T0OHR9Y=uwiCU3{vMcdHEq!=0S`*Ek+)bqq4R~A@6s(L
ztVAts{*a~Cq8jfRV{ZJ|Ove~=Eh78s@<Qf9z_IE=*^9&ewC9!fQQBPF3QVc-ogaIB
zajVAK%MZ2yzn(D0m^T+kSxC?tOPgy8@Gpn~LK6doCI$#i3=o<aAT%*RXkviS*aH0e
zPY#S0?4?_4TwQuin`;a3tj5#19c4#rX)iz60$i!_Qf@oh(OTNe-vBlBV%-Eve*9T=
zXMqo;UCmppp$a_|8KPtUQE8sI6s*vDsM`c~XdgQ|-`K!tXSH_|I^P23Tm_a1$Es_C
zzC(mKUf=LyzAHq9-g}}5PRX!s@_b^dN&Bp_EFzQQ=M&SDv>%m+#+VDodXY#ZGC;ln
X9%DuCE{I7=00000NkvXXu0mjfdzAYm

diff --git a/chromiumTabs/src/main/res/drawable-xhdpi/tablet_add_tab_button.9.png b/chromiumTabs/src/main/res/drawable-xhdpi/tablet_add_tab_button.9.png
deleted file mode 100644
index f640d283d7410e72011025b6573ade3d9ca7e5ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 672
zcmV;R0$=@!P)<h;3K|Lk000e1NJLTq003zK002k`1^@s6^>W*(0007KNkl<Zc-rmU
zF-X*57{~E5#SC;PgTgJaK_sN5j5eEf*EJhl%29N!SsSxf6SoQxgj&@xbQIhoQX15u
zNd7)P|L$5Ye4pj?_v(Eg_`Tftz~}z&J$L{2f0areW#^m=R~NGBCMp97Bnl*uD3B<S
zK%zjRKmv&Z2_)*0AemXa=Xw+8TDC~u+-<YtRnL*fnmoH^#ge~xoEg&bGC2RGTxPOB
z@<zJ7p#qfCViP$a-3KC>gYu26M!E|`cr{I`ky@)CmS7~ZmBHXp%mNW!O@rzYybpvZ
z#asE8S#M+=h-40Z=@KK^I1u5MH?BtN^hWl9NM=2Q-|mWeAi}F@K>Y*jLlD9NVorXm
z!W;PtL^3~p=@28?3n0QRZ&ZzR!yEYpL^7Y{cV>OxeGf!<8>3f@WKVzy2Z)zyq!w>v
z8;E4S`_d*oh*I8_1R@+DhSf;rxraYMB=bRjq|2N52t+bRzVwKZYy^mK%bQjswRt1o
zfJkP?mn+f}tUhYK0wTPchQvsAha+F%ccumTS#WRU3lPct_T{D+$;N;Px4h?Sq^sV@
z9uUcF${&64efKpG;nnm&jAZvf2nUEaQl#1du>nLwkA0m5l05?=-145PkvgkS8Gw<<
zniQ!vK)eGYyqfyONHz#UI6%xwk!l0P77)>Mx7I2~vPmGqEw5LN)Xf0VkmJZ_`)3>F
z1HV9=nxZ_vC`YP6O;yjJ0aKSx^1-1F>XA<~i{97|aQ+_LS@9RQvO=l@>uB=7y=j;K
zc1Jb-eGL*w6i6UZAW<NJM1e$s1QG=jNL0Q^|6Y(hQ#k>znt;z(URw(Q0000<MNUMn
GLSTZ+iY{RQ

diff --git a/chromiumTabs/src/main/res/drawable-xhdpi/tablet_tab_background.9.png b/chromiumTabs/src/main/res/drawable-xhdpi/tablet_tab_background.9.png
deleted file mode 100644
index 3b8f2f873e5d50f3760b5a833250a7e73a39ff21..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1834
zcmV+_2i5qAP)<h;3K|Lk000e1NJLTq003zK002k`1^@s6^>W*(000K@Nkl<Zc-rlq
zdrXye9L5jQDUV2DSSE$6vk;{fA|bIx4Mw)0m1B^#v7|tgCf)`^m^GkqFalG7rXV08
zSHS~<g4{*9iYPJ=kTki<ExE`Ye!b7MWt*3C;JoL&w`Y6*W4zDve8$e<{hjakh(zoc
zQSf4ING3>wy4L#m_=KdTrTvwcmq*IV%1C8pC8?^alKZ-R`LaSkkKd2`;C{F-?oatx
z^Ux1t_%H&JmX_AK@bK`=($Z4W+uKX#=H`ehh5O;YxIcWrj{xcaTIuiaA6Z^rPNt`)
zi8_V*!-t=rUj%#!kRD23U;mTr?Cg>I_wN%X2tMEkz63}Q^s=w7Z`jqVR|%5@Kh*0}
zDEtYKL?V;K#KeYyfdNKAf*<&TKfXhHZsW#{-xU`Z&k+Wyq@;w{+1a^KKE-^7wCd2I
zLuof}-ee*p0$=b4pS*>%bm`I$Wir{o`1m*@Ax%t7kj%`?zjbtUKH@7R?OnTe{fvJ;
znXH<c8nSce&H&2qi+qG+eB#83s-B)6Mni%>%4a3~@(t1=b93`A^Yim(RQ+UOK2IXx
z)55~yEBNLUB)#C^;J6z%ZV)!8si}zs1qH>b=?R2-Ac@6di}dvL&XJK3RzMmZ9VL|C
zZusU4B#Eo5t9M031!0rm*Tu!foASSe50F+zM@JWRbab!^QhR$liHeFUr2HFl9g>Ej
zq2Xue&Yhc>nVDe~B>2tE&7CkZGWuM_XH6=H^a_puu3x`S*eLj>{D&h4mm#fBNl9tF
zckdo6A;EWYa&ilm!<4I#p5L@-llz4W7YLh$qjm=ehaZrKi;&)oh=|C#b?X+ZA;CX#
zAP?sttyr<b_RN_x!;_PftcC>t+1c5ndU|>va}AP?mzP&?U0ogFg05V-LOeY^gOH0$
zklsm1NT}=U>*E9@<Uk(e;tC{9YisLoii(QnnEo(T5#co1#>U14r^{S`^hQ`%SW-(%
z3*nNGCp0uP5&2jTNg|PaaQgJ=-m$SUPC>$HvP>rHLq4`c(sFlq|EapVns8CbwSD{c
zAMr^5HbYty8ykDEyStl{kh;3MNK8yjndrf1$5{zU!^FhI;r#jYQ?s+PoP>m2RK96b
zQ&UG8AG*>C>9qp~4n#LLHWDri`2qt2qmY-4kjybkGCVxYX-LR->eQ)rD(`!2gS6P$
z*?I4!OP2^Agq+BW+-!pM*3qL!^X}Za!wX2riM+_o8b}5P2A}5S<cz6%)<~77w#X}$
zO6_QP13?QU-TnLb|90)#HNqz$FLEP48z8MqN=j-P9312oB;=)XHzGgNA&D_6Qc_Yf
zM|ddA+uGaPZxbnZR7UBL42~Q*lF`=I#z#g3xep&coQ@tC3u*cC<<=M#!N>?7h1^+L
zSwp(Ix;9LO^wOR^dje}~YYCr)QJ&qqcmE<%-l&XHA-x?RA769#?p<C(LVl`;YV^T0
zNSc<GmR}bX6wGqz^mRT${=&k-IV&qGXY|4(NUw*4g#6Lm+)M-!f{`Aok9evVJ;p#1
zi^cD!r>A!@Wm$&0g&s08GI}Hui6v7YEpc;m^Ti@1LH`MTxVpOfh!#F7qZCL+$B!Q`
z>Fn$j$UGv9_C!ZV7gPPLRyQOKjDoOnl!b2L)HXLachcC{_=^QTbX_o{R|5h9es5@K
z5U4yx=mq_tCv`$HOHEB}8yXrCh&)CZm7)6ilj>=`x*)ya=;-Ld_E8qPg;5#wguc`P
zNg5d$nSJ~AZGps7gnrNy`cgS0jDBDQWNK<kAn_F8bUG&|XLJDz4(APN*}i@Ie&xz2
z3*ACb-rn9=z`IP9klsCc@??E~f4@LL4xuOXh2B&JNfRR<82#Y;!&F6tzHDu6zZEGy
zDl;!gs}3GKn8MUWf=pFwYb&98OQ!nMryY{Ewzic_ChKSFB0;7KePw254x&H0A!&Pf
zc=%&cpCHABQJEb(cKD%3Iw7r%i;Jt^>L?4{LT^-m<>-+vNQ=zO%$)M`^QVP34D-{!
z3l6c6Q6&F@Lxmu%3<?U0!Gb<P^Vh=#hcP1g7aS@CX#++)*s@5FsltLos>cqoSiC{m
zkQTeRxOm}<HUuqP=yA)IEuK`b5@kX%jEagXz+yf@3m1AkcI;TbNWKM!azWCNN~QK^
z&z>FU%P0%o!YMXRv*lcHC>JC>%)Zvw*9+|`QRoxB%JH$UXF}56ym|BY)L+pg*Oq0d
zTj&$LIypIQd&WPvPlSYrfUCA{-MTj`D{Dk}Eu!zWiRyP4J&PWEX^G|&A!TG_lu~aC
zFD54^S0*GR)W*lhH>aki4#;FOQczGpa6~R#^jzo{J)>{*j{d;`Jiz7AKO!PrjJ-tv
Y0H&gyz!0kk<^TWy07*qoM6N<$g5gVj3;+NC

diff --git a/chromiumTabs/src/main/res/drawable-xhdpi/tablet_tab_background_selected.9.png b/chromiumTabs/src/main/res/drawable-xhdpi/tablet_tab_background_selected.9.png
deleted file mode 100644
index 7192fb0dd42f3f971bfec5f2ea2e048d9e4d4295..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1823
zcmV+)2jKXLP)<h;3K|Lk000e1NJLTq003zK002k`1^@s6^>W*(000K&Nkl<Zc-rlq
zdrXye9L8UwQy!7RuuKwJEJSIANJy+v1IZS&atyLImK12x#M@vfvj!9nMqnzJDF{f)
zMFbBB2y#`DtBN861xb^u+>(pj;n(|2nzosq1Lr;Gy*=CeALD(V=QB9){?7M%D2n?c
z3SOKI$p&fA*UCM6_JpLSrv8<emq$uVOG!mV1*xp8l>54L>5@WUkMEEB;C{F-?oazz
zG2@3dd{_ZVOG|52czAfm`Sa&VS63IAo}MPE6z+%n;{NafKO&_6YKgzUe`Hx%8JU=v
zAnFwE4<CMhei85`LYk4jzWyg!Sy_V*9y}my5PZN7e2I`A>J?vK->|D!uM##1e(2Yy
zQ1}xeQIu(7Vq#ryZ!fDL!4G`FpU@#azi!>S?~03yrwI#HQc^<f?d{!ZpAsQMT6W;T
zfz(^KZn2ROfiL)jPr*W3uwcQ5GMTJ*WMqVukVZ#GNk&G--#R)v9|;wb_V(@Df5tzb
zY*ux3HQBapTLA6%B_TpGId<$=WoKt6t0BQ3?Xv=Yg$C(43k!=c^Yim3RsCdPHcukp
z)6&xNEBF=?B)#C^;P@LiZV)c0p`n2U1qH>a=?R2-AW0+=%e1t#w!y(cPCyzO8X~mc
z4)_)dB&nO5n@@RpIpLDv*VWb4hxR{T2#}V?#KaV}wzhH#QcFt<iH?pgr2QN59g>ET
zk<n*o&z>EfoSftoB>2tE%^fv1HvU}2XH6=H^eT=3u3x`SxG4Ch{f8q5pCPSINl9tC
zfB!xwA;EWYa&jY`!;G(xURb|=y~l+M7YLVyqjpC}#~+Y~kC5Jsh=|C%efu`2A;CX#
zAP?^#End9X?#!7p17l-joQ4GdSy@>_dU|>v^9_=Yx3_n2O-&8qgRWe;LcF}Zf{=?(
zkls0d{CG`wcQ-E}AqVmx7hfQ0+Su59Q&dzm&Gv_>iU_C4wzjseI9=ugq@`hDVM&dR
zjf77^p3u<HMC9W<B&k&T!RgbdyM~8{c?Ail$ugO&8~L~nNz22-<EN^sD#Ax0*Oo0?
ze#AQgxD07UTwL5A9UUFKgw)>NPGVzYOR0zN9p@w@4O3H7$8+b-jZaNY@e&ep(fKCK
z%*>n^eCWz3q}TWD+ZR(`Ur+cf<O>W8j7DBALbAXp$-uw>uOT7dsZ*y~=)CW74bnUp
z7nfZZFJ2@<5ON|fa&rmNTZa!H&bxc}t{@;GC-NdUXCN6E7<`(Yojt7XStC`R+9I!^
zp`kqke?Tw-Nq6twy}w<%c8v&0$cx;_&jm=Ul9G}d`uh3=1qpfS-1W%Mc1RM8ij<U;
zOcMbL^R^BS4x1_Ej>;$<lEI-vhtivyn}x`TAosz82h-34YauOKw8#ddA{ZGFqL4c?
zGqYb;SJ#%UkY3)ob7$b?%a@6eg;AazJ9hj+DQ{FpsgT}INJyx@ckiB{At68ALlyd9
z8zfCDE32;y3JRw9box3QA%9_E;k322wF`P-6QnmnLPCDOdGjU_MF>WE=sptYUi4T4
zNg|QFpO%)^&X#2v>K1xPPfzcZN~Kn8fi&OU-Q5?9lteue`fzh|+e6KLR7NR~jE^2Y
zTGH0mCX#tf810FPi7BT0S*~tK8W;uP;wTH#!l`X;Ztj?giOCmpeCRr7NUsG11Vq)<
z)rnM|AoPNM(33hLnV&p)vbn#%UnKGbVN{0h=TEw))#`%uqLY)8C)Y<=m=;E5&=dMn
z2PDJD$jGcackYNJo+9*vp3s-dAz}0bBOv4B<06Tt2&dE8+1W#LSa3LNNDFuG-u)|I
zMp>8^dh+q{!2;fes)Y3Ji4!MkdwP0A0&)mFp)d5NDoC0b`M~Ih&>yBMBJ^cvXZJ0o
z_^8aRAT8U!e}4*F7YVXeO-)UN?k$<_PoHr}+S=OIGMTK0t&0TND)g0+k<o|#n1-b7
z>FMc@MSY?a7e-~aZr$pK9+`x+GCn@OoUfxSObfly{gt6drXW3MZf@?JpPxS={=qOi
z{kz~03mGZ-7aS@CX-QB}P%IYoiJHA;797S>@-H}42+|sicyMKrAX|k6hjfpv5{YDu
zvLVfLb#?W|2W^O&yU^ptjT^n_UZu)}WE348U4X@WqUJ92c;v{Dd`i9rhjKyEFf=rD
z$jQkW5y~hF)50k>PP64)a3~ifJ<Pt=*4B#cDpBYYy~^>nuV+Hi-mqcA_w-NE7~hs<
zs9We0y*fKPZ+^x<xBm+X4*{2L+O%m`W@hG~_*%r=YZKk?0D7h#erSp2vmjxs2lnKw
zTDx|wTU1n34*h#`3JWDfF(>qkp3ygYpBX}1N<G@LLLR3jUhKT6e*i~7!=<h<NA>^!
N002ovPDHLkV1k|YWx4<W

diff --git a/chromiumTabs/src/main/res/drawable-xhdpi/tablet_tab_close_button_icon_dark.png b/chromiumTabs/src/main/res/drawable-xhdpi/tablet_tab_close_button_icon_dark.png
deleted file mode 100644
index 1f49d62a9caaaac62df9b2df3987b0505033699d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 533
zcmV+w0_y#VP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00004b3#c}2nYxW
zd<bNS00009a7bBm0013_0013_0gvVJWdHyG8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10g_2XK~z|U?Uv0=13?UhpI4N?kutmmkq`u;0Jw!C1&|;mB=i%z
z1CCU|CFa0H8df{MOHh#ZT~@MYJ>Pgdwt-QjMxB7njQ+|;lUg7mkE;4=X34cN7!g^B
z$Wv<VSqcWg8~{`mW;P?DeGLo|-8!FW+x8)}K6q*u;tS6-QPovRq|B^Q)%5|!={$CQ
zLFYtd%sex*7tcIZ)pZV(i_9~Csb}6Y^EDA!aNkVFi_R&x%pAPFnt!r^A{)Fh^Hp~P
zGb2@90=OxK$p*@W8VXYcl!5|aLt%=698{yKD|C|8eJ7r6;}W>2OjK3iK%{&XM`jRE
z0;(DY$Y>og5mDcP2KBw_E9*&MU%e&aC_u+f>S%NAfgx30bYYlz2Eat*)61!;sy1d;
z6se-Zn5r`+6+NV^q&{pEg8{x9a@)3dorZjw+mM0()?9};uKhO%<Z@<>p9x&_asn@M
z<DhzHqUeA|MDLzyTl$QNXx}sBeZ&T|q*V1@L^eZ*{M~N16p?u~NY~*h_!u>6)Nkku
XenMPX2u@}I00000NkvXXu0mjfCWqNc

diff --git a/chromiumTabs/src/main/res/drawable-xhdpi/tablet_tab_close_button_icon_light.png b/chromiumTabs/src/main/res/drawable-xhdpi/tablet_tab_close_button_icon_light.png
deleted file mode 100644
index 666ca0bfdb567f6e5ec73a462aff2ebbfaec26c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 542
zcmV+(0^$9MP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00004b3#c}2nYxW
zd<bNS00009a7bBm0013_0013_0gvVJWdHyG8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10h>ugK~z|U?Uy@F12GVWKL;9mL`Ap*1s#QRm4rkfaR9pgxdQ=-
zkX(XCMd5~1(7_F;s1gcxkrnn~dlf{nf3xz)p8eM2nejrWPM!XT%wPFvoFqv=9~eto
zrou>?0w0nt>LzXlz+}K7(6`n;IOkT0FlWHAwRXoj_gpo3yUr1??~RARO41~BrzG`&
zTVUjwcXQvRAJ(h!w~{mlZamuvnB^~Ok^!#PU>3ln3I-ZN2H>1~vexbaN4Y5^e14dG
zn8tJ12vh@gV6D9`fijY=Q(%IDBA^PG(-fE}pa3Y^!azd7tH_*1{v3L?IS`zY$w0-r
zl0)k&dS?nnh0Iq;_*%n2eH{u>*$%hrd#O8AmQ97~N<y>a*ae$D)UhEmz_bKrEa`;b
zZRRep&HN}PWQ|2HvZA*F3hqsby)OzVx>2@)Y642`+Nn@=2hK>Et-;JgU~;X1^L$OA
zA>SEVnccM)G-J%GH(n5##*&unmpo(4JE<2m=iJL+F!%)CXweRe@EKzsvn;zz@v*Ky
g`wi;Usne$Q1*KB(0>tK}MF0Q*07*qoM6N<$g0++9@&Et;

diff --git a/chromiumTabs/src/main/res/drawable-xxhdpi/phone_tab_background.9.png b/chromiumTabs/src/main/res/drawable-xxhdpi/phone_tab_background.9.png
deleted file mode 100644
index 33cfd6061835bb23f0c543bbf514b3e451af0651..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5969
zcmeHLc{J4R+n-S~jYgwPWE~_+gtF9F8#9?9%gi9lLzX<2tThM?L)4hECR>(_!PuTG
zgCc}bDU3lGl|1Fi(%7<;^*8*^d(QjE`~LHu_s`!S*E#q3p8NV<+kId6=lUdATbe?^
z;$Q#(0KsBVcmMz>w=19nyf4nJ;|&0Ss2CP?!R981`)L+$>($V`$WRhL3|CQ!jdg_{
z{vvF{hgrB^YX7We?z2qT<tr9%Y(f-0!$n&PH^mH@sRmxY&tJ2PK8HK1x>lXvu^N6#
zp2{-niFEuua|*dsH+n}d4vIu<%jh9NKsh7`D!eCT3KYo`K2+SEz<HZ^0uYwnmHiaZ
zo*1J*vOL*U`?qSQfk^#6wD<vG3oD=~6exrS+O){}u3edNp>o>!icjAGT~(?s7d3kn
z(pCEA%CaGKhRm_dC41im`0DELbQ6aI=uJ}ecTIdlr(IVGHWC%iuEP-ey8sjeY*_X8
zbuz7?#t~hSrv${^13hdnJ%k8{44UKg>}_jQV#`!8#>_5drNfW)Z@Rw=szyoC7-}}z
z(x+lo4j0R%AV>(#j|OGNA!CPy^!CYFYDgB1UcPE|oJn={6~!dpVc5pGvy*!i1@q)E
zNj8ik5e3`gFe<#a<8_h9qqHVS(YpX+hAmlNU(@@RywoX%A+_8Zy_GJI-SfJL2}?mh
zijv|Osz|W4w4rpKs{OirNG^?IUnAWc+xyif4nLAsrE)PbmH|eF16IJs=wCO3m=_Mv
zEm1Qk(Ef$)2E_)Voo2x*NaaA}5<Eoi;-kFSfzM!2I9cdCS>F(x+;dXvjdEE#Ca;7S
zRb?sjyS_a*z2h4WA(@>bLO&zM<pS>OH2WV}>eV<rpeZmA9AnB_e36@qnDu2m?!(z6
z7%q~E4ZgQ8ol`c8!Y{#pPde&e;#tvwbU~LQFVuK`U`gI04xZ;$FJ>KbN<_`*qwB3}
zT)?D%gb8%Z=GV%C#YOzR+Ro*+U5pH9{ZUyX{uNKax5eW}g7h^+)5IT&-v~*iIVz2t
zay&%kTp@y%n(6u&G#jVuI;07G=#V6(k`*iRSj<q9D3TRiaj?Q1KW<ZrEg!M1mtkfi
zqvN9p)$ZrItnn#JB}L_8!_qVrwzV+Qfnc3Q<}*h8zIn5oU!v=4?Qr@K?DA#ha@6lu
zRz8@dGhLkn%@sMBm(GWAL%zvLs?``YD6-6^hC*m(%xm@IHbq1-T*1~^xA+Xf{dDrt
zpl5%EeDZblJ&D&<Qo+}_uw1}fuyt;^aq&6+EIu<gJU*o(?VXjWr$%`#s=@%}gvOLU
zE(95WjZN;jVNs2<4>%dpJJT?fhxt^@z;s2RBbArmTL`>o0*W>G)4S#25OhgVsOu1j
zvXpVvR(Md^`-A|ztEcFOlWVqxZ{JM*FsV#H#I}$bhBS)b&VfA*Fb%?|chJ9G5D#YK
zD#TzG=z22at(M4`=wRaX8BpSzBX9R<`A4?{rP1H>;b#km8tnw_?%A2AMqqIG8tH>u
zN7s2CJa-N0pAd0va%-u8ljO}CSZQL@2SP`;XnDC*oiM?|7KO~KrXRbRrb?<^7d^o_
zZvj(DTWEos|M2IcV?587%~#r`MVwg4qN${>_EDFIYhTnW8NU;}R5wzmnL<Q}KP+}U
zRAkuBczeWOca^H6=P5q8fsDeAWS%{kmsxC|75f**UINf`ZHJ>|crUh(3jcYctkkYQ
zEh1p0V^{?}nLeL6VA@Y_%Lmz=ie=MGeEK5Jk%^xo^e>sZm4zC5ote3(%5pbdZ`Ou|
zh@cRV-wLDT+$2v~Ed|1WMK<pQ2(GGIzxZCWPZ99*Oxa~@OGAXm%E<7V2uyigu`n8G
z)KV+$1f%m=Crg<L^5L^m0^Sg{9^S^Cvyh;uvfj+WhL6xb)T&nEB0p&nUs{+bP7;6Q
zIwdJ1&$@xvC+^C)v_|i22VT2&t<BHRuafk8Y4YbuS?6@R*Up3008XcmdRydLfNe=p
zHt1qeEbDmt)YIk#1_2j%^@(?>ZdDjR?F>65KW#eA52I631cC?&8UFgU_|+(CgWCvk
z%pOuMFpB<+iP)I;Nfve0av!IjW^F1vo+9A5vTrz#SIukP^ctRfKMKi&6`EoVN$bmk
zYUVS!D=RAnnVFfFB`;=jA3gORe-(5!A)`Ln`5L9+3}oe*&(!@f(VXfBw<{W4wn<0K
zc4EB=gK;NzzC?+Mi|6RxFX1|6F#|o`s<CQy{?hYQnGvIGVjbFkK=MM_*7j-6HAmx!
zKj#9PB#R8N57JJv{raa$NP?HICWN+2P0x0Rj2v|2!r$nr%_`TZ3MzWm_+T=xP6z*!
zNA$=skR5z!AV2n^)nh#NG^@6Rwtb|xE?>&fV9b`{-pJT$DQwU6@#b_7juu3%Pe*&3
z559cPOYoCWrc8#n1A*n**COYfKYV~zS+MzPOlGOK7U+->|DbkCEB$kg{go?Tw{x`4
z@Ty@nW>8dFhOru`&G15RpvJb?a48_p&!ObePz3&;(!%AD>CNu$ZiE^(CyTze<DV)0
zU5=2N{}`s$FAhm<!*bO%@*hT;99@e0n(U+0LdtR3q$yyJK3Hx2^kSq;NgtS<5{dSb
z7nR(ynC&*EOAI?~m_+UVoe+u$>K*BtZrg9pl=r#*V|wuU514afAX>L7Bs`<hN@T41
zFMd>bKSHQUQL2Vr`=RznLyNVgjKFC&l|BJg8*2>eZ%zELbjhlpSTKdzPutRa?$*ME
zdbX&a;>d`nZxt@&df;`+<~d3^tu`)&Fl?u+V@=>hD@nqQ9f8j$9qQevQ`tc2EzVWS
z!v`~0YdkhIM`ggGVx6_Bq{7WCyAzPRQ#B+(xA0@9&$(ng8maNPwIkP-3hk19Cf$F&
zq2PL{=Qszm9=EqKLA8H**-z!W*v`#v`45gJ%qRO%Bw<Ql^H$;UQ5iEU@Zgo^$cv}a
z?wBmUZH?z2Rm=(AK%pf@ntuaA-^;#1XtKSeCUokh$Be4AgV$$6`+d-ZL6rQl#%k~J
zJJMh8I*qJ<G`aG1<3SzAWat4fb!YT&wEM9!MwF{*#x&;_e-%bth$XmjEaS%*#oxZi
zvTw6L)+YSM$S{=KAA?DrTOp0c>CY}m3{P`zKHT-#d$^Uq&5dNCQ@QdfTYAFl0<&!n
zD)lO6D(<%TP+nI2z5CIAHi|20yL*+kAU{fL-Ks<-R_@dziE;w8eHJkcT>;t!fz&pf
zfg<m(GTWydQ?(>%msi!|AhXY2L1tO6grg48T;S_R<+l8N4Vv1xa5F1Gm%Zw>gerR7
zxZdd~3pV{_Y_nt+G9pC_BDQ%qVq+)(Rsl3#Vq{GYn)r}BWlfMp{J}^2AVmY<BK&^e
z*-LgJNl;p@#oT5;Yof$NWW%;wmC|7qtqK&D#ZfZ8DPEw$sm{LpY4^WNIY13+H;xAG
zCG#_<ae;9H72a48gMkmq^a{u!Is0%=ogpZgY?D&I9+{Fd19c9We@AAZDJLiMvJK|}
za>&1-(`S<xj9m89{K->=Emhbj4bfJ6b!;ICPJ|_pK@=W1gUjuw{Acw)=b-5b&Eo$z
zKR)`XO$~8b<NYWeI)?Jf{-4$VngcasX8KSO-Q~ne#@^kjA_*q{7z6B{W{Hi?T<nY`
zel3QQ@&{#ZtnrM;c%QB@Q=8KL<M1LFDm-`ub@_*c_&(YU6r!Nbn^l-Fn(#&gnE{|3
z#X>UTycNp6V_WuGYlO#mhZ&Y~fa|nRE@ldY?@60c2eP>IIfZ%<Dh?&<$PD}zdXTct
z9n%{mQd&;~S;h2{w45a4W!19xOgW!(s3%;f1*pYX<BhWYs4KcK+HD26c%rdZ<`5D;
z&MWZ_KPzn2|1BCWt_EaXfUgHq`c7*9fH&n2sR^*ybQjj{tI$##ctN(wbNoJ1%WwP`
zbTs-~j3mYKJmq9slPdJx$rXQmFV+A%qp;U4&2M{;wkA5nOx2Q1z^pP!ijWpRZR<P~
za*lEugnFOW<P-hsXXrzNc<=venDKXc9&j43Tfm#Xz{Ow1ct?Mdop~L@u!18zM4t>A
zJr8cCMX4>ll_xp<jNQw2JV|gnyhnQ@w43XM@EW%xGt>oW`AtZs`aWI*({dH9>U+hV
z2@d}!xO2`_znUGh%=iArUL*a!s;0_moG1vp-&-|vb~O?5R1c*|S=HvJ(Z+_?KffJU
zSpWL%{;m;>)m!&4N{3z@&1ty)u6N);O46kM&jI<(pzEtWceM9nJvzz|QvA~)j3Pqw
zP=Irs!gwH}BH1))q37f4?D6WTOM4ydTrI9j@lTJ`qK&VxK->4yw900b*Ef(+gB!`{
zV|B^y6AIQXpEr%V>-|U4T)*FhUC3pV^su;jb#3Vo(_azSOEysJLtob>kMA1A*=J0%
zg+9qp^RiaPbib>g%{bpQZ$??YDmk(CXKrqnPGygrZe{0^U&3w_-q;M!?Tah+35mXk
zQ;nL&3A&Ueoyz2Mlnz4{rP-~j=hw7S)52tL=FUJ8JpmgzZrRK0`Ej1vpBd7rTe9&}
znAb;nZ)19+713-p!M(RGC_<;Lre-mkdBVp%YHQ_v^q3aC)HBLKN42+BWy2&f_LX}7
z`lP$Z53!wEKgS(ISXEWk7ScTJ<jLu+Xdd*-(Np``v)W`teEOy4+GP`)KRcTg1!%4J
zJvIfe_d1r+M%U)YcOGV(uy~tnwEatTRASJ_`(ulG@4D^9!#EZ@$zbeD*I&qQYYDZ|
zFJ^8ePuVQbeQF-=FE9!m$e?4f5!>&XYx3-r0DQrz8r6!W?#c>y`O=WdS^_b=q}0oS
zfP4Do=Gxbu<mggu?1QC=&bvGHktP#-9wS=mjjB9|!)bm8;vxB(Fs~>!&z*!P+nX}#
z+pQ=GNy%H)t*zVYoCjL61w5#$p{1pzZeAM{6D;Q?{wCsz-8G71I6z{<A>~183+-M&
zLWbc&bN%z@&(mC&&-$Cq<Sxs6WWI+K9&bF+EH)~E$X=|IY5qM>FE2au?&kiAUG&GB
znf%Q(%@m7>+1>fVWfS=W7n>v{#KfM?Lvzv;Mj3j_KO;?elP^~s<<M`inMW&16-;VE
z^}bYc)-8Q>bK1u-;(7MxvwsiDPdCsF9<2rpcJ5q?_^sZcNooYhI;TM{2H-cEO?c?f
z_aJV#>{Y?z=_3|v_w+Ba8^XhSlC<Z?;-Bz0gWLR)_p?QNt+<VU<c~f1SRBoop5G}k
zy131mNgQ^%JWjBo-ztdPKDf2~Cc<wxV(!_>7sBjo*evVrNZrqo&bkq{ZdH!~vPu10
z=GB^=Xoq1Rh9=ZA@9}gCjc}cMtdj>{p9S<}H~zSiavnJC6j`=uZ5?sdV&SDYG6szC
zslwY>{*DTtdlBy2vic#yYSDoy4FSA+Ekf*!(9@rIg`6Vx9jG@_zNUq82%|>a(D}<l
z4ASh$QP4a8RE~`UC||;?Nty|+X11L;NAiNDM4Yh4*^CZ;c1UdnPpLZ0tDU<w_j<nw
z08AKw%`Tb;oY%>{ZS8lvsqxF4brrn)49wGDV?e=i<f@2HwK`|fGb_m*{;46_?N9EN
zM*#M|c4Yu81#JEM-(#$Uh~F`K+doy``Sfp$JP4~Y^#H^xdv`<__+9d{;0>C`BKvB_
z*aJxyY?wYRPh3@&O1;CyoKuQ9#URXk{|EDTs_OS$3X`-1GRQ-ub}H>n#%iAd(3JH|
ze&HkYb8d}`Etv=wuX9nqopL4Z;iv?s`8H^``~=>}9nWUUI+T0HXiZw@G_(<u34oaf
z<H_06Xtc`6DUNxg+|*lpbrnOx8DKcM1Mi2i>~TbUH<lJAkr`4vWv#p<eT>`dW7auD
z4d?m;AY*=diIm-0q0`hQ*er}&Jj>UoJ!=r}g<m*mu5mcU^1=kM(ix-;rqL7}kKgY&
zuxfl2u}eDm+gOW-X(;nTP>wO1RY5;g8rS6zGNlmU{-<Bgs+eo=zp}cpFTkS-RJa9$
zmcvkJv91!D{{7{SqJpH3&p3b&W;La+mrmE<&*ifQmYEAx)M{ggo61*juMWnM&z{~Y
zU5GP;L>im$S$_~*BBZ$3zeO@;(){{`Mh7&ZlWHug2Gzn;(Gy866ggQeW?2-QK7ywD
z7T%KaNe(9xmll5=LXh1F19ni~Lnv;yQXpap-enEmGe;f5>{q3h^9U93V?ljbnf!Mz
z6c1RBhz$9ILJpxkHI{mr&!?yCh0GAjJetMQOA;?#QHe0cDXhO-d${`1C&pB<K=l^2
z<Z-1zp$ceNoOXtQJAR*tpvDk~V(3czS^AcxlK9)g)k@_LsVhUuy4>9KR>`1W%X+um
z0n;Kj{Dq(L@9;RE&`TFJQ#P-w-ATJU{dAvMDnb}|kLFlrZv{CQlw|rPVS;eraX@xl
zs1&VS3>HJwI3qh*NPIg%H(v2_MdO^R?2}i{6O&+Hz5)^UM;=?E86L9bvAB`A^!T(6
z`nj$Ys;vy#mO+bJ+6sHwPKdKQ^tcK>grStX@+d$Ng?MZ*A{S_jlPYE$!cbL4BCnW!
zIsYvp{1hNW4k-m>*=gWY+|6~+uRFg5Q)O*Sga|eVPI#(}+!i?dWjdsVyEvV2OXd^V
zy2sci4p#w(wWsqBwWoRWuAK_oqvo@Iiso<T(Z>c-3tM4_P*s;q(Y*XGX-FvnVQBx$
zlPiC3^WAy_U^aFFXY47C*-5q5)b{jv0<2QWx5BnWAkyqbo%;944{QZch$^opzWl|i
zSxde~==z%S)$vxHuj~X+h!%>=R|YBxjX~qMfD#q`PeRu3jcs7`S`B}GWhy7Be6Y^8
z?XIQOdt)Xn-LXA^hA4LAt_7G~Mh*$3zo5?id3A<tRR!l*rYn_8lna%?PyjSg2nrNM
v0|j~H^8bxk{_mXh;3U)^FM{UcNh>=I9$nY|R&!?ZsB!=nZHf8|=^Fbl&y`mQ

diff --git a/chromiumTabs/src/main/res/drawable-xxhdpi/phone_tab_border.9.png b/chromiumTabs/src/main/res/drawable-xxhdpi/phone_tab_border.9.png
deleted file mode 100644
index bfc0df7e0f21e3ea5364e5e7df6ee561d2b6e310..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 966
zcmeAS@N?(olHy`uVBq!ia0vp^hd`Kv4M<8qlr>~vVD9yFaSW-r_4c--pR}P!L*fpv
zh2hB)qZP_TZFyYpGVb+O3J{1?-91V2y8b41_C;P(PbnGSSC4dZ+)!}8|9EFr(V=wj
z|Ct|O{tsf$*?xP=&74bFTfI&{HL|s{i@FxLcKPz<ci$Z2Ij&P4Tb^;{{=W-b^uN{4
zzxMj;yXiN4vQrYj7~VE~T+gf6Rase?S^vXy{q8+_pJzRdFG-9%z9}i~^qYIrBk!Fp
zog?t}<py!5kWYF|v!6eIt}iDe+5EGnZd&>;cWGx^$!|^_%8NT6MAyB%^38D5?hl!E
zn(JQAIezAStAP09XMP3BOvhxL=Y70gmEPgLM6qQ@;B=0<YMG=rV%<k8_ZlC0!>@Sc
za}ejlb7qFDKTRrDl(#CjJS%SUjy~ezw4-Zg|4n(PjCbtD(MLq4Y!53he+-mmZs!Kd
z`n7aheRp!;fFcIP1_1{S1r`A&4#pM+r-9-&XtqvhX%Ik1SR8a<fBS>_6^bm13aDss
zc!RTbLcGt@qce4rxRS1&mjAz9VA|<a-iMdO3?~Xd)Jn5UtLI4E8g*6RU9O-o=fm(b
zHD~?_97@}~QgP3@=bw#lADN*m*1g{Fwc%&O-_9Jd*N<)vick76G019bY){~svUy+U
zKdrlP92oac@|S(Bnmen!f8Ego9?C!Bp4+6^y=lGhy*BF|*T%fhf<<}1B~CvMu;n~;
zcR~Nm{{l`O$&X@r*8gmmKgC-u_I_{FwT)|xHisJ?{^}Q?^djlnYJSBllNI}Vo}EjG
zTpUrkZ2Q;36{Q9(-%2{9feHCzT=wUMvr}bHKX{*Jo@SA@)0UO5Enwe<H7nOmwl8^X
W<-{@l#vEY&WbkzLb6Mw<&;$Vb)MR7;

diff --git a/chromiumTabs/src/main/res/drawable-xxhdpi/phone_tab_close_button_icon_dark.png b/chromiumTabs/src/main/res/drawable-xxhdpi/phone_tab_close_button_icon_dark.png
deleted file mode 100644
index 9fbe54e94aae0f0b6bb3b5d10ef37546e7797693..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 442
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL1|)l2v+e>ZmSQK*5Dp-y;YjHK@;M7UB8wRq
zbi6^BajEUJl|Vts64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<_&%{^Tl
zLoyoQ&h+JLG7xYJ{m@n<Hf`4zg<T3VpNbP_o5cUnK67BoncGUWwUR1I)4LyA^Z`*O
zgAKzK>xwJ}{#^eldp|5^F9`n<!m#h)*K40#B72(BWLzCh`5c-PtxldcimAKXv3laC
zC5N~Uq`PPs?VRYjlyC0)t!Z}>1Gg|<+;MnuhO$y&+M*2S*^kb+UOX0dbY|}&-n64L
z`@5bT5fv7V6bg?CVY$3tYS+wUv&BlrleM#heB5Fz11GW;t_n0?+sb^s_jqpO%iZ$+
zzHbvlr}V5SdQ@=i_TMv0ehIAow?XUFB#mEd{_dEgVRbz3&MXb9>v4CcX+$0No8uy~
zwzOtWipbi^m^p4DYxmaANfWXB)_XYe|0BLjVaY+v^A?`8U23b7Yr0s-UuwDZRFCuD
iADu6hIbJA}Zff6OV$cy=7#j=>X9iDKKbLh*2~7ZWrnGqg

diff --git a/chromiumTabs/src/main/res/drawable-xxhdpi/phone_tab_close_button_icon_light.png b/chromiumTabs/src/main/res/drawable-xxhdpi/phone_tab_close_button_icon_light.png
deleted file mode 100644
index 05a5741a9cf29067d6694f51ca05c4d86d000873..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 597
zcmV-b0;>IqP)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ00004b3#c}2nYxW
zd<bNS00009a7bBm001e5001e50V3?*i~s-t8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10n$lCK~!jg?b$(U6hRb+@n0P93W6kVvvNJ6*9aa!m*Qp2H3IIv
zfCP2r%5{buLXdIM-8vNMq^kS9A&dH;8K#D=;-jjo-hY}-r_<?lI-SSP7MmlCvl+))
zbYm+Qc#l(j!+y!Y6+FQQyv0-eY`M8r>|(qa#IocjsW;>IbB%H>Vz2P7XgkGod>1FT
z!AHC<+Rw2Yuc}UJxy3WQDB91&&D=Cor4(G_bL|){Vtd2P+$9&WEX(D0$TdFUPi<$d
z&sdgRs1(a~#b~*3DVCo_QF19#tUF}a%B4xMzIs?Hmnua}S=1_*E=63uS1Who2vWor
zvU~h6R3c}^Z&QV`b@$=>6_<jfh_BH1hMAeGP)cEjnF^I6CwknsEK5R{-yvC<szxqN
zieZP!<RrQOS+ZvAzAb$sGtZ@n)ksaG$wiCJg+zueeP{kChzzTtVh@GH%keWitRhaV
zwoJ+ntN(})Ypwl`BDYp-X+fJVw?=Gjm7XfMR4gibq{%H2i_TLia;;)nAu(L8MJzk{
zhRU^wZ4EC7N+LtzLt*ts!e87w{Km_Jwv3QC7gn$ErM8pSXY7~%a+!ImT$WekmCmDo
j@z?2eI-O3Zb3Fb6Ghe&44MK6l00000NkvXXu0mjf+C~iD

diff --git a/chromiumTabs/src/main/res/drawable-xxhdpi/tab_switcher_drawable_background.png b/chromiumTabs/src/main/res/drawable-xxhdpi/tab_switcher_drawable_background.png
deleted file mode 100644
index 4c5fb2472e0fbef64a85478196db8b2d6f2c9661..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 853
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z=y-!L<5JscD}jQNC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NHH)lUGj8s
z45^s&cDAj5h@(i`{f!rx7EMrSotAM$V#7D)&bbX{T5ie7JrBhN{!NzOc#*B~!_q&j
zj=fXEq7q_~O->{iUYD3`UH)ucd6~hS<u<c7zu$TO-CwUXmBR)+Af$27^k?dU1xr>>
zI_G7jw=z5^ezK%$j%Su<m2zh6rQqjxjvtx%l|il1^nv=%n`~i?op<6`<}ikR`n4j3
zQ{tp*I@ga`-+wIr!FK26wmFdr>Yp30C$i6Y`6MDceo5o&Nphu^W=pEvEjwrHF+Cur
z*lGDynF4tW#xE+;&(8bU9ynR{?DK&f-2{uL2B$?IN*`!VdHB(|Z(I7ujWe_=HYt^G
zdi>oZ%zHunhvD(ymUWef;@+xR?q~ef=zIQ*wr@LckWItXiGR0zaxC06btA7#p3#eW
z>KW@cPH<uPJn!cFV_)8PpRs(ua{2C5v*XVGe`9=#*DO%<|C^dp?|04SYqH_ljZJ)&
zujG|}7k|1J+`nt%5w2VDVI}9bD*fIZX!y8s#=i*1YB6Dv11zitj*LD53?wr<M87Ov
z!|}z;!ds}Jd0zj%<6n+*-THK;-|gG;CmqY*SufiURB<j?zW2@flQWk8Gh1dEc7faf
zZyL~n%WS?r6N_UJ3y96qS&`V#Ey}%uZ5Chj*OuH3)zcsB{dQ*09HoLo!fZ#IPX0UQ
zY`sKxd6wYwry&QuMHkL)c;9rxv|(dcJ>LPRQy&Bmai4tNnE5~?w!)98>UQMi15OFs
z^bfqWx_|#<SWEUKxpHt66`lKeO=nur@6f}R-(4={SbwNz^fWGg`X^fH&Vn1iH{8w)
z%sKGV?tsCD8Ica6+*kHITOwrYxAF6Z?*=!0w`t~m?7eep_Ps0C3NO35TAw>>P2(?5
w4t}35`abOSq<NOl?Nra1fRmfSH>>>&7ia8Mjj-;W49o%yp00i_>zopr0P){}82|tP

diff --git a/chromiumTabs/src/main/res/drawable-xxhdpi/tablet_add_tab_button.9.png b/chromiumTabs/src/main/res/drawable-xxhdpi/tablet_add_tab_button.9.png
deleted file mode 100644
index 9d11a9ecb1c1ee978f16c0a4f7a69d618a7b6709..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 991
zcmeAS@N?(olHy`uVBq!ia0vp^^ME*qgAGW|zR#V>z`(rB)5S5Q;?~=_{vE!F67A_b
zlvR}^V;8$zo-)PWwR6M58$C&f{iZC8*pOhzWx6CXAk8q%d81;o^TvdOO_2dXlQSnw
zak-pha$<jV{QJ3|Z)%txy;EKH-p2p$zO>(8tAF{u-<f`H<?8Onrv?UXml#&PlX=7l
zf(mj9attU8Y+^ml6=~b9t-12>rJ||#_UAq27oSDS#qG&CoT|L@w0HcsYOaSzKKs61
z_~6d+^V63lJeoQ`c+HuY*Cm{6?w_dPntJN1#-p{1eYQquKbjczq>km|EX^RjsY_jB
z_jvA`n0PA0d!_M#kmy&7Ja*Q6SnBxK?p{#W6d9v!tUsPE`qQHHw8*-lVq3q`)1XhO
zjk_u?*D5Pd(KJty;r~$L^-{?7)YG;4lbLPATxT{pA4~hm?pUk*S44CAJ%&d&6T7CI
z=8x}s_2}%k-kPO8J5RqA%=~z1LSe7cQ==E&dv{c9>r_(p-~08|qpQE&;sTf4vE6(6
z(j(QMeSu42_WdyOj@^@FrW?58#?x;NTPj}8yQd2@Z!^%`u&yaKU&B^)hkxkZv)E&&
z;^QW;v?fs6<7uXH;m4fBZ+FC7yJGXoy}PHk^;84h)6RHg^IQ?l%2&F9;`v?qDIH2r
z+j=%%dbCvWv5f1f)Em=RK6-RBscXufJMSil>GMkVYXs?)Gj|;4mT|qm`O+G_dnWf!
zxSyILZDh6NsJF8lKhWQQE%v4_o%QIZR@al%zEE+XCVybKnlpE#vug%@idUF@<>>5}
z(m#D>7EQlh2KIQX($i17KCwjrUC8X}HLpr~DbTEA46di{UfwO`U}NnyvFPWs(=w$W
zpZ#*%7rgAw({B@iJ}atj1_s!N`S&&ld4J5|25HQ`a&&dgf~UN$r+6jBfrfnl;uo+a
z#_p$)bIhKL{{8=!00TRB_Lhpw6FZzI7FEhP*xdG;IBEGkuF{WEIbROvP0=(<De(k_
zjUO=3F4*6>e7d{h+N8h5oS;w>2g|UFSSIGFJ@>T9Ug~jV_0^Tvy=MkJ5^e5C@7=dh
zTtsVP-OrWZ_<uh8x$KvQ+4tpl*98D$j%!-&&*}+H#g+W;_x#ZpPo7XPGktyjw=K)9
ztCbm72KrTruYNk;uaT1*XX;l3W(f2w@yB(~{d$3*wO9T!740l|5q59KT42Uy@O1Ta
JS?83{1OR^K;AQ{-

diff --git a/chromiumTabs/src/main/res/drawable-xxhdpi/tablet_tab_background.9.png b/chromiumTabs/src/main/res/drawable-xxhdpi/tablet_tab_background.9.png
deleted file mode 100644
index e2b2c3e7824666cdb7cf369e4e1a4cd4f6cf8b3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2259
zcmW+&3p|ti8+SR&Eh)-ng(6wzQXH3NCAn^MXRb?POEI@J4XKlI855a_W^zgHiaAtR
zVdiX+3Nw+*lulzZ=N~#H=iUGPeBSr{yzle<KHu;AJipKLdr4j%F3O5vMJXvMWrVAv
z4{$FBPQ3gM;7XfSx+Enfe;?s!??-$uqKCNc4LFchoAF%vXx?3xb2Q$^hip)futYu?
z4~6LUJW7+&NkRA>WXg9ZTmomTRmccs!$4~4ijJp)yiV)SU#OBl3a-5A80=T^=Hfmj
zbj#>JA(0S+Q*$drr4|<3W+yzmhqlYix`viJ4<cATcY81_U#qdG?w7ojto}V(y1LtG
zv9Yl+$;rvHUq)+P&YDil>X~Bpcd<h;(HIN{+@fs(VFbQA(MZ}b5Bd7_L)S)DLqkJl
z;^)^K0)cQjB!o8o_U)l_T}kfDgoR8mrHR|o{g#5@gkdU`daLB-@LIXK8p-h3FML`N
zh2r~qS6oYdJ%X9|`40T#NfR0fvm~18#9?eN{Ke%O4Y+afhs*zfkMKH%hK6Li!!a+e
zpDm};sl$qZjj&=enY@7SxJuPRz<Y`M#>RNhm>3Z@AmAQ;-?3MdjL2F&Jw3rOeUjnK
zFl$%sX!19~K<?VuSP_oZZ(O3lIPaW0jSqD0p0J9W`Kg?WE9oID72_?Bsa>B{QdZvD
z#V8~SR$tHeXQ9Agu<^I3&ecp=hBoX<UCHosDogF72XAoja|B$j-)zAjl#k()Z@>=R
z@ibl~4yX!13pb%Fzg9kUMFxqF?Y}_I%X1$XI$YkmIj1$jp%{kHXf#~o=(~4%8tUpD
zPfGi#lL+`Nq9p_ZQOw`}?~flQW;4SyYw<-K%*MthbC`LbWpT$uOH0dcKH||}zHUe;
zd?-7JD#s0Rg-5JLK-b3VeP0lglDJ9I41Yhronc8h6<7G{rd$#U(PuVYU0vO=M}-l-
z`1jv`J1$F;2Je05|9jBR?nPy5t9Ln##>gX<?6Y7@E=}rOt6K(<21x<_&B5Pr?(V~m
z=gvLATc@O^;;eqyMe~}z=ZFT7s`<M60rPj}Od`X>`;r9bFHB<}K6<nmX66b%Wy60T
z<nO<}M1=-myV567C{*eb4SbKQ;EQJ%kw`Q?^}8+@+}2Di(SE#n_wHRWUrp8XMu)C#
zQj@SRLuqYjh#WKE0LeM|GSt;`ji~DBBJ*==%dWAdg*iJqsy{_vS&5zebUDxD9P?*l
zhc(m{zQr#nDk>s%mbA7WpUT}>op;!niU|)F<n#Bddg@-AeD96HOecSNXHZI%S?~LD
zCCPQMf#PmZUIUHr^j`W{P*4yzsncvAZjWrF0<Vr=qT|8hX=(x*J+2E$AZ=HVarF86
zoCAcmODu*HZu#huCW`wZ9VQD;<MMso{0(Vmy1#QZL8js>|9^n{u?IyyTB$i4A$ER%
zfs-&AC>a`Y+Q^VDG`qZt$MN>|Rw(2X+TIB2sR<{4C1ul%0AX*saXS$z!T?l+5L-FG
zAOKW8bh&hn(Dp>&javrg3bAse&MS51>oRI%oW7jSJfnz_AV0%6Lvb-%@lSK-^C)5_
zfG!Zkoc2ahTd&p;E}uDbCi8G8-MEan!qs##L9=Io57PT3!p^g*xq%KlcI<F$revta
zL6N}?<Uj4_U_lV^7?)UL6d~H(?xBwC4%^%Arxl$WZ1{Di$JR-;)<fMHeicVfF9r}n
zUWN-ds=gNxw_EQUMQnL3ef+jG;erYW%w=1j)3QtXU$)y@P3a}<AwaA|Hhr9PCfkL2
zT+Z3qS)IqRPtwRYitv#4H{5SJa}7tnT>M7krV!gdFqQ2CWIqMCM<S6OSUeqHCvjh6
zjAsAz5`K*3@L`i);yQDyKYDxZHyX>=9xuv@Amv@=r*8a$quB?5wpP33`y<)ooJ>+@
z-^j?<QK3-yqRxC#W&J>gH8PG<0-HQ0Nw8a5h;@(@LTYCVMR`vgP#<<gJRP4+^wUy$
znGTygDt=6Pmg_=oJ*^pNn5bc<X#kiAkKb7NkU?0Z`R|Kkn#V>(RrzZCws&^f?Y;q%
zU>+b@J-{eBjAjeMyy!z{cmo*(6nS)X^dE!k1aoV#SNF<8ZlGKIk!Ae#dz<5&X;w(q
z8r3M``0)ylMLiufJH4960cJ442D*!2t|2ihUABZZ1r`BbMtz(UM>`ATbpLG-7Iak-
z+><N(I5BJt5Rb@2vg$o}5=nRYT3Aqk*s3DFhRes)5!RS#Ki*AhF>zKve>aWL?8WNl
zX7{hKAZsx%_I>-8Xg@aOtU_XMr3cSlLf@GM3zA58NWmsJ&w;kJg5Esy;9-E6$?ZFY
zwnd4XLq)J;BmhhlcT`{j9WbDCQ&w*6_ZEufKF?<Ik9zZtUE12(DPx@bIT{cB*^pp`
z=n7wYQz=m3kiB#vc9<2SwR`uf6EJLS&}^PVJ;l(gFxt;B`pArPQ6mwdqpMp>Y153N
zmjOqOH@%5OjKWR3Q(Fnou6=JSCbS(9fHE^OM7>#DNT5P=Re}UD<<;ba!^fzParS}7
zIH8jM<-K|0u^tSVk73=CQ)zFY^r%XD7ZX$C+o}K_=Y)~~kaBO(!cb2W5L2PHQj8)}
zD|s9_6&>TXDv$L*3D*tSUOEYFgM#4zHUzC8iFYN5keN!|tW;8Sc41+mX#-iL^qTqf
z>88fh3Y*GC;$IIO_N4Z0&d;BRNz>99S+YMizK&$5jg+wMD8yHMMFa|E+qV*R0kVF0
zP73q#L8Y(aCtPq&mdb6}w6wH-27~b`EE$E$g`YTqu#HPBU@s`y$Lm3%jYTKY%|Ia2
zLwZELnNo|$vOr*uwYz75M4_NLIXMlUWj5XqXtb%oz(68(Ynl1#Q{mFm(x>(Hq)t)$
z#a@t&wDp{;y}i9{*-hJcdDGsbPis=F%yhaeA35bt1#g-{N2>-B5Zf|oy%QHNC8I)t
QpA{*DlZRu=nXvT#0P})bvj6}9

diff --git a/chromiumTabs/src/main/res/drawable-xxhdpi/tablet_tab_background_selected.9.png b/chromiumTabs/src/main/res/drawable-xxhdpi/tablet_tab_background_selected.9.png
deleted file mode 100644
index ec8e347d526925ed47c800b6a2881d398965f281..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2280
zcmXX|dpwhUAEsW9(<|pOvZoYdPJ5<Tn(;W)gp4uAIixW>&WCAos*t8dnPc3_BjwN(
zB8s9mqB*=T%S6k@OF0jrlHS|r^Zs!kKHuN<y{_xNe&5gi`O#c)_Hr^BGGbz4at>!t
zyMfP2@QRfB4ZN3sk_{IVlX~oM+J->=uneS~_4GR2xB6faT41N7(He#<8<LjwEaZ8n
z#F1BO1beQ(c(Me<&D-At=hSN!^BtLcu9^m=xsHGBxRLQYo+|pIt~s{Ro(qX%#m-(Y
zXFq<k`nXt;(o;FlPZ;jl-oA41Cq6M_K9#!3pWmqcTS4~B*9(fjnyQj!^xJIxjlIsr
z$FG+pCnvXtgoJd#T`CXPH8$?~v$7*d<GjoWXGh0@?pD%oQ4k_J^rWaVXmL=>A}Q6w
z$LAFF`(}7+V<RpqJRDCX61jPKhgw@&+-tKVUbhM~;+XAoxw*OGoNjWmT{(@Vte(-v
z?;jjABITSM9T~aDe@<}%?%Z(;5g)&_G3Ts0o(FAiX>md_%rt56BQDLYL7!fxeG;n9
zd}xhWc#|XV;nM@!;1m=UQ3?mQo|_$`!PQN$SZwrTCKCvYiSb%KKt4rT7z<8JOjIHt
z7qMQH@d)1D)UUhWHWp@Q??<uT7?w)61YygkB6--(`SC{oAJQoyRO(Ex95?#BZt5#F
zMMV*mtRrFxS~Df(A>-rYlMCGF6*)<=MeMY-VmZZ<27e1Y%FiEuK|ORWrgvEe*6{?I
z5!d0jIx#KEHDbxWIp{U@^J7OsUz;$<j8j@#+OBEJpuQJohWhp8{~i+^8A({ixw|ti
zE%BOk%@PXDENG#M!xEB`eS$c<z`(o9>=)@j(J<z@?CflvCle)LZ<Dcs!J=m8;O2DC
z!O0sr&_5cstdq59p>pYw><aTZVP9LD8CU=O`}OtpbWY>4IIXYjR#sNliPSfiD3nlL
zgft-M<>$MwVYjHM$yb@rWMpI(O#IsK4RJW;SPUn(Y+@;t2kT@mOVIjgp(RE{2+`f$
zls`GyfWBE-2`d`h>&sO&u)2`aRLGj?TcFeFb~^>8R#q$KBBW_FDruDu+~_(Y+L^u(
zkq{pKMc%8?4-d$YP4xA@^aecndV&^eWrN4#Y1Glw*w~RKVNg=1u#d$$PI5Vm*_fct
zzP&w=Fh5i`Iy#!CDqp3yC6-c!8JKavC`)f{Z~wYiU%&8dWhI*XC6Pj@<8ryx;^N{&
z9^de&h(q%5_5EO#N`q=?Q97yHD<2awI-H%Ie`=)I3Cl7~h~?n)eJ~E_tX0bI4p4zW
z+7R*Fem7d^;sDQm6MYJU*>!KTH*mnr_{7YErQ=LSjpDFB)XURzkFHd*W8n*6=$3A?
zwfkkoqNayuz2QzrVOFfA(tUITqeda74TZhpv};iS@?Osw*r|0#kX&v*!a)Ks_MW|!
z+IYaQlX_Gy3h;!c<Oaa|*z6j;3*-H^Hy(QRhOV{PRS>}XX-e~m(1;QrvZP-y2CmJ2
z2I-%8@l1ObgM--B13cL|ZojcojKDQyNkVC?|8?%OD+tnXnHN0fxCqj#)P=$ZIZ>}o
zQ<`rHnYMVRqNa<VDe;buj>XymfMEr7WkCImkw-7Tn%l3vw-hX3ft1$YfBZPZWMnJH
zSUURF({I{LqkZ&5n*-GA2-1wgQyj#x6RGl)0M)z^0FRk$GxAq_h=X7;7enY*i$O%0
zJACHi-`{RgGny(8q>Yiq*^!YE>KQuPM_oiVnEA22%FzGq*m=M(i%NhdSU*AgNQr7u
zbKPreYg6b`ye~q02uHeSA^07;oJq$IDa~oS0+Aim2K<0q2uHFDhjVcm#y?^*j8wt>
zs4lD-DE-|Rn5yw6!ifl&M=u14L{6u3N7K2fx0KllV3xy`Am-R5Aa!R=Aj5u+o<NC;
zcfNh=3iR;!YT(hk+f!M+hW*0yc83#n_X)JEfk+zYP4+UI(ySw7-XGvyGHhfRDdr<c
z;-&6zHN@^>@Cs<tPyzD3e~K+@Ck^JRKJ_v!B^uam_TTrdsiE<COhTM}(t?4_jsZ9x
zU_5?AqJ>RSlesqmo}jwV_3y=54u^9fI}qSFV^kiO*P$TF719>vcU96UsFNaF*OzV~
zhPsfkem`(qyko(!{PWLOheFv^xH)ams8V;w|6h=gap@jOV2Z_3d6ee;1Pv9z-<n!5
z1eBq5L*wch&ijhe0s_1o!AGbx5}@z01K_Ju9i|LGV9-nhXU?k*Rh(a33~5;m9%T_b
z$b)zC@zCl-o!P5)K;#`T52t_TpeIy7l{RtR@%{(b?Teb^kR3QPKTJJ6DvL&G7J$N$
z$DX2-|C5EDh!wrB3a%O8!9G*g`CTa+a*Yf*RhP%~A7H;clgT8H^<T?Xd*s!t=PR9Z
z-VKN>1tlg`7z@E~SVRqV^_?JR=RtLk-YvTZMjyUFlK|J$<^NUKKy`p=YF0Cvp_hQp
zi1EhA%!Ob()~LaZaXo$c-GASe+<e54Q#8>-q2ew01Z<BZPdRfDL`+`3P=p|*m_EcA
zpS*|L@&!F>WnG~(kAt3<j;!#zA_%}z5w)c#E+N4b$hAY(;<g<3K~h5+p(`Q#YqfOQ
zI#dz_)Xn&{x7u0Du-uPVa+J?si2|0Iz}`O`Jzo2O-}|0Pyx1cVAT%NyJa2Dr2N0zB
zt1Tu7#CMo+7_JlnTc4L=RU*^F!mi`GtEQI(-IbOp>(eaK15v&XU%TzKDGGI{>BXJ!
zTuW(lF|{?)=cl&Gw{Hsta)Kj)fuCwCDk|K(`D0`Eap%sB3|Sn$FWRwIsCYXxWE_+?
zZD(U6dtGYpC~VK>@>Wlt!m`c@T{E*S*+S_Zd1L?QvwQN=2c}#86?-5WX^(yuIkDbR
z+;1Ot$Y{JG{^woljn-E?Zhn4#hAr)vKb}s!hw0H|rKP2<1U_|ANVuXLdoZtCb&C30
r%lscDCmuqE)m(lZH1h2%UWYrp@J5h;cM{+UM$F+1?sTK=`K$i}pYU<m

diff --git a/chromiumTabs/src/main/res/drawable-xxhdpi/tablet_tab_close_button_icon_dark.png b/chromiumTabs/src/main/res/drawable-xxhdpi/tablet_tab_close_button_icon_dark.png
deleted file mode 100644
index aaed239f0b27bfa1c7fc9853a4a6758950c49786..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 695
zcmV;o0!aOdP)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ00004b3#c}2nYxW
zd<bNS00009a7bBm001mY001mY0i`{bsQ>@~8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10yIfPK~!jg?U_N2(=Zf<f77yRbB8Kta1M|gAXFmJZny>PD7)bp
zGtvmjt>6egfPIEs!rd{{EWoIgOviTKivamsrpdFv<kfl40Sbjep-?Ck{%VXdYpwO1
zdmOFx+!(XYx%OG=1;&^ifc<j0{A8_to-=3+N~zgmvA6}WH^$tgUN2Hk{wekT?9f37
zv5``KO&$0eN~zguwYn2RY|ajUY?|g>Y>a3zYwauVz4{}75Xw2XZQJ%CHr6$?*7K^W
z?!EWjz*wD>avu{XIu-lA|15;KzdY`}@2Ju;q~DMffP-`HOKhy9R8&gM>bk!5-fxEn
z9+Q@jq~EXD$K&yJN>(I^g$Yp0QA+_CVqqdwavV}XrdXKJSUD~!V1!thSgstW6fjZ@
z$dlui0tm!_G`T6H03tCUPOk6!(-cwwp&0OF)u4bMFZ7|`D61EMSPXdb$qhmJqypq(
zK$0Ab6u=|~M9Hy90U7;R3a8WQ>W!<aitWa-rQ(&<?;MtX4q#e5BBcT>a{ujePxc>+
zXcD)5-*32^)c{#Z6<bkoHmm256v3%w(iC!|+m_tgk6Uh3qdB&q<&?|b8lbAux#Y4o
zbEsPn4!Pv*H?Dq)S}s~_iq4l(F8T#s*Y(RGDItWSs?xiz`{tZ`6RMO8)&O3_#)=k`
zQtpKimmdWV)TL0{whxa~D7)Bwdmv-+u-3ly-rs<^pSnoPUDGrlIL7&nf8oPlp-?Ck
d3WdUSd<S$q3-jprB#Zz6002ovPDHLkV1li9KHUHS

diff --git a/chromiumTabs/src/main/res/drawable-xxhdpi/tablet_tab_close_button_icon_light.png b/chromiumTabs/src/main/res/drawable-xxhdpi/tablet_tab_close_button_icon_light.png
deleted file mode 100644
index e3e566b1553a9bc05c07ec467aac434830546172..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ00004b3#c}2nYxW
zd<bNS00009a7bBm001mY001mY0i`{bsQ>@~8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10trb(K~!jg?U_q%+b|G7pYl0?mpX!dnjmlm)ZS$0BeXk>cF7UE
zOo5<)93;1~ui!f*DZ7Z>5~-q))Qr#;d`o?XeBzj%ksy=FWHOmd=C4LX<|1-7!Z>Fl
zGEcepBw;WCHo*7wdVQWUXb5fFo&vYPMntY-?=NC5K1kKxq5HBd7pv9kDR$sK+O|F2
zZnxing?IQyM81Z`2o`Ia=96=-?V1O$6p`o9SbZE){0^wzo-2x?s_S|a5+^tnr_<@f
zVZgUkD5a&Bet$>-_s+S;&{$Eacu0|3VA(bBkhFX!{eHy;KF4H5l$bXGRXJ@bND%WT
zq9SJ@1&Lzbga*l3Nx=XyZ(>PumQpZK4ASJRr9eRp;^fAV0wpmBlbcK?KgN&(MKS2F
z8hEWx=sBlWy@0Y9e7JI5sIJrzbuoyNGm!!#F$j_~lY)ePERx;_SC*yOgSAY>_jW%Y
zlYS2DHjfagBPMeH?RKyB8~dn91eUYeY=LpJdPK9N3aTh9n^hmJA~>o{8beN_ZAq&A
ztmTF_nu7{jOSvJh22`qaE4kE{IjXIPg<Q((H<Nx!TP|2^jLuh6F8B|6x7%IPE!Cn_
zrB_w;0$lOCO7WTR_xp>`SW&6iG|d<1od4y+r1j`pxuPhfuInZ=M)c<4$(i<3zFe$S
mGXKJdzf2~R$z(E_@%RbvYtN#pMIoL50000<MNUMnLSTZ;ej)S#

diff --git a/chromiumTabs/src/main/res/drawable-xxxhdpi/phone_tab_background.9.png b/chromiumTabs/src/main/res/drawable-xxxhdpi/phone_tab_background.9.png
deleted file mode 100644
index 3c94a8b51dcefd86b068e0f8bc81aa8203b5f969..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8467
zcmeHtc{tQ>)c0U8mSJX)HO$y|`Po`5V`j3IEy)&B6j`#QC}|kmAlaAfL=?l2>|tb?
zlE{{lEFnv&kc=?zm*4X)f4|Qk&--52^T%9s%{}*W?$0^jbI#|SZ=98dF_cq;69fW5
zO--;iAP^Jr-~(X;M!xTK$ALhSA5F1n+mMgnrzYzz_GFX?a7g<wC8G0G+&Y<~SWifD
zyb?_|%o}9yK;N`(udJwuZ-2_}51zQkma{?$8{`VI{mmuRv~oRbO6PpN+M8$)Zj`k)
zRK@G@ouFG+-yVPO;#Bo~@khdTN4RF+_N_(Qo97<9lx82-GC+W;-x6m)AQT7$V*-Uk
zKp-q24KoM?2Z2Z+kRka0`mb#5P~7}ec5KnB1c(DH;;|ZP-Vn^^x%-|}6+nuB$c}9b
zyr5l$#6UC&i7rv{vQp8$%o9_+1TslkWx7F#ghw$CE#V$ZaT-ln!N1vUNc=^w@ughs
zzYe+l+GwKSDJb*Zt{^@9PXcY`Ta5HA3@4Uy6=7fh>xW%rhXuCUy)mk`Lg+Cn(wA9i
zdN=q{Ey38m>jO04enwY%H08xI!v6Gz#N^MuBh+A=`;&Dc#h6-~30q;Gv`)&R!Q)w8
z`Vue6MC&BH4|a?@r7PW?@*)mlZwm?=Aeg-L3;XmwfwpvC;B=wTPATOK5=P}T#oq@x
z4s_Hkzt^7^Jw1Oqh2zQ@Uv2@MIk$>}GAin93U%wT37)2iuK;-sbc}8GX>KwkQ7?q0
zk~76(OfEG>8-k}(!H$*T`b_CL1oATPwRIh>bv<}<svVg-1$UN5MS&aM^|&7&IwC_M
zfy@Z>ED=KGhp!Ub1A5Ik_pas2B>hXH^U3DL^)~jlkX-4=?+WHcvf+*!YFhht&jt;)
zA`?F;YRuMqJ+c&&L8o_Hr5T-toJ*yCjK{+{zF|S+URUoedfz=KnZ^W@=lYJr@~@DB
zFYBTx%EB<}`AoxU#UknO-5N%&NMgt6PjBe{1EV#ulveDxu3P(W8}ewWH3EB<TT3B5
zO5OeDkdBVMoUo5y%fXF?IRQB)b~hfodTo(q?*+?D3qHhq{T@m+HAOUw1uBe2SvexP
zFCO)I{Tlxrr*6j_ATWe5++FP$2i6qo?CeGwq%W}RH5<FLjQpAUdeer_Sd}CnBOl#l
zL#m9*gvC_x#L&Va<A%(1Zs4RgdS7p$&Yn$L67J_q<v%>MFqCLAa{7*ogjU3SDk+e3
zS>Ci*HtKGxr<sPmC|p@F;-lSAVxmfseE6;!qm?t!z;F9@T2hZcAyWcMyOaW@CHv{s
zB&C`JnqrS*k9|7tpfGQ=?Sh7o$t71_heK{rMC@&ub!?>pp_kPdnCM=DU-5@55ju;5
zc-1^I1#0oVb#V2ObgDDr&yjBbiaMJmzOJ*0<dS?Ee(VCPH<I|#3tt7k?qgCU0|?Jh
z_ujufGMIZ;Ia~_KE4c2K!ck_+QhVBLodgKqR71H;E3@M3QekO~@1^1M?N}#QRU^Wr
zq}78CQ2V^gE0}Zd^U{bhL32JO**G-tj62KlpZvZY((_bvDKpgTS$`a-7V`eZqnoer
z(<1$NGIpp@CY?7X)=bisb)MN%ixJCtmf>0as{FF9cwk9#8rR~n6u)B$_ZrJYNLs1p
z(($OQml!=8T6A&^Pw#6<p5)*b92N|P-~WIRQHmH>l&l5?GR+SdXzx#KCJE+*D(0L+
zmUA7K(uhcJ-?JBOb}x|+1aQOxD3X+-##itUHH7LEC5aIz+69*9&7Jlf^OfOEtm$AF
zV@FMkF|oZ7Q>gQ&uQd;P`~uAqtF2q+r$3H;n&vFhEE#xg{=f#Lqw25NIv!P4j2v#m
zzj=C~6B*l7Lseo9c%58yS5)4WN&4Wi+EI5KA)NBwd;)4{IR#&L&n(BvChxW;X{D@4
z#~*-GEEDYvxfY%5C%E8*QxP6r6HZ@bT}4HHKcC+DS>`&&b7@#3(X2AOo;BSLlyqc&
zeNdFqJoMA;k);HKt}19$@OJ$^4V+5&Q!8tekG+OHw3vCD5X~ysaHh5I&E$r7M-BV&
zBk!ILaN5~`6RO$FoQwk0#Tp|6IZ7Q29a&3-JKs^5byIxl2MF$MI2`QUqdIu&c6IVs
zuG?t$#B)23&8P1@O|X@-7O_TH^EC6%9T|?J80m^!g<QJ{^I&i09@e%NlT7-6ax6bj
z-Fj+@|K?TXr)rhfS$u}M?0lyb8YI`6q_p?j)qDR}%}zq`hp*7R9#ysIHfNd=N;G{~
zN8DR-45ym>m6I6Kf{d;=(-p9T^mW~`Za>kamMc2yt{&t<xn4=kI6^I{jL;R-wHM}o
zFa6WM0UD&?#FWQ1sb32?Ck9vXhrZr@udMe*E`#eaG&VWLXE&A7oe-I{o&+?HHFq=r
z@YcI#pJ;!LN!2?|$jD(39j~o6u?(p1^mVSpi_rNS5h2*13a~|#u;EAM9aEU$$92<z
zj?ryb4yb|lADz~=v4!u-Kls<rrD$0!=f3UuYs>pYzeLlee?B<@X^Qkk>H&fW^vnAS
zCZ?d<JPyQ8JI@5?hM~Q+tR@lh2oqzhIU+<lm-UT7-m|}3-zRq#)Clyo^1^#NyoH2)
zx?Gl;>;AXZnvVTOUyxE?oAy_&6E$PE2lnR#JGT38LxYWU^9OjupU`FszIiSmO;jnV
ztz<?CA&KKJB5(~+Ydnai;BfHb-vkeX?U~4q_MqiqhLua_&idE|*S%kllJs}}TCjPr
z(PlnNMz#i1aHGLB;SjcXJk6^p$V~n^M-QLTpO_JJz)5-2ncRq<AD(#>?u``gZ%(Jf
zD97(^eehst)_hktvCtq*Vq;&v8xBdWsK@cM_a#(ulJHdDV&t=k;Y=%iLExTW&di8%
z?0)kw2o2p5?3PG}Qf}X+FJuuy{!9f=zjjZ)%C_uz&D$lphBM|3XRi-0oJz#Zee^1N
zE|dO%)Jy&OaHQPQb$2d7ZQr38B>Lj~W=BIqLqUH-oH*3j{BHxvtdfX}?M*v0327qE
zjwQfceu__5oc(1(WcVu|zCAZ>Lw)fz;ck@@oE>Y~WN&4g;)Dw;M?F^ks>vruXnI4`
zgPR@+9mi2SlhgZK1`53R6T3U_JN762>o?uA1?Qcx<nz=L%$M^g^y<e^LM<XqjT8}*
zlTng{uK!G&TKo3gA2XJ0o-EaiJ7K}~o4>k_So`{aY6KjM%qQ9Qt25V%?>forE53Jx
zmYy@}d+9avspj7A$_|?&otq&)Ui{gwYmL5p;*-8bImxk-I9Ycd{YhLT@Q!CjL9YFA
z`2FK5qdL;n18j2&#dKF@1N!EOB_kmf^ti82g0Oojn1%l98^5)$9VM;!SGHRzR{gTm
z(&OF+tL0Lw9B8Sz+eQbtAbZ-#7SXwxJ+|LBb%XzFmqLlI63r4e))0IBBXtV~SC%9W
zHw;m`l69v<J*(Lkf22CM-=!0jIPiDgcrjdC8sm2CSeISU`kMN>{-Gqu>G&dT3Ekwl
zqFavg1{yntv!z2BW1YJxihk@&BknGLr!Y4I&imI<6lqDRTlwN<dtS6Wz`95?C(+<C
zy5V%gP~@y$agd)R88|E3fGifiT=#X_RV7TLigWG-QCCyEMUVe0nEV%vRiEp&^0jh4
zp`BBB<f$)L{`Y<6?2b$KtQA0j!h5O(PrdscGrnbYO3(J>=@UWtHbrBT3wB`458loE
zgZX7+op(*Qt875BDnyS~mt;FuOhc?!R(~(|{kS5@2z|J-1a?SA!X%64HEHBD6~6S)
zq2K~%XDROI-S=DtD|axyq4FKh<2iiJg?c*g<cQv+B4y$#CyEp~7etWUTQkh#?KXE`
zzF0ihFr=&|&x#*Lg%sE7rGJ)qt(H}G9KDlI3@I$yT(i<wmnBA6nvaU-cthizHX@XC
z;=UX#Q9N97Y*IX4C(-E!5y|r9BTG=_<~CqHL~pkEnN}7{?w-Fa%i00H`pFH^i<a-&
zOZmf16K2YQyB}TSPgl+Aaq4{@@oPx5_dSojz!?kh`v?5!Q^!Vi<W-M~>J=`sJZmdC
zT#=zJr|WwB^hX_a@zB7fk4y*tLXtRMq^qX{XYaYDPZ?8TQo9uzS@W+<T5mX1gY-}X
z91nsgF}xmwXY1K|u@nrvehv0%=tfZetrX=c3EiV?Jr@>Pupk&(Th4^#%gC%g`uk;v
zRmd_l^w!o$26hOBz8AFlpewHU<!tv*ZCBCuvZh4#f>s&mj3c<_$_=8fx`ly%p#{%T
z)jYA5M_-?CpzIC7f7wYhi$sW*T+I5P=mPGI2s&YZ)r={-9^&%j4myYLltV~x#gF+R
za)wmtNqUON!9^lj;qz(_dL@cqS#l3BMqCRPpofR}1-+1TQBKggKaw<-?t)50>6(E1
z1*kV!aQ;qcFnt6;k1H+*<Pt!ENJXox*YLZxv-4KVPvXWe5|JHtr@>NcY0t6#9<w~?
z?@LQ|!Kc1`kR<A4FsomKw+Ul^`n;EFU=u?Q5L)Ui!P7`$4>nm^9SeSb68tOHvjpPu
z&4R0~>=1wQxA`IZH^_1vQ!s}kO6bOu`w+HI$R$4X{z!V6PK+vyDLe+EYWrF2giVwA
zkQ{L}4&RKb*s};Q1^*g*mkOyCJ1WB*4yltW)q>9-Y_SyjAO})i0-1BWp#^UvA0F~O
z1~T{M29{!kA{p2loCf#wyB{cLu&nMFN@#~g3rmrPr{8<%Qvn%1N_-y&k|b6OmbQWu
zNceAR8E|SU&i}$JwfPt-#Q5+DJ9!d@-i;7J*)zdEVZb2Zur(xcj32%K76u2|XF|+=
zK;cvo(u{rZKR>yF5kv5=tk)zw3l=7k*SdZ%37h;vC*9zbF_;fVwLC;^HyuI(=pIUv
z83nLBEI{;tp8(^7!<gUz0R+ZDz#tZ&ga^}rL4Y3q_vHUlG>DHO4M45n{}l~Yl|#1v
z+bI5jctk$_FGqq^KMK#wU3leCP_RIEa4A^0`LDlK3w|-XTzw%=iZ}qHK6;jyx1f3G
zN6K5p*X7|=NszVt1><L@bo*aoLHIaSNYko{!O9&dys8Lt4{#lTM*_YorHCgznnT%9
zAx?*GYw{$FI(3m3Mf5WTvwJlAqT#1>`puuUod$#8K`(&VsiTY{PPP<a!52)yIs<_l
z%qZQH{d~`y0pA0KJ1^bo`M`?xzw!PN2_KF9NmG`)dVCB<bvledpS?&kw(l|GfFFcW
zp;HFmVDMAw{V6e!g8YRZ2bTjE-Qx1|@_SJ)l<x5FOeCtQcGUq(!NSFa<cSh*0|_{A
z(qNrd|7{d#2u7t>UpVCgr|w;>5k?VNu#_8ctng;sj1>;t*P0vA3>p51&+p%O{Ld-1
zl!Teu>ezIwzh@DoU35nnexLs^ju{6(Xp|;CdI%W~#Rz^0#T?2xcM>D`@+8I@Y^;Q8
zs$4~5u>MEk_xY&%5vZo;lEm#dSOoP|*UKBrs({<YCa=NfdEe%9qez41^QfkqMUX8%
zY9P+v91VUR`_<wq@1P9)jU`80^<k9xT`edL?`HpMp)H=*kMrk(D_es90{LAi5QBLK
z^|IrN?mRhjpb7M<#)mjbBD)gr+o_Z(#Wg;vK5C*F;x%}tUcBI>b(8I_h56*e?Cj&a
zchbc1$Q$IZG9)}2&fRQ2gh1cRnwj+vl%JBBSlNFz(wPlJ4U@<@u8T<~!H@^+@KaVH
z{?)R?;$R2~ABzIgk4g4VGBit`eBK+x3+aau8nMXol}j#W2S{4P*?O=P7P#|2HsCU;
zQu;;W%UQ^BZP%+}r5ntLnL>bma-q<PBM%;ktA0W@Jz8(;Mm5IEDG+P3UhiOsP8_$r
z6TSI5&+zbGdA!_vSL()(66J~GSL!msvPwknJE|EMU5^{xnJiehwA+`@6H|O~JV<|l
z<4}@PdMEw0D8_&%a&EVK==(+9ma_G?R;wDq04b#I6Cu?#Vn`L}{U3ua$brI~roh^N
z@oO`&yW@z;7iuAN7HvQNxw7<I54dent=?#ht@dWtYctEU^EZe}lmDUf1}k6vArby0
z`jxsI$QFXiP$SmL#jZyL_*z(f61O?XY^^4bcnz?dMa~t=#gK}O*|gwyJ!W1Nw~7e%
zoAsG=G+(JYRPi!Jq{5eLLGV=!cRa5xTTe5v9l8Tj&4u#R(@GiS*lCD;Tjtd3O4$3|
zp}-Ch1#g2-vidsyP8ELoFhXpRro1eX2}n7%o%b<Y0T$}+p-ZoyjUKStGp3-CFO@az
zJ6U>+AJ0a}zQwybkYQY1F_0dw!C+Kol;_^P03h*p6*zU|0_!0gHe=2fC+u$&8oae*
zNfNMQachW<;fasK7eRVIsjr>X8+8`AyZft;0Tc?Cf3;5Utwl0bMzoI@xn1Yyqk`a@
z0~|Xps2AiqJ^t9<UwvNf&DVDK|NiKxJea;w$k<h@%k5q^_7qojM)ebN0+$jVCFBWx
z^n`Qk8J*bDM+3sRs49^;+mEB`{ifT==2@zHE)JlPOLiNK8!mrmORaphU}`B-W4hWc
zw1%O^u%MvtxS`-X6%C32&l+GLLUwgJ=mXOVQ2dFz+q1ER5!0C<V3oJl&<PdITTY&J
zD4~sQ=V_K8%mvmm2Xxzop94wbhcvtNRQQ00-74eeAY<>>!w|nBZBd~*5n5yP5dmt!
z6B2%q7V*m>rZ-kmj<l{)@=v*CVf%KEpzH244JPd@0OXY<Cnu-D=yOH^<`qFUOG7-d
z-EM3>p(K3m2*wSd!zv{q@k?)7f3*J{&vLy-XJ26U5#KP_T-5q(Dp`O~^yL7`A<AFs
zhvsqW^FqtXCs_l|Cx4bugg*G9P~v9Iwvj>gS>8^1%{Ec>z38^D2SPV9AE5{(jkFp)
zA2akdIRiFFP*IpK^@>7uxJ|2&*d_Z<vN=B_?){{)6T+5<%NW&B;lHmmbTPgdON4Fy
znK~nRo&6}+4-P&4g47CMj)lqyBxY{h@*ILn8^MHC5_OeGgBAcKrz@0Xa<>ah4kl&2
zVC?^8{7SRbrw?v8kq%7kf*&7K<*WZFng~m@|M?tBcy|<@7&!}+<<1$EsT7CURA`CX
z$Br0zD-n-9Bi>D@&{iX9=;lC^Era{|-`;BEEnNC6^U%OXi%{#|{wA;Eiaz5~0=-6T
zfUtgj|8Ke45BeX8?t3>g-(S5QmZ{Uy_F;jn>gRF0Jh?EwD!^<yXn(5wj>+$om4)Bc
zF)rV|Ru-yzUA}p((W}|iZfV^vu6!rglA|a3fTW)}05(I&53sJQ6c;~ZLfOyV;QLoE
zlU+yN2?>`@_LUQ1i#kB{5B4@#V)`F6=ivEn*g`V+mm>`KMieEQw;P)D{HNFWrg<Vz
z5!@|Y_WF4j)@gU4(iBwQMV>u|un#h?Xb`b4^N<-o4L<20klsLAzl}c2X56J0S${q~
z%3l_OB*O~0ZJLH)m{be`o7!#uP}${eH?mGaA?!;nn+rFT5pAVY`ztGlk#>nS84RqD
zyw19(o5%Civ`ABs));lmO-tPrD8!13v;rm%&u~w!;hwuzBK2WK@-2_W6{piG3fN<(
z`1I#JBBj?)xze~$-g(117k9P_RWx@!x-ti&Pj49Hl0kFIlGV%)+{+_l%w`rN5JDQF
z_GP}s83NRa^VICyXc6%&_v8nenRe^}t@32pF!$^kH0QOy@~@E`C^J+XYEd|aLz=Os
z=0320w<1>#qvtD-!+5C9Vxkn@1WmVN3Q&^I=TS73gvR#0VI9AzMM0qKx1JVhsmZ^R
ze9JxjZWzGBj{VxL<c5S{&e;%q8EJ+2%cMXPA}Q6Rgml}?o%vPAU%9%g9Re$h&K2bo
z+vWodd)aVJE)$?KD*)817XOLJ0h`^3z+Gjj1TYtdE2AR!q#8+P8Z>rVtVm^~GsIZQ
zMpwAoUoj0pIvtC^6%>+u{LQ9!KU94%5MNmgYFIeuy`N+YwsK+>d&(VSju2{*sV59b
zQ|wR^%SWuufpXdM)FH0x0$nNb{DH@$kIxfzGvelg&?2bZyx~R(Zz=8FwBmxxUw|sM
zRJ4F$9_yzxU)CO}k^~d{n@phK6JQ54SGp(rf^83x<eZHl0{hGZ7u79@o5P|-+%~dl
zjoG-4NgHUl$Z<Q*o!egqa~UkGOx?akm}qiQkmbxwstjf2S;TXG^tJO=xq|mI(7reQ
z<(-iArLdmlek8}7r)<1@g5!fYAH$vY4dc4g1WnD|w&lLwX|H_)Wk^v2r;t>{xHC{A
z4u@n)11JI2-O8o6;>h&F4Q7kaAguX$1xt|{(dk|@Cga~E6gBq_5bux)KWXg43eD);
z*UIet2vFApRNOAGTSH_N=9QwQW1M+n|1q7flV1ROAZJ!{2Un%WEqr$V#NJ5&npZgl
zb5K}iI8Mg@yND@%0ZXAh#aD5AIpM;L<jIJVLp-r)EU?~lfkI<*r!^M5?+bHyImnpn
zkQ<#Yw#vG_@q^FMSIJWtAxXUGEO0*sy;^|2cGC)B)NUqE=1&zW5i5}_kq&gI4=ntj
z8|X#HFe0ryrfYT=3K_p$5uM58qG5c91F(faD%$yIeH73ZQ;kU#3p7o4w|=dM63uS^
zp<k2M_Tci!peTV%Zv<OSa^}Q?$8Es<$>?j96|zxHSNJb*H1n4no)>66Pj9Dz&sD~@
zU0+ky+&gKs*Rv?W*s1Yl$^ct^<opQbfKgSeICtEEE}7LwRYeYDmJvTD9m9`RjZ0PD
z3CyC2c)V$Jd73f#Z2qhPqu+qB+94f2tX$+L095c#)Ueq(g8NgcLt|*)Xh2p|ZlD7o
z8E85hh13`uUHLL@_R=7G%;od8(?Ex8II=RlJ)^V56i>!cD!4O|QPR;lLS{soOaR4L
z1a;1=Qv15X{Nm{^9SW6W`JDKN2QXxy%^@lZquo{rtSKUF81~R+XXQ(1M$EL=E_rbp
z(K#wjIfAl};XWc@bS(o`22|R!FlP}emq=%hlN}Yt#uGDo2^hO)w>PHaK-y=Sy`_k_
zD?^S)x#31<Ih%z7kEes*$#KE2>Chctb`)DBvERvISTS)suvWE#$IZYPcM5H#NG2*1
zFo5)Vt2C^VPW%~pH?K!_uIxbLacs8_f`50u^Rw16*;|GPbkM3`JEc|#j42NWi$uK?
z4Xa!xG+LFD7dt9I+NR9j3dCZKi8xq{NwIWHrerS!<GvzngL%HwdOc#X!-whH#b*UA
znWzb<@ck5{v)p0Ci8x)Xww~MS<MWY!1%38an0%gs#~s0L?v%!_2Eq6Fy)Fx(NLOBC
z+|%kjr|P`|rb&w(%D^@wE-mAzCPyPr(@P|=TNp7^ZZ>YUqDH?)CVW7UYA?LWafu`p
zL%Z~_3-<8xktem@!9&}E@XpWBr9x2vp=gS-f-(kys>{1d(8^(ahOXp_$`SJ+mn!&g
zp&;-NFYc44U+@Wb_9o!VjqGi?vB<g;iT4~53FlbV0q<rG=|@D8oL?wcuIc2zBH?vP
z4f#>I@0Q9ZcIDKFl?rS`xI>ait_GI!_%aNhSO}q^v6^8hNiI0RI{uS={{QpEf&cyP
kfUGLf7Y={uzO^fH{o3<}{Nht5fOic*rZ}KAZ-giQ4_x@^h5!Hn

diff --git a/chromiumTabs/src/main/res/drawable-xxxhdpi/phone_tab_border.9.png b/chromiumTabs/src/main/res/drawable-xxxhdpi/phone_tab_border.9.png
deleted file mode 100644
index 2ac893ba7f159ad97fa929621b07876638c7952a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1352
zcmeAS@N?(olHy`uVBq!ia0y~yU}OSe4mO~OsQ=9X1_oAsPZ!6Kid%2*c;*Q^iZndT
zdElg@Y<REXr40+;L4|{j69f|{3g7UwIl*21&~w`CsuQ{4w>aBa1;p>G+p=nEbPK)r
zFW+_eqTv78ulV`c|LQ0A|E!7Ybz7WeAQ5smZ~LwtJ64=Kf4<jndrp#hvU_rPa(Z(4
z_nR(%mhCr~eRfsd{`U>NmJeQjt-6|G^z*O4ny}Sb7BW^Y$y~E;yu9%?p6g)I&Od<@
zviDuMZleD3(&NZq6?5$F86Uf|F7kcan-?dm(#zNJB^|GqYFgoH%rw{U`RAukpEBEf
zHXgp5w_SdjZJufJgm}p}Eek5GC!G4U?P}KD!Z`&ylG-nufBAm)c1yOi!Cb%D+nMBL
z6{jfg+xXmCj-R>AX@b3M$8E-Nrht1>9qVQbSl6qvd|b2fV{xN<A8*$ltsV2<|4Q0;
zqfH^s=EQtH3q6hSTOTi1-9P^LqZ!Lbu^_Rg@IJ0CzJsr;?k9gYSL_HE+N{p%FDp7l
z`|hv(E56&7)eAQrd(S6ht)=m+>w(4pyDh#PQt$ch6o&+?`zqZrd#*T>0Fxqvq5z3h
z3xfcY0|$d5!;oh@c;CK2h(zDx4XzLOXEqCPFmf~sFgP)AFe<P#3`@obe&-2xfvNK?
z%797f#>Y3(|IJwL=9LRK`7Qr^C(v={rM~@ZzVE&MI@j4ig6ETVldwCh>wT#`D<Ns}
zV#bvA2dfu1Ez0NJclEcOT>o~(8Rwr@ay<I>p!0Flr!BYNw*OqGFV>yQv1-Zv_s<P8
zRLf<gr#yc1=1tzMxB6e_9Y5EutvJJPdH6c6OEpC$0evM)|LfiVcr$04bd!M$-|X!i
z?_(q#1jCu+Ki%z%UH`TvVQbXiia8f{7-bx-ZGGI*yoak|&V9Zs{XEIn^LZR2^rl}w
zs_@L@?CUSB@kh8hKbB20d{*ZB2AJ!A2|mm$?oZyHe7yL2+k$;Y8TZsAlKHBWmVef6
z+^e|aD8I0jzi^KsyIG;A!AzgLsLy|af}4+3d{nsS)OCHL^#0iiJv&u}cS~AJ?Uu5Z
o-o5+08p~^YiR6FhEr0PTaH^Dj(p268EFl>@UHx3vIVCg!0ApmcP5=M^

diff --git a/chromiumTabs/src/main/res/drawable-xxxhdpi/phone_tab_close_button_icon_dark.png b/chromiumTabs/src/main/res/drawable-xxxhdpi/phone_tab_close_button_icon_dark.png
deleted file mode 100644
index 8ebd9fd5af53807ac0d698566f719db0f6851fac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 575
zcmV-F0>J%=P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00004b3#c}2nYxW
zd<bNS00009a7bBm0027<0027<0nE0cg8%>k8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10lY~>K~#90?V3$a!!Qtq$Eczl4{@0;Vaas>mBNxGN2-MMSdf8W
zk>J>I#y{`d)|tHdI!)@dB7_h^2qA<JLP)Cs*jZ;#O3ET4A^`3Hya2c=Aj>6yM*#QM
zSw!Spj$$flBuBB8<jFCW^oJZ<NfUBRB+baNkpy4|;CUtxhS&ESWZ4I1+4jO6@UCT_
zq!Ka|8?bmemO-nLqih+tIyuS~!K;;{<ZPgNIZBR3nvtWd*-&$Gl%cVQl*R((oT`(f
zq)2LBjuIoO8#&4nN!`g&@U^Kt{?qs|a8342unB>a)Ys(rBuHvsjuIiMA34ebNv3ix
ztWG@OR$9{*2)mV!sc$P0ON5+$BqhjcUlRC5ahkx%IpJrkk@OUxDwfFcj%i;~j2!RS
zb|t0A@oKauX$?7Et#%}>DaWf>zoZ;;yxR3j$|=V?M}3k4<@EW}vqj))Bv}S6UQ!7G
zOUN)4ted~!MLkh;&V7i;+su+z5xH^Bonz`R%yJfyYY};xS@u3;-WC9dB1T$fKW?{M
zXYqp_tmTZd_>yepD1#*X+p7GMRE8WS_9B>rlCls&2qA<JLI@$N^9fpU%zE)s>BIm4
N002ovPDHLkV1hcJ_7(sD

diff --git a/chromiumTabs/src/main/res/drawable-xxxhdpi/phone_tab_close_button_icon_light.png b/chromiumTabs/src/main/res/drawable-xxxhdpi/phone_tab_close_button_icon_light.png
deleted file mode 100644
index 956793088edc92bc99f9da87af4b2a1c42a55eb2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 763
zcmV<X0tEeuP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00004b3#c}2nYxW
zd<bNS00009a7bBm001{#001{#0U3ZsT>t<88FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10(eP8K~#90?VDe2(?Af1Kk|n&1Rf{_q&}evxCc+UNTJ+<_9UDm
z6c9=yBqSsbz!{p><-uObMDZrxot?45e3BI@UfI^CS=;-Y1RTe49LI4S$8j9zfEim~
zKnt;Jkvh;Ecnf?1DxqVhG6CKJPk|q~2a^yqZ?+lm99u~f;0$;JoB$8Wl$0wd$O%|V
zYRd^^OUe<nDJNhdX`7rtmZVYQ1&x6hk^QH@dtjP){60*9bGFL~JRz|dQY+{lxB`xV
z#~oudDk)UX>&TcDZ~@$=oFHe4Rlry5B*msxU<G^x)~P4Sy-8b1Qjr5Pk9loLYH~pC
zMNvzVsvMAA9+Z}(E(he-Po*T8$bm8oOle7Ga-iG_TuPFu94H%6<VrG^1LZTER7r!7
z13DpBUr8edA_w3>=@Yb=QU_VDB4d`#=dLlAD98cbn6#p<kXR)>YPK%I!c#>K=;z4$
zOt&u7rd1n@pgl#Bi5#%&MD&qlCI`|J#s3DY3fkvACt%twu@KZpPQXl(wxAR_0TW4@
zf~M4+j#$9H1pd(dE;Iv<sc-NqlC%W%={_vj{W7UmNg9IsE<CNfCI3)bQ0l6DFp^3N
z%8e`rA*qxgsXWJAQVBuQVV9{SX+fouKr=~_f=b7vCX%ECX=TXjk|YFa2kfenas^p+
zAJin}2(oU?s7Oi`GzLBpUt3*MK47naZ@@EZ8QYjO`#)3vGOib?iQ*mbGqPW^`>>|2
z((jQmzp1aeH#t-67jOf--1y!iLyk?iPtBG@?oE1Al4ZcYO;VN|ka^4pNfn0OhlaMK
t1(|ZBImkb=IF92uj^j9v<2cUX_zN~z0Lpb@<=y}Q002ovPDHLkV1k3GJnR4f

diff --git a/chromiumTabs/src/main/res/drawable-xxxhdpi/tab_switcher_drawable_background.png b/chromiumTabs/src/main/res/drawable-xxxhdpi/tab_switcher_drawable_background.png
deleted file mode 100644
index c1e292dc5d9c953b5b8aabced9cfeedf3e502c2e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1246
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zSo47}<C$#>n}LFoC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6Fs_H=O!
zshIP2u5FKKsL1j9bi+eh+3(Ym|8V53pD|;`f=e&ELKf{fnbi`ps@2WQS~^zRdaFU(
zkF8p2DY~i=8A@9=CAi$_PvGTV)cH?0jpOL4d)CI~?@HyKU*Gd+Px-U@clFQC&HeuA
z9P9By88~|GcCbj+<C4V(g$=?p*wh-M8{Y0TiD@r=V6=g44x=B#{n<CC%CNt`%HWxN
zK<<I%1H**q`NzFah$aaB5U|Kf`!90sGLNTPrr#w=-ubGYn<rISMow0rYQkH?U^B(4
zJh6|N{p_3PQ#_9csZHK8KZ{Rx>p}J#taGM(DLJ*|B+rB|Mg=oInP0V=$zV6_i`%Le
z&t(dp?G5I^PoxCa&%7BOJGsPc!MrlQ<tI!HSl*a#_TR1Y(j?<6?{}7um(Lj$v}ARb
z^F^3$_Kr0valN$mfJlM50rMNycO8FzxIXxI#r&B@h^}eBtKQQvmAx97-en7UCz`0e
z)bvbO&i=h_y=s=ni<l(`T7T(Ci%i<){mW?6vGn5Z+e$A>S~hI&o+H~CP&)Oz`;|(s
ztHJeViPg$3x;&L1)-THP>e?yv?TLt}(3Ulfe%9BWua<0)TJiI9Owuvczk&jvYs3sC
zCzdD#d{*_0F6Ou?EAVMH+lE`2U8{cID_ZcaefG25;>R~6JL*%@>bIZxy?@!dm#+`p
zc1qsdXvTI&x}*NG((`}_o+Ha=tK}pgc-#0xU$=;_b#r4yMvmEqV+|Ls^X=b$!cycK
z)5p$boVO(kKBqYvN9Rv07I3+8twMCl`<G{b`rm0dw1cs=keTZ-o5(R<jUMR$3G)R8
zc@BxxkeFe{_GfEkz@-!0R!=O6exO@#cJ?OFUGqhx{`;mo_^>?^2fO^I!=HI#mhFe`
z!d!m2@yBD3S7tiYtSo1pB)7Nm|BAgrD{8~}6mN^<g??~)?_{L>GGW0po3&h7hVd*%
z)?~DVIZskkS<9OB?#iw;D;KCUCoNgE_|%Fmt1X2B-wW?_)phNdCBKQYbnbhXD?cX}
zndPiHde)6&@+$4bg3A+EWvV|rGhN8MxK}h|(!O4i9jjJl-uJ!PYUXl%*0;IcYu@g#
zig_A)JM0~UpU{2f#MV_$Pb+=U4!wP9(OTYDtBbjIbZ6&kFITd!W8886Oq98X=fxeR
z@*h0AVwjx|*cnH^n6%_`@8L6c%yF+~r8n%kRr*2k;`NJZ-}F9k8La8$yQTP`)Ofc4
zM4gvg0@t(MTkLv&PGbS1#e_#^_It@oTfAYoxBS(1doP*Aw+<*~x^H;G&tIzi+PxvN
zsK)w+{qlzNhPx}-<v-;-GG;z=b^YU7Ieo?Hjf)SsA4r-%`^S?z$Fj7qnuYNPl*Y|j
z^2$E^muBVMSJT&g4%uJ&hvQE|+U$Q{URm@#Mj+px;&qP{SxlXp{DEZ=gQu&X%Q~lo
FCIHR~Iv4-|

diff --git a/chromiumTabs/src/main/res/drawable-xxxhdpi/tablet_add_tab_button.9.png b/chromiumTabs/src/main/res/drawable-xxxhdpi/tablet_add_tab_button.9.png
deleted file mode 100644
index 4d721236ddbd78052bb429906e395529a06e697f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1318
zcmeAS@N?(olHy`uVBq!ia0vp^mw|W!2OE%_bUIF&fq~_%r;B4q#jUq@tvg~vMH(I+
zIr787QF#_e;Ngy?8XOx<COI9=6v^p{J$5WS(@Qs5S<55fa^}m$0?Fw*TZ3{`k`@ZO
zn7DnIc;xupr+nq!94duI<-YH3rq|p5X<y0z`n=`M^0d39uRqkg98Tgp%%reT*^n`b
z=?F^)XTuBz2-Cp_%oGq-Py;hNI3Y|1kSYOTs49?#2E(Hwg40Fwwe&Vb=WFB%U4Es!
zOFQZ3-$$KE6OJk$EkDigFScIz@+qgPC3m*i^YWihp4opg`)Rvwl2y6K_G!|kcQzEX
z%4tt`HJod@?4&nai};I`r{xUi{tUSlkaxzvt$B69r60mtw#!(Z4@%lZ=|vwk>3wO(
zeDLNR8G*|t%Ulm1ko>zlCQl^zh~D7?H+%Ocb=}AlnDOBH(@p!n&$#CQUpQ02;`8Oq
z<>zN6ZMv^u@KE8Auc7N30}h`LE<1C+?XKMTXJ%r;q1E>;Cux}<R4_QGe?+9vcc);z
z1e==8+_E3l%Vz9J6_`;V@Nw4+r7|fNwI9(tWA2vvd{ublefU62_+C|@X{JEagbiJD
zG|eCB0|l2~o*R2SB>w9?Lk=H{j*3VhL4FCKM(>?5H>-W7Pm%uE3%2pyy5v>!Ep79G
zu2lqT);51657eydw!Ks~*tWwWLjq{)Mt`7YX`p83oiVqneWXwK{<voV^29=*W_Ce+
zpt%(RK9_BuoNjC6yd9ta(rQ_iK;a3n5=)@V%z!T2U3BvT(BA3NA2$Q-bv*JH=s13*
zIH2P`<Qlr($rG^HwD-y9-`l<xDchOy_*7i24)YQ8W@}Ww<!yI;#yTzYN8w;k*@E@m
zGvJUp8TYC3xJbD)OJ9oq&l-?JzD+9TsXo~*5NwkyV9~VqNpr`^xT3y9{hxmzvYWr|
zed62+6f@gDy~e<B?k~MNhk-6$Usb)UZzWr*zGd`1Z@U#U-l(QuyZo{b956S%&xL)T
z#ILJXeRAfu>3_QJC2yKOCvtsNf0=CX-!nj?(tb<?X_yVPR~#5%KQ0(-*a)<x7i7!!
z=`|Y+fhJu0Hi_RD7$k}Mmd1Y^e7;TEyms%C!@VozTxxP8Zk&kwwD7n{za%gapD4Xi
zm9GIQm<m+T2UKvw`<&RfN!tY`?|qV!r2q2+)SEA=PeylY%9#U0?}OAk)qFLe`z*ig
zeUf_w7^rVlpHKKcX}btekI!xIy4>rASDQP|^D+y^eVr!+6qI=v_vu;EEt^^&X%4<T
z{mN*dJO|K!g#sT}f&9{E-<7#*`X6m@%9_0!5;Vq1yTXAEE3T-Yb}<c<@EQ^y^ccPs
zy8PwkmaTUtEM{vmKC&g&XL)nf9KACJ5_>*e-t)vhHQ#!f)RjpKc66Pe8TaO2#vd6+
z+lagihRlaVe^r0dzE_cCReQ+%W_;ci&%=j4R}}Sb+ta7M%(%W@e_qGS?E-b#6%n>^
zHTu`yX<Ho^za07KR>YotI}YUC4ZE}D+G4X`Ga9<TzTbvcS|l-HFD(?*7%+;L12Rd!
g-m_0yU4D1}Kchw`<{hakf#n~Ar>mdKI;Vst0It<t;Q#;t

diff --git a/chromiumTabs/src/main/res/drawable-xxxhdpi/tablet_tab_background.9.png b/chromiumTabs/src/main/res/drawable-xxxhdpi/tablet_tab_background.9.png
deleted file mode 100644
index 83101967debaeda6f7ef46843aad1caae8316844..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4223
zcmXX~2T&7T7sU?*As{8vn}P&EA`t~?ilX!+^j=J8(#uCj0TDuzqC_E-Py_?QhZF-w
z5tM|YbPXj&5CaN^Dwu$Pz`xA=JF~kp``+w*@7#0Gxx1NGND~1*DLxJk4goXM8#ch5
z3Y-s)aRb-<0S{>o4k2T+8`tb&=_~lSSmZ6KUduoNvo@Qk(x8Q?H+n{>qSpn~JySK;
zOdGCntCe!K&K~tt6Fz;h7TS#E5?=RdReze1FjJU1CKqTZa^p_KDt0TfbHK{%&Vcjk
zOjJkGz^?wtUZ-;TT8x6(jX<XrV#fVq6FE3<Tn9wmAWoCDxw&8G-X6Vo@7_H^YFgTG
ziFUZBVQlOl8<Xcn7jB)4X1z^LKpD`)Hy3{V80X&=-A%L~OV&Sa!cR?6IoqhKWd6wS
zgpiPsh@|8zMI9ZTr1jYzhg;7@&pJ5a_d-3(HxgfNF{#QDyM;@?GHZFzxU9h??IPE<
zpwD^`2xKUF)S=NMc)BgPBx<HJVd8rFac4pKE6bx%-`@+TA4t=9Hd7MNNo~82x5~40
zGfL`2Oj6LQeD*MHU?yIzd^Ap?_VHOqmpr-40Yk&XZN*2H!Mi=3J&4Dbyx%{_RIsww
zR^Ycq$4YX7B_t#WWrNzyzc)7i^X1y@-8X`+_9qvg{^!S#H5#{{VY3l1N<frwuw$xN
ztjM#?s!>*)<DCh+^51pG#n}q{)P%SZD)mKXkEc#vmrmkeZCh_jvsd4vt56r>&(iet
zbc4m7hiKfYiNAj5w<<LMAn>yPV%EO;+zYyT*-CtjCrTvm_EQ~Qerm^?OokIF46U2?
zgWehlA4$0CZdFdB(QIcGe_sM7V4;5mKaBip7vc7yqzS-><nQiOARAm?t}0G8lyx7B
z`rv|oksB^XEsj0@J6icm-uOM+<&+%zjkX~_wx8$E4&2kzbGXH4;J=rlGrpd38{s;O
zkAUNTqvHp5{Rd%B+&f!scOF4G{UbFiWtVT`3JmY+R(hmx3rMMl)Y$NYDRz<+Az9f3
zE=u^1eo@F%A-B#u&b;772-&U(tr3Hh!%o)ZNMBmb>T+t2hT7V2O*FXHaP`m39O#W%
zk73aoDkF1tn8dr4rU-<OVHU?C=Jf~meesvn-~8CPxRL4Uy@Ax!)IlYS0;kZgZ$6}+
zI5Gx`!Y&nJLUZ4<?-Zgnlr8(0B4W+8-D8$%U6Cg^#{}3ZTdDE=OX~dC?b^F0*xK4!
zcZsy@Y<@_UL`6ug{NfoowkixhPZ^n<+>*WnlG2cQo9_5`ZK=Weh4Hr5tMc-hmo~}s
z`w|pyxw0M=-RNbSUuoTgZ>H<XyxF?5vLdt5@daoN!O-?suM*JBP8u*S-{xDgMo47t
z#<d%6Zc|EQ_Rm8#(>}=PpK9cuejO!!?_}`j7L0!rXRYGm=hnc<uG+@h3l#6L{yA&!
z&E?N3e*2$a+$!SI3!5L5RD!?o9ijtE^g!dX^BVK=MkZsg9rF;&FE1ZCO*=9s%zm^K
zUlY$>Z1|y@)D4rA7A!69>gu`>o+YOr`#_~hk>|LKRY=W4MU!EnmslQ(x7(djZ>J}I
z@xHzgFv_H*rNs`kMdXFL*<yIL{5sl#zib*&E`?0JXU1^Uo?Qe5I;+N}So5ZRh&`jV
zLiDFPRDOQDw<)bWbEH=6+@f0109n%>cje5@&c6ov`S~Ga5zQqFCD|doUd(?3h3e^;
z+aR{_v?Ro<l17Y`RzVJR+}`?kQ8puhL4SjMb%Nq8^C%`=-KpuDM6gR=$_^iBtJYf%
zG<gCY@8%JOPI=PRbUky<8af3*6h~g)Gm@8p;BAlB%vGCVMLtdui5HQt!B_Ftp=0hE
z>6pMQn97=<rKu^YGm>eu1dv{viR6ef?f`?qp^u=hn``;&GZrC#U@BU{Zxi>7=N?VH
zicqeZ%B&R&0rbPftoLP@fIJ~9wi~Axvnod?4)^tvr=b8lG~hd2Z41gkszNMFCNya-
zB%pqnC%39{z1={Qqi9t{Q5q5CM}2*KOqQKKt|s|~tQm>>dd|7UdyYgR4K!Uvr-&?I
zOG@gUNbBqCj-!Gs4EmFJ7UBy4N2Rvt%aG~*XVItXF!vKpdt1W<q#->7{DoV?zI5Vq
z9=3_R??_pPnf~JATR7JBm4NZO)+dO1fmJWYgfEWOMb+LjG&J<362_1J<lGUKk<qu%
zAYcOD!?xdTxDow6N?u&sVK0?>3*5a@oAk`xiFAb@+h!d^k6xj(ug}@o*l71i8McOf
zlz;Y)ya%RKyL*royID-?WQBhX5<kloc#JkgCc6VTczEK77En5o-ZMdNu&N{*D0w-P
z()h4?$o9(X=|}>i-hEUY%|Pa7`!J+b;dO}HGDEN9*{aHpDFDQ9IK23nt!SE=>lv+J
zfYk97)^GQB&ek|kDhz(wQVEE5i{9oi0r278_2d542zFViav}ZuHotqtE*JgjxTYU<
zktfB4ly(g3N!|Z5msd&jXLIhPCU)H`$VM}y6yRA1JwOu@{Dyn(i|aho<w!7mJ3owX
zchpG3)bAc<9Votoqa|Pm<zSZt)K!q<7TP9=UY@iccMAE+t1ma)JSsJSkt==aobeRW
zM*=cwjn`^OY;Fyko}PYt!$1-;SwSPtBpvL*=)|3)3D*zeSwDr(Fu#z;qi`ON`GV+B
zzus373))4xT)-g8$YQ50EJ~I@Z_+}Cl4rm32=08pBDUJckBtD}x2`fC>UtLabMzGQ
zX|6TYjb%H9w7dWxo&x~xW%TAqo8#2P2IA0+&K{T!4~@vyi~KoSuGJ8JRsQ41=E|3Y
zlT0dk+z0n&{S3^jH@lVSpToJ6kx0%jVEHo^HQ@4mC7WVFF0_&x2UC6I2H+)PJp@^;
zASZ2PbHeUsIG+I5PG%=JH+Nd*7iJ?rb}p9FC^s|H%;;mIdwVbMMWLpuwdSxH6iz0^
zld1*a3V=4(lDHSIWYt7aN^mB<=A(kN8^~mGK?O}2S^Dj}q!7#AiSz-G!(?=e!5W2t
z!JCy#kfs11^Z>o&rg+~p?_c`8zqgy$^$aMbb4YyhwWN=?Xw=zg)eo@GdFD3Bh<14+
zpm;@;hu;D6vI8aCWujXIo79(TwN}*M{w1ro7IUy9lLJO8t|^<zi#<O_wsTNz^7rzm
z7W1$q_tK1@ObU722=_G^0g?tgK$hX2cY@TW>UEpLH02?e?)(~kackscsm+(R;JHUd
z$HvJR1XT3R@xdIl>Xk-DR$fL1E$c~{K~fpmSHTV>z9*g+->3oasfo^!(xjhOR$gdy
zY0Z+?$MLhI6Z&{8H3KJt&iVuSkHnRA`CkO+U|Nby7nGlmED~}W`}tO%M>xL?>V`;X
zhLQ=FElMWd{CrOy55l3GC)Q}qa~voB1!!NY3QpPgI*xL*I4ZVUE=eF)(TPh|-P9V(
zh$ryu00#NFSYG^Bep|+Nlg(4}AuJXfO6jad1cr<r0FBbOC{&z%ot=O3HVVg=?n&i7
zdK6KKu&@JGU(i~O06AjOb*g|m`4jy!`R1=Wk(5sdyO4@O;Q#tZTmW^ruLXT24&V@+
zqw|o@W49M}nWKjwASie<>j_YW`QRIgCaq!T<?}by+=ejBy?=l7Ya-zA!L(rBrF<dL
zK~9e~$cRa9VWH!NK@cS}31zD#qaF55yYxzX%-THb!NK*`Fdlvhn8T+6O#L%hNAB!k
zxxvB7V3&=PFmW>Z@=5;z@;DrKqNL5EBVN|Nq~HNhr3*<wT5DNtWT+-z3y7M^)G5^f
zL*PvnrhR$x3*8TR?rpy-&6YPvd`QCgYrqfYWND9@RQ;*>>EXZU5j|vtsp)&xuV26V
z{=(o#0j*j4+F|mI__;GduLh%k!f6s$2*eU7B%&DshngV`G@mJ2P!%;C7|jR)0~tRL
z&u5(vcCoR8Dc3tTwzY=s4az|*OI0f?D<gm~PwvGDi-lB^@MY&CfR#^pHoIN5M%jzl
zIJLZZVGp`Q85&vv4Pu=s)iferH%cnwUeMP!Mbv9qhso?Oa0_I-z6e*J3n<fxn2$d(
zH&}F`l;6f1g$99Q@UdgJKWC#io+2#dL|s8I0j-BBO*)g#fo%Ot6)5R~<!QD)2m5=a
zd^SNa1Dqo5bN-T=TOo#t2#RNrG0N7dgM)A+mx`9Nv$Hu4W~l(T9}<Dk9+tNTj4#fd
zd6y<2tu65VAz-KlfFBkt)R%p~1DaGq#|zi=JyNkP@cPYUGE2EO-oNV?6I;~?*X!_0
zgN>&u@w$pk0KD-O+}PM~3ufqEhFdbmBrf`m#?p!1Ur}W+$EMbv71pDNhkO3`@nd>3
z6L9~Ce=?@6pi|qw7vx3I@zb^Fdji}3RmM55QIx>R=RRAR(_L=pPS~yd2&h|4npv|y
zAR`i%B?a1i03lnUAvFux5`-8G;<iA+=^!)1<(wQ$$q#SPr2nC8UrE^Enj51vd-1d*
zWw?Wa2PKz-0S8O?WQwjk8AQj^zGFb*wD4IN>?ZC4?F*6^h8Kev+`KsxiZUYSRwFEA
zG8-_i^$rcu$d)j?2xOdqPp8hlf2g>u6|P-}0o`|<LY5gHv(-dXeNhojioD?$>oC&d
z;xX1vq;ZxU#3_&69?8_m(1M0*;VuojFAU=k6i3jUJg%hUg4DAl&s#&qt;zo%l?@6}
zb^@Mb)%Uqo08xGbRO5vYBO?dXWcK>{wo6%G9!m-^KH2l0-I1lofu0Q&lSu_!VX%^f
zH(xprcxef;q<{nflarHk86!yUc3V^h$ou8+s{_cvIBFl3-qbGZ$Iw-SdypOzkoed6
zKyXc*!QiRo5FQuOaS)XUi0S|&q`JD=Ei`nk5p{b>>CiM|e|_WC763X=N{C1y;JHn2
zdRFYr1<`eCL3G7Gj7GOtWTZ$TXT9|AV*_8Vi9Me_%<^FqZ(dU1mlL%#p_06@wRJFj
z<Zy`frpX`t>v|1=(2{cF0!r?DVN-`Jib1~&U+W6#o{<8mO-yUREHRm%xi()qP`FCg
zf8V`(SBOr$QI9%zzPzb(C5S=SJS<F6(N>T_kg+khp2@}Z989~d{-XV;C(e&5GUOG=
z*xBArIIA|*M?68$Fx>`-P~}e*X-L`bF3pv^;M)mkgP#&SZ=gP!y*Tcw41s)orydJ@
zV=ha4RBH-5U$gPX*DC~5yiO7$+ljiszH(8v(!m`SiHZse3Z5mS^qH_Ioa$`g3Rc+?
z*(=B`eD>0%LcBsTPefK+&lIxwqKfrTNl|xUg7SB^mWZsFSet}_&;;QAG^Hofu*SvZ
zS;MBd^?va1F>L#vRrkw3e=b@mHGlf_i6;9*Z!88|uinrt4;3G_{h^R3*>(~h9v+^&
zn3a<wkd>P&Cn+kb88BR`Qwi9EwEE2yMwLlkE<Z1CkvP!ZCGD`7DnJ+cYC}EjkJ4~)
ze!l1B*k32b3(twqJK}u?TlIfSpI^Xjl_&0~{PR0c=A_{JqZ`SkwE6ihn6sMLxpU7=
qocO`wg?LK!l{Fx&Xp-5%(dP>We?0^YG=U!r9A-wy8_x|<_x=YdcsDBm

diff --git a/chromiumTabs/src/main/res/drawable-xxxhdpi/tablet_tab_background_selected.9.png b/chromiumTabs/src/main/res/drawable-xxxhdpi/tablet_tab_background_selected.9.png
deleted file mode 100644
index 2ecfb3e7947cf4381a7f766e2d3f28d1e632aa12..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4277
zcmXw7c|6m9{1-JbN6MK-$&o^%+(U9KnOpAbgAU}T+*G#ZE{fG033Id6)EJcwUsuFp
z8mc*S=d4J6AHUz@_s2f_Jl>zj<MnyJU+?Gj{-ju2BKdib^Kx)-@S9yRwgvwg;P264
z2zbrz@sQ-;I1*=OY-k_FS}KT+vb=e`!zzFkVQ+e|Y=|&Gt|*(UcvJO!z+R;6xRLG|
zu~d>s`@=IGmJdk6W{a*$LcVX$i|7jNh{~33IUUPBIT+j*zgF0H_gRJPyJ@9gD@}co
zf6hl2%{G4fH5HyPn<M*DUCAm+NI^3T@!WfDlMwf(+tJ9%s=t1;AwUcsHq|*d`CpbN
zB69xo4?hN>_RXyN&A$AnTmK}SxQ8D^0`XE(QXh#Pq-9NGSf@`|8(i<X+S;{pCz5x@
z-`(B+k}(+hj`sHHI=9BbiOzuWrbtob9;(L9W993+_#KG%ZWv5oWb-7SU2!y2H@qiT
zc_$f*Eq4-Rb!12?^YHNG(y@ZBnbHP9+MyH4?)9amveZ4k8m@)bCZhhrX7_@XDXh)x
z+T)T|xCo|OJRhKA4)y3p2tfRIw>NWh6s%m-E?iK)!LiU5LkbGDo#un-L{uHNzn*!R
zZhxd3@WKd6OTAp~9U+B>g(=-QxX`g}qMVS!B_hi?-DLyd{yjXpHuS;*ukmmGn`vcb
zrKq>f{0m4`{La?yw9b&&rVO9mySVSm%U@+>WG2)gvm0{^)MJry%K}@@2JiM%^Pr%h
zgbFbv2I$Vpro^`*>EgHo-McOcJ4>4KoxGp9A`RoM6+)?w*(G$iUhk-Q=JlT3GH<7#
z@uv2TDX#hZ+e)7A{^tMg{2Q1lK=<YUXS5dnw>H`E%bP$+yLIjt`W1Ey!?iozk<|*T
z1`!hS=MW)hKjKt<^b8`-{Kg7}wG5}Y>Ir5Zp_i@+Nfo7}q;$EwzL7EgZ+8dP>!YuN
zEb#X6dA%C-)b0KA6Q?jdh^+C*&PS*0h@(=7s7HQ^92Ljr)uVoX@0y4>+X`1jJ%#fD
z0AMDbDXAF*S3LB6dvoC`&RSE5aFs8ok-qUHE`FF2IvFIM{t>TvK@NRVU*Ci0Nm0?a
zUlk=43UpsvkB&OtT@Iti`T4!c!knL>kvR)ua+c+J67uV7_o}NG90vvl=BgcPUyZfI
z=J6;VtPq=*XP)P>%Iw^XD+1IM`n#B7Kc5h(^78U(FcXeQquuX%#f58|H!)ptPyVaz
zqM@O`e8dL_2XW~#NlnEG6(y9RbN%pVf}YaSMJqprFZycfV;whUH#GuTr3j1Vg@sYW
zZpK)VH?EhSHe#Y+nJ<oU7dd)DQ3rm{2H9+MIp6ZU8fu2^E+&?D{<MtDApGDB(#<6k
z2Z!7>Lt|gxDfQ3S>VnlVT_+IdJo%gMuILLJvRYy_8D3o0$j`4`-v$|3d)k1r`yR!1
z@cr5xt^4V3n%H?Y9*ytdRIlP@`U<G-WAiP2a0zMY;NX?u)%!=9m1H$F^UR0`Do)QU
zGB*u3=Z9Q-BL7L!eQ%Eu10WDcU#m*Y;)p8Y1LlNYjJ<Y2!uDMGmx+ilA6$Bx=5s!C
zVGAoOtDBs+ub7%*{Mm(?#pr-4cq^oq`6h5Q;nwf1rBUtOI~<WF@qn^<bTIsE2V6q1
zolu}1J_EV9!}Ls?o*F$cL^COn3wNdvco|3!507tc9UWiMa{j}4S6O&&K`E!<I(I1a
zm(+Yl(*;z=Ws={jhV9~WtN?7{^Qh1ets$l$j0e-Db!J7tvngUukwxC(-V_mCHtRx&
z)+y39$Z<nx{!|EEKyC}!5Q4wxHwfDli}%7sSUN9e8X6j^-U_;Ul~-Z>z>B^L&3Tn)
zbeg&e?#VAK5{dlg(Gt@z{k0`FKY}|+r{t@us_NbDCyMKLyMC|8X~yA%@fs&jdY!n_
z1u`_W8}`tjy|us$uJMh7GJgV9Nv`Q8X`--Fi-o8fr7^Avhk8zWsg+l3f(!M|(iYjT
z;6Vf06(nzFn8Ey&j)o9^7-7)1(1Q9zqjvq$xJ{zd$83_an-O+ye4;%~Gc!HCSpX`m
zaV8Y;<;#~;w4{hgB-idGPjUJ9;t{f5%mxUi(EdWbe1C<PE|ecwUpFX|2-x0c{aK$~
zd1<i_XPvkK?1Q4cwor^-D(&wGLSH1%CGb%e+7%BBa+eWzG9)hCkP38JO45HJeed4A
za5*0r3WhI7Q>kC%oP*n?^`LL>KAH`4{CKc!u|%V7-oTMFycur-m?|6@qa+{hawnq-
zQI+k})6SGcZydQNfP%)U2Mo(!TpDW(&-da#Ky`MaNVeC04dBbUQ)z;CpgOryrhD@C
zu)a!ArZo`O9;A7Dgy_X0vkt`zi3UCTzhT=z7UR}1NOJAQ<HijkbUNM67<cvpiUmRe
z57s}H!FqKaTJAu9VerF_L9mFu(m@L0KPKN!;1>|cEU~DLw}(0|JJx6wbgQ9Q#gIUk
zT`y}W^T>X4q!a&!BEW$p{bEnz3ppPr3g&Q*H$%mv`8WJ|_~!gI%PN6OMW5>TH!?dN
zV9)ELQY}EHjVID(l84Oj4$|VEXhZQJ61HZG5<M{P%bzRl@@-+oE|eU33tq8uJ3mZU
zw0*fnwP%g8o1-JM{*x7^OZ$w*lAys~_<fDq1jBEi-WTe{3gm4BvgdVB!B?U+mVz!$
z4wjkcqhR;n6(<s3%Eh}<ngr|uo$y3WAav~kcYJmhdWVNT<s^*1vp7OpCso4?67uaT
zee9uPyTavmikPm@W+VKt7T9+rkDak`+jW5bjt<v`jF2~V?<{I1Y1D>Zk{;*>>G>;f
z!;d|$hAO0p;Phg*Zm`H52jYzl05kJ#a!8~EAq#C0E2yEoXz?;}jT91~irO+E`61KA
zRr#qSY&upO4dL81_QZn5CSzIt9*){7;Y~duB~_UI@>^46+Ob<Fy^sdJYzF|h_`sW?
z5&X4TEYM~0Rpf$$oHdak7w=4I;$@s0sl9ypvP1C*X!YzVi6a}=oG76a5iw}sm7X+>
zfG#k@4^zh8C+-2zw-CCoYibWuj0?htOL7m``?s5~!}Z|b%YI^c`<#6~@CqhUhQMzf
zPK{e)saxjXvr%^2a80h1q5DdDc@EnIvOE+1pamPAb8JZ5^Z)e1@TQrxXq^hp-n9F*
zUmk;?F8JfZHh-GSAQoMn25;fUi)zT%phljx{dRJuXhwRo{q<2QzrPnd)_a^Lnajz_
zhIFHn{n<1^?wSYp3=J+)pc&eB-ihcXm>TnE?Ybo{#TuM|Cn&pMWGG;%`+vT54Agfj
zK!+s!^ium2yaAI&4AnTlt}P9OIx>Km1JnV~)h?5C3$#M-Gp=9uvMJeHJE8Q59LV<9
zK_!Z4ESa##GbTvUx*PO^J+Bf#0fD@Hq<eRH%Kn-7hIBXw)usD&ND+YJ&Gct<lsug6
zFPb%eCO$+%yDJB6A|wd+*F)P=MezT%w~u4v!N!ig*aKaizVIRJtYh66=Q=n~zIFmk
zJ8UX~MK(5R2mzeUS>zCP2|^X9PWa3C+zKy&WOS_QAOT(72yd<W+YGX!#gCDV1$#X*
zj60^d(h$tYIBk8KwV&Wj2l@*2dU#~sm$*=Hf@ZOzbu+XL;LEG)_>Q(VU)r1GNVA8$
zGY9JL=FFb%q0>twX3#*l^vDx_ZvNvJd8qyOxVW|SruM9r$G|(wC*<pF|FfvzVlDGr
zC2doDE`qlgO$^Dp%6b)|zR&quaAy>T2y#<46{10O3_rCqeEnG|Kh*I85W_?5eWGY5
zV_nK9w+i>}Jlz`SWhrk}*bF-Fb#cPps?_bPPEW~xU6Yj9Uv=JWQzWvS+SvF9NDwC=
zgz;~ziu6lJql@FzJjP`yXiY$``O4Q8q#27CqAs+rHvIe+r55JAyfem56rKr(6$^}6
zwtg`<0-f=l?8q1vt*ie+pUQN<{`dE4+AT&l?S3?<aur$y9`NveF9AaxZz^YX_M`jR
z&z@DfQ2bO>R6M;4dyj*~K?z+yDeTLvbI%vBy#?~z;ms7N@Rh(>Y)N!qzP77PI#f(0
zMD0rPJ+!jYSX5}WV_!P32EM&eH~{+Af2c}XZq}J%3AHm@lqoUIc%I@u-TC-*KCi7W
z+yHla<V*Itl3O`?E>I~3+?ty<$r~FHmIoEpBqSuR;^0;?sB0gO%8xuQ0xQjXp7{W}
zyB7acijDGEuCnXa<Js!MsVFE@5r`3?{s*Q~ruQlsU-J*HwSDLo6<t0as?*|+fe$6i
z@wgrxmJM|AhK7ZO<p;8L5U741rZ^(%r!R}#HtbahcO*8n&uuh6rk9S8!Sts<{IS5S
z59fUN5!`<{^V}0+Kuk{saG(E=Gq{K*?^e8K@Qq(7A6wmkckr9pKFV%bj2X!fB*k$P
zeC`MognffDnEBGh3BN!ggXYTKHoJT~<0%@?_JT5jeGB;Ca{==T3gyd88BeOs(0<UO
z3_4i9gd%DhZ9x@GYYv;{)wNuN%s|5-v7`4y>*%zpg~`cvSk0A@$7H`0J<^+yfT60P
zK10zuBU&kooJMk$m6Iclwk?Bps1y{c(<pfgHI!_D$F#R*%C>z4feEI$YXIAU5sUNE
z8(v{GEP$rhHsJLYe%HMz;?G+ImVfa!o27@UpL_@=_+^d%e@bkGdF_wu{}!+vArnve
zF^(d$@%SAodSPj4w-%9=$Or(TbZ6toz-yu|7}=hT%L#z7M->Z(>dOD%l^TI(16?MR
z?4fu6tWD4UG{oV|-O*sjM#+AYR`^^k$zJK1BX{1yl-;Q4F0S&ybcqYY41!!AWF4!W
zJRXRIGJ}BahZ@QQyj5sPNlE<D+}t1a+rcf#U=1vvgxVo$YwH8<FBTIKAVzcFY871l
zaSHVmTzj(TKk$sTC>yFnY*Ni4HZS?ISqRWfNB1*4*u~+8Sy_&p)3dX`T3||Uc<kJD
zfMGhBXK879gFEHM2ZXl@5IfpRYlz0_CyhT`IbLRAPR2B#7r@id!L7Fr^n>_SXky}?
zDp<;))y-QUh#wuHHTdl}gH1#4to9Jf%1GhH;h>D~wAFe<D`Qf?RUr0BSs%;|u=UHz
z;7?7v_ft8jDz{+03NsP3WFGUjIeV9LK#a>fe^6LjB2lPb*x!43PoK7D3Vq~+iiMx;
z50Ia6sF1J<IEA`ad}z`F9+#*!0G&T31Qk`fa>ON8<R-R~Qz}3Z%p&yj5TSFry7&T_
z=iK3`(d}c9Lx<WA>y_NUK-;K^Ye_T4CMValoljl>-GA}u06)$#@=oYUr<SN`XJm5M
zHAJkVpia}at(lvmqT-^!0BoMxHI(NtVcvsYx37F8NS~1;+-%GFR@OEt8l{-}HY&IB
zR3<$sDJj&(#zu1$`dzT`!p%P7IpeqAPkuPzQ>e;}`gv(=i=FdM$NQhBSo9gWwN;cM
z&E74}-pTT>4F;*Azq+=z-ITcZZ;wY%(8?w!o!j{j%)ITeSLRTCNvm9cw3+~auilL3
z)Qi+k6TinfG<2mAR^S_GXONZ9PMgF}pgIW0KHgI`Pd_*#@hziT-(98dM6W@Z^&@!Y
i-uL!2$AR;6?*k&u?C$<t_60vjaG04`8rNO+y8l0--bEe&

diff --git a/chromiumTabs/src/main/res/drawable-xxxhdpi/tablet_tab_close_button_icon_dark.png b/chromiumTabs/src/main/res/drawable-xxxhdpi/tablet_tab_close_button_icon_dark.png
deleted file mode 100644
index 132aea37fda02d037751a7ed1d62d3a4d388489f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 881
zcmV-%1CIQOP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00004b3#c}2nYxW
zd<bNS00009a7bBm0027<0027<0nE0cg8%>k8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10`5sfK~#90?VCSu(?A%9e@0b`Y!9CD4Ln6+GrOmXN>mN-UCKt-
z;IkCcQc!6pixJt3p8O%=;Sy0)#SGXGp#FDvzSpYWXNi=YF6ZYiclX|V0T_m17=~dO
zhG7`yz7j>z9(5ZkbhhPzj!NP<UO0~PDT<<pI_gs)P1A|%y306@-{`2%Qmr74;{||M
z08kXg^?JQN4#V)fYP~X~X*$_#HtzsDE#G<@1i?#{I+X<N%Bi4|bcdV@B}vkP?vhhs
zT2h0Y3Ta7Fb5J=6KCb)RvaAEwb(dL|?aS2Phb+tXH=E5l>g52yBiV^tdIWXowZTV{
zi8d(BL6nkAeYf%|Mj^@McPa}4%r@9`hiDN5m}xl0Xw@bN81@0E<~yx|fMFhlaxu^@
z2+;dL)Y}Oy!Ro)vX0so*ZNC6;QCG&YtOLh!&YJ?<E^+`|4Y}7EWCT@|4|odTsIE+1
z?{}3WgqRN*(hMpHkdrhPIe-B{KtD;->2y05Ie;NSz^|Y(&+{dK!-is)<!fUZ&-0%7
zzJH^yb@dn%1auooEf^a)6-EUCN|KDr0SE*EQj$pI07Qa-UXsY<00V6ld(hfJMNyD-
zB0&2SYg@{HLzyk1nxs3+si2ZXvCQ|DQ$Zog*c?=5AI{J$=MsN5i~mt(OWvEvmQ)xK
zl&0w<&+}6>?~t#A5YKJfo}=Lu0KnmDwfbNx&21`J?G;<8oC4^^#BqmI;5imag9*}c
zWHAOwWJj*(xI?CvL~>}4p5X(fB;#oxNXAxFl8hz}p%{2lNaECU3w(K@1-|~$0$-qN
zK}t{*MSHI6UI2K~Q0%kkdGn#O4`sIGtgS6Vh@&tJZ~N9S6|9C~cxzeKm%7i3qPP}9
z7)j0ezJFue_A!8u4aL67$N?1Rpd?97ilX@I!uANS0WX3ecr9D6@+!6~X@nQamE-`L
z_CZOKoNTw-kWx;?j-+p@a<p<^|IETL48t%C!!QiPFr(uq6-dv8WdQm~00000NkvXX
Hu0mjfEyspj

diff --git a/chromiumTabs/src/main/res/drawable-xxxhdpi/tablet_tab_close_button_icon_light.png b/chromiumTabs/src/main/res/drawable-xxxhdpi/tablet_tab_close_button_icon_light.png
deleted file mode 100644
index ef2e4a90980ad8b4ffe038f62194221099cd91b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 832
zcmV-G1Hb%<P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00004b3#c}2nYxW
zd<bNS00009a7bBm0027<0027<0nE0cg8%>k8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10=-E@K~#90?VG)B6G0GwzXcSa^)n#RAsVPC&JvOZ5>bM94!?qj
zj@mClLE=OK1tL)_1qCnTI-mqm_%2x1`F?iycC2W=#)VhAbKjoUJG)~r48t%C!!QiP
zFpS%Zh}_eTp(150cT#jBA_9C7kq0UIi;QItScu4n6#d<e?Vyx110Dg-ilR93-e1M`
z8yL$Ta0I*oUKB;~(0l(qrq3urYjP^oByGs4h?W#As76jjc1c_0R76P%T7$|(@OeX%
z39y*Y=l4VU??XApDfMzHo`f#kE+{HmXRYD_I1rJ`&~db52o?mol5&k5B?xpR<s36w
z5abOw_k<)71bG72cw3VRf?*#(YrRV<2!?qO%^!p0f*|b!X>TWzB&(Z<$RFSxaMsXl
z0-QD_xE<wuW5B)EAa77b`GB8*{f1_>v)@C`;ZSm5U_lTjX;<Vx20_qI67ZKDkpr0o
z!78a-E|&}7bwjiB^0TqcXf%2|olbwJi*7sF1VQIFsflcFPDNHh5G5(Q98eGhL6TJD
zfRZ5SB}q*V475?~L6-?qn?$w2JMMGV8T4eb39UuCkDLk>Ng6-%A#y6ROUkwemA4Nk
zG|M^X|7Nj{32>a_wxl9ws?jNZV3leFCAdS7D_QN8Tg99Lq$bC4M^NIqE0P8il;X%@
z7bIyOxpvwiYfI8PwC|NZXiCz!_6f?Zv?S%eIE+d>H6+>9a|>3y(1Mk}v|t5PEd&XY
zRXN)k@T#HN*U@NnIP~p9d0TSQ77MU1BE4%SLu(YToO3@Knp^-`u4c+H4uH?w+BoNa
zg~)-3Dp&9Q&+&MC3B26+D*Ks@_x`#lieum@@Ob?@=bX%Dv-hEWN7YH!NK!i*t&<ch
z2NG1;uSvQ_NzPg<H<FxlA7kYtMQ-VzSq#H448t%C!!QhE=lBO2Gvc+^>K0Z20000<
KMNUMnLSTZ!G+|5t

diff --git a/chromiumTabs/src/main/res/layout-land/phone_tab.xml b/chromiumTabs/src/main/res/layout-land/phone_tab.xml
deleted file mode 100644
index 2649211d..00000000
--- a/chromiumTabs/src/main/res/layout-land/phone_tab.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2016 - 2020 Michael Rapp
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing permissions and limitations under the
-License.
--->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:id="@+id/tab_title_container"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/tab_title_container_height"
-        android:orientation="horizontal">
-
-        <ImageButton
-            android:id="@+id/close_tab_button"
-            android:layout_width="@dimen/tab_title_container_height"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_vertical"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@null"
-            android:src="@drawable/phone_tab_close_button_icon_light"/>
-
-        <FrameLayout
-            android:layout_width="@dimen/tab_icon_size"
-            android:layout_height="@dimen/tab_icon_size"
-            android:layout_gravity="center_vertical"
-            android:layout_marginEnd="@dimen/phone_tab_title_drawable_padding"
-            android:layout_marginLeft="@dimen/phone_tab_title_padding"
-            android:layout_marginRight="@dimen/phone_tab_title_drawable_padding"
-            android:layout_marginStart="@dimen/phone_tab_title_padding">
-
-            <ImageView
-                android:id="@+id/tab_icon_image_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:contentDescription="@null"
-                android:scaleType="centerInside"/>
-
-            <de.mrapp.android.view.CircularProgressBar
-                android:id="@+id/tab_progress_bar"
-                android:layout_width="@dimen/tab_progress_bar_size"
-                android:layout_height="@dimen/tab_progress_bar_size"
-                android:layout_gravity="center"
-                android:thickness="@dimen/tab_progress_bar_thickness"
-                android:visibility="gone"/>
-        </FrameLayout>
-
-        <TextView
-            android:id="@+id/tab_title_text_view"
-            style="@style/Tab.Title.Phone"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_vertical"
-            android:layout_marginEnd="@dimen/phone_tab_title_padding"
-            android:layout_marginRight="@dimen/phone_tab_title_padding"
-            android:layout_weight="1"
-            android:gravity="center_vertical"/>
-
-    </LinearLayout>
-
-    <FrameLayout
-        android:id="@+id/content_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/phone_tab_content_background_color_light">
-
-        <ImageView
-            android:id="@+id/preview_image_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:contentDescription="@null"
-            android:scaleType="matrix"
-            android:visibility="gone"/>
-
-        <View
-            android:id="@+id/border_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone"/>
-
-    </FrameLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/chromiumTabs/src/main/res/layout/phone_tab.xml b/chromiumTabs/src/main/res/layout/phone_tab.xml
deleted file mode 100644
index c75d39b3..00000000
--- a/chromiumTabs/src/main/res/layout/phone_tab.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2016 - 2020 Michael Rapp
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing permissions and limitations under the
-License.
--->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:id="@+id/tab_title_container"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/tab_title_container_height"
-        android:orientation="horizontal">
-
-        <FrameLayout
-            android:layout_width="@dimen/tab_icon_size"
-            android:layout_height="@dimen/tab_icon_size"
-            android:layout_gravity="center_vertical"
-            android:layout_marginEnd="@dimen/phone_tab_title_drawable_padding"
-            android:layout_marginLeft="@dimen/phone_tab_title_padding"
-            android:layout_marginRight="@dimen/phone_tab_title_drawable_padding"
-            android:layout_marginStart="@dimen/phone_tab_title_padding">
-
-            <ImageView
-                android:id="@+id/tab_icon_image_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:contentDescription="@null"
-                android:scaleType="centerInside"/>
-
-            <de.mrapp.android.view.CircularProgressBar
-                android:id="@+id/tab_progress_bar"
-                android:layout_width="@dimen/tab_progress_bar_size"
-                android:layout_height="@dimen/tab_progress_bar_size"
-                android:layout_gravity="center"
-                android:thickness="@dimen/tab_progress_bar_thickness"
-                android:visibility="gone"/>
-        </FrameLayout>
-
-        <TextView
-            android:id="@+id/tab_title_text_view"
-            style="@style/Tab.Title.Phone"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_vertical"
-            android:layout_marginEnd="@dimen/phone_tab_title_padding"
-            android:layout_marginRight="@dimen/phone_tab_title_padding"
-            android:layout_weight="1"
-            android:gravity="center_vertical"/>
-
-        <ImageButton
-            android:id="@+id/close_tab_button"
-            android:layout_width="@dimen/tab_title_container_height"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_vertical"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@null"
-            android:src="@drawable/phone_tab_close_button_icon_light"/>
-
-    </LinearLayout>
-
-    <FrameLayout
-        android:id="@+id/content_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/phone_tab_content_background_color_light">
-
-        <ImageView
-            android:id="@+id/preview_image_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:contentDescription="@null"
-            android:scaleType="matrix"
-            android:visibility="gone"/>
-
-        <View
-            android:id="@+id/border_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone"/>
-
-    </FrameLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/chromiumTabs/src/main/res/layout/phone_toolbar.xml b/chromiumTabs/src/main/res/layout/phone_toolbar.xml
deleted file mode 100644
index cdbc2215..00000000
--- a/chromiumTabs/src/main/res/layout/phone_toolbar.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2016 - 2020 Michael Rapp
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing permissions and limitations under the
-License.
--->
-<androidx.appcompat.widget.Toolbar
-    android:id="@id/primary_toolbar"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="?attr/actionBarSize"
-    android:background="@android:color/transparent"
-    android:theme="@style/ThemeOverlay.AppCompat.Dark"
-    android:visibility="invisible"
-    app:popupTheme="?attr/tabSwitcherToolbarPopupTheme"/>
\ No newline at end of file
diff --git a/chromiumTabs/src/main/res/layout/tab_switcher_menu_item.xml b/chromiumTabs/src/main/res/layout/tab_switcher_menu_item.xml
deleted file mode 100644
index 70366128..00000000
--- a/chromiumTabs/src/main/res/layout/tab_switcher_menu_item.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2016 - 2020 Michael Rapp
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing permissions and limitations under the
-License.
--->
-<de.mrapp.android.tabswitcher.view.TabSwitcherButton
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/tab_switcher_drawable_size"
-    android:layout_height="@dimen/tab_switcher_drawable_size"/>
\ No newline at end of file
diff --git a/chromiumTabs/src/main/res/layout/tablet_add_tab_button.xml b/chromiumTabs/src/main/res/layout/tablet_add_tab_button.xml
deleted file mode 100644
index e3516421..00000000
--- a/chromiumTabs/src/main/res/layout/tablet_add_tab_button.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2016 - 2020 Michael Rapp
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing permissions and limitations under the
-License.
--->
-<View xmlns:android="http://schemas.android.com/apk/res/android"
-      android:layout_width="@dimen/tablet_add_tab_button_width"
-      android:layout_height="@dimen/tablet_tab_height"
-      android:background="@drawable/tablet_add_tab_button"/>
\ No newline at end of file
diff --git a/chromiumTabs/src/main/res/layout/tablet_layout.xml b/chromiumTabs/src/main/res/layout/tablet_layout.xml
deleted file mode 100644
index 6b792801..00000000
--- a/chromiumTabs/src/main/res/layout/tablet_layout.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2016 - 2020 Michael Rapp
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing permissions and limitations under the
-License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@id/primary_toolbar"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/tablet_tab_container_height"
-            android:layout_gravity="start|bottom"
-            android:background="@android:color/transparent"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark"
-            android:visibility="invisible"
-            app:popupTheme="?attr/tabSwitcherToolbarPopupTheme"/>
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@id/secondary_toolbar"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/tablet_tab_container_height"
-            android:layout_gravity="end|bottom"
-            android:background="@android:color/transparent"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark"
-            android:visibility="invisible"
-            app:popupTheme="?attr/tabSwitcherToolbarPopupTheme"/>
-
-        <View
-            android:id="@+id/border_view"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_gravity="bottom"
-            android:background="@color/tablet_tab_border_color"/>
-
-        <FrameLayout
-            android:id="@id/tab_container"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/tablet_tab_container_height"/>
-
-    </FrameLayout>
-
-    <FrameLayout
-        android:id="@+id/content_container"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/chromiumTabs/src/main/res/layout/tablet_tab.xml b/chromiumTabs/src/main/res/layout/tablet_tab.xml
deleted file mode 100644
index fcd29b3e..00000000
--- a/chromiumTabs/src/main/res/layout/tablet_tab.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2016 - 2020 Michael Rapp
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing permissions and limitations under the
-License.
--->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/tablet_tab_max_width"
-    android:layout_height="@dimen/tablet_tab_height"
-    android:orientation="horizontal"
-    android:paddingEnd="@dimen/tablet_tab_padding_right"
-    android:paddingLeft="@dimen/tablet_tab_padding_left"
-    android:paddingRight="@dimen/tablet_tab_padding_right"
-    android:paddingStart="@dimen/tablet_tab_padding_left">
-
-    <LinearLayout
-        android:id="@+id/tab_title_container"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:orientation="horizontal">
-
-        <FrameLayout
-            android:layout_width="@dimen/tab_icon_size"
-            android:layout_height="@dimen/tab_icon_size"
-            android:layout_gravity="center_vertical"
-            android:layout_marginEnd="@dimen/tablet_tab_title_drawable_padding"
-            android:layout_marginRight="@dimen/tablet_tab_title_drawable_padding">
-
-            <ImageView
-                android:id="@+id/tab_icon_image_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:contentDescription="@null"
-                android:scaleType="centerInside"/>
-
-            <de.mrapp.android.view.CircularProgressBar
-                android:id="@+id/tab_progress_bar"
-                android:layout_width="@dimen/tab_progress_bar_size"
-                android:layout_height="@dimen/tab_progress_bar_size"
-                android:layout_gravity="center"
-                android:thickness="@dimen/tab_progress_bar_thickness"
-                android:visibility="gone"/>
-        </FrameLayout>
-
-        <TextView
-            android:id="@+id/tab_title_text_view"
-            style="@style/Tab.Title.Tablet"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_vertical"
-            android:layout_weight="1"
-            android:gravity="center_vertical"/>
-    </LinearLayout>
-
-    <ImageButton
-        android:id="@+id/close_tab_button"
-        android:layout_width="@dimen/tablet_tab_height"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_vertical"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@null"
-        android:src="@drawable/tablet_tab_close_button_icon_light"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/chromiumTabs/src/main/res/values-v21/styles.xml b/chromiumTabs/src/main/res/values-v21/styles.xml
deleted file mode 100644
index 29cc1aeb..00000000
--- a/chromiumTabs/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2016 - 2020 Michael Rapp
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing permissions and limitations under the
-License.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <style name="Tab.Title.Phone" parent="@style/Tab.Title.Base">
-        <item name="android:fontFamily">sans-serif-medium</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/chromiumTabs/src/main/res/values/attrs.xml b/chromiumTabs/src/main/res/values/attrs.xml
deleted file mode 100644
index bfa54a7c..00000000
--- a/chromiumTabs/src/main/res/values/attrs.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2016 - 2020 Michael Rapp
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing permissions and limitations under the
-License.
--->
-<resources>
-
-    <attr name="tabSwitcherThemeGlobal" format="reference"/>
-    <attr name="tabSwitcherThemePhone" format="reference"/>
-    <attr name="tabSwitcherThemeTablet" format="reference"/>
-    <attr name="tabSwitcherBackground" format="reference|color"/>
-    <attr name="tabSwitcherLayoutPolicy" format="enum">
-        <enum name="auto" value="1"/>
-        <enum name="phone" value="2"/>
-        <enum name="tablet" value="3"/>
-    </attr>
-    <attr name="tabSwitcherTabIcon" format="reference"/>
-    <attr name="tabSwitcherTabIconTint" format="color"/>
-    <attr name="tabSwitcherTabBackgroundColor" format="color"/>
-    <attr name="tabSwitcherTabContentBackgroundColor" format="color"/>
-    <attr name="tabSwitcherAddTabButtonColor" format="color"/>
-    <attr name="tabSwitcherTabTitleTextColor" format="color"/>
-    <attr name="tabSwitcherTabCloseButtonIcon" format="reference"/>
-    <attr name="tabSwitcherTabCloseButtonIconTint" format="color"/>
-    <attr name="tabSwitcherTabProgressBarColor" format="color"/>
-    <attr name="tabSwitcherToolbarTitle" format="string"/>
-    <attr name="tabSwitcherToolbarMenu" format="reference"/>
-    <attr name="tabSwitcherToolbarNavigationIcon" format="reference"/>
-    <attr name="tabSwitcherToolbarNavigationIconTint" format="color"/>
-    <attr name="tabSwitcherTabToolbarPreviewFadeThreshold" format="integer"/>
-    <attr name="tabSwitcherTabToolbarPreviewFadeDuration" format="integer"/>
-    <attr name="tabSwitcherEmptyView" format="reference"/>
-    <attr name="tabSwitcherEmptyViewAnimationDuration" format="integer"/>
-    <attr name="tabSwitcherToolbarPopupTheme" format="reference"/>
-
-    <declare-styleable name="TabSwitcher">
-        <attr name="android:background"/>
-        <attr name="preserveState" format="boolean"/>
-        <attr name="layoutPolicy" format="enum">
-            <enum name="auto" value="0"/>
-            <enum name="phone" value="1"/>
-            <enum name="tablet" value="2"/>
-            <enum name="tablet_landscape" value="3"/>
-        </attr>
-        <attr name="tabIcon" format="reference"/>
-        <attr name="tabIconTint" format="color"/>
-        <attr name="tabBackgroundColor" format="color"/>
-        <attr name="tabContentBackgroundColor" format="color"/>
-        <attr name="addTabButtonColor" format="color"/>
-        <attr name="tabTitleTextColor" format="color"/>
-        <attr name="tabCloseButtonIcon" format="reference"/>
-        <attr name="tabCloseButtonIconTint" format="color"/>
-        <attr name="showToolbars" format="boolean"/>
-        <attr name="toolbarTitle" format="string"/>
-        <attr name="toolbarMenu" format="reference"/>
-        <attr name="toolbarNavigationIcon" format="reference"/>
-        <attr name="toolbarNavigationIconTint" format="color"/>
-        <attr name="tabPreviewFadeThreshold" format="integer"/>
-        <attr name="tabPreviewFadeDuration" format="integer"/>
-        <attr name="emptyView" format="reference"/>
-        <attr name="emptyViewAnimationDuration" format="integer"/>
-        <attr name="themeGlobal" format="reference"/>
-        <attr name="themePhone" format="reference"/>
-        <attr name="themeTablet" format="reference"/>
-    </declare-styleable>
-
-</resources>
\ No newline at end of file
diff --git a/chromiumTabs/src/main/res/values/colors.xml b/chromiumTabs/src/main/res/values/colors.xml
deleted file mode 100644
index 869534de..00000000
--- a/chromiumTabs/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2016 - 2020 Michael Rapp
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing permissions and limitations under the
-License.
--->
-<resources>
-
-    <!-- Common -->
-    <color name="tab_title_text_color_light">#a8000000</color>
-    <color name="tab_title_text_color_dark">@android:color/white</color>
-    <color name="tab_progress_bar_color">#ff2196f3</color>
-
-    <!-- Phone layout -->
-    <color name="phone_tab_switcher_background_color">#ff14181c</color>
-    <color name="phone_tab_background_color_light">#fff2f2f2</color>
-    <color name="phone_tab_background_color_light_selected">#fff2f2f2</color>
-    <color name="phone_tab_background_color_dark">#ff505050</color>
-    <color name="phone_tab_background_color_dark_selected">#ff505050</color>
-    <color name="phone_tab_content_background_color_light">#fffafafa</color>
-    <color name="phone_tab_content_background_color_dark">#ff232323</color>
-
-    <!-- Tablet layout -->
-    <color name="tablet_tab_switcher_background_color">@android:color/black</color>
-    <color name="tablet_tab_background_color_light">#ffdadada</color>
-    <color name="tablet_tab_background_color_light_selected">#fff2f2f2</color>
-    <color name="tablet_tab_background_color_dark">#ff3c3c3c</color>
-    <color name="tablet_tab_background_color_dark_selected">#ff505050</color>
-    <color name="tablet_tab_content_background_color_light">#fff2f2f2</color>
-    <color name="tablet_tab_content_background_color_dark">#ff505050</color>
-    <color name="tablet_tab_border_color">#ffaeaeae</color>
-    <color name="add_tab_button_color_pressed">#ff2196f3</color>
-
-</resources>
\ No newline at end of file
diff --git a/chromiumTabs/src/main/res/values/dimens.xml b/chromiumTabs/src/main/res/values/dimens.xml
deleted file mode 100644
index 3f5ab202..00000000
--- a/chromiumTabs/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2016 - 2020 Michael Rapp
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing permissions and limitations under the
-License.
--->
-<resources>
-
-    <dimen name="tab_inset">16dp</dimen>
-    <dimen name="tab_border_width">4dp</dimen>
-    <dimen name="tab_title_container_height">48dp</dimen>
-    <dimen name="end_overshoot_pivot">128dp</dimen>
-    <dimen name="stacked_tab_spacing">4dp</dimen>
-    <dimen name="max_overshoot_distance">48dp</dimen>
-    <dimen name="max_camera_distance">1280dp</dimen>
-    <dimen name="min_swipe_velocity">1024dp</dimen>
-    <dimen name="drag_threshold">8dp</dimen>
-    <dimen name="swipe_threshold">24dp</dimen>
-    <dimen name="tab_switcher_drawable_size">48dp</dimen>
-    <dimen name="tab_switcher_drawable_font_size_normal">10sp</dimen>
-    <dimen name="tab_switcher_drawable_font_size_small">7sp</dimen>
-    <dimen name="swiped_tab_distance">32dp</dimen>
-    <item name="swiped_tab_scale" format="float" type="dimen">0.5</item>
-    <item name="swiped_tab_alpha" format="float" type="dimen">0</item>
-
-    <!-- Common -->
-    <dimen name="swipe_gesture_threshold">24dp</dimen>
-    <dimen name="pull_down_gesture_threshold">12dp</dimen>
-    <dimen name="tab_icon_size">18dp</dimen>
-    <dimen name="tab_progress_bar_size">16dp</dimen>
-    <dimen name="tab_progress_bar_thickness">2dp</dimen>
-
-    <!-- Phone layout -->
-    <dimen name="phone_tab_title_padding">12dp</dimen>
-    <dimen name="phone_tab_title_drawable_padding">8dp</dimen>
-
-    <!-- Tablet layout -->
-    <dimen name="tablet_tab_container_height">48dp</dimen>
-    <dimen name="tablet_tab_min_width">164dp</dimen>
-    <dimen name="tablet_tab_max_width">256dp</dimen>
-    <dimen name="tablet_tab_height">36dp</dimen>
-    <dimen name="tablet_tab_padding_left">22dp</dimen>
-    <dimen name="tablet_tab_padding_right">12dp</dimen>
-    <dimen name="tablet_tab_title_drawable_padding">4dp</dimen>
-    <dimen name="tablet_tab_offset">24dp</dimen>
-    <dimen name="tablet_add_tab_button_width">54dp</dimen>
-    <dimen name="tablet_add_tab_button_offset">14dp</dimen>
-
-</resources>
\ No newline at end of file
diff --git a/chromiumTabs/src/main/res/values/ids.xml b/chromiumTabs/src/main/res/values/ids.xml
deleted file mode 100644
index 62f5afcf..00000000
--- a/chromiumTabs/src/main/res/values/ids.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2016 - 2020 Michael Rapp
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing permissions and limitations under the
-License.
--->
-<resources>
-
-    <!-- Views -->
-    <item name="primary_toolbar" type="id"/>
-    <item name="secondary_toolbar" type="id"/>
-    <item name="tab_container" type="id"/>
-
-    <!-- Tags -->
-    <item name="tag_view_holder" type="id"/>
-    <item name="tag_properties" type="id"/>
-    <item name="tag_visibility" type="id"/>
-
-</resources>
\ No newline at end of file
diff --git a/chromiumTabs/src/main/res/values/integers.xml b/chromiumTabs/src/main/res/values/integers.xml
deleted file mode 100644
index 1d9ab5d0..00000000
--- a/chromiumTabs/src/main/res/values/integers.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2016 - 2020 Michael Rapp
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing permissions and limitations under the
-License.
--->
-<resources>
-
-    <!-- Common -->
-    <integer name="max_start_overshoot_angle">2</integer>
-    <integer name="max_end_overshoot_angle">3</integer>
-    <integer name="show_switcher_animation_duration">@android:integer/config_shortAnimTime</integer>
-    <integer name="hide_switcher_animation_duration">@android:integer/config_shortAnimTime</integer>
-    <integer name="toolbar_visibility_animation_duration">@android:integer/config_mediumAnimTime
-    </integer>
-    <integer name="toolbar_visibility_animation_delay">@android:integer/config_shortAnimTime
-    </integer>
-    <integer name="swipe_animation_duration">@android:integer/config_longAnimTime</integer>
-    <integer name="relocate_animation_duration">@android:integer/config_mediumAnimTime</integer>
-    <integer name="revert_overshoot_animation_duration">@android:integer/config_shortAnimTime
-    </integer>
-    <integer name="reveal_animation_duration">@android:integer/config_shortAnimTime</integer>
-    <integer name="peek_animation_duration">1200</integer>
-    <integer name="empty_view_animation_duration">@android:integer/config_shortAnimTime</integer>
-
-    <!-- Smartphone layout -->
-    <integer name="phone_stacked_tab_count">3</integer>
-
-    <!-- Tablet layout -->
-    <integer name="tablet_stacked_tab_count">4</integer>
-    <integer name="close_button_visibility_animation_duration">
-        @android:integer/config_shortAnimTime
-    </integer>
-
-</resources>
\ No newline at end of file
diff --git a/chromiumTabs/src/main/res/values/styles.xml b/chromiumTabs/src/main/res/values/styles.xml
deleted file mode 100644
index 908beed1..00000000
--- a/chromiumTabs/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright 2016 - 2020 Michael Rapp
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing permissions and limitations under the
-License.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <style name="TabSwitcher" parent="@style/ThemeOverlay.AppCompat.Dark">
-        <item name="tabSwitcherThemePhone">@style/TabSwitcher.Phone</item>
-        <item name="tabSwitcherThemeTablet">@style/TabSwitcher.Tablet</item>
-        <item name="tabSwitcherTabTitleTextColor">@color/tab_title_text_color_dark</item>
-        <item name="tabSwitcherToolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
-        <item name="tabSwitcherTabProgressBarColor">@color/tab_progress_bar_color</item>
-    </style>
-
-    <style name="TabSwitcher.Light" parent="@style/ThemeOverlay.AppCompat.Light">
-        <item name="tabSwitcherThemePhone">@style/TabSwitcher.Phone.Light</item>
-        <item name="tabSwitcherThemeTablet">@style/TabSwitcher.Tablet.Light</item>
-        <item name="tabSwitcherTabTitleTextColor">@color/tab_title_text_color_light</item>
-        <item name="tabSwitcherToolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
-        <item name="tabSwitcherTabProgressBarColor">@color/tab_progress_bar_color</item>
-    </style>
-
-    <style name="TabSwitcher.Phone" parent="@style/TabSwitcher">
-        <item name="tabSwitcherBackground">@color/phone_tab_switcher_background_color</item>
-        <item name="tabSwitcherTabBackgroundColor">@color/phone_tab_background_color_dark</item>
-        <item name="tabSwitcherTabContentBackgroundColor">
-            @color/phone_tab_content_background_color_dark
-        </item>
-        <item name="tabSwitcherTabCloseButtonIcon">@drawable/phone_tab_close_button_icon_dark</item>
-    </style>
-
-    <style name="TabSwitcher.Phone.Light" parent="@style/TabSwitcher.Light">
-        <item name="tabSwitcherBackground">@color/phone_tab_switcher_background_color</item>
-        <item name="tabSwitcherTabBackgroundColor">@color/phone_tab_background_color_light</item>
-        <item name="tabSwitcherTabContentBackgroundColor">
-            @color/phone_tab_content_background_color_light
-        </item>
-        <item name="tabSwitcherTabCloseButtonIcon">@drawable/phone_tab_close_button_icon_light
-        </item>
-    </style>
-
-    <style name="TabSwitcher.Tablet" parent="@style/TabSwitcher">
-        <item name="tabSwitcherBackground">@color/tablet_tab_switcher_background_color</item>
-        <item name="tabSwitcherTabBackgroundColor">@color/tablet_tab_background_dark</item>
-        <item name="tabSwitcherTabContentBackgroundColor">
-            @color/tablet_tab_content_background_color_dark
-        </item>
-        <item name="tabSwitcherAddTabButtonColor">@color/tablet_add_tab_button_dark</item>
-        <item name="tabSwitcherTabCloseButtonIcon">@drawable/tablet_tab_close_button_icon_dark
-        </item>
-    </style>
-
-    <style name="TabSwitcher.Tablet.Light" parent="@style/TabSwitcher.Light">
-        <item name="tabSwitcherBackground">@color/tablet_tab_switcher_background_color</item>
-        <item name="tabSwitcherTabBackgroundColor">@color/tablet_tab_background_light</item>
-        <item name="tabSwitcherTabContentBackgroundColor">
-            @color/tablet_tab_content_background_color_light
-        </item>
-        <item name="tabSwitcherAddTabButtonColor">@color/tablet_add_tab_button_light</item>
-        <item name="tabSwitcherTabCloseButtonIcon">@drawable/tablet_tab_close_button_icon_light
-        </item>
-    </style>
-
-    <style name="Tab.Title.Base" parent="@style/TextAppearance.AppCompat.Small">
-        <item name="android:ellipsize">none</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:requiresFadingEdge">horizontal</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:textColor">@color/tab_title_text_color_light</item>
-    </style>
-
-    <style name="Tab.Title.Phone" parent="@style/Tab.Title.Base"/>
-
-    <style name="Tab.Title.Tablet" parent="@style/Tab.Title.Base"/>
-
-</resources>
\ No newline at end of file
diff --git a/chromiumTabs/variables.gradle b/chromiumTabs/variables.gradle
deleted file mode 100644
index 02340da7..00000000
--- a/chromiumTabs/variables.gradle
+++ /dev/null
@@ -1,41 +0,0 @@
-/*arm versions*/
-project.ext.arm_vname = '605'
-project.ext.arm_vcode = 605
-
-/*aarch versions*/
-project.ext.aarch_vname = '606'
-project.ext.aarch_vcode = 606
-
-/*x86 versions*/
-project.ext.x86_vname = '607'
-project.ext.x86_vcode = 607
-
-/*x64 versions*/
-project.ext.x64_vname = '608'
-project.ext.x64_vcode = 608
-
-/*dimension*/
-project.ext.dimen = 'abi'
-
-/*firefox version*/
-project.ext.firefox_version = "81.0.20200930150533"
-project.ext.firefox_channel = ""
-
-/*Application Preferences*/
-project.ext.compileSdkVersion = 30
-project.ext.minSdkVersion = 21
-project.ext.targetSdkVersion = 30
-project.ext.versionCode = 600
-project.ext.versionName = "600.0"
-project.ext.applicationId = "com.darkweb.genesissearchengine"
-
-
-/*test*/
-project.ext.architecture_components_version = '2.1.0'
-project.ext.support_libraries_version = '1.0.0'
-project.ext.espresso_version = '3.1.0-alpha4'
-project.ext.coroutines_version = '1.3.0'
-project.ext.spotbugs_version = '3.1.4'
-project.ext.mozilla_components_version = '59.0.0'
-project.ext.mozilla_components_icon_version = '60.0.1'
-project.ext.gecko_nightly_version = '81.0.20200930150533'
diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
index 28f3d78f..25259939 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -58,6 +58,8 @@ import org.torproject.android.service.util.TorServiceUtils;
 import org.torproject.android.service.util.Utils;
 import org.torproject.android.service.vpn.OrbotVpnManager;
 import org.torproject.android.service.vpn.VpnPrefs;
+import org.torproject.android.service.wrapper.localHelperMethod;
+import org.torproject.android.service.wrapper.logRowModel;
 import org.torproject.android.service.wrapper.orbotLocalConstants;
 
 import java.io.BufferedReader;
@@ -435,7 +437,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
         try {
             mHandler = new Handler();
 
-            appBinHome = getFilesDir();//getDir(TorServiceConstants.DIRECTORY_TOR_BINARY, Application.MODE_PRIVATE);
+            appBinHome = getFilesDir();
             if (!appBinHome.exists())
                 appBinHome.mkdirs();
 
@@ -1286,16 +1288,13 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
         LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
     }
 
-    private void sendCallbackLogMessage (String logMessage)
+    private void sendCallbackLogMessage(String logMessage)
     {
 
-        //Log.i("FUCK","FUCK:"+logMessage);
         Intent intent = new Intent(LOCAL_ACTION_LOG);
-        // You can also include some extra data.
         intent.putExtra(LOCAL_EXTRA_LOG, logMessage);
         intent.putExtra(EXTRA_STATUS, mCurrentStatus);
-
-        orbotLocalConstants.mTorLogsHistory.add(logMessage);
+        orbotLocalConstants.mTorLogsHistory.add(new logRowModel(logMessage, localHelperMethod.getCurrentTime()));
 
         if(!mConnectivity){
             orbotLocalConstants.mTorLogsStatus = "No internet connection";
diff --git a/orbotservice/src/main/java/org/torproject/android/service/wrapper/localHelperMethod.java b/orbotservice/src/main/java/org/torproject/android/service/wrapper/localHelperMethod.java
new file mode 100644
index 00000000..260e7c0a
--- /dev/null
+++ b/orbotservice/src/main/java/org/torproject/android/service/wrapper/localHelperMethod.java
@@ -0,0 +1,22 @@
+package org.torproject.android.service.wrapper;
+
+import java.time.LocalDateTime;
+import java.util.Calendar;
+
+public class localHelperMethod
+{
+    /*Helper Methods General*/
+    public static String getCurrentTime(){
+        Calendar now = Calendar.getInstance();
+        int year = now.get(Calendar.YEAR);
+        int month = now.get(Calendar.MONTH) + 1; // Note: zero based!
+        int day = now.get(Calendar.DAY_OF_MONTH);
+        int hour = now.get(Calendar.HOUR_OF_DAY);
+        int minute = now.get(Calendar.MINUTE);
+        int second = now.get(Calendar.SECOND);
+        int millis = now.get(Calendar.MILLISECOND);
+
+        System.out.printf("%d-%02d-%02d %02d:%02d:%02d.%03d", year, month, day, hour, minute, second, millis);
+        return month + "/" + year + " | " + hour + ":" + minute + ":" + second;
+    }
+}
diff --git a/orbotservice/src/main/java/org/torproject/android/service/wrapper/logRowModel.java b/orbotservice/src/main/java/org/torproject/android/service/wrapper/logRowModel.java
new file mode 100644
index 00000000..cc72670b
--- /dev/null
+++ b/orbotservice/src/main/java/org/torproject/android/service/wrapper/logRowModel.java
@@ -0,0 +1,33 @@
+package org.torproject.android.service.wrapper;
+
+public class logRowModel {
+    /*Private Variables*/
+
+    private String mLog;
+    private String mDate;
+
+    /*Initializations*/
+
+    public logRowModel(String pLog, String pDate) {
+        this.mLog = pLog;
+        this.mDate = pDate;
+    }
+
+    /*Variable Setters*/
+
+    public void setLog(String pLog){
+        this.mLog = pLog;
+    }
+    public void setDate(String pDate) {
+        mDate = pDate;
+    }
+
+    /*Variable Getters*/
+
+    public String getLog() {
+        return mLog;
+    }
+    public String getDate() {
+        return mDate;
+    }
+}
diff --git a/orbotservice/src/main/java/org/torproject/android/service/wrapper/orbotLocalConstants.java b/orbotservice/src/main/java/org/torproject/android/service/wrapper/orbotLocalConstants.java
index e2383ae1..da1593ff 100755
--- a/orbotservice/src/main/java/org/torproject/android/service/wrapper/orbotLocalConstants.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/wrapper/orbotLocalConstants.java
@@ -6,7 +6,7 @@ import java.util.ArrayList;
 
 public class orbotLocalConstants
 {
-    public static ArrayList<String> mTorLogsHistory = new ArrayList<>();
+    public static ArrayList<logRowModel> mTorLogsHistory = new ArrayList<>();
     public static String mTorLogsStatus = "Loading...";
     public static boolean mIsTorInitialized = false;
     public static int mNotificationStatus = 0;