From 0cd76cf398a7c799b2a81f4206142a9bce9cbdee Mon Sep 17 00:00:00 2001
From: FatttSnake <fatttsnake@gmail.com>
Date: Mon, 21 Mar 2022 21:05:32 +0800
Subject: [PATCH] Dynamic add ToolButtons Add Navigation menu Change
 home_fragment's padding Unified color management

---
 .idea/misc.xml                                |  8 ++++
 .../fatapp/oxygentoolbox/MainActivity.java    | 26 ++++++------
 .../AboutFragment.java}                       | 16 ++++----
 .../AboutViewModel.java}                      |  8 ++--
 .../oxygentoolbox/ui/exit/ExitFragment.java   | 17 ++++++++
 .../oxygentoolbox/ui/home/HomeFragment.java   | 18 +++++---
 .../SettingFragment.java}                     | 16 ++++----
 .../SettingViewModel.java}                    |  8 ++--
 .../oxygentoolbox/ui/theme/ThemeFragment.java | 35 ++++++++++++++++
 .../ui/theme/ThemeViewModel.java              | 19 +++++++++
 .../main/res/drawable-v21/ic_menu_about.xml   | 11 +++++
 .../main/res/drawable-v21/ic_menu_exit.xml    | 17 ++++++++
 .../main/res/drawable-v21/ic_menu_home.xml    | 11 +++++
 .../main/res/drawable-v21/ic_menu_setting.xml | 11 +++++
 .../main/res/drawable-v21/ic_menu_theme.xml   | 11 +++++
 .../res/drawable-v21/ripple_foreground.xml    |  5 +--
 .../main/res/drawable/button_radius_shape.xml |  2 +-
 .../main/res/drawable/down_to_right_arrow.xml |  2 +-
 app/src/main/res/drawable/ic_menu_camera.xml  | 12 ------
 app/src/main/res/drawable/ic_menu_gallery.xml |  9 ----
 .../main/res/drawable/ic_menu_slideshow.xml   |  9 ----
 .../main/res/drawable/right_to_down_arrow.xml |  2 +-
 app/src/main/res/drawable/side_nav_bar.xml    |  8 ++--
 app/src/main/res/drawable/tools_icon.xml      |  2 +-
 app/src/main/res/layout/activity_main.xml     |  3 +-
 ...ragment_gallery.xml => fragment_about.xml} |  4 +-
 app/src/main/res/layout/fragment_home.xml     | 38 ++++++++++-------
 ...ent_slideshow.xml => fragment_setting.xml} |  4 +-
 app/src/main/res/layout/fragment_theme.xml    | 22 ++++++++++
 app/src/main/res/layout/layout_item.xml       | 41 +------------------
 app/src/main/res/layout/tool_button.xml       |  8 ++++
 .../main/res/menu/activity_main_drawer.xml    | 22 ++++++----
 app/src/main/res/menu/main.xml                |  2 +-
 .../main/res/navigation/mobile_navigation.xml | 26 ++++++++----
 app/src/main/res/values-night/colors.xml      |  6 ++-
 app/src/main/res/values-night/styles.xml      |  2 +-
 app/src/main/res/values-night/themes.xml      |  4 +-
 app/src/main/res/values/colors.xml            |  6 ++-
 app/src/main/res/values/strings.xml           | 12 +++---
 app/src/main/res/values/styles.xml            |  9 +++-
 app/src/main/res/values/themes.xml            |  4 +-
 41 files changed, 322 insertions(+), 174 deletions(-)
 rename app/src/main/java/com/fatapp/oxygentoolbox/ui/{slideshow/SlideshowFragment.java => about/AboutFragment.java} (57%)
 rename app/src/main/java/com/fatapp/oxygentoolbox/ui/{gallery/GalleryViewModel.java => about/AboutViewModel.java} (61%)
 create mode 100644 app/src/main/java/com/fatapp/oxygentoolbox/ui/exit/ExitFragment.java
 rename app/src/main/java/com/fatapp/oxygentoolbox/ui/{gallery/GalleryFragment.java => setting/SettingFragment.java} (61%)
 rename app/src/main/java/com/fatapp/oxygentoolbox/ui/{slideshow/SlideshowViewModel.java => setting/SettingViewModel.java} (59%)
 create mode 100644 app/src/main/java/com/fatapp/oxygentoolbox/ui/theme/ThemeFragment.java
 create mode 100644 app/src/main/java/com/fatapp/oxygentoolbox/ui/theme/ThemeViewModel.java
 create mode 100644 app/src/main/res/drawable-v21/ic_menu_about.xml
 create mode 100644 app/src/main/res/drawable-v21/ic_menu_exit.xml
 create mode 100644 app/src/main/res/drawable-v21/ic_menu_home.xml
 create mode 100644 app/src/main/res/drawable-v21/ic_menu_setting.xml
 create mode 100644 app/src/main/res/drawable-v21/ic_menu_theme.xml
 delete mode 100644 app/src/main/res/drawable/ic_menu_camera.xml
 delete mode 100644 app/src/main/res/drawable/ic_menu_gallery.xml
 delete mode 100644 app/src/main/res/drawable/ic_menu_slideshow.xml
 rename app/src/main/res/layout/{fragment_gallery.xml => fragment_about.xml} (91%)
 rename app/src/main/res/layout/{fragment_slideshow.xml => fragment_setting.xml} (90%)
 create mode 100644 app/src/main/res/layout/fragment_theme.xml
 create mode 100644 app/src/main/res/layout/tool_button.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 06084a0..8e44fc4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,11 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/drawable-v21/ic_menu_about.xml" value="0.246875" />
+        <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/drawable-v21/ic_menu_exit.xml" value="0.246875" />
+        <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/drawable-v21/ic_menu_home.xml" value="0.246875" />
+        <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/drawable-v21/ic_menu_setting.xml" value="0.246875" />
+        <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/drawable-v21/ic_menu_theme.xml" value="0.246875" />
         <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/drawable-v21/ripple_foreground.xml" value="0.15520833333333334" />
         <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.11944444444444445" />
         <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/drawable/bottom_radius_background.xml" value="0.11944444444444445" />
@@ -24,11 +29,14 @@
         <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/layout/basic_tool_list.xml" value="0.1390625" />
         <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/layout/content_main.xml" value="0.14990942028985507" />
         <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/layout/fold_layout.xml" value="0.1" />
+        <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/layout/fragment_about.xml" value="0.1" />
         <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/layout/fragment_gallery.xml" value="0.1" />
         <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/layout/fragment_home.xml" value="0.1" />
         <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/layout/fragment_slideshow.xml" value="0.1" />
+        <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/layout/fragment_theme.xml" value="0.1" />
         <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/layout/layout_item.xml" value="0.1" />
         <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/layout/nav_header_main.xml" value="0.1" />
+        <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/layout/tool_button.xml" value="0.3619791666666667" />
         <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/menu/activity_main_drawer.xml" value="0.1" />
         <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/menu/main.xml" value="0.1" />
         <entry key="..\:/.workspace-android/Project-ToolBox/OxygenToolbox/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.11944444444444445" />
diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/MainActivity.java b/app/src/main/java/com/fatapp/oxygentoolbox/MainActivity.java
index b0c655b..eb90941 100644
--- a/app/src/main/java/com/fatapp/oxygentoolbox/MainActivity.java
+++ b/app/src/main/java/com/fatapp/oxygentoolbox/MainActivity.java
@@ -5,6 +5,7 @@ import android.content.pm.ShortcutInfo;
 import android.content.pm.ShortcutManager;
 import android.graphics.drawable.Icon;
 import android.os.Bundle;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.Menu;
 
@@ -29,7 +30,6 @@ import java.util.List;
 public class MainActivity extends AppCompatActivity {
 
     private AppBarConfiguration mAppBarConfiguration;
-    private FoldLayout foldLayout;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -44,10 +44,18 @@ public class MainActivity extends AppCompatActivity {
         });
         DrawerLayout drawer = findViewById(R.id.drawer_layout);
         NavigationView navigationView = findViewById(R.id.nav_view);
+        navigationView.inflateHeaderView(R.layout.nav_header_main);
+        navigationView.inflateMenu(R.menu.activity_main_drawer);
+        navigationView.addOnLayoutChangeListener((v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
+            if (navigationView.getMenu().getItem(0).isChecked()) {
+                fab.setVisibility(View.VISIBLE);
+            } else {
+                fab.setVisibility(View.GONE);
+            }
+        });
         // Passing each menu ID as a set of Ids because each
         // menu should be considered as top level destinations.
-        mAppBarConfiguration = new AppBarConfiguration.Builder(
-                R.id.nav_home, R.id.nav_gallery, R.id.nav_slideshow)
+        mAppBarConfiguration = new AppBarConfiguration.Builder(R.id.nav_home)
                 .setDrawerLayout(drawer)
                 .build();
         NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment);
@@ -73,7 +81,7 @@ public class MainActivity extends AppCompatActivity {
                         .setClassName("com.fatapp.oxygentoolbox", "com.fatapp.oxygentoolbox.MainActivity"))
                 .setShortLabel("This is a dynamic shortcut")
                 .setLongLabel("This is a dynamic shortcut with long label")
-                .setIcon(Icon.createWithResource(this, R.drawable.ic_menu_camera));
+                .setIcon(Icon.createWithResource(this, R.drawable.ic_menu_home));
         ShortcutManager shortcutManager = getSystemService(ShortcutManager.class);
         shortcutManager.addDynamicShortcuts(Collections.singletonList(builder.build()));
     }
@@ -91,14 +99,4 @@ public class MainActivity extends AppCompatActivity {
         return NavigationUI.navigateUp(navController, mAppBarConfiguration)
                 || super.onSupportNavigateUp();
     }
-
-    public void initView() {
-        foldLayout = (FoldLayout) findViewById(R.id.foldLayout);
-
-        List<View> viewList = new ArrayList<>();
-
-        viewList.add(getLayoutInflater().inflate(R.layout.layout_item, null));
-
-        foldLayout.addItemView(viewList);
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/ui/slideshow/SlideshowFragment.java b/app/src/main/java/com/fatapp/oxygentoolbox/ui/about/AboutFragment.java
similarity index 57%
rename from app/src/main/java/com/fatapp/oxygentoolbox/ui/slideshow/SlideshowFragment.java
rename to app/src/main/java/com/fatapp/oxygentoolbox/ui/about/AboutFragment.java
index 24d0af2..a7db11e 100644
--- a/app/src/main/java/com/fatapp/oxygentoolbox/ui/slideshow/SlideshowFragment.java
+++ b/app/src/main/java/com/fatapp/oxygentoolbox/ui/about/AboutFragment.java
@@ -1,4 +1,4 @@
-package com.fatapp.oxygentoolbox.ui.slideshow;
+package com.fatapp.oxygentoolbox.ui.about;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -14,17 +14,17 @@ import androidx.lifecycle.ViewModelProvider;
 
 import com.fatapp.oxygentoolbox.R;
 
-public class SlideshowFragment extends Fragment {
+public class AboutFragment extends Fragment {
 
-    private SlideshowViewModel slideshowViewModel;
+    private AboutViewModel aboutViewModel;
 
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
-        slideshowViewModel =
-                new ViewModelProvider(this).get(SlideshowViewModel.class);
-        View root = inflater.inflate(R.layout.fragment_slideshow, container, false);
-        final TextView textView = root.findViewById(R.id.text_slideshow);
-        slideshowViewModel.getText().observe(getViewLifecycleOwner(), new Observer<String>() {
+        aboutViewModel =
+                new ViewModelProvider(this).get(AboutViewModel.class);
+        View root = inflater.inflate(R.layout.fragment_about, container, false);
+        final TextView textView = root.findViewById(R.id.text_about);
+        aboutViewModel.getText().observe(getViewLifecycleOwner(), new Observer<String>() {
             @Override
             public void onChanged(@Nullable String s) {
                 textView.setText(s);
diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/ui/gallery/GalleryViewModel.java b/app/src/main/java/com/fatapp/oxygentoolbox/ui/about/AboutViewModel.java
similarity index 61%
rename from app/src/main/java/com/fatapp/oxygentoolbox/ui/gallery/GalleryViewModel.java
rename to app/src/main/java/com/fatapp/oxygentoolbox/ui/about/AboutViewModel.java
index 8cba9c8..8c1aead 100644
--- a/app/src/main/java/com/fatapp/oxygentoolbox/ui/gallery/GalleryViewModel.java
+++ b/app/src/main/java/com/fatapp/oxygentoolbox/ui/about/AboutViewModel.java
@@ -1,16 +1,16 @@
-package com.fatapp.oxygentoolbox.ui.gallery;
+package com.fatapp.oxygentoolbox.ui.about;
 
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
-public class GalleryViewModel extends ViewModel {
+public class AboutViewModel extends ViewModel {
 
     private MutableLiveData<String> mText;
 
-    public GalleryViewModel() {
+    public AboutViewModel() {
         mText = new MutableLiveData<>();
-        mText.setValue("This is gallery fragment");
+        mText.setValue("This is about fragment");
     }
 
     public LiveData<String> getText() {
diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/ui/exit/ExitFragment.java b/app/src/main/java/com/fatapp/oxygentoolbox/ui/exit/ExitFragment.java
new file mode 100644
index 0000000..48d4c2f
--- /dev/null
+++ b/app/src/main/java/com/fatapp/oxygentoolbox/ui/exit/ExitFragment.java
@@ -0,0 +1,17 @@
+package com.fatapp.oxygentoolbox.ui.exit;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
+public class ExitFragment extends Fragment {
+
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        System.exit(0);
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/ui/home/HomeFragment.java b/app/src/main/java/com/fatapp/oxygentoolbox/ui/home/HomeFragment.java
index 2485195..3bde98c 100644
--- a/app/src/main/java/com/fatapp/oxygentoolbox/ui/home/HomeFragment.java
+++ b/app/src/main/java/com/fatapp/oxygentoolbox/ui/home/HomeFragment.java
@@ -3,10 +3,12 @@ package com.fatapp.oxygentoolbox.ui.home;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.os.Bundle;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -33,8 +35,7 @@ public class HomeFragment extends Fragment {
     private FoldLayout foldLayout;
     private FoldLayout foldLayout1;
 
-    public View onCreateView(@NonNull LayoutInflater inflater,
-                             ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         homeViewModel =
                 new ViewModelProvider(this).get(HomeViewModel.class);
         root = inflater.inflate(R.layout.fragment_home, container, false);
@@ -43,12 +44,19 @@ public class HomeFragment extends Fragment {
     }
 
     private void initView() {
-        foldLayout = (FoldLayout) root.findViewById(R.id.foldLayout);
+        foldLayout = root.findViewById(R.id.foldLayout);
         List<View> viewList = new ArrayList<>();
-        viewList.add(getLayoutInflater().inflate(R.layout.layout_item, null));
+        View layout_item = getLayoutInflater().inflate(R.layout.layout_item, null);
+        ViewGroup layout_item_AutoLinefeedLayout = layout_item.findViewById(R.id.layout_item_AutoLinefeedLayout);
+        for (int i = 1; i < 1000; i++) {
+            View toolButton = getLayoutInflater().inflate(R.layout.tool_button, null);
+            ((Button) toolButton.findViewById(R.id.toolButton)).setText("Bt" + i);
+            layout_item_AutoLinefeedLayout.addView(toolButton);
+        }
+        viewList.add(layout_item);
         foldLayout.addItemView(viewList);
 
-        foldLayout1 = (FoldLayout) root.findViewById(R.id.foldLayout1);
+        foldLayout1 = root.findViewById(R.id.foldLayout1);
         List<View> viewList1 = new ArrayList<>();
         viewList1.add(getLayoutInflater().inflate(R.layout.layout_item, null));
         foldLayout1.addItemView(viewList1);
diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/ui/gallery/GalleryFragment.java b/app/src/main/java/com/fatapp/oxygentoolbox/ui/setting/SettingFragment.java
similarity index 61%
rename from app/src/main/java/com/fatapp/oxygentoolbox/ui/gallery/GalleryFragment.java
rename to app/src/main/java/com/fatapp/oxygentoolbox/ui/setting/SettingFragment.java
index 2a8d8e5..ac5855e 100644
--- a/app/src/main/java/com/fatapp/oxygentoolbox/ui/gallery/GalleryFragment.java
+++ b/app/src/main/java/com/fatapp/oxygentoolbox/ui/setting/SettingFragment.java
@@ -1,4 +1,4 @@
-package com.fatapp.oxygentoolbox.ui.gallery;
+package com.fatapp.oxygentoolbox.ui.setting;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -14,17 +14,17 @@ import androidx.lifecycle.ViewModelProvider;
 
 import com.fatapp.oxygentoolbox.R;
 
-public class GalleryFragment extends Fragment {
+public class SettingFragment extends Fragment {
 
-    private GalleryViewModel galleryViewModel;
+    private SettingViewModel settingViewModel;
 
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
-        galleryViewModel =
-                new ViewModelProvider(this).get(GalleryViewModel.class);
-        View root = inflater.inflate(R.layout.fragment_gallery, container, false);
-        final TextView textView = root.findViewById(R.id.text_gallery);
-        galleryViewModel.getText().observe(getViewLifecycleOwner(), new Observer<String>() {
+        settingViewModel =
+                new ViewModelProvider(this).get(SettingViewModel.class);
+        View root = inflater.inflate(R.layout.fragment_about, container, false);
+        final TextView textView = root.findViewById(R.id.text_setting);
+        settingViewModel.getText().observe(getViewLifecycleOwner(), new Observer<String>() {
             @Override
             public void onChanged(@Nullable String s) {
                 textView.setText(s);
diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/ui/slideshow/SlideshowViewModel.java b/app/src/main/java/com/fatapp/oxygentoolbox/ui/setting/SettingViewModel.java
similarity index 59%
rename from app/src/main/java/com/fatapp/oxygentoolbox/ui/slideshow/SlideshowViewModel.java
rename to app/src/main/java/com/fatapp/oxygentoolbox/ui/setting/SettingViewModel.java
index 96e3379..2be9f35 100644
--- a/app/src/main/java/com/fatapp/oxygentoolbox/ui/slideshow/SlideshowViewModel.java
+++ b/app/src/main/java/com/fatapp/oxygentoolbox/ui/setting/SettingViewModel.java
@@ -1,16 +1,16 @@
-package com.fatapp.oxygentoolbox.ui.slideshow;
+package com.fatapp.oxygentoolbox.ui.setting;
 
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
-public class SlideshowViewModel extends ViewModel {
+public class SettingViewModel extends ViewModel {
 
     private MutableLiveData<String> mText;
 
-    public SlideshowViewModel() {
+    public SettingViewModel() {
         mText = new MutableLiveData<>();
-        mText.setValue("This is slideshow fragment");
+        mText.setValue("This is setting fragment");
     }
 
     public LiveData<String> getText() {
diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/ui/theme/ThemeFragment.java b/app/src/main/java/com/fatapp/oxygentoolbox/ui/theme/ThemeFragment.java
new file mode 100644
index 0000000..97c2041
--- /dev/null
+++ b/app/src/main/java/com/fatapp/oxygentoolbox/ui/theme/ThemeFragment.java
@@ -0,0 +1,35 @@
+package com.fatapp.oxygentoolbox.ui.theme;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
+
+import com.fatapp.oxygentoolbox.R;
+
+public class ThemeFragment extends Fragment {
+
+    private ThemeViewModel themeViewModel;
+
+    public View onCreateView(@NonNull LayoutInflater inflater,
+                             ViewGroup container, Bundle savedInstanceState) {
+        themeViewModel =
+                new ViewModelProvider(this).get(ThemeViewModel.class);
+        View root = inflater.inflate(R.layout.fragment_theme, container, false);
+        final TextView textView = root.findViewById(R.id.text_theme);
+        themeViewModel.getText().observe(getViewLifecycleOwner(), new Observer<String>() {
+            @Override
+            public void onChanged(@Nullable String s) {
+                textView.setText(s);
+            }
+        });
+        return root;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/fatapp/oxygentoolbox/ui/theme/ThemeViewModel.java b/app/src/main/java/com/fatapp/oxygentoolbox/ui/theme/ThemeViewModel.java
new file mode 100644
index 0000000..bbda7fb
--- /dev/null
+++ b/app/src/main/java/com/fatapp/oxygentoolbox/ui/theme/ThemeViewModel.java
@@ -0,0 +1,19 @@
+package com.fatapp.oxygentoolbox.ui.theme;
+
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+
+public class ThemeViewModel extends ViewModel {
+
+    private MutableLiveData<String> mText;
+
+    public ThemeViewModel() {
+        mText = new MutableLiveData<>();
+        mText.setValue("This is theme fragment");
+    }
+
+    public LiveData<String> getText() {
+        return mText;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/ic_menu_about.xml b/app/src/main/res/drawable-v21/ic_menu_about.xml
new file mode 100644
index 0000000..bf287d4
--- /dev/null
+++ b/app/src/main/res/drawable-v21/ic_menu_about.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="1024dp"
+    android:height="1024dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+
+    <path
+        android:fillColor="@color/app_theme"
+        android:pathData="M512 0C229.376 0 0 229.376 0 512s229.376 512 512 512 512-229.376 512-512S794.624 0 512 0z m62.464 774.144c0 27.648-22.528 50.176-50.176 50.176h-25.088c-27.648 0-50.176-22.528-50.176-50.176V474.624c0-27.648 22.528-50.176 50.176-50.176h25.088c27.648 0 50.176 22.528 50.176 50.176v299.52zM512 349.696c-34.304 0-62.464-28.16-62.464-62.464 0-34.304 28.16-62.464 62.464-62.464s62.464 28.16 62.464 62.464c0 34.304-28.16 62.464-62.464 62.464z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/ic_menu_exit.xml b/app/src/main/res/drawable-v21/ic_menu_exit.xml
new file mode 100644
index 0000000..638d372
--- /dev/null
+++ b/app/src/main/res/drawable-v21/ic_menu_exit.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="1024dp"
+    android:height="1024dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+
+    <path
+        android:fillColor="@color/app_theme"
+        android:pathData="M952.7 492.1c-1.4-1.8-3.1-3.4-4.8-4.9l-179-178.9c-12.5-12.5-32.9-12.5-45.4 0s-12.5 32.9 0 45.4l126 126H421.3h-0.1c-18.2 0-32.9 14.8-32.9 33s14.7 33 32.9 33c0.3 0.1 0.5 0 0.7 0h427.8l-126 126c-12.3 12.3-12.3 32.4 0 44.7l0.7 0.7c12.3 12.3 32.4 12.3 44.7 0l182-182c11.7-11.7 12.3-30.6 1.6-43z" />
+    <path
+        android:fillColor="@color/app_theme"
+        android:pathData="M562.3 799c-18 0-32.7 14.7-32.7 32.7v63.8H129.2V128.7h400.4v63.1c0 18 14.7 32.7 32.7 32.7s32.7-14.7 32.7-32.7V96.3c0-3.5-0.6-6.8-1.6-10-4.2-13.3-16.6-23-31.2-23H96.6c-18 0-32.7 14.7-32.7 32.7v831.9c0 14.2 9.2 26.3 21.8 30.8 3.6 1.4 7.5 2.1 11.5 2.1h463.2c0.6 0 1.3 0.1 1.9 0.1 18 0 32.7-14.7 32.7-32.7v-96.5c0-18-14.7-32.7-32.7-32.7z" />
+    <path
+        android:fillColor="@color/app_theme"
+        android:pathData="M256.8 512.7a32.9 33 0 1 0 65.8 0 32.9 33 0 1 0-65.8 0Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/ic_menu_home.xml b/app/src/main/res/drawable-v21/ic_menu_home.xml
new file mode 100644
index 0000000..144853f
--- /dev/null
+++ b/app/src/main/res/drawable-v21/ic_menu_home.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="1036dp"
+    android:height="1024dp"
+    android:viewportWidth="1036"
+    android:viewportHeight="1024">
+
+    <path
+        android:fillColor="@color/app_theme"
+        android:pathData="M1014.628571 504L543.885714 33.6a36.491429 36.491429 0 0 0-51.657143 0L21.485714 504c-13.714286 13.714286-21.485714 32.342857-21.485714 51.771429 0 40.342857 32.8 73.142857 73.142857 73.142857h49.6V964.571429c0 20.228571 16.342857 36.571429 36.571429 36.571428H444.914286V745.142857h128v256h303.885714c20.228571 0 36.571429-16.342857 36.571429-36.571428V628.914286h49.6c19.428571 0 38.057143-7.657143 51.771428-21.485715 28.457143-28.571429 28.457143-74.857143-0.114286-103.428571z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/ic_menu_setting.xml b/app/src/main/res/drawable-v21/ic_menu_setting.xml
new file mode 100644
index 0000000..6aaaa4a
--- /dev/null
+++ b/app/src/main/res/drawable-v21/ic_menu_setting.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="1024dp"
+    android:height="1024dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+
+    <path
+        android:fillColor="@color/app_theme"
+        android:pathData="M542.464 85.333333c23.466667-0.426667 45.696 8.106667 62.293333 24.32 16.682667 15.786667 25.6 37.546667 25.6 60.586667 0 46.933333 38.826667 84.949333 87.082667 84.949333 14.933333 0 29.866667-4.266667 43.093333-11.52 41.386667-22.272 93.013333-8.106667 116.48 31.573334l29.013334 49.92c7.253333 12.8 11.52 27.306667 11.52 42.24 0 30.293333-16.64 58.453333-43.52 73.386666-13.226667 7.253333-24.32 18.346667-32 31.146667a83.626667 83.626667 0 0 0 32 113.92 84.394667 84.394667 0 0 1 32 115.2l-29.013334 48.213333c-15.36 26.453333-43.946667 42.666667-74.666666 42.666667-15.36 0-30.72-3.84-43.52-11.52-13.653333-7.253333-28.586667-11.52-43.52-11.52-23.04 0-45.226667 8.96-61.44 25.173333-16.64 15.786667-25.6 37.546667-25.6 60.16 0 46.506667-38.826667 84.48-87.04 84.48h-58.453334c-23.04 0-44.8-9.386667-60.586666-25.173333-16.213333-16.213333-24.746667-37.546667-24.746667-59.733333 0-46.933333-38.4-84.906667-86.613333-84.906667-15.786667 0-31.146667 4.266667-44.373334 12.373333a91.733333 91.733333 0 0 1-66.133333 8.533334c-22.186667-5.973333-41.386667-20.48-52.906667-39.68l-27.306666-48.213334a83.157333 83.157333 0 0 1-10.666667-66.56c5.973333-22.613333 21.333333-41.813333 42.24-53.333333 13.226667-7.253333 24.32-17.92 32-31.146667a84.48 84.48 0 0 0-32-113.92 83.072 83.072 0 0 1-31.573333-113.92l27.306666-47.786666c11.52-20.053333 30.72-34.56 53.333334-40.533334a88.149333 88.149333 0 0 1 66.56 8.96c13.653333 7.253333 28.586667 11.093333 43.52 11.093334 23.04 0 45.226667-8.96 61.44-24.746667 16.213333-15.786667 25.173333-37.546667 25.173333-59.733333 0-46.933333 38.826667-84.906667 87.04-84.906667z m17.109333 319.189334a121.728 121.728 0 0 0-130.986666 25.173333c-34.133333 33.28-44.8 84.053333-26.026667 127.573333a119.210667 119.210667 0 0 0 110.506667 72.533334h0.426666c32 0.426667 61.866667-11.946667 84.48-34.133334 22.613333-21.76 35.413333-51.626667 35.413334-82.773333 0.426667-47.36-29.013333-90.453333-73.813334-108.373333z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/ic_menu_theme.xml b/app/src/main/res/drawable-v21/ic_menu_theme.xml
new file mode 100644
index 0000000..984bb26
--- /dev/null
+++ b/app/src/main/res/drawable-v21/ic_menu_theme.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="1024dp"
+    android:height="1024dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+
+    <path
+        android:fillColor="@color/app_theme"
+        android:pathData="M1004.12788 321.092L762.77088 79.735a68.267 68.267 0 0 0-96.546 0l-30.293 30.294a68.284 68.284 0 0 1-48.265 20.002H436.47388a68.181 68.181 0 0 1-48.265-20.002l-30.293-30.294a68.267 68.267 0 0 0-96.546 0L19.99588 321.092a68.267 68.267 0 0 0 0 96.546l96.546 96.547a67.84 67.84 0 0 0 66.645 17.271c10.804-3.072 21.675 4.181 21.675 15.411V896c0 37.547 30.72 68.267 68.267 68.267H750.99388c37.547 0 68.267-30.72 68.267-68.267V546.867c0-11.23 10.872-18.483 21.675-15.411a67.84 67.84 0 0 0 66.645-17.271l96.546-96.547a68.267 68.267 0 0 0 0-96.546z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/ripple_foreground.xml b/app/src/main/res/drawable-v21/ripple_foreground.xml
index 61479c0..3104a7c 100644
--- a/app/src/main/res/drawable-v21/ripple_foreground.xml
+++ b/app/src/main/res/drawable-v21/ripple_foreground.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="#88cccccc">
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/tools_button_ripple">
     <item android:id="@android:id/mask">
         <shape>
-            <!--<solid android:color="#FFFFFF" />-->
-            <solid android:color="#88cccccc" />
+            <solid android:color="@color/tools_button_ripple" />
             <corners android:radius="120dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/button_radius_shape.xml b/app/src/main/res/drawable/button_radius_shape.xml
index f44b82d..c05d950 100644
--- a/app/src/main/res/drawable/button_radius_shape.xml
+++ b/app/src/main/res/drawable/button_radius_shape.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#FFF5F5F5" />
+    <solid android:color="@color/tools_button_background" />
     <corners android:radius="120dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/down_to_right_arrow.xml b/app/src/main/res/drawable/down_to_right_arrow.xml
index 076320c..526f2f0 100644
--- a/app/src/main/res/drawable/down_to_right_arrow.xml
+++ b/app/src/main/res/drawable/down_to_right_arrow.xml
@@ -11,7 +11,7 @@
             <path
                 android:name="path"
                 android:pathData="M 1008.02 276.637 C 983.509 254.352 945.634 256.617 923.35 278.864 L 513.35 720.056 L 103.351 278.826 C 81.067 254.315 43.18 254.315 18.668 276.599 C -5.843 298.883 -5.843 336.758 16.441 361.269 L 468.782 849.245 C 479.918 860.393 495.52 869.264 513.35 869.264 C 528.941 869.264 546.77 862.583 557.906 849.245 L 1010.247 361.269 C 1032.531 336.758 1032.531 298.883 1008.02 276.599 Z M 1008.02 276.637"
-                android:fillColor="#666666"
+                android:fillColor="@color/tools_arrow"
                 android:strokeWidth="1"/>
         </vector>
     </aapt:attr>
diff --git a/app/src/main/res/drawable/ic_menu_camera.xml b/app/src/main/res/drawable/ic_menu_camera.xml
deleted file mode 100644
index 634fe92..0000000
--- a/app/src/main/res/drawable/ic_menu_camera.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9,2L7.17,4H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2H9zm3,15c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_gallery.xml b/app/src/main/res/drawable/ic_menu_gallery.xml
deleted file mode 100644
index 03c7709..0000000
--- a/app/src/main/res/drawable/ic_menu_gallery.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M22,16V4c0,-1.1 -0.9,-2 -2,-2H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zm-11,-4l2.03,2.71L16,11l4,5H8l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2H4V6H2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_slideshow.xml b/app/src/main/res/drawable/ic_menu_slideshow.xml
deleted file mode 100644
index 5e9e163..0000000
--- a/app/src/main/res/drawable/ic_menu_slideshow.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6zm16,-4H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zm-8,12.5v-9l6,4.5 -6,4.5z" />
-</vector>
diff --git a/app/src/main/res/drawable/right_to_down_arrow.xml b/app/src/main/res/drawable/right_to_down_arrow.xml
index 9eaa65f..9e8553b 100644
--- a/app/src/main/res/drawable/right_to_down_arrow.xml
+++ b/app/src/main/res/drawable/right_to_down_arrow.xml
@@ -11,7 +11,7 @@
             <path
                 android:name="path"
                 android:pathData="M 13.25 15.29 C -4.56 34.88 -2.78 65.15 15 83 L 367.64 410.64 L 15 738.32 C -4.56 756.14 -4.56 786.41 13.25 806 C 31.06 825.59 61.33 825.59 80.92 807.78 L 470.92 446.26 C 479.83 437.36 486.92 424.89 486.92 410.64 C 486.92 398.18 481.58 383.93 470.92 375.03 L 80.92 13.51 C 61.33 -4.3 31.06 -4.3 13.25 15.29 Z M 13.25 15.29"
-                android:fillColor="#666666"
+                android:fillColor="@color/tools_arrow"
                 android:strokeWidth="1"/>
         </vector>
     </aapt:attr>
diff --git a/app/src/main/res/drawable/side_nav_bar.xml b/app/src/main/res/drawable/side_nav_bar.xml
index 6d81870..2a9219e 100644
--- a/app/src/main/res/drawable/side_nav_bar.xml
+++ b/app/src/main/res/drawable/side_nav_bar.xml
@@ -1,9 +1,9 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <gradient
-        android:angle="135"
-        android:centerColor="#009688"
-        android:endColor="#00695C"
-        android:startColor="#4DB6AC"
+        android:angle="270"
+        android:startColor="?attr/colorPrimary"
+        android:centerColor="?attr/colorPrimary"
+        android:endColor="@color/app_background"
         android:type="linear" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tools_icon.xml b/app/src/main/res/drawable/tools_icon.xml
index c411da0..176e9f5 100644
--- a/app/src/main/res/drawable/tools_icon.xml
+++ b/app/src/main/res/drawable/tools_icon.xml
@@ -6,6 +6,6 @@
     android:viewportHeight="1024">
 
     <path
-        android:fillColor="@color/purple_500"
+        android:fillColor="@color/app_theme"
         android:pathData="M810.666667 942.933333c-34.133333 0-68.266667-12.8-93.866667-38.4l-234.666667-234.666666c-140.8 51.2-302.933333-12.8-371.2-153.6-38.4-81.066667-38.4-174.933333 0-256 4.266667-12.8 17.066667-21.333333 29.866667-25.6s25.6 0 38.4 12.8L315.733333 384H384V315.733333L247.466667 179.2c-8.533333-8.533333-12.8-21.333333-12.8-38.4 4.266667-12.8 12.8-25.6 25.6-29.866667 72.533333-34.133333 153.6-38.4 230.4-12.8s136.533333 81.066667 170.666666 153.6c34.133333 72.533333 38.4 153.6 12.8 230.4l234.666667 234.666667c51.2 51.2 51.2 136.533333 0 187.733333-29.866667 25.6-64 38.4-98.133333 38.4z m-320-366.933333c12.8 0 21.333333 4.266667 29.866666 12.8l256 256c17.066667 17.066667 51.2 17.066667 68.266667 0 8.533333-8.533333 12.8-21.333333 12.8-34.133333s-4.266667-25.6-12.8-34.133334l-256-256c-12.8-12.8-17.066667-34.133333-8.533333-46.933333 29.866667-59.733333 29.866667-123.733333 0-183.466667-25.6-51.2-68.266667-93.866667-119.466667-110.933333-34.133333-12.8-68.266667-17.066667-102.4-8.533333l98.133333 98.133333c8.533333 8.533333 12.8 17.066667 12.8 29.866667v128c0 25.6-17.066667 42.666667-42.666666 42.666666H298.666667c-12.8 0-21.333333-4.266667-29.866667-12.8L170.666667 358.4c-4.266667 42.666667 0 85.333333 17.066666 123.733333 51.2 106.666667 179.2 149.333333 285.866667 102.4 4.266667-8.533333 12.8-8.533333 17.066667-8.533333z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 01e2945..e1e313a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -19,6 +19,5 @@
         android:layout_height="match_parent"
         android:layout_gravity="start"
         android:fitsSystemWindows="true"
-        app:headerLayout="@layout/nav_header_main"
-        app:menu="@menu/activity_main_drawer" />
+        android:background="@color/app_background" />
 </androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_gallery.xml b/app/src/main/res/layout/fragment_about.xml
similarity index 91%
rename from app/src/main/res/layout/fragment_gallery.xml
rename to app/src/main/res/layout/fragment_about.xml
index 643fe25..51e8099 100644
--- a/app/src/main/res/layout/fragment_gallery.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -4,10 +4,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.gallery.GalleryFragment">
+    tools:context=".ui.about.AboutFragment">
 
     <TextView
-        android:id="@+id/text_gallery"
+        android:id="@+id/text_about"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 9fb91b6..c5e33f0 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,27 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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/fragment_home"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     android:background="@color/app_background"
+    android:orientation="vertical"
     tools:context=".ui.home.HomeFragment">
 
-    <com.fatapp.oxygentoolbox.layout.FoldLayout
-        android:id="@+id/foldLayout"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layoutId="@layout/fold_layout" />
-    <com.fatapp.oxygentoolbox.layout.FoldLayout
-        android:id="@+id/foldLayout1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layoutId="@layout/fold_layout" />
+        android:paddingBottom="10dp"
+        android:orientation="vertical">
 
-</LinearLayout>
\ No newline at end of file
+        <com.fatapp.oxygentoolbox.layout.FoldLayout
+            android:id="@+id/foldLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layoutId="@layout/fold_layout"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.fatapp.oxygentoolbox.layout.FoldLayout
+            android:id="@+id/foldLayout1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layoutId="@layout/fold_layout"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_slideshow.xml b/app/src/main/res/layout/fragment_setting.xml
similarity index 90%
rename from app/src/main/res/layout/fragment_slideshow.xml
rename to app/src/main/res/layout/fragment_setting.xml
index 2141a33..0f28cad 100644
--- a/app/src/main/res/layout/fragment_slideshow.xml
+++ b/app/src/main/res/layout/fragment_setting.xml
@@ -4,10 +4,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.slideshow.SlideshowFragment">
+    tools:context=".ui.setting.SettingFragment">
 
     <TextView
-        android:id="@+id/text_slideshow"
+        android:id="@+id/text_setting"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
diff --git a/app/src/main/res/layout/fragment_theme.xml b/app/src/main/res/layout/fragment_theme.xml
new file mode 100644
index 0000000..fe154c0
--- /dev/null
+++ b/app/src/main/res/layout/fragment_theme.xml
@@ -0,0 +1,22 @@
+<?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"
+    tools:context=".ui.theme.ThemeFragment">
+
+    <TextView
+        android:id="@+id/text_theme"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:textAlignment="center"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_item.xml b/app/src/main/res/layout/layout_item.xml
index c77d6f0..020086c 100644
--- a/app/src/main/res/layout/layout_item.xml
+++ b/app/src/main/res/layout/layout_item.xml
@@ -9,52 +9,13 @@
     android:gravity="center_vertical">
 
     <com.fatapp.oxygentoolbox.layout.AutoLinefeedLayout
+        android:id="@+id/layout_item_AutoLinefeedLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:background="@drawable/bottom_radius_background"
         android:gravity="center_vertical">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-
-            <Button
-                style="@style/ToolsButton"
-                android:text="Button1"/>
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-            <Button
-                style="@style/ToolsButton"
-                android:text="Button2"/>
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-            <Button
-                style="@style/ToolsButton"
-                android:text="Button3"/>
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-            <Button
-                style="@style/ToolsButton"
-                android:text="Button4"/>
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-            <Button
-                style="@style/ToolsButton"
-                android:text="Button5"/>
-        </LinearLayout>
     </com.fatapp.oxygentoolbox.layout.AutoLinefeedLayout>
-    <!--</LinearLayout>-->
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tool_button.xml b/app/src/main/res/layout/tool_button.xml
new file mode 100644
index 0000000..e20a6de
--- /dev/null
+++ b/app/src/main/res/layout/tool_button.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:layout_height="wrap_content"
+    android:layout_width="wrap_content"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <Button
+        android:id="@+id/toolButton"
+        style="@style/ToolsButton" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index d7f2df2..6fb8cf8 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -6,15 +6,23 @@
     <group android:checkableBehavior="single">
         <item
             android:id="@+id/nav_home"
-            android:icon="@drawable/ic_menu_camera"
+            android:icon="@drawable/ic_menu_home"
             android:title="@string/menu_home" />
         <item
-            android:id="@+id/nav_gallery"
-            android:icon="@drawable/ic_menu_gallery"
-            android:title="@string/menu_gallery" />
+            android:id="@+id/nav_theme"
+            android:icon="@drawable/ic_menu_theme"
+            android:title="@string/menu_theme" />
         <item
-            android:id="@+id/nav_slideshow"
-            android:icon="@drawable/ic_menu_slideshow"
-            android:title="@string/menu_slideshow" />
+            android:id="@+id/nav_setting"
+            android:icon="@drawable/ic_menu_setting"
+            android:title="@string/menu_setting" />
+        <item
+            android:id="@+id/nav_about"
+            android:icon="@drawable/ic_menu_about"
+            android:title="@string/menu_about" />
+        <item
+            android:id="@+id/nav_exit"
+            android:icon="@drawable/ic_menu_exit"
+            android:title="@string/menu_exit" />
     </group>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index 412d5f8..edb7269 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -5,5 +5,5 @@
         android:id="@+id/action_settings"
         android:orderInCategory="100"
         android:title="@string/action_settings"
-        app:showAsAction="never" />
+        app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 3146c13..5ccbe71 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -12,14 +12,24 @@
         tools:layout="@layout/fragment_home" />
 
     <fragment
-        android:id="@+id/nav_gallery"
-        android:name="com.fatapp.oxygentoolbox.ui.gallery.GalleryFragment"
-        android:label="@string/menu_gallery"
-        tools:layout="@layout/fragment_gallery" />
+        android:id="@+id/nav_theme"
+        android:name="com.fatapp.oxygentoolbox.ui.theme.ThemeFragment"
+        android:label="@string/menu_theme"
+        tools:layout="@layout/fragment_theme" />
 
     <fragment
-        android:id="@+id/nav_slideshow"
-        android:name="com.fatapp.oxygentoolbox.ui.slideshow.SlideshowFragment"
-        android:label="@string/menu_slideshow"
-        tools:layout="@layout/fragment_slideshow" />
+        android:id="@+id/nav_setting"
+        android:name="com.fatapp.oxygentoolbox.ui.setting.SettingFragment"
+        android:label="@string/menu_setting"
+        tools:layout="@layout/fragment_setting" />
+
+    <fragment
+        android:id="@+id/nav_about"
+        android:name="com.fatapp.oxygentoolbox.ui.about.AboutFragment"
+        android:label="@string/menu_about"
+        tools:layout="@layout/fragment_about" />
+
+    <fragment
+        android:id="@+id/nav_exit"
+        android:name="com.fatapp.oxygentoolbox.ui.exit.ExitFragment" />
 </navigation>
\ 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 d3434a3..2175eae 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -7,7 +7,11 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="app_theme">#FFBB86FC</color>
     <color name="app_background">#FF202020</color>
     <color name="fold_layout_background">#FF303030</color>
-    <color name="button_text">#FFFAFAFA</color>
+    <color name="tools_button_text">#FFFAFAFA</color>
+    <color name="tools_button_background">#FFF5F5F5</color>
+    <color name="tools_arrow">#FF666666</color>
+    <color name="tools_button_ripple">#88cccccc</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 2a7d6e8..42c5f9f 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -10,6 +10,6 @@
         <item name="android:background">@drawable/button_radius_shape</item>
         <item name="android:foreground">@drawable/ripple_foreground</item>
         <item name="android:stateListAnimator">@null</item>
-        <item name="android:textColor">@color/button_text</item>
+        <item name="android:textColor">@color/tools_button_text</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 069e418..77a271a 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -2,8 +2,8 @@
     <!-- Base application theme. -->
     <style name="Theme.OxygenToolbox" parent="Theme.MaterialComponents.DayNight.DarkActionBar.Bridge">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_200</item>
+        <item name="colorPrimary">@color/app_theme</item>
+        <item name="colorPrimaryVariant">@color/app_theme</item>
         <item name="colorOnPrimary">@color/black</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7460c0c..0395769 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,7 +7,11 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="app_theme">#FF6200EE</color>
     <color name="app_background">#FFF5F5F5</color>
     <color name="fold_layout_background">#FFFFFFFF</color>
-    <color name="button_text">#FF434343</color>
+    <color name="tools_button_text">#FF434343</color>
+    <color name="tools_button_background">#FFF5F5F5</color>
+    <color name="tools_arrow">#FF666666</color>
+    <color name="tools_button_ripple">#88cccccc</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4c0b9c0..61a71a3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,14 +2,16 @@
     <string name="app_name">Oxygen</string>
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
-    <string name="nav_header_title">Android Studio</string>
-    <string name="nav_header_subtitle">android.studio@android.com</string>
-    <string name="nav_header_desc">Navigation header</string>
+    <string name="nav_header_title">Oxygen Toolbox</string>
+    <string name="nav_header_subtitle">All in One</string>
+    <string name="nav_header_desc">Oxygen Toolbox</string>
     <string name="action_settings">Settings</string>
 
     <string name="menu_home">Home</string>
-    <string name="menu_gallery">Gallery</string>
-    <string name="menu_slideshow">Slideshow</string>
+    <string name="menu_theme">Theme</string>
+    <string name="menu_setting">Setting</string>
+    <string name="menu_about">About</string>
+    <string name="menu_exit">Exit</string>
 
     <string name="shortcutDisabledMessage">Disable</string>
     <string name="shortcutLongLabel">Oxygen Toolbox</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2a7d6e8..37aec40 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,14 +2,21 @@
 <resources>
     <style name="ToolsButton" parent="Widget.AppCompat.Button">
         <item name="android:layout_width">wrap_content</item>
+        <item name="android:minWidth">0dp</item>
         <item name="android:layout_height">35dp</item>
         <item name="android:layout_marginStart">5dp</item>
         <item name="android:layout_marginEnd">5dp</item>
         <item name="android:layout_marginTop">5dp</item>
         <item name="android:layout_marginBottom">5dp</item>
+        <item name="android:paddingLeft">10dp</item>
+        <item name="android:paddingRight">10dp</item>
         <item name="android:background">@drawable/button_radius_shape</item>
         <item name="android:foreground">@drawable/ripple_foreground</item>
         <item name="android:stateListAnimator">@null</item>
-        <item name="android:textColor">@color/button_text</item>
+        <item name="android:textColor">@color/tools_button_text</item>
+    </style>
+    <style name="ToolsLinearLayout">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ad1e66b..50deb4c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -2,8 +2,8 @@
     <!-- Base application theme. -->
     <style name="Theme.OxygenToolbox" parent="Theme.MaterialComponents.DayNight.DarkActionBar.Bridge">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_500</item>
+        <item name="colorPrimary">@color/app_theme</item>
+        <item name="colorPrimaryVariant">@color/app_theme</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>