添加navigation

cleaner/app/build.gradle

@@ -8,7 +8,7 @@ apply plugin: 'kotlin-kapt'
 
 android {
     compileSdkVersion Versions.compileSdk
-    buildToolsVersion "29.0.3"
+    buildToolsVersion Versions.buildTools
 
     defaultConfig {
         applicationId "com.mints.cleaner"

cleaner/app/build/intermediates/bundle_manifest/cleanerDebug/bundle-manifest/AndroidManifest.xml

@@ -33,9 +33,9 @@
             android:name="android.max_aspect"
             android:value="2.4" />
 
-        <!-- <activity android:name=".ui.login.LoginActivity"/> -->
+        <activity android:name="com.mints.cleaner.ui.login.LoginActivity" />
         <activity android:name="com.mints.cleaner.ui.SplashActivity" />
-        <activity android:name="com.mints.cleaner.ui.login.LoginActivity" >
+        <activity android:name="com.mints.cleaner.ui.NavigationActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

cleaner/app/build/intermediates/incremental/mergeCleanerDebugResources/compile-file-map.properties

-#Fri Sep 04 17:50:44 CST 2020
+#Mon Sep 07 15:29:56 CST 2020
+/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/navigation/navigation.xml=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/navigation_navigation.xml.flat
 /Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/mipmap-xhdpi_ic_launcher_round.png.flat
+/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/mipmap-xhdpi/ic_main_my_enable.png=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/mipmap-xhdpi_ic_main_my_enable.png.flat
 /Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/mipmap-xxxhdpi_ic_launcher_round.png.flat
+/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/mipmap-xhdpi/ic_main_my_none.png=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/mipmap-xhdpi_ic_main_my_none.png.flat
+/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/layout/fragment_my.xml=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/layout_fragment_my.xml.flat
+/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/menu/bottom_nav_menu.xml=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/menu_bottom_nav_menu.xml.flat
 /Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/xml/provider_paths.xml=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/xml_provider_paths.xml.flat
 /Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/mipmap-anydpi-v26_ic_launcher.xml.flat
 /Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/drawable/ic_launcher_background.xml=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/drawable_ic_launcher_background.xml.flat
@@ -8,13 +13,20 @@
 /Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/incremental/mergeCleanerDebugResources/stripped.dir/layout/activity_login.xml=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/layout_activity_login.xml.flat
 /Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/mipmap-anydpi-v26_ic_launcher_round.xml.flat
 /Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/layout/activity_splash.xml=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/layout_activity_splash.xml.flat
+/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/layout/activity_navigation.xml=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/layout_activity_navigation.xml.flat
 /Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/mipmap-xhdpi/ic_launcher.png=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/mipmap-xhdpi_ic_launcher.png.flat
 /Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/drawable-v24/ic_launcher_foreground.xml=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/drawable-v24_ic_launcher_foreground.xml.flat
-/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/layout/activity_main.xml=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/layout_activity_main.xml.flat
+/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/mipmap-xhdpi/ic_main_care_enable.png=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/mipmap-xhdpi_ic_main_care_enable.png.flat
+/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/drawable/main_bottom.xml=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/drawable_main_bottom.xml.flat
+/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/drawable/ic_home_black_24dp.xml=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/drawable_ic_home_black_24dp.xml.flat
 /Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/mipmap-xxhdpi_ic_launcher_round.png.flat
 /Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/mipmap-mdpi/ic_launcher_round.png=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/mipmap-mdpi_ic_launcher_round.png.flat
-/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/mipmap-xxhdpi/ic_launcher.png=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/mipmap-xxhdpi_ic_launcher.png.flat
 /Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/mipmap-hdpi/ic_launcher_round.png=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/mipmap-hdpi_ic_launcher_round.png.flat
+/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/mipmap-xxhdpi/ic_launcher.png=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/mipmap-xxhdpi_ic_launcher.png.flat
 /Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/xml/network_security_config.xml=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/xml_network_security_config.xml.flat
+/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/layout/activity_bottom_navigation.xml=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/layout_activity_bottom_navigation.xml.flat
 /Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/mipmap-hdpi/ic_launcher.png=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/mipmap-hdpi_ic_launcher.png.flat
+/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/layout/fragment_home.xml=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/layout_fragment_home.xml.flat
+/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/layout/fragment_news.xml=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/layout_fragment_news.xml.flat
 /Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/mipmap-xxxhdpi_ic_launcher.png.flat
+/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/res/mipmap-xhdpi/ic_main_care_none.png=/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/build/intermediates/res/merged/cleaner/debug/mipmap-xhdpi_ic_main_care_none.png.flat

cleaner/app/build/intermediates/incremental/mergeCleanerDebugResources/stripped.dir/layout/activity_bottom_navigation.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/mainViewpager"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/navView"
+        style="@style/Widget.MaterialComponents.BottomNavigationView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:itemIconTint="@drawable/main_bottom"
+        app:itemTextColor="@drawable/main_bottom"
+        app:menu="@menu/bottom_nav_menu" />
+
+</LinearLayout>
\ No newline at end of file

cleaner/app/build/intermediates/incremental/mergeCleanerDebugResources/stripped.dir/layout/activity_login.xml

-<?xml version="1.0" encoding="utf-8"?>
-
-                                                    
-                                                   
-
-    
-
-                 
-                            
-                                                               
-           
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" android:tag="layout/activity_login_0" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:binding="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools">
-
-        <Button
-            android:id="@+id/btn_getdata"
-            android:layout_width="match_parent"
-            android:text="getData"
-            android:layout_centerInParent="true"
-            android:tag="binding_1"                              
-            android:layout_height="wrap_content"/>
-
-    </RelativeLayout>
-
-         
\ No newline at end of file

cleaner/app/build/intermediates/incremental/packageCleanerDebug/tmp/cleanerDebug/dex-renamer-state.txt

-#Fri Sep 04 17:50:48 CST 2020
+#Mon Sep 07 15:52:27 CST 2020
 path.3=classes_0.dex
 path.2=classes2.dex
 path.1=classes.dex

cleaner/app/build/intermediates/instant_app_manifest/cleanerDebug/AndroidManifest.xml

@@ -34,9 +34,9 @@
             android:name="android.max_aspect"
             android:value="2.4" />
 
-        <!-- <activity android:name=".ui.login.LoginActivity"/> -->
+        <activity android:name="com.mints.cleaner.ui.login.LoginActivity" />
         <activity android:name="com.mints.cleaner.ui.SplashActivity" />
-        <activity android:name="com.mints.cleaner.ui.login.LoginActivity" >
+        <activity android:name="com.mints.cleaner.ui.NavigationActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

cleaner/app/build/intermediates/manifest_merge_blame_file/cleanerDebug/manifest-merger-blame-cleaner-debug-report.txt

@@ -58,13 +58,15 @@
 34            android:value="2.4" />
 34-->/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/AndroidManifest.xml:21:13-32
 35
-36        <!-- <activity android:name=".ui.login.LoginActivity"/> -->
+36        <activity android:name="com.mints.cleaner.ui.login.LoginActivity" />
+36-->/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/AndroidManifest.xml:23:9-59
+36-->/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/AndroidManifest.xml:23:19-57
 37        <activity android:name="com.mints.cleaner.ui.SplashActivity" />
 37-->/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/AndroidManifest.xml:24:9-55
 37-->/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/AndroidManifest.xml:24:19-52
-38        <activity android:name="com.mints.cleaner.ui.login.LoginActivity" >
+38        <activity android:name="com.mints.cleaner.ui.NavigationActivity" >
 38-->/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/AndroidManifest.xml:25:9-31:20
-38-->/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/AndroidManifest.xml:25:19-57
+38-->/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/AndroidManifest.xml:25:19-56
 39            <intent-filter>
 39-->/Users/mcg/Documents/worker/androidspace/Cleaner/cleaner/app/src/main/AndroidManifest.xml:26:13-30:29
 40                <action android:name="android.intent.action.MAIN" />

cleaner/app/build/intermediates/merged_manifests/cleanerDebug/AndroidManifest.xml

@@ -33,9 +33,9 @@
             android:name="android.max_aspect"
             android:value="2.4" />
 
-        <!-- <activity android:name=".ui.login.LoginActivity"/> -->
+        <activity android:name="com.mints.cleaner.ui.login.LoginActivity" />
         <activity android:name="com.mints.cleaner.ui.SplashActivity" />
-        <activity android:name="com.mints.cleaner.ui.login.LoginActivity" >
+        <activity android:name="com.mints.cleaner.ui.NavigationActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

cleaner/app/build/intermediates/navigation_json/cleanerDebug/navigation.json

-[]
\ No newline at end of file
+[
+  {
+    "name": "navigation",
+    "navigationXmlIds": [],
+    "deepLinks": []
+  }
+]
\ No newline at end of file

cleaner/app/build/intermediates/symbol_list_with_package_name/cleanerDebug/package-aware-r.txt

@@ -1017,6 +1017,7 @@ color background_floating_material_dark
 color background_floating_material_light
 color background_material_dark
 color background_material_light
+color black
 color bright_foreground_disabled_material_dark
 color bright_foreground_disabled_material_light
 color bright_foreground_inverse_material_dark
@@ -1218,8 +1219,10 @@ color switch_thumb_normal_material_dark
 color switch_thumb_normal_material_light
 color test_mtrl_calendar_day
 color test_mtrl_calendar_day_selected
+color theme
 color tooltip_background_dark
 color tooltip_background_light
+color white
 dimen abc_action_bar_content_inset_material
 dimen abc_action_bar_content_inset_with_nav
 dimen abc_action_bar_default_height_material
@@ -1733,6 +1736,7 @@ drawable leak_canary_icon
 drawable leak_canary_icon_foreground
 drawable leak_canary_notification
 drawable leak_canary_toast_background
+drawable main_bottom
 drawable material_ic_calendar_black_24dp
 drawable material_ic_clear_black_24dp
 drawable material_ic_edit_black_24dp
@@ -1874,7 +1878,6 @@ id beginning
 id blocking
 id bottom
 id bounce
-id btnClick
 id btn_getdata
 id buttonPanel
 id cancel_button
@@ -2014,6 +2017,7 @@ id load_more_load_fail_view
 id load_more_loading_view
 id loading_progress
 id loading_text
+id mainViewpager
 id main_container
 id masked
 id matrix
@@ -2065,8 +2069,11 @@ id mtrl_picker_text_input_range_end
 id mtrl_picker_text_input_range_start
 id mtrl_picker_title_text
 id multiply
+id my
+id navView
 id nav_controller_view_tag
 id nav_host_fragment_container
+id navigation
 id navigation_header_container
 id never
 id noScroll
@@ -2160,7 +2167,9 @@ id stop
 id stretch
 id submenuarrow
 id submit_area
+id tabFragment
 id tabMode
+id tabNavigation
 id tag_accessibility_actions
 id tag_accessibility_clickable_spans
 id tag_accessibility_heading
@@ -2179,7 +2188,6 @@ id textEnd
 id textSpacerNoButtons
 id textSpacerNoTitle
 id textStart
-id textView
 id textWatcher
 id text_input_end_icon
 id text_input_start_icon
@@ -2206,6 +2214,8 @@ id transition_position
 id transition_scene_layoutid_cache
 id transition_transform
 id triangle
+id tv_home_text
+id tv_news_text
 id tv_prompt
 id unchecked
 id uniform
@@ -2216,6 +2226,7 @@ id useLogo
 id view_offset_helper
 id visible
 id visible_removing_fragment_view_tag
+id wifi
 id withText
 id withinBounds
 id wrap
@@ -2282,8 +2293,9 @@ layout abc_search_dropdown_item_icons_2line
 layout abc_search_view
 layout abc_select_dialog_material
 layout abc_tooltip
+layout activity_bottom_navigation
 layout activity_login
-layout activity_main
+layout activity_navigation
 layout activity_splash
 layout banner
 layout brvah_quick_view_load_more
@@ -2303,6 +2315,9 @@ layout design_navigation_menu
 layout design_navigation_menu_item
 layout design_text_input_end_icon
 layout design_text_input_start_icon
+layout fragment_home
+layout fragment_my
+layout fragment_news
 layout leak_canary_heap_analysis_failure_screen
 layout leak_canary_heap_dump_toast
 layout leak_canary_heap_render
@@ -2372,9 +2387,11 @@ layout text_view_with_line_height_from_layout
 layout text_view_with_line_height_from_style
 layout text_view_with_theme_line_height
 layout text_view_without_line_height
+menu bottom_nav_menu
 mipmap ic_launcher
 mipmap ic_launcher_round
 mipmap leak_canary_icon
+navigation navigation
 plurals leak_canary_group_screen_title
 plurals leak_canary_heap_analysis_list_retained_instances
 plurals mtrl_badge_content_description
@@ -2422,6 +2439,7 @@ string exposed_dropdown_menu_content_description
 string fab_transformation_scrim_behavior
 string fab_transformation_sheet_behavior
 string hide_bottom_view_on_scroll_behavior
+string home
 string icon_content_description
 string item_view_role_description
 string leak_canary_about_message
@@ -2517,6 +2535,7 @@ string mtrl_picker_toggle_to_day_selection
 string mtrl_picker_toggle_to_text_input_mode
 string mtrl_picker_toggle_to_year_selection
 string mtrl_slider_range_content_description
+string my
 string nav_app_bar_navigate_up_description
 string nav_app_bar_open_drawer_description
 string password_toggle_content_description
@@ -2527,6 +2546,7 @@ string path_password_strike_through
 string search_menu_title
 string status_bar_notification_info_overflow
 string tray__authority
+string wifi
 style AlertDialog_AppCompat
 style AlertDialog_AppCompat_Light
 style AndroidThemeColorAccentYellow
@@ -2755,6 +2775,7 @@ style Base_Widget_MaterialComponents_TextView
 style CardView
 style CardView_Dark
 style CardView_Light
+style DrawerArrowStyle
 style EmptyTheme
 style MD_ActionButton
 style MD_Dark

cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.s

+

\ No newline at end of file

cleaner/app/build/kotlin/compileCleanerDebugKotlin/caches-jvm/lookups/counters.tab

-31
-1
\ No newline at end of file
+44
+10
\ No newline at end of file