diff --git a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/HardWareFragment.kt b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/HardWareFragment.kt
index 95d08a2..a8c7bf3 100644
--- a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/HardWareFragment.kt
+++ b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/HardWareFragment.kt
@@ -2,10 +2,12 @@ package com.xyzshell.myphoneinfo.dashboard
 
 import android.content.Intent
 import android.os.Bundle
+import android.text.format.Formatter
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import com.xyzshell.andinfo.AndInfo
 import com.xyzshell.myphoneinfo.R
 import com.xyzshell.myphoneinfo.databinding.FragmentHardWareBinding
 import com.xyzshell.myphoneinfo.dialog.DialogBlueTooth
@@ -29,51 +31,71 @@ class HardWareFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View? {
         binding = FragmentHardWareBinding.inflate(inflater, container, false)
+        dialogExtension=dialogExtension?: DialogExtension()
+        initText()
         binding.cpuBtn.setOnClickListener {
             var intent=Intent(requireContext(), AnalysisActivity::class.java)
             startActivity(intent)
         }
         binding.pair1.setOnClickListener {
             dialogBlueTooth= dialogBlueTooth?: DialogBlueTooth()
+            println("showBluetoothDialog"+AndInfo.instance.bluetooth.bondedDevices.size)
             dialogBlueTooth?.show(childFragmentManager, "BlueTooth1")
         }
-        binding.pair2.setOnClickListener {
-            dialogBlueTooth= dialogBlueTooth?: DialogBlueTooth()
-            dialogBlueTooth?.show(childFragmentManager, "BlueTooth2")
-        }
+//        binding.pair2.setOnClickListener {
+//            dialogBlueTooth= dialogBlueTooth?: DialogBlueTooth()
+//            dialogBlueTooth?.show(childFragmentManager, "BlueTooth2")
+//        }
         binding.othertext.setOnClickListener {
             dialogInput=dialogInput?: DialogInput()
             dialogInput?.show(childFragmentManager, "Input")
         }
         binding.extensionShow.setOnClickListener {
-            dialogExtension=dialogExtension?: DialogExtension()
             dialogExtension?.show(childFragmentManager, "Extention")
         }
-        binding.disktext.setOnClickListener {
+        binding.memoryLayout.disktext.setOnClickListener {
             dialogDiskPart=dialogDiskPart?: DialogDiskPart()
             dialogDiskPart?.show(childFragmentManager, "DiskPart")
         }
-        initText()
+
         return binding.root
     }
 
     private fun initText() {
         //processor
+        binding.text0.textTitle.text = getString(R.string.processor)
+
         binding.text1.textTitle.text = getString(R.string.vendor)
-        binding.text1.textContent.text=getString(R.string.apps)
+        binding.text1.textContent.text=AndInfo.instance.device.manufacturer
         binding.text2.textTitle.text = getString(R.string.hardware)
+        binding.text2.textContent.text=AndInfo.instance.device.hardwareName
         binding.text3.textTitle.text = getString(R.string.cores)
+        binding.text3.textContent.text=AndInfo.instance.cpu.cores.size.toString()
         binding.text4.textTitle.text = getString(R.string.CPU)
+        binding.text4.textContent.text=AndInfo.instance.cpu.text()
         binding.text5.textTitle.text = getString(R.string.process)
+
         binding.text6.textTitle.text = getString(R.string.architecture)
+
         binding.text7.textTitle.text = getString(R.string.ABI)
         binding.text8.textTitle.text = getString(R.string.supported_ABls)
         binding.text9.textTitle.text = getString(R.string.frequencies)
 
+
         //gpu
         binding.cpuText1.textTitle.text = getString(R.string.vendor)
-        binding.cpuText1.textContent.text=getString(R.string.apps)
         binding.cpuText2.textTitle.text = getString(R.string.gpu)
+        val gpuInfo=AndInfo.instance.gpu.getGpuInformation()
+        gpuInfo.vkPhysicalDevices?.let { devices ->
+            if (devices.isNotEmpty()) {
+                devices.forEachIndexed { index, vkPhysicalDevice ->
+                    binding.cpuText1.textContent.text=vkPhysicalDevice.vendorId.toString()
+                    binding.cpuText2.textContent.text=vkPhysicalDevice.deviceName
+
+
+                }
+            }
+        }
         binding.cpuText3.textTitle.text=getString(R.string.max_frequency)
         binding.cpuText4.textTitle.text=getString(R.string.architecture)
         binding.cpuText5.textTitle.text=getString(R.string.cores)
@@ -81,7 +103,17 @@ class HardWareFragment : Fragment() {
         binding.cpuText7.textTitle.text=getString(R.string.bus_width)
         binding.cpuText8.textTitle.text=getString(R.string.vulkan_support)
         binding.cpuText9.textTitle.text=getString(R.string.vulkan_API)
-
+        binding.open1.text=getString(R.string.opengl)
+        gpuInfo.eglInformation?.let { eglInfo ->
+            eglInfo.eglExtensions?.let {
+                dialogExtension?.setContent(it.joinToString())
+            }
+            eglInfo.glInformation?.let{glInfo ->
+                binding.openItem1.text=glInfo.glVendor
+                binding.openItem2.text=glInfo.glRenderer
+                binding.openItem3.text=glInfo.glVersion
+            }
+        }
         //display
         binding.disText1.textTitle.text=getString(R.string.resolution)
         binding.disText2.textTitle.text=getString(R.string.screen_density)
@@ -93,11 +125,47 @@ class HardWareFragment : Fragment() {
         binding.disText8.textTitle.text=getString(R.string.hdr_support)
 
         //memory
-        binding.memText1.textTitle.text=getString(R.string.ram_size)
+        val storageInfo = AndInfo.instance.storage//存储信息
+        val used=Formatter.formatFileSize(AndInfo.instance.context, storageInfo.internalStorageUsedSpace)
+        val free=Formatter.formatFileSize(AndInfo.instance.context, storageInfo.internalStorageAvailableSpace)
+        val total=Formatter.formatFileSize(AndInfo.instance.context, storageInfo.internalStorageTotalSpace)
+        binding.memoryLayout.memText1.textTitle.text=getString(R.string.ram_size)
+        binding.memoryLayout.memText1.textContent.text=total
+        binding.memoryLayout.ram1.text=used+" used"
+        binding.memoryLayout.ram2.text=free+" free"
+        binding.memoryLayout.seekbar.progress=(used.substring(0,used.indexOf(" ")).toDouble() / total.substring(0,total.indexOf(" ")).toDouble() *100).toInt()
 
         //storage
-        binding.storText1.textTitle.text=getString(R.string.filesystem)
-        binding.storText2.textTitle.text=getString(R.string.block_size)
+        binding.memoryLayout.memText3.textTitle.text=getString(R.string.zram)
+        binding.memoryLayout.memText3.textContent.text=Formatter.formatFileSize(AndInfo.instance.context, storageInfo.internalStorageTotalSpace)
+        binding.memoryLayout.ram3.text=used+" used"
+        binding.memoryLayout.ram4.text=free+" free"
+        binding.memoryLayout.seekbar2.progress=(used.substring(0,used.indexOf(" ")).toDouble() / total.substring(0,total.indexOf(" ")).toDouble() *100).toInt()
+
+        //fileSystem
+        binding.memoryLayout.storText1.textTitle.text=getString(R.string.filesystem)
+        binding.memoryLayout.storText1.textContent.text=total
+        binding.memoryLayout.stor1.text=used+" used"
+        binding.memoryLayout.stor2.text=free+" free"
+        binding.memoryLayout.radius1.text=used
+        binding.memoryLayout.radius2.text=used
+        binding.memoryLayout.radius3.text=free
+        binding.memoryLayout.seekbar3.progress=(used.substring(0,used.indexOf(" ")).toDouble() / total.substring(0,total.indexOf(" ")).toDouble() *100).toInt()
+
+        //internalStorage
+        binding.memoryLayout.interText1.textTitle.text=getString(R.string.filesystem)
+        binding.memoryLayout.interText1.textContent.text=storageInfo.internalStorageEncryptionType.toString()
+        binding.memoryLayout.interText2.textTitle.text=getString(R.string.block_size)
+        binding.memoryLayout.interText2.textContent.text=total
+        binding.memoryLayout.interText3.textTitle.text="/data"
+        binding.memoryLayout.interText3.textContent.text=total
+        binding.memoryLayout.stor3.text=used+" used"
+        binding.memoryLayout.stor4.text=free+" free"
+        binding.memoryLayout.seekbar2.progress=(used.substring(0,used.indexOf(" ")).toDouble() / total.substring(0,total.indexOf(" ")).toDouble() *100).toInt()
+
+
+
+
 
         //Audio
         binding.check1.content.text=getString(R.string.low_audio)
diff --git a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/SystemShowFragment.kt b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/SystemShowFragment.kt
index d4dda57..17bbecd 100644
--- a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/SystemShowFragment.kt
+++ b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/SystemShowFragment.kt
@@ -5,10 +5,12 @@ import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import com.xyzshell.andinfo.AndInfo
 import com.xyzshell.myphoneinfo.R
+import com.xyzshell.myphoneinfo.databinding.FragmentSystemShowBinding
 
 class SystemShowFragment : Fragment() {
-
+private lateinit var binding: FragmentSystemShowBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -18,7 +20,73 @@ class SystemShowFragment : Fragment() {
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return inflater.inflate(R.layout.fragment_system_show, container, false)
+        binding= FragmentSystemShowBinding.inflate(inflater,container,false)
+        initView()
+        return binding.root
+    }
+
+    private fun initView() {
+        binding.phoneName.text=AndInfo.instance.device.brand
+        binding.text0.textTitle.text=getString(R.string.model)
+        binding.text0.textContent.text=AndInfo.instance.device.model
+        binding.text1.textTitle.text=getString(R.string.product)
+        binding.text1.textContent.text=AndInfo.instance.device.productName
+        binding.text2.textTitle.text=getString(R.string.device)
+        binding.text2.textContent.text=AndInfo.instance.device.device
+        binding.text3.textTitle.text=getString(R.string.board)
+        binding.text3.textContent.text=AndInfo.instance.device.boardName
+        binding.text4.textTitle.text=getString(R.string.manufacturer)
+        binding.text4.textContent.text=AndInfo.instance.device.manufacturer
+        binding.text5.textTitle.text=getString(R.string.baseband)
+        binding.text6.textTitle.text=getString(R.string.google_play_services_version)
+
+        //操作系统
+        val buildInfo = AndInfo.instance.build
+        binding.textOp1.textTitle.text=getString(R.string.android_version)
+        binding.textOp1.textContent.text=buildInfo.versionRelease
+        binding.textOp2.textTitle.text=getString(R.string.api)
+        binding.textOp2.textContent.text=buildInfo.versionSdkInt.toString()
+        binding.textOp3.textTitle.text=getString(R.string.emui)
+
+        binding.textOp4.textTitle.text=getString(R.string.security_patch)
+        binding.textOp4.textContent.text=buildInfo.securityPatch
+        binding.textOp5.textTitle.text=getString(R.string.version)
+        binding.textOp5.textContent.text=buildInfo.display
+        binding.textOp6.textTitle.text=getString(R.string.baseband)
+
+        binding.textOp7.textTitle.text=getString(R.string.fingerprint)
+        binding.textOp7.textContent.text=buildInfo.fingerprint
+        binding.textOp8.textTitle.text=getString(R.string.build_time)
+        binding.textOp8.textContent.text=buildInfo.buildDate.toString()
+        binding.textOp9.textTitle.text=getString(R.string.initial_release)
+
+        binding.textOp10.textTitle.text=getString(R.string.architecture)
+
+        binding.textOp11.textTitle.text=getString(R.string.instruction_sets)
+
+        binding.textOp12.textTitle.text=getString(R.string.treble)
+        binding.textOp13.textTitle.text=getString(R.string.root_access)
+        binding.textOp14.textTitle.text=getString(R.string.google_play_services)
+        binding.textOp15.textTitle.text=getString(R.string.toybox)
+        binding.textOp16.textTitle.text=getString(R.string.java_VM)
+        binding.textOp16.textContent.text=AndInfo.instance.build.jvmName + " " + AndInfo.instance.build.jvmVersion
+        binding.textOp17.textTitle.text=getString(R.string.ssl_version)
+        binding.textOp18.textTitle.text=getString(R.string.language)
+        binding.textOp19.textTitle.text=getString(R.string.usb_debugging)
+        binding.textOp20.textTitle.text=getString(R.string.kernel)
+
+
+        binding.textclear1.textTitle.text=getString(R.string.vendor)
+        binding.textclear2.textTitle.text=getString(R.string.version)
+
+
+        binding.textwide1.textTitle.text=getString(R.string.vendor)
+        binding.textwide2.textTitle.text=getString(R.string.version)
+        binding.textwide3.textTitle.text=getString(R.string.algorithm)
+        binding.textwide4.textTitle.text=getString(R.string.device_id)
+        binding.textwide5.textTitle.text=getString(R.string.security_level)
+        binding.textwide6.textTitle.text=getString(R.string.highest_hdcp_level)
+
     }
 
     companion object {
diff --git a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dialog/DialogBlueTooth.kt b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dialog/DialogBlueTooth.kt
index 4c75480..29f7faf 100644
--- a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dialog/DialogBlueTooth.kt
+++ b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dialog/DialogBlueTooth.kt
@@ -1,18 +1,59 @@
 package com.xyzshell.myphoneinfo.dialog
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.compose.material3.Text
+import com.xyzshell.andinfo.AndInfo
 import com.xyzshell.myphoneinfo.R
 import com.xyzshell.myphoneinfo.base.BaseDialogFragment
 import com.xyzshell.myphoneinfo.databinding.DialogBlueToothBinding
 
 class DialogBlueTooth :BaseDialogFragment<DialogBlueToothBinding>(DialogBlueToothBinding::inflate){
+
     override fun getTitle(): String  = resources.getString(R.string.bluetooth)
 
     override fun getIconRes(): Int=5
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        val bluetoothInfo = AndInfo.instance.bluetooth
+        val  list=ArrayList<Map<String, String>>()
+        bluetoothInfo.bondedDevices.forEach { (name, address) ->
+            val deviceMap = mapOf(
+                "name" to (name ?: "Unknown device"),
+                "address" to (address ?: "")
+            )
+            list.add(deviceMap)
+        }
+        val container = binding.view as? ViewGroup
+
+        container?.let {
+            // 遍历 list，为每个设备创建 item view
+            if(list.isEmpty()){
+                it.addView(TextView(requireContext()).apply {
+                    text = "No devices"
+                })
+            }else{
+                list.forEach { deviceMap ->
+                    // 加载 item 布局
+                    val itemView = LayoutInflater.from(requireContext())
+                        .inflate(R.layout.item_blue_tooth, it, false)
+
+                    // 设置设备信息
+                    val tvName = itemView.findViewById<TextView>(R.id.textTitle)
+                    val tvAddress = itemView.findViewById<TextView>(R.id.textContent)
+
+                    tvName.text = deviceMap["name"]
+                    tvAddress.text = deviceMap["address"]
+                    // 添加到容器
+                    it.addView(itemView)
+                }
+            }
+
+        }
 
     }
 
@@ -24,4 +65,5 @@ class DialogBlueTooth :BaseDialogFragment<DialogBlueToothBinding>(DialogBlueToot
     override fun onPositiveClick() {
         super.onPositiveClick()
     }
+
 }
\ No newline at end of file
diff --git a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dialog/DialogExtension.kt b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dialog/DialogExtension.kt
index 99f0c2a..ff5d76a 100644
--- a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dialog/DialogExtension.kt
+++ b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dialog/DialogExtension.kt
@@ -7,6 +7,7 @@ import com.xyzshell.myphoneinfo.base.BaseDialogFragment
 import com.xyzshell.myphoneinfo.databinding.DialogExtentionBinding
 
 class DialogExtension :BaseDialogFragment<DialogExtentionBinding>(DialogExtentionBinding::inflate){
+    private var content :String = ""
     override fun getTitle(): String  = resources.getString(R.string.extensions)
 
     override fun getIconRes(): Int? =6
@@ -15,6 +16,7 @@ class DialogExtension :BaseDialogFragment<DialogExtentionBinding>(DialogExtentio
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        binding.textContent.text = content
     }
 
     override fun onNegativeClick() {
@@ -25,4 +27,7 @@ class DialogExtension :BaseDialogFragment<DialogExtentionBinding>(DialogExtentio
     override fun onPositiveClick() {
         super.onPositiveClick()
     }
+    open fun setContent(string :String){
+        this.content = string
+    }
 }
\ No newline at end of file
diff --git a/myphoneinfo/src/main/res/drawable/dialog_cancel_bg.xml b/myphoneinfo/src/main/res/drawable/dialog_cancel_bg.xml
new file mode 100644
index 0000000..f86f90d
--- /dev/null
+++ b/myphoneinfo/src/main/res/drawable/dialog_cancel_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="8dp"/>
+    <solid android:color="@color/dialog_cancel"/>
+
+</shape>
\ No newline at end of file
diff --git a/myphoneinfo/src/main/res/drawable/dialog_ok_bg.xml b/myphoneinfo/src/main/res/drawable/dialog_ok_bg.xml
new file mode 100644
index 0000000..2ae8969
--- /dev/null
+++ b/myphoneinfo/src/main/res/drawable/dialog_ok_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="8dp"/>
+    <solid android:color="@color/module_title_color"/>
+
+</shape>
\ No newline at end of file
diff --git a/myphoneinfo/src/main/res/drawable/hard_bg.xml b/myphoneinfo/src/main/res/drawable/hard_bg.xml
index 1fc9362..94cb3de 100644
--- a/myphoneinfo/src/main/res/drawable/hard_bg.xml
+++ b/myphoneinfo/src/main/res/drawable/hard_bg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="19dp"/>
-    <solid android:color="@color/module_title_color"/>
+    <corners android:radius="8dp"/>
+    <solid android:color="@color/btn_30_trans"/>
 
 </shape>
\ No newline at end of file
diff --git a/myphoneinfo/src/main/res/drawable/progress_bg.xml b/myphoneinfo/src/main/res/drawable/progress_bg.xml
index dc7d8c9..cd6c961 100644
--- a/myphoneinfo/src/main/res/drawable/progress_bg.xml
+++ b/myphoneinfo/src/main/res/drawable/progress_bg.xml
@@ -6,7 +6,7 @@
         android:top="0dp">
         <shape>
             <corners android:radius="5dp" />
-            <solid android:color="#AAD7D2" />
+            <solid android:color="@color/btn_30_trans" />
             <!-- 明确设置高度 -->
             <size android:height="10dp" />
         </shape>
diff --git a/myphoneinfo/src/main/res/drawable/tab_indicator.xml b/myphoneinfo/src/main/res/drawable/tab_indicator.xml
deleted file mode 100644
index 3950e71..0000000
--- a/myphoneinfo/src/main/res/drawable/tab_indicator.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <solid android:color="@color/main_tab_selected" />
-
-</shape>
\ No newline at end of file
diff --git a/myphoneinfo/src/main/res/drawable/tab_indicator_image.xml b/myphoneinfo/src/main/res/drawable/tab_indicator_image.xml
new file mode 100644
index 0000000..4d97de3
--- /dev/null
+++ b/myphoneinfo/src/main/res/drawable/tab_indicator_image.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 使用图片作为指示器 -->
+    <item
+        android:width="72dp"
+        android:height="4dp"
+        android:left="5dp"
+        android:end="5dp"
+        android:gravity="bottom|center">
+        <bitmap
+            android:src="@mipmap/indicator_img"
+        android:gravity="center" />
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/myphoneinfo/src/main/res/layout/activity_analysis.xml b/myphoneinfo/src/main/res/layout/activity_analysis.xml
index cfb7406..a943ced 100644
--- a/myphoneinfo/src/main/res/layout/activity_analysis.xml
+++ b/myphoneinfo/src/main/res/layout/activity_analysis.xml
@@ -33,7 +33,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/cpu_analysis"
                 android:textStyle="bold"
-                style="@style/TextDeviceBig"/>
+                style="@style/TextHeavy20"/>
 
         </LinearLayout>
         <View
@@ -64,7 +64,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/titlePro"
-                style="@style/TextDeviceBig"
+                style="@style/TextHeavy20"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/processor"
@@ -122,7 +122,7 @@
 
                 <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/info1"
-                    style="@style/TextContentLeft"
+                    style="@style/LeftContent"
                     android:layout_width="150dp"
                     android:layout_height="wrap_content"
                     android:text="@string/proc_cpuinfo"
@@ -148,7 +148,7 @@
 
                 <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/time1"
-                    style="@style/TextContentLeft"
+                    style="@style/LeftContent"
                     android:layout_width="150dp"
                     android:layout_height="wrap_content"
                     android:text="@string/cpu_times"
@@ -176,7 +176,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/cluster1Title"
-                style="@style/TextDeviceBig"
+                style="@style/TextHeavy20"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/cluster_1"
@@ -217,7 +217,7 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/cluster2Title"
-                style="@style/TextDeviceBig"
+                style="@style/TextHeavy20"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/cluster_2"
diff --git a/myphoneinfo/src/main/res/layout/activity_blue_tooth.xml b/myphoneinfo/src/main/res/layout/activity_blue_tooth.xml
index 9fb084d..f671d01 100644
--- a/myphoneinfo/src/main/res/layout/activity_blue_tooth.xml
+++ b/myphoneinfo/src/main/res/layout/activity_blue_tooth.xml
@@ -49,7 +49,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/paired_devices"
-                style="@style/TextDeviceBig"/>
+                style="@style/TextHeavy20"/>
 
         </LinearLayout>
         <View
diff --git a/myphoneinfo/src/main/res/layout/activity_main.xml b/myphoneinfo/src/main/res/layout/activity_main.xml
index d41d129..4f750ee 100644
--- a/myphoneinfo/src/main/res/layout/activity_main.xml
+++ b/myphoneinfo/src/main/res/layout/activity_main.xml
@@ -52,6 +52,7 @@
             app:layout_collapseMode="pin"
             app:tabIndicatorColor="@color/module_title_color"
             app:tabIndicatorFullWidth="true"
+            app:tabIndicator="@drawable/tab_indicator_image"
             app:tabIndicatorHeight="@dimen/tab_indicator_height"
             app:tabMaxWidth="100dp"
             app:tabMinWidth="100dp"
diff --git a/myphoneinfo/src/main/res/layout/activity_sensor_each.xml b/myphoneinfo/src/main/res/layout/activity_sensor_each.xml
index 1ce687b..298d00e 100644
--- a/myphoneinfo/src/main/res/layout/activity_sensor_each.xml
+++ b/myphoneinfo/src/main/res/layout/activity_sensor_each.xml
@@ -75,7 +75,7 @@
             android:padding="15dp"
             android:visibility="visible">
             <com.google.android.material.textview.MaterialTextView
-                style="@style/TextDeviceBig"
+                style="@style/TextHeavy20"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/st_li3dh"
@@ -100,7 +100,7 @@
 
                 <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/titleDis"
-                    style="@style/TextDeviceBig"
+                    style="@style/TextHeavy20"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/info"
diff --git a/myphoneinfo/src/main/res/layout/activity_test.xml b/myphoneinfo/src/main/res/layout/activity_test.xml
index 78ba53f..c51d4ed 100644
--- a/myphoneinfo/src/main/res/layout/activity_test.xml
+++ b/myphoneinfo/src/main/res/layout/activity_test.xml
@@ -32,7 +32,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/tests"
-                style="@style/TextDeviceBig"/>
+                style="@style/TextHeavy20"/>
             <View
                 android:layout_width="0dp"
                 android:layout_weight="1"
diff --git a/myphoneinfo/src/main/res/layout/activity_tools.xml b/myphoneinfo/src/main/res/layout/activity_tools.xml
index 646b1aa..6af8e62 100644
--- a/myphoneinfo/src/main/res/layout/activity_tools.xml
+++ b/myphoneinfo/src/main/res/layout/activity_tools.xml
@@ -32,7 +32,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/tools"
-                style="@style/TextDeviceBig"/>
+                style="@style/TextHeavy20"/>
 
         </LinearLayout>
         <View
diff --git a/myphoneinfo/src/main/res/layout/common_check_style.xml b/myphoneinfo/src/main/res/layout/common_check_style.xml
index 4e91066..5cb48c5 100644
--- a/myphoneinfo/src/main/res/layout/common_check_style.xml
+++ b/myphoneinfo/src/main/res/layout/common_check_style.xml
@@ -8,18 +8,19 @@
 
         <ImageView
             android:id="@+id/image"
-            android:layout_width="23dp"
-            android:layout_height="23dp"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
             android:layout_gravity="center_vertical"
             android:src="@mipmap/check_false" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/content"
-            style="@style/TextCheck"
+            style="@style/TextHeavy20"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
+            android:textSize="16sp"
             android:text="@string/apps"
-            android:textStyle="bold"
+            android:textColor="@color/left_color"
             tools:ignore="RelativeOverlap" />
 </LinearLayout>
\ No newline at end of file
diff --git a/myphoneinfo/src/main/res/layout/common_text_15size_style.xml b/myphoneinfo/src/main/res/layout/common_text_15size_style.xml
index 5922d30..e41cf8a 100644
--- a/myphoneinfo/src/main/res/layout/common_text_15size_style.xml
+++ b/myphoneinfo/src/main/res/layout/common_text_15size_style.xml
@@ -8,7 +8,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/textTitle"
-            style="@style/TextContentLeft"
+            style="@style/LeftContent"
             android:layout_width="150dp"
             android:layout_height="wrap_content"
             android:text="@string/model"
diff --git a/myphoneinfo/src/main/res/layout/common_text_style.xml b/myphoneinfo/src/main/res/layout/common_text_style.xml
index 84759c9..91b4525 100644
--- a/myphoneinfo/src/main/res/layout/common_text_style.xml
+++ b/myphoneinfo/src/main/res/layout/common_text_style.xml
@@ -8,18 +8,18 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/textTitle"
-            style="@style/TextContentLeft"
+            style="@style/LeftContent"
             android:layout_width="150dp"
             android:layout_height="wrap_content"
-            android:text="@string/model"
-            android:textStyle="bold" />
+            android:text="@string/model" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/textContent"
-            style="@style/TextContentRight"
+            style="@style/LeftContent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:text="@string/apps"
+            android:textColor="@color/right_color"
             tools:ignore="RelativeOverlap" />
 </LinearLayout>
\ No newline at end of file
diff --git a/myphoneinfo/src/main/res/layout/dialog_app_click.xml b/myphoneinfo/src/main/res/layout/dialog_app_click.xml
index 78d6f49..b168182 100644
--- a/myphoneinfo/src/main/res/layout/dialog_app_click.xml
+++ b/myphoneinfo/src/main/res/layout/dialog_app_click.xml
@@ -94,7 +94,7 @@
                 android:orientation="vertical">
                 <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/extension1"
-                    style="@style/TextContentLeft"
+                    style="@style/LeftContent"
                     android:layout_width="wrap_content"
                     android:textSize="16sp"
                     android:layout_height="wrap_content"
diff --git a/myphoneinfo/src/main/res/layout/dialog_base.xml b/myphoneinfo/src/main/res/layout/dialog_base.xml
index 8301ecc..58df52f 100644
--- a/myphoneinfo/src/main/res/layout/dialog_base.xml
+++ b/myphoneinfo/src/main/res/layout/dialog_base.xml
@@ -12,15 +12,15 @@
         android:orientation="horizontal">
         <ImageView
             android:id="@+id/image_icon"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
             android:layout_marginStart="25dp"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="18dp"
             android:src="@mipmap/ic_launcher" />
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/dialog_title"
-            style="@style/TextBig"
-            android:textSize="24sp"
+            style="@style/TextHeavy20"
+            android:textSize="20sp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="25dp"
@@ -32,6 +32,7 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_marginTop="20dp"
+        android:layout_marginHorizontal="20dp"
         android:background="@color/module_title_color" />
 
 
@@ -58,38 +59,47 @@
 <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="end"
+    android:gravity="center"
+    android:paddingBottom="10dp"
+    android:paddingHorizontal="20dp"
     android:orientation="horizontal">
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/text_cancel"
-        style="@style/TextBtnTitle"
-        android:layout_width="wrap_content"
+        style="@style/LeftContent"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:textAlignment="center"
         android:layout_height="wrap_content"
         android:padding="10dp"
         android:text="@string/cancel"
+        android:background="@drawable/dialog_cancel_bg"
         android:layout_marginEnd="20dp"
+        android:textColor="@color/black"
         android:visibility="gone" />
 
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/text_settings"
-        style="@style/TextBtnTitle"
-        android:layout_width="wrap_content"
+        style="@style/LeftContent"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:textAlignment="center"
         android:layout_height="wrap_content"
         android:padding="10dp"
-        android:layout_marginBottom="10dp"
+        android:textColor="@color/white"
         android:text="@string/settings"
-        android:layout_marginEnd="20dp"
+        android:background="@drawable/hard_bg"
         android:visibility="gone" />
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/text_ok"
-        style="@style/TextBtnTitle"
-        android:layout_width="wrap_content"
+        style="@style/LeftContent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="10dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginBottom="10dp"
+        android:textAlignment="center"
+        android:background="@drawable/dialog_ok_bg"
         android:visibility="visible"
+        android:textColor="@color/white"
         android:text="@string/ok" />
 </LinearLayout>
 
diff --git a/myphoneinfo/src/main/res/layout/dialog_blue_tooth.xml b/myphoneinfo/src/main/res/layout/dialog_blue_tooth.xml
index 1ee6cde..d2d6011 100644
--- a/myphoneinfo/src/main/res/layout/dialog_blue_tooth.xml
+++ b/myphoneinfo/src/main/res/layout/dialog_blue_tooth.xml
@@ -1,57 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingHorizontal="18dp"
-    android:layout_marginTop="17dp"
+    android:paddingVertical="20dp"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
     <LinearLayout
+        android:id="@+id/view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginVertical="4dp"
-        android:orientation="horizontal">
-        <com.google.android.material.textview.MaterialTextView
-            style="@style/TextTool21"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="start"
-            android:textSize="16sp"
-            android:text="NUCBOX_K8" />
-        <View
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_weight="1"/>
-        <com.google.android.material.textview.MaterialTextView
-            style="@style/TextTool21"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="start"
-            android:textSize="16sp"
-            android:text="D0:12:55:2C:43:FB" />
+        android:orientation="vertical">
+
     </LinearLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="4dp"
-        android:orientation="horizontal">
-        <com.google.android.material.textview.MaterialTextView
-            style="@style/TextTool21"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="start"
-            android:textSize="16sp"
-            android:text="NUCBOX_K8" />
-        <View
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_weight="1"/>
-        <com.google.android.material.textview.MaterialTextView
-            style="@style/TextTool21"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="start"
-            android:textSize="16sp"
-            android:text="D0:12:55:2C:43:FB" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/myphoneinfo/src/main/res/layout/dialog_camera_more.xml b/myphoneinfo/src/main/res/layout/dialog_camera_more.xml
index e4192ad..3827ac4 100644
--- a/myphoneinfo/src/main/res/layout/dialog_camera_more.xml
+++ b/myphoneinfo/src/main/res/layout/dialog_camera_more.xml
@@ -91,7 +91,7 @@
                     android:layout_marginTop="15dp"
                     >
                     <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="Capabilities"
@@ -112,7 +112,7 @@
                     android:layout_marginTop="15dp"
                     >
                     <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="Exposure modes"
@@ -133,7 +133,7 @@
                     android:layout_marginTop="15dp"
                     >
                     <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="Autofocus modes"
@@ -156,7 +156,7 @@ picture"
                     android:layout_marginTop="15dp"
                     >
                     <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="White balance modes"
@@ -177,7 +177,7 @@ picture"
                     android:layout_marginTop="15dp"
                     >
                     <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="Scene modes"
diff --git a/myphoneinfo/src/main/res/layout/dialog_disk_part.xml b/myphoneinfo/src/main/res/layout/dialog_disk_part.xml
index f2412fc..fed8a75 100644
--- a/myphoneinfo/src/main/res/layout/dialog_disk_part.xml
+++ b/myphoneinfo/src/main/res/layout/dialog_disk_part.xml
@@ -36,7 +36,7 @@
                     android:orientation="horizontal">
 
                     <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:textSize="19sp"
@@ -60,7 +60,7 @@
                     android:orientation="horizontal">
 
                     <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:textSize="19sp"
@@ -172,7 +172,7 @@
                     android:orientation="horizontal">
 
                     <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:textSize="19sp"
@@ -196,7 +196,7 @@
                     android:orientation="horizontal">
 
                     <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:textSize="19sp"
diff --git a/myphoneinfo/src/main/res/layout/dialog_extention.xml b/myphoneinfo/src/main/res/layout/dialog_extention.xml
index 812d579..05b0621 100644
--- a/myphoneinfo/src/main/res/layout/dialog_extention.xml
+++ b/myphoneinfo/src/main/res/layout/dialog_extention.xml
@@ -17,121 +17,10 @@
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/textContent"
-                style="@style/TextDialogLabel"
+                style="@style/LeftContent"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="GL_EXT_debug_marker
-GL_ARM_rgba8
-GL_ARM_mali_shader_binary
-GL_OES_depth24
-GL_OES_depth_texture GL_O
-ES_depth_texture_cube_map
-GL_OES_packed_depth_stencil
-GL_OES_rgb8_rgba8
-GL_EXT_read_format_bgra
-GL_OES_compressed_palet
-ted_texture GL_OES_comp
-ressed_ETC1_RGB8_texture
-GL_OES_standard_derivatives
-GL_OES_EGL_image
-GL_OES_EGL_image_external
-GL_OES_EGL_image_externa
-L_essl3 GLLOES_EGL_sync
-GL_OES_texture_npot
-GL_OES_vertex_half_float GL_O
-ES_required_internalformat
-GL_OES_vertex_array_object
-GL_OES_mapbuffer GL_EXT
-texture_format_BGRA8888
-GL_EXT_texture_rg GL_EXTtex
-ture_type_2_10_10_10_REV
-GL_OES_fbo_render_mipmap
-GL_OES_element_index_uint
-GL_EXT_shadow_samplers GL
-LOES_texture_compression_astc
-GL_KHR_texture_compress
-ion_astc_Idr GL_KHR_textu
-re_compression_astc_hdr
-GL_KHR_texture_compression
-astc_sliced_3d GL.EXT_texture_c
-ompression_astc_decode_mode
-GL_EXT_texture_compression
-astc_decode_mode_rgb9e5
-GL_KHR_debug GL EXT
-occlusion_query_boolean
-GL_EXT_disjoint_timer_query
-GL_EXT_blend_minmax
-GL_EXT_discard_framebuffer
-GL_OES_get_program_binary
-GL_OES_texture_3D
-GL_EXT_texture_storage
-GL_EXT_multisampled_rend
-er_to_texture GL_EXT_multis
-ampled_render_to_texture2
-GL_OES_surfaceless_context
-GL OES_texture_stencil8 GL
-EXT_shader_pixel_local_storage
-GL_ARM_shader_framebuffe
-rfetch GL_ARM_shader_fram
-ebuffer_fetch_depth_stencil
-GL_ARM_mali_program_binary
-GL_EXT_sRGB
-GL_EXT_sRGB_write_control
-GL_EXT_texture_sRGB_decode
-GL_EXT_texture_sRGB_R8
-GL_EXT_texture_sRGBRG8GL
-KHR_blend_equation_advanced
-GL_KHR_blend_equation_ad
-vanced_coherent GL_OES_textur
-e_storage_multisample_2d_array
-GL_OES_shader_image_atomic
-GL_EXT_robustness
-GL_EXT_draw_buffers_indexed
-GL_OES_draw_buffers_indexed
-GL_EXTtexture_border_clamp
-GL_OES_texture_border_clamp
-GL_EXTtexture_cube_map_a
-rray GL_OES_texture_cube_map
-_array GL_OES_sample_variables
-GL_OES_sample_shading
-GL_OES_shader_multi
-sample_interpolation
-GL_EXTshader_io_blocks
-GL_OES_shader_io_blocks
-GL EXT tessellation shader
-GL_OES_tessellation_shader
-GL_EXT_primitive_bounding
-box GL OES_primitive_boundin
-g_box GL_EXT_geometry_shader
-GL_OES_geometry_shader
-GL_ANDROID_extension_p
-ack_es31a GL_EXT_gpu_ shader5
-GL_OES_gpu shader5
-GL_EXT_texture_buffer
-GL_OES_texture_buffer
-GL_EXT_copy_image
-GL_OES_copy_image
-GL_EXTLshader_non_cons
-tant_global_initializers
-GL_EXT_color_buffer_half_float
-GL_EXT_color_buffer_float
-GL_EXTYUVtarget
-GL_OVR_multiview
-GL_OVR_multiview2
-GL_OVR_multiview_multis
-ampled_render_to_texture
-GL_KHR_robustness
-GL_KHR_robust_buffer_ac
-cess_behavior GL_EXT_dra
-w_elements_base_vertex GL_O
-ES_draw_elements_base_vertex
-GL_EXT_protected_textures
-GL_EXT_buffer_storage
-GL_EXT_external_buffer
-GL_EXT_EGL_image_array
-GL_EXT_clip_control"
-                android:textStyle="normal"
-                android:textSize="19sp" />
+                android:text="text1" />
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
diff --git a/myphoneinfo/src/main/res/layout/dialog_memory.xml b/myphoneinfo/src/main/res/layout/dialog_memory.xml
index e530255..67c577f 100644
--- a/myphoneinfo/src/main/res/layout/dialog_memory.xml
+++ b/myphoneinfo/src/main/res/layout/dialog_memory.xml
@@ -20,14 +20,14 @@
          android:orientation="horizontal">
 
          <com.google.android.material.textview.MaterialTextView
-             style="@style/TextContentLeft"
+             style="@style/LeftContent"
              android:layout_width="wrap_content"
              android:layout_height="wrap_content"
              android:text="@string/ram"
              android:textSize="21sp"
              android:textStyle="bold" />
          <com.google.android.material.textview.MaterialTextView
-             style="@style/TextContentLeft"
+             style="@style/LeftContent"
              android:layout_width="wrap_content"
              android:layout_height="wrap_content"
              android:text="@string/size_"
diff --git a/myphoneinfo/src/main/res/layout/dialog_storage.xml b/myphoneinfo/src/main/res/layout/dialog_storage.xml
index 4e88022..22fb3b7 100644
--- a/myphoneinfo/src/main/res/layout/dialog_storage.xml
+++ b/myphoneinfo/src/main/res/layout/dialog_storage.xml
@@ -186,7 +186,7 @@
 
                <com.google.android.material.textview.MaterialTextView
                    android:id="@+id/textTitle"
-                   style="@style/TextContentLeft"
+                   style="@style/LeftContent"
                    android:layout_width="150dp"
                    android:layout_height="wrap_content"
                    android:textSize="18sp"
diff --git a/myphoneinfo/src/main/res/layout/dialog_temp.xml b/myphoneinfo/src/main/res/layout/dialog_temp.xml
index 87abe46..5c9bb7e 100644
--- a/myphoneinfo/src/main/res/layout/dialog_temp.xml
+++ b/myphoneinfo/src/main/res/layout/dialog_temp.xml
@@ -7,7 +7,7 @@
     android:orientation="vertical">
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/dialog_title"
-        style="@style/TextDeviceBig"
+        style="@style/TextHeavy20"
         android:textColor="#000000"
         android:textSize="24sp"
         android:layout_width="wrap_content"
diff --git a/myphoneinfo/src/main/res/layout/fragment_battery.xml b/myphoneinfo/src/main/res/layout/fragment_battery.xml
index 2ab5356..2395374 100644
--- a/myphoneinfo/src/main/res/layout/fragment_battery.xml
+++ b/myphoneinfo/src/main/res/layout/fragment_battery.xml
@@ -32,7 +32,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/titleCon"
-                        style="@style/TextDeviceBig"
+                        style="@style/TextHeavy20"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/status"
@@ -143,7 +143,7 @@
 
                 <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/titleInform"
-                    style="@style/TextDeviceBig"
+                    style="@style/TextHeavy20"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/information"
@@ -157,7 +157,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/informTitle1"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/temperature"
@@ -180,7 +180,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/informTitle2"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/technology"
@@ -203,7 +203,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/informTitle3"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/health_status"
@@ -226,7 +226,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/informTitle4"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/maximum_output"
@@ -249,7 +249,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/informTitle5"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/capacity_system_feedback"
diff --git a/myphoneinfo/src/main/res/layout/fragment_camera.xml b/myphoneinfo/src/main/res/layout/fragment_camera.xml
index 4b6b337..5fe78b9 100644
--- a/myphoneinfo/src/main/res/layout/fragment_camera.xml
+++ b/myphoneinfo/src/main/res/layout/fragment_camera.xml
@@ -51,7 +51,7 @@
 
                 <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/titleCon"
-                    style="@style/TextDeviceBig"
+                    style="@style/TextHeavy20"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/rear_camera_1"
@@ -105,7 +105,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/cameraTitle2"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/resolution"
@@ -128,7 +128,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/cameraTitle3"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/sensor_size"
@@ -151,7 +151,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/cameraTitle4"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/pixel_size"
@@ -174,7 +174,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/cameraTitle5"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/_35mm_equivalent_focal_length"
@@ -197,7 +197,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/cameraTitle6"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/shutter_speed"
@@ -220,7 +220,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/cameraTitle7"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/lso_sensitivity_range"
@@ -245,7 +245,7 @@
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
                     <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextDeviceBig"
+                        style="@style/TextHeavy20"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/more"
@@ -272,7 +272,7 @@
 
                 <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/titleFront"
-                    style="@style/TextDeviceBig"
+                    style="@style/TextHeavy20"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/front_camera_1"
@@ -323,7 +323,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/camera1Title2"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/resolution"
@@ -346,7 +346,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/camera1Title3"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/sensor_size"
@@ -369,7 +369,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/camera1Title4"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/pixel_size"
@@ -392,7 +392,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/camera1Title5"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/_35mm_equivalent_focal_length"
@@ -415,7 +415,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/camera1Title6"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/shutter_speed"
@@ -438,7 +438,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/camera1Title7"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/lso_sensitivity_range"
@@ -463,7 +463,7 @@
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
                     <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextDeviceBig"
+                        style="@style/TextHeavy20"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/more"
@@ -495,7 +495,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/titleDis"
-                        style="@style/TextDeviceBig"
+                        style="@style/TextHeavy20"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/video_capture"
@@ -509,7 +509,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/open1"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="15dp"
diff --git a/myphoneinfo/src/main/res/layout/fragment_hard_ware.xml b/myphoneinfo/src/main/res/layout/fragment_hard_ware.xml
index b6c6725..6be4a1c 100644
--- a/myphoneinfo/src/main/res/layout/fragment_hard_ware.xml
+++ b/myphoneinfo/src/main/res/layout/fragment_hard_ware.xml
@@ -11,8 +11,6 @@
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
-
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -31,38 +29,15 @@
 
                 <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/titleDev"
-                    style="@style/TextDeviceBig"
+                    style="@style/TextHeavy20"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/processor"
                     tools:ignore="RelativeOverlap" />
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="20dp"
-                    android:layout_marginBottom="42dp"
-                    android:orientation="horizontal">
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/logoDevice"
-                        style="@style/TextDeviceLogo"
-                        android:layout_width="150dp"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="HONOR"
-                        tools:ignore="RelativeOverlap" />
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/phone_Name"
-                        style="@style/TextSize37"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="HiSilicon Kirin 710"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
-
+                <include
+                    android:id="@+id/text0"
+                    layout="@layout/common_text_style" />
                 <include
                     android:id="@+id/text1"
                     layout="@layout/common_text_style" />
@@ -99,20 +74,20 @@
                     android:id="@+id/text9"
                     layout="@layout/common_text_style" />
 
-                <com.google.android.material.textview.MaterialTextView
+                <TextView
                     android:id="@+id/cpuBtn"
                     style="@style/TextDialogSubTitle"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="170dp"
                     android:layout_marginTop="21dp"
                     android:background="@drawable/hard_bg"
                     android:paddingHorizontal="12dp"
-                    android:paddingVertical="9dp"
-                    android:textSize="15sp"
+                    android:paddingVertical="8dp"
+                    android:textSize="14sp"
                     android:textStyle="normal"
                     android:text="@string/cpu_analysis"
-                    android:textColor="@color/white" />
+                    android:textAlignment="center"
+                    android:textColor="@color/module_title_color" />
             </LinearLayout>
 
             <LinearLayout
@@ -127,7 +102,7 @@
 
                 <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/titleGPU"
-                    style="@style/TextDeviceBig"
+                    style="@style/TextHeavy20"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/gpu"
@@ -176,20 +151,41 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/open1"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="15dp"
-                        android:text="@string/model"
-                        android:textStyle="bold" />
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/open2"
-                        style="@style/TextContentRight"
-                        android:layout_width="wrap_content"
+                        android:text="@string/model" />
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="@string/apps"
-                        tools:ignore="RelativeOverlap" />
+                        android:orientation="vertical">
+                        <com.google.android.material.textview.MaterialTextView
+                            android:id="@+id/openItem1"
+                            style="@style/LeftContent"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/apps"
+                            android:textColor="@color/right_color"
+                            tools:ignore="RelativeOverlap" />
+                        <com.google.android.material.textview.MaterialTextView
+                            android:id="@+id/openItem2"
+                            style="@style/LeftContent"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/apps"
+                            android:textColor="@color/right_color"
+                            tools:ignore="RelativeOverlap" />
+                        <com.google.android.material.textview.MaterialTextView
+                            android:id="@+id/openItem3"
+                            style="@style/LeftContent"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/apps"
+                            android:textColor="@color/right_color"
+                            tools:ignore="RelativeOverlap" />
+                    </LinearLayout>
+
                 </LinearLayout>
 
                 <LinearLayout
@@ -197,25 +193,29 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="15dp"
-                    android:orientation="horizontal"
+                    android:orientation="vertical"
                     android:visibility="visible">
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/extension1"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/extensions"
                         android:textStyle="bold" />
-
-                    <com.google.android.material.textview.MaterialTextView
+                    <TextView
                         android:id="@+id/extensionShow"
                         style="@style/TextButteryRight"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:paddingHorizontal="10dp"
-
+                        android:layout_marginTop="21dp"
+                        android:background="@drawable/hard_bg"
+                        android:paddingHorizontal="12dp"
+                        android:paddingVertical="8dp"
+                        android:textSize="14sp"
+                        android:textStyle="normal"
                         android:text="@string/show"
+                        android:textAlignment="center"
                         tools:ignore="RelativeOverlap" />
                 </LinearLayout>
             </LinearLayout>
@@ -236,7 +236,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/titleDis"
-                        style="@style/TextDeviceBig"
+                        style="@style/TextHeavy20"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/display"
@@ -287,685 +287,17 @@
                     layout="@layout/common_text_style" />
 
             </LinearLayout>
-
-            <LinearLayout
+            <include
+                android:id="@+id/memory_layout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
-                android:background="@drawable/dashboard_model_background"
-                android:orientation="vertical"
-                android:paddingBottom="30dp"
-                android:visibility="visible">
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingHorizontal="15dp"
-                    android:paddingTop="15dp">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <com.google.android.material.textview.MaterialTextView
-                            android:id="@+id/titleMem"
-                            style="@style/TextDeviceBig"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/memory"
-                            tools:ignore="RelativeOverlap" />
-
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="1dp"
-                            android:layout_weight="1" />
-
-                        <ImageView
-                            android:layout_width="23dp"
-                            android:layout_height="23dp"
-                            android:layout_gravity="center_vertical"
-                            android:src="@mipmap/setting" />
-                    </LinearLayout>
-
-                    <include
-                        android:id="@+id/memText1"
-                        layout="@layout/common_text_style" />
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="15dp"
-                        android:orientation="horizontal">
-
-                        <com.google.android.material.textview.MaterialTextView
-                            style="@style/TextDialogLabel"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/ram"
-                            android:textSize="21sp"
-                            android:textStyle="bold"
-                            tools:ignore="RelativeOverlap" />
-
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="1dp"
-                            android:layout_weight="1" />
-
-                        <com.google.android.material.textview.MaterialTextView
-                            android:id="@+id/ram1"
-                            style="@style/TextDialogLabel"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="5.97 GB"
-                            android:textSize="25sp"
-                            android:textStyle="bold"
-                            tools:ignore="RelativeOverlap" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <com.google.android.material.textview.MaterialTextView
-                            style="@style/TextTool21"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="2.22 GB used"
-                            android:textSize="18sp"
-                            android:textStyle="bold"
-                            tools:ignore="RelativeOverlap" />
-
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="1dp"
-                            android:layout_weight="1" />
-
-                        <com.google.android.material.textview.MaterialTextView
-                            android:id="@+id/ram2"
-                            style="@style/TextTool21"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="3.75 GB free"
-                            android:textSize="18sp"
-                            android:textStyle="bold"
-                            tools:ignore="RelativeOverlap" />
-                    </LinearLayout>
-                </LinearLayout>
-
-                <SeekBar
-                    android:id="@+id/seekbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="10dp"
-                    android:maxHeight="10dp"
-                    android:minHeight="10dp"
-                    android:padding="0dp"
-                    android:progress="50"
-                    android:progressDrawable="@drawable/progress_bg"
-                    android:thumb="@drawable/progress_oval"
-                    android:thumbOffset="0dp" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="15dp"
-                    android:layout_marginTop="15dp"
-                    android:orientation="horizontal">
-
-                    <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextDialogLabel"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/zram"
-                        android:textSize="21sp"
-                        android:textStyle="bold"
-                        tools:ignore="RelativeOverlap" />
-
-                    <View
-                        android:layout_width="0dp"
-                        android:layout_height="1dp"
-                        android:layout_weight="1" />
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/ram3"
-                        style="@style/TextDialogLabel"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="5.97 GB"
-                        android:textSize="25sp"
-                        android:textStyle="bold"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="15dp"
-                    android:orientation="horizontal">
-
-                    <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextTool21"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="2.22 GB used"
-                        android:textSize="18sp"
-                        android:textStyle="bold"
-                        tools:ignore="RelativeOverlap" />
-
-                    <View
-                        android:layout_width="0dp"
-                        android:layout_height="1dp"
-                        android:layout_weight="1" />
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/ram4"
-                        style="@style/TextTool21"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="3.75 GB free"
-                        android:textSize="18sp"
-                        android:textStyle="bold"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
-
-                <SeekBar
-                    android:id="@+id/seekbar2"
-                    android:layout_width="match_parent"
-                    android:layout_height="10dp"
-                    android:maxHeight="10dp"
-                    android:minHeight="10dp"
-                    android:padding="0dp"
-                    android:progress="50"
-                    android:progressDrawable="@drawable/progress_bg"
-                    android:thumb="@drawable/progress_oval"
-                    android:thumbOffset="0dp" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
-                android:background="@drawable/dashboard_model_background"
-                android:orientation="vertical"
-                android:paddingBottom="30dp"
-                android:visibility="visible">
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingHorizontal="15dp"
-                    android:paddingTop="15dp">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <com.google.android.material.textview.MaterialTextView
-                            android:id="@+id/titleStor"
-                            style="@style/TextDeviceBig"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/storage"
-                            tools:ignore="RelativeOverlap" />
-
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="1dp"
-                            android:layout_weight="1" />
-
-                        <ImageView
-                            android:layout_width="23dp"
-                            android:layout_height="23dp"
-                            android:layout_gravity="center_vertical"
-                            android:src="@mipmap/setting" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:orientation="horizontal">
-
-                        <com.google.android.material.textview.MaterialTextView
-                            android:id="@+id/textTitle"
-                            style="@style/TextContentLeft"
-                            android:layout_width="150dp"
-                            android:layout_height="wrap_content"
-                            android:text="@string/size"
-                            android:textStyle="bold" />
-
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="1dp"
-                            android:layout_weight="1" />
-
-                        <com.google.android.material.textview.MaterialTextView
-                            android:id="@+id/textContent"
-                            style="@style/TextContentRight"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="20dp"
-                            android:text="128 GB"
-                            tools:ignore="RelativeOverlap" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="15dp"
-                        android:orientation="horizontal">
-
-                        <com.google.android.material.textview.MaterialTextView
-                            style="@style/TextDialogLabel"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="28.01 GB used"
-                            android:textSize="19sp"
-                            android:textStyle="bold"
-                            tools:ignore="RelativeOverlap" />
-
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="1dp"
-                            android:layout_weight="1" />
-
-                        <com.google.android.material.textview.MaterialTextView
-                            android:id="@+id/stor1"
-                            style="@style/TextDialogLabel"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="128 GB total"
-                            android:textSize="19sp"
-                            android:textStyle="bold"
-                            tools:ignore="RelativeOverlap" />
-                    </LinearLayout>
-
-                </LinearLayout>
-
-                <SeekBar
-                    android:id="@+id/seekbar3"
-                    android:layout_width="match_parent"
-                    android:layout_height="10dp"
-                    android:maxHeight="10dp"
-                    android:minHeight="10dp"
-                    android:padding="0dp"
-                    android:progress="50"
-                    android:progressDrawable="@drawable/progress_bg"
-                    android:thumb="@drawable/progress_oval"
-                    android:thumbOffset="0dp" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:padding="15dp">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-
-                        <ImageView
-                            android:layout_width="13dp"
-                            android:layout_height="13dp"
-                            android:src="@mipmap/radius1" />
-
-                        <com.google.android.material.textview.MaterialTextView
-                            style="@style/TextDialogSubTitle"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="11dp"
-                            android:text="@string/apps_and_data"
-                            android:textColor="@color/dialog_value_color"
-                            tools:ignore="RelativeOverlap" />
-
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="1dp"
-                            android:layout_weight="1" />
-
-                        <com.google.android.material.textview.MaterialTextView
-                            android:id="@+id/radius1"
-                            style="@style/TextDialogSubTitle"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="11dp"
-                            android:text="18.77 GB"
-                            android:textColor="@color/dialog_value_color"
-                            tools:ignore="RelativeOverlap" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-
-                        <ImageView
-                            android:layout_width="13dp"
-                            android:layout_height="13dp"
-                            android:src="@mipmap/radius2" />
-
-                        <com.google.android.material.textview.MaterialTextView
-                            style="@style/TextDialogSubTitle"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="11dp"
-                            android:text="@string/system"
-                            android:textColor="@color/dialog_value_color"
-                            tools:ignore="RelativeOverlap" />
-
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="1dp"
-                            android:layout_weight="1" />
-
-                        <com.google.android.material.textview.MaterialTextView
-                            android:id="@+id/radius2"
-                            style="@style/TextDialogSubTitle"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="11dp"
-                            android:text="18.77 GB"
-                            android:textColor="@color/dialog_value_color"
-                            tools:ignore="RelativeOverlap" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-
-                        <ImageView
-                            android:layout_width="13dp"
-                            android:layout_height="13dp"
-                            android:src="@mipmap/radius3" />
-
-                        <com.google.android.material.textview.MaterialTextView
-                            style="@style/TextDialogSubTitle"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="11dp"
-                            android:text="@string/free"
-                            android:textColor="@color/dialog_value_color"
-                            tools:ignore="RelativeOverlap" />
-
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="1dp"
-                            android:layout_weight="1" />
-
-                        <com.google.android.material.textview.MaterialTextView
-                            android:id="@+id/radius3"
-                            style="@style/TextDialogSubTitle"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="11dp"
-                            android:text="18.77 GB"
-                            android:textColor="@color/dialog_value_color"
-                            tools:ignore="RelativeOverlap" />
-                    </LinearLayout>
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingHorizontal="15dp">
-
-                    <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextSecondaryTitle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="30dp"
-                        android:text="@string/internal_storage"
-                        tools:ignore="RelativeOverlap" />
-
-                    <include
-                        android:id="@+id/storText1"
-                        layout="@layout/common_text_style" />
-
-                    <include
-                        android:id="@+id/storText2"
-                        layout="@layout/common_text_style" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="15dp"
-                    android:layout_marginTop="15dp"
-                    android:orientation="horizontal">
-
-                    <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextDialogLabel"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="/data"
-                        android:textSize="19sp"
-                        android:textStyle="bold"
-                        tools:ignore="RelativeOverlap" />
-
-                    <View
-                        android:layout_width="0dp"
-                        android:layout_height="1dp"
-                        android:layout_weight="1" />
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/stor2"
-                        style="@style/TextDialogLabel"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="119 GB"
-                        android:textSize="25sp"
-                        android:textStyle="bold"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="15dp"
-                    android:orientation="horizontal">
-
-                    <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextTool21"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="2.22 GB used"
-                        android:textSize="18sp"
-                        android:textStyle="normal"
-                        tools:ignore="RelativeOverlap" />
-
-                    <View
-                        android:layout_width="0dp"
-                        android:layout_height="1dp"
-                        android:layout_weight="1" />
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/stor3"
-                        style="@style/TextTool21"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="3.75 GB free"
-                        android:textSize="18sp"
-                        android:textStyle="normal"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
-
-                <SeekBar
-                    android:id="@+id/seekbar5"
-                    android:layout_width="match_parent"
-                    android:layout_height="10dp"
-                    android:maxHeight="10dp"
-                    android:minHeight="10dp"
-                    android:padding="0dp"
-                    android:progress="50"
-                    android:progressDrawable="@drawable/progress_bg"
-                    android:thumb="@drawable/progress_oval"
-                    android:thumbOffset="0dp" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="15dp"
-                    android:orientation="horizontal"
-                    android:paddingHorizontal="15dp">
-
-                    <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextContentLeft"
-                        android:layout_width="150dp"
-                        android:layout_height="wrap_content"
-                        android:text="@string/disk_partitions"
-                        android:textStyle="bold" />
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/disktext"
-                        style="@style/TextButteryRight"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:paddingHorizontal="10dp"
-                        android:text="@string/show"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
-                android:background="@drawable/dashboard_model_background"
-                android:orientation="vertical"
-                android:padding="15dp"
-                android:visibility="visible">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <com.google.android.material.textview.MaterialTextView
-                            android:id="@+id/titleBlue"
-                            style="@style/TextDeviceBig"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/bluetooth"
-                            tools:ignore="RelativeOverlap" />
-
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="1dp"
-                            android:layout_weight="1" />
-
-                        <ImageView
-                            android:layout_width="23dp"
-                            android:layout_height="23dp"
-                            android:layout_gravity="center_vertical"
-                            android:src="@mipmap/setting" />
-                    </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="15dp"
-                    android:orientation="horizontal">
-
-                    <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextContentLeft"
-                        android:layout_width="150dp"
-                        android:layout_height="wrap_content"
-                        android:text="@string/paired_devices"
-                        android:textStyle="bold" />
-                    <View
-                        android:layout_width="0dp"
-                        android:layout_height="1dp"
-                        android:layout_weight="1"/>
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/pair1"
-                        style="@style/TextButteryRight"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:paddingHorizontal="10dp"
-                        android:text="@string/show"
-                        tools:ignore="RelativeOverlap" />
-
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="15dp"
-                    android:orientation="horizontal">
-
-                    <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextContentLeft"
-                        android:layout_width="150dp"
-                        android:layout_height="wrap_content"
-                        android:text="@string/nearby_devices"
-                        android:textStyle="bold" />
-                    <View
-                        android:layout_width="0dp"
-                        android:layout_height="1dp"
-                        android:layout_weight="1"/>
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/pair2"
-                        style="@style/TextButteryRight"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:paddingHorizontal="10dp"
-                        android:text="@string/show"
-                        tools:ignore="RelativeOverlap" />
-
-                </LinearLayout>
-                <com.google.android.material.textview.MaterialTextView
-                    style="@style/TextSecondaryTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="30dp"
-                    android:text="@string/bluetooth_4_features"
-                    tools:ignore="RelativeOverlap" />
-                <include
-                    android:id="@+id/blueCheck1"
-                    layout="@layout/common_check_style" />
-                <include
-                    android:id="@+id/blueCheck2"
-                    layout="@layout/common_check_style" />
-                <include
-                    android:id="@+id/blueCheck3"
-                    layout="@layout/common_check_style" />
-                <include
-                    android:id="@+id/blueCheck4"
-                    layout="@layout/common_check_style" />
-                <com.google.android.material.textview.MaterialTextView
-                    style="@style/TextSecondaryTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="30dp"
-                    android:text="@string/bluetooth_5_features"
-                    tools:ignore="RelativeOverlap" />
-                <include
-                    android:id="@+id/blueCheck01"
-                    layout="@layout/common_check_style" />
-                <include
-                    android:id="@+id/blueCheck02"
-                    layout="@layout/common_check_style" />
-                <include
-                    android:id="@+id/blueCheck03"
-                    layout="@layout/common_check_style" />
-                <include
-                    android:id="@+id/blueCheck04"
-                    layout="@layout/common_check_style" />
-                <include
-                    android:id="@+id/blueCheck05"
-                    layout="@layout/common_check_style" />
-
-            </LinearLayout>
+                layout="@layout/hard_memory"
+                android:layout_height="wrap_content"/>
+
+          <include
+              android:id="@+id/bluetooth_layout"
+              android:layout_width="match_parent"
+              layout="@layout/hard_bluetooth"
+              android:layout_height="wrap_content"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -983,7 +315,7 @@
                     android:paddingTop="15dp">
 
                     <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextDeviceBig"
+                        style="@style/TextHeavy20"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/audio"
@@ -1002,18 +334,19 @@
                         layout="@layout/common_check_style" />
 
                     <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="15dp"
                         android:text="@string/codecs"
-                        android:textColor="@color/check_color"
-                        android:textStyle="bold" />
+                        android:textSize="16sp"
+                        android:textColor="@color/left_color" />
 
                     <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:textSize="16sp"
                         android:text="gsm, aac, mlaw, flac, raw, opus, decoder, alaw, encoder, amrnb, mp3, h263, h264, hevc, amrwb, mpeg4, vorbis, vp9, vp8"
                         android:textColor="@color/right_color"
                         android:textStyle="normal" />
@@ -1030,7 +363,7 @@
                 android:visibility="visible">
 
                 <com.google.android.material.textview.MaterialTextView
-                    style="@style/TextDeviceBig"
+                    style="@style/TextHeavy20"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/other"
@@ -1075,7 +408,7 @@
                     android:orientation="horizontal">
 
                     <com.google.android.material.textview.MaterialTextView
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/input_devices"
diff --git a/myphoneinfo/src/main/res/layout/fragment_network.xml b/myphoneinfo/src/main/res/layout/fragment_network.xml
index 496bbcf..df4e55f 100644
--- a/myphoneinfo/src/main/res/layout/fragment_network.xml
+++ b/myphoneinfo/src/main/res/layout/fragment_network.xml
@@ -32,7 +32,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/titleCon"
-                        style="@style/TextDeviceBig"
+                        style="@style/TextHeavy20"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/connection"
@@ -129,7 +129,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/titleWifi"
-                        style="@style/TextDeviceBig"
+                        style="@style/TextHeavy20"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/wifi"
@@ -160,7 +160,7 @@
 
                         <com.google.android.material.textview.MaterialTextView
                             android:id="@+id/wifiTitle1"
-                            style="@style/TextContentLeft"
+                            style="@style/LeftContent"
                             android:layout_width="150dp"
                             android:layout_height="wrap_content"
                             android:text="@string/status"
@@ -184,7 +184,7 @@
 
                         <com.google.android.material.textview.MaterialTextView
                             android:id="@+id/net2"
-                            style="@style/TextDeviceBig"
+                            style="@style/TextHeavy20"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="15dp"
@@ -199,7 +199,7 @@
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/netTitle1"
-                                style="@style/TextContentLeft"
+                                style="@style/LeftContent"
                                 android:layout_width="150dp"
                                 android:layout_height="wrap_content"
                                 android:text="@string/network"
@@ -223,7 +223,7 @@
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/netTitle2"
-                                style="@style/TextContentLeft"
+                                style="@style/LeftContent"
                                 android:layout_width="150dp"
                                 android:layout_height="wrap_content"
                                 android:text="@string/bssid"
@@ -247,7 +247,7 @@
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/netTitle3"
-                                style="@style/TextContentLeft"
+                                style="@style/LeftContent"
                                 android:layout_width="150dp"
                                 android:layout_height="wrap_content"
                                 android:text="@string/function"
@@ -271,7 +271,7 @@
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/netTitle4"
-                                style="@style/TextContentLeft"
+                                style="@style/LeftContent"
                                 android:layout_width="150dp"
                                 android:layout_height="wrap_content"
                                 android:text="@string/connection_speed"
@@ -295,7 +295,7 @@
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/netTitle5"
-                                style="@style/TextContentLeft"
+                                style="@style/LeftContent"
                                 android:layout_width="150dp"
                                 android:layout_height="wrap_content"
                                 android:text="@string/signal_strength"
@@ -319,7 +319,7 @@
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/netTitle6"
-                                style="@style/TextContentLeft"
+                                style="@style/LeftContent"
                                 android:layout_width="150dp"
                                 android:layout_height="wrap_content"
                                 android:text="@string/frequency"
@@ -343,7 +343,7 @@
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/netTitle7"
-                                style="@style/TextContentLeft"
+                                style="@style/LeftContent"
                                 android:layout_width="150dp"
                                 android:layout_height="wrap_content"
                                 android:text="@string/frequency_band"
@@ -367,7 +367,7 @@
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/netTitle8"
-                                style="@style/TextContentLeft"
+                                style="@style/LeftContent"
                                 android:layout_width="150dp"
                                 android:layout_height="wrap_content"
                                 android:text="@string/channel"
@@ -391,7 +391,7 @@
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/netTitle9"
-                                style="@style/TextContentLeft"
+                                style="@style/LeftContent"
                                 android:layout_width="150dp"
                                 android:layout_height="wrap_content"
                                 android:text="@string/standard"
@@ -408,7 +408,7 @@
                         </LinearLayout>
 
                         <com.google.android.material.textview.MaterialTextView
-                            style="@style/TextDeviceBig"
+                            style="@style/TextHeavy20"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="15dp"
@@ -423,7 +423,7 @@
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/dhTitle1"
-                                style="@style/TextContentLeft"
+                                style="@style/LeftContent"
                                 android:layout_width="150dp"
                                 android:layout_height="wrap_content"
                                 android:text="@string/dhcp_server"
@@ -447,7 +447,7 @@
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/dhTitle2"
-                                style="@style/TextContentLeft"
+                                style="@style/LeftContent"
                                 android:layout_width="150dp"
                                 android:layout_height="wrap_content"
                                 android:text="@string/dhcp_lease_time"
@@ -471,7 +471,7 @@
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/dhTitle3"
-                                style="@style/TextContentLeft"
+                                style="@style/LeftContent"
                                 android:layout_width="150dp"
                                 android:layout_height="wrap_content"
                                 android:text="@string/gateway"
@@ -495,7 +495,7 @@
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/dhTitle4"
-                                style="@style/TextContentLeft"
+                                style="@style/LeftContent"
                                 android:layout_width="150dp"
                                 android:layout_height="wrap_content"
                                 android:text="@string/subnet_mask"
@@ -519,7 +519,7 @@
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/dhTitle5"
-                                style="@style/TextContentLeft"
+                                style="@style/LeftContent"
                                 android:layout_width="150dp"
                                 android:layout_height="wrap_content"
                                 android:text="@string/dns1"
@@ -543,7 +543,7 @@
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/dhTitle6"
-                                style="@style/TextContentLeft"
+                                style="@style/LeftContent"
                                 android:layout_width="150dp"
                                 android:layout_height="wrap_content"
                                 android:text="@string/dns2"
@@ -567,7 +567,7 @@
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/dhTitle7"
-                                style="@style/TextContentLeft"
+                                style="@style/LeftContent"
                                 android:layout_width="150dp"
                                 android:layout_height="wrap_content"
                                 android:text="@string/ip_address"
@@ -591,7 +591,7 @@
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/dhTitle8"
-                                style="@style/TextContentLeft"
+                                style="@style/LeftContent"
                                 android:layout_width="150dp"
                                 android:layout_height="wrap_content"
                                 android:text="@string/dhcp_server"
@@ -615,7 +615,7 @@
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/dhTitle9"
-                                style="@style/TextContentLeft"
+                                style="@style/LeftContent"
                                 android:layout_width="150dp"
                                 android:layout_height="wrap_content"
                                 android:text="@string/dhcp_server"
@@ -639,7 +639,7 @@
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/dhTitle10"
-                                style="@style/TextContentLeft"
+                                style="@style/LeftContent"
                                 android:layout_width="150dp"
                                 android:layout_height="wrap_content"
                                 android:text="@string/dhcp_server"
@@ -658,7 +658,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/wifiTitle2"
-                        style="@style/TextDeviceBig"
+                        style="@style/TextHeavy20"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="15dp"
@@ -811,7 +811,7 @@
                         android:orientation="horizontal">
                         <com.google.android.material.textview.MaterialTextView
                             android:id="@+id/pubTitle"
-                            style="@style/TextContentLeft"
+                            style="@style/LeftContent"
                             android:layout_width="150dp"
                             android:layout_height="wrap_content"
                             android:text="@string/public_ip"
@@ -845,7 +845,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/titleModel"
-                        style="@style/TextDeviceBig"
+                        style="@style/TextHeavy20"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/mobile_data"
@@ -870,7 +870,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/mdTitle1"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/dual_sim_dual_standby"
@@ -893,7 +893,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/mdTitle2"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/phone_type"
@@ -916,7 +916,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/mdTitle3"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/esim"
@@ -932,7 +932,7 @@
                         tools:ignore="RelativeOverlap" />
                 </LinearLayout>
                 <com.google.android.material.textview.MaterialTextView
-                    style="@style/TextDeviceBig"
+                    style="@style/TextHeavy20"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="30dp"
@@ -946,7 +946,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/conTitle1"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/status"
@@ -962,7 +962,7 @@
                         tools:ignore="RelativeOverlap" />
                 </LinearLayout>
                 <com.google.android.material.textview.MaterialTextView
-                    style="@style/TextDeviceBig"
+                    style="@style/TextHeavy20"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="30dp"
@@ -976,7 +976,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/deTitle1"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/data"
@@ -999,7 +999,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/deTitle2"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/voice"
@@ -1022,7 +1022,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/deTitle3"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/short_message"
@@ -1038,7 +1038,7 @@
                         tools:ignore="RelativeOverlap" />
                 </LinearLayout>
                 <com.google.android.material.textview.MaterialTextView
-                    style="@style/TextDeviceBig"
+                    style="@style/TextHeavy20"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="30dp"
@@ -1052,7 +1052,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/smTitle1"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/status"
@@ -1075,7 +1075,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/sm1Title2"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/nation"
@@ -1098,7 +1098,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/sm1Title3"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/roaming"
@@ -1121,7 +1121,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/sm1Title4"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/network_type"
@@ -1137,7 +1137,7 @@
                         tools:ignore="RelativeOverlap" />
                 </LinearLayout>
                 <com.google.android.material.textview.MaterialTextView
-                    style="@style/TextDeviceBig"
+                    style="@style/TextHeavy20"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="30dp"
@@ -1151,7 +1151,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/sm2Title1"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/status"
@@ -1174,7 +1174,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/sm2Title2"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:layout_width="150dp"
                         android:layout_height="wrap_content"
                         android:text="@string/support"
diff --git a/myphoneinfo/src/main/res/layout/fragment_sensors.xml b/myphoneinfo/src/main/res/layout/fragment_sensors.xml
index 4470882..10e118a 100644
--- a/myphoneinfo/src/main/res/layout/fragment_sensors.xml
+++ b/myphoneinfo/src/main/res/layout/fragment_sensors.xml
@@ -49,7 +49,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/titleHall"
-                        style="@style/TextDeviceBig"
+                        style="@style/TextHeavy20"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/hall_sensor"
@@ -98,7 +98,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/titleSign"
-                        style="@style/TextDeviceBig"
+                        style="@style/TextHeavy20"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/signifcant_motion"
@@ -147,7 +147,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/titleGeo"
-                        style="@style/TextDeviceBig"
+                        style="@style/TextHeavy20"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/geomagnetic_rotation_vector"
@@ -196,7 +196,7 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/titleRpc"
-                        style="@style/TextDeviceBig"
+                        style="@style/TextHeavy20"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/rpc_sensor"
diff --git a/myphoneinfo/src/main/res/layout/fragment_system_show.xml b/myphoneinfo/src/main/res/layout/fragment_system_show.xml
index 2b2d3b2..cb51b95 100644
--- a/myphoneinfo/src/main/res/layout/fragment_system_show.xml
+++ b/myphoneinfo/src/main/res/layout/fragment_system_show.xml
@@ -31,7 +31,7 @@
 
                 <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/titleDev"
-                    style="@style/TextDeviceBig"
+                    style="@style/TextHeavy20"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/device"
@@ -54,169 +54,33 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/phone_Name"
-                        style="@style/TextSize37"
+                        style="@style/TextHeavy20"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:text="OPPO A53 5G"
+                        android:textSize="16sp"
                         tools:ignore="RelativeOverlap" />
                 </LinearLayout>
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="42dp"
-                    android:orientation="horizontal">
+                <include
+                    android:id="@+id/text0"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/text1"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/text2"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/text3"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/text4"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/text5"
+                    layout="@layout/common_text_style" />
 
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/textTitle1"
-                        style="@style/TextContentLeft"
-                        android:layout_width="150dp"
-                        android:layout_height="wrap_content"
-                        android:src="@mipmap/ic_launcher"
-                        android:text="@string/model"
-                        android:textStyle="bold" />
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/textDev1"
-                        style="@style/TextContentRight"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:layout_marginStart="20dp"
-                        android:text="@string/apps"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="15dp"
-                    android:orientation="horizontal">
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/textTitle2"
-                        style="@style/TextContentLeft"
-                        android:layout_width="150dp"
-                        android:layout_height="wrap_content"
-                        android:src="@mipmap/ic_launcher"
-                        android:text="@string/product"
-                        android:textStyle="bold" />
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/textDev2"
-                        style="@style/TextContentRight"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:layout_marginStart="20dp"
-                        android:text="@string/apps"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="15dp"
-                    android:orientation="horizontal">
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/textTitle3"
-                        style="@style/TextContentLeft"
-                        android:layout_width="150dp"
-                        android:layout_height="wrap_content"
-                        android:src="@mipmap/ic_launcher"
-                        android:text="@string/device"
-                        android:textStyle="bold" />
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/textDev3"
-                        style="@style/TextContentRight"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:layout_marginStart="20dp"
-                        android:text="@string/apps"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="15dp"
-                    android:orientation="horizontal">
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/textTitle4"
-                        style="@style/TextContentLeft"
-                        android:layout_width="150dp"
-                        android:layout_height="wrap_content"
-                        android:src="@mipmap/ic_launcher"
-                        android:text="@string/motherboard"
-                        android:textStyle="bold" />
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/textDev4"
-                        style="@style/TextContentRight"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:layout_marginStart="20dp"
-                        android:text="@string/apps"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="15dp"
-                    android:orientation="horizontal">
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/textTitle5"
-                        style="@style/TextContentLeft"
-                        android:layout_width="150dp"
-                        android:layout_height="wrap_content"
-                        android:src="@mipmap/ic_launcher"
-                        android:text="@string/manufacturer"
-                        android:textStyle="bold" />
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/textDev5"
-                        style="@style/TextContentRight"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:layout_marginStart="20dp"
-                        android:text="@string/apps"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="15dp"
-                    android:orientation="horizontal">
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/textTitle6"
-                        style="@style/TextContentLeft"
-                        android:layout_width="150dp"
-                        android:layout_height="wrap_content"
-                        android:src="@mipmap/ic_launcher"
-                        android:text="@string/baseband"
-                        android:textStyle="bold" />
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/textDev6"
-                        style="@style/TextContentRight"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:layout_marginStart="20dp"
-                        android:text="@string/apps"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
 
             </LinearLayout>
 
@@ -236,7 +100,7 @@
                     android:orientation="horizontal">
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/titleSystem"
-                        style="@style/TextDeviceBig"
+                        style="@style/TextHeavy20"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/operating_system"
@@ -260,15 +124,15 @@
                     android:layout_marginTop="20dp"
                     android:layout_height="wrap_content">
                     <ImageView
-                        android:layout_width="90dp"
+                        android:layout_width="66dp"
                         android:scaleType="fitXY"
-                        android:layout_height="90dp"
+                        android:layout_height="66dp"
                         android:src="@mipmap/subtract"
                         android:layout_marginEnd="60dp"/>
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/androidName"
-                        style="@style/TextSize28"
-                        android:textSize="28sp"
+                        style="@style/TextHeavy20"
+                        android:textSize="16sp"
                         android:layout_marginStart="20dp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -276,6 +140,67 @@
                         android:layout_gravity="center"
                         tools:ignore="RelativeOverlap" />
                 </LinearLayout>
+                <include
+                    android:id="@+id/textOp1"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textOp2"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textOp3"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textOp4"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textOp5"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textOp6"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textOp7"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textOp8"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textOp9"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textOp10"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textOp11"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textOp12"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textOp13"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textOp14"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textOp15"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textOp16"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textOp17"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textOp18"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textOp19"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textOp20"
+                    layout="@layout/common_text_style" />
+
 
             </LinearLayout>
 
@@ -290,7 +215,7 @@
                 >
                 <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/titleId"
-                    style="@style/TextDeviceBig"
+                    style="@style/TextHeavy20"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/identifier"
@@ -304,17 +229,17 @@
                         android:id="@+id/idTitle1"
                         android:layout_width="150dp"
                         android:text="@string/google_services_framework_id"
-                        android:textStyle="bold"
                         android:layout_height="wrap_content"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:src="@mipmap/ic_launcher"/>
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/idDev1"
-                        style="@style/TextContentRight"
+                        style="@style/LeftContent"
                         android:layout_marginStart="20dp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/apps"
+                        android:textColor="@color/right_color"
                         tools:ignore="RelativeOverlap" />
                     <View
                         android:layout_width="0dp"
@@ -336,17 +261,17 @@
                         android:id="@+id/idTitle2"
                         android:layout_width="150dp"
                         android:text="@string/device_id"
-                        android:textStyle="bold"
                         android:layout_height="wrap_content"
-                        style="@style/TextContentLeft"
+                        style="@style/LeftContent"
                         android:src="@mipmap/ic_launcher"/>
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/idDev2"
-                        style="@style/TextContentRight"
+                        style="@style/LeftContent"
                         android:layout_marginStart="20dp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/apps"
+                        android:textColor="@color/right_color"
                         tools:ignore="RelativeOverlap" />
                     <View
                         android:layout_width="0dp"
@@ -359,28 +284,9 @@
                         android:layout_gravity="center_vertical"
                         />
                 </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:orientation="horizontal"
-                    android:layout_marginTop="15dp"
-                    android:layout_height="wrap_content">
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/idTitle3"
-                        android:layout_width="150dp"
-                        android:text="Google Play Services version"
-                        android:textStyle="bold"
-                        android:layout_height="wrap_content"
-                        style="@style/TextContentLeft"
-                        android:src="@mipmap/ic_launcher"/>
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/idDev3"
-                        style="@style/TextContentRight"
-                        android:layout_marginStart="20dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/apps"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
+                <include
+                    android:id="@+id/text6"
+                    layout="@layout/common_text_style" />
 
             </LinearLayout>
 
@@ -395,7 +301,7 @@
                 >
                 <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/titleD"
-                    style="@style/TextDeviceBig"
+                    style="@style/TextHeavy20"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/drm"
@@ -407,48 +313,12 @@
                     android:layout_marginTop="30dp"
                     android:text="@string/clearkey_cdm"
                     tools:ignore="RelativeOverlap" />
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:orientation="horizontal"
-                    android:layout_marginTop="15dp"
-                    android:layout_height="wrap_content">
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/dTitle1"
-                        android:layout_width="150dp"
-                        android:text="@string/vendor"
-                        android:textStyle="bold"
-                        android:layout_height="wrap_content"
-                        style="@style/TextContentLeft" />
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/dDev1"
-                        style="@style/TextContentRight"
-                        android:layout_marginStart="20dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/apps"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:orientation="horizontal"
-                    android:layout_marginTop="15dp"
-                    android:layout_height="wrap_content">
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/dTitle2"
-                        android:layout_width="150dp"
-                        android:text="@string/version"
-                        android:textStyle="bold"
-                        android:layout_height="wrap_content"
-                        style="@style/TextContentLeft" />
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/dDev2"
-                        style="@style/TextContentRight"
-                        android:layout_marginStart="20dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/apps"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
+                <include
+                    android:id="@+id/textclear1"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textclear2"
+                    layout="@layout/common_text_style" />
                 <com.google.android.material.textview.MaterialTextView
                     style="@style/TextSecondaryTitle"
                     android:layout_width="wrap_content"
@@ -456,138 +326,24 @@
                     android:layout_marginTop="30dp"
                     android:text="@string/widevine"
                     tools:ignore="RelativeOverlap" />
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:orientation="horizontal"
-                    android:layout_marginTop="15dp"
-                    android:layout_height="wrap_content">
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/dTitle4"
-                        android:layout_width="150dp"
-                        android:text="@string/vendor"
-                        android:textStyle="bold"
-                        android:layout_height="wrap_content"
-                        style="@style/TextContentLeft"
-                        android:src="@mipmap/ic_launcher"/>
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/dDev4"
-                        style="@style/TextContentRight"
-                        android:layout_marginStart="20dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/apps"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:orientation="horizontal"
-                    android:layout_marginTop="15dp"
-                    android:layout_height="wrap_content">
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/dTitle5"
-                        android:layout_width="150dp"
-                        android:text="@string/version"
-                        android:textStyle="bold"
-                        android:layout_height="wrap_content"
-                        style="@style/TextContentLeft"
-                        android:src="@mipmap/ic_launcher"/>
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/dDev5"
-                        style="@style/TextContentRight"
-                        android:layout_marginStart="20dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/apps"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:orientation="horizontal"
-                    android:layout_marginTop="15dp"
-                    android:layout_height="wrap_content">
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/dTitle6"
-                        android:layout_width="150dp"
-                        android:text="@string/algorithm"
-                        android:textStyle="bold"
-                        android:layout_height="wrap_content"
-                        style="@style/TextContentLeft"
-                        android:src="@mipmap/ic_launcher"/>
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/dDev6"
-                        style="@style/TextContentRight"
-                        android:layout_marginStart="20dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/apps"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:orientation="horizontal"
-                    android:layout_marginTop="15dp"
-                    android:layout_height="wrap_content">
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/dTitle3"
-                        android:layout_width="150dp"
-                        android:text="@string/device_id"
-                        android:textStyle="bold"
-                        android:layout_height="wrap_content"
-                        style="@style/TextContentLeft"
-                        android:src="@mipmap/ic_launcher"/>
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/dDev7"
-                        style="@style/TextContentRight"
-                        android:layout_marginStart="20dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/apps"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:orientation="horizontal"
-                    android:layout_marginTop="15dp"
-                    android:layout_height="wrap_content">
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/dTitle8"
-                        android:layout_width="150dp"
-                        android:text="@string/security_level"
-                        android:textStyle="bold"
-                        android:layout_height="wrap_content"
-                        style="@style/TextContentLeft"
-                        android:src="@mipmap/ic_launcher"/>
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/dDev8"
-                        style="@style/TextContentRight"
-                        android:layout_marginStart="20dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/apps"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:orientation="horizontal"
-                    android:layout_marginTop="15dp"
-                    android:layout_height="wrap_content">
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/dTitle9"
-                        android:layout_width="150dp"
-                        android:text="@string/highest_hdcp_level"
-                        android:textStyle="bold"
-                        android:layout_height="wrap_content"
-                        style="@style/TextContentLeft"
-                        android:src="@mipmap/ic_launcher"/>
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/dDev9"
-                        style="@style/TextContentRight"
-                        android:layout_marginStart="20dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/apps"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
+                <include
+                    android:id="@+id/textwide1"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textwide2"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textwide3"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textwide4"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textwide5"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/textwide6"
+                    layout="@layout/common_text_style" />
             </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/myphoneinfo/src/main/res/layout/hard_bluetooth.xml b/myphoneinfo/src/main/res/layout/hard_bluetooth.xml
new file mode 100644
index 0000000..2c3a6a1
--- /dev/null
+++ b/myphoneinfo/src/main/res/layout/hard_bluetooth.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:background="@drawable/dashboard_model_background"
+        android:orientation="vertical"
+        android:padding="15dp"
+        android:visibility="visible">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/titleBlue"
+                style="@style/TextHeavy20"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/bluetooth"
+                tools:ignore="RelativeOverlap" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:layout_weight="1" />
+
+            <ImageView
+                android:layout_width="23dp"
+                android:layout_height="23dp"
+                android:layout_gravity="center_vertical"
+                android:src="@mipmap/setting" />
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:orientation="vertical">
+
+            <com.google.android.material.textview.MaterialTextView
+                style="@style/LeftContent"
+                android:layout_width="150dp"
+                android:layout_height="wrap_content"
+                android:text="@string/paired_devices" />
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:layout_weight="1"/>
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/pair1"
+                style="@style/TextButteryRight"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:paddingHorizontal="12dp"
+                android:paddingVertical="8dp"
+                android:layout_marginTop="21dp"
+                android:background="@drawable/hard_bg"
+                android:textStyle="normal"
+                android:text="@string/show"
+                android:textAlignment="center"
+                tools:ignore="RelativeOverlap" />
+
+        </LinearLayout>
+        <!--                <LinearLayout-->
+        <!--                    android:layout_width="match_parent"-->
+        <!--                    android:layout_height="wrap_content"-->
+        <!--                    android:layout_marginTop="15dp"-->
+        <!--                    android:orientation="horizontal">-->
+
+        <!--                    <com.google.android.material.textview.MaterialTextView-->
+        <!--                        style="@style/LeftContent"-->
+        <!--                        android:layout_width="150dp"-->
+        <!--                        android:layout_height="27dp"-->
+        <!--                        android:text="@string/nearby_devices" />-->
+        <!--                    <View-->
+        <!--                        android:layout_width="0dp"-->
+        <!--                        android:layout_height="1dp"-->
+        <!--                        android:layout_weight="1"/>-->
+        <!--                    <com.google.android.material.textview.MaterialTextView-->
+        <!--                        android:id="@+id/pair2"-->
+        <!--                        style="@style/TextButteryRight"-->
+        <!--                        android:layout_width="wrap_content"-->
+        <!--                        android:layout_height="wrap_content"-->
+        <!--                        android:paddingHorizontal="10dp"-->
+        <!--                        android:text="@string/show"-->
+        <!--                        tools:ignore="RelativeOverlap" />-->
+
+        <!--                </LinearLayout>-->
+        <com.google.android.material.textview.MaterialTextView
+            style="@style/TextHeavy20"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp"
+            android:textSize="16sp"
+            android:text="@string/bluetooth_4_features"
+            tools:ignore="RelativeOverlap" />
+        <include
+            android:id="@+id/blueCheck1"
+            layout="@layout/common_check_style" />
+        <include
+            android:id="@+id/blueCheck2"
+            layout="@layout/common_check_style" />
+        <include
+            android:id="@+id/blueCheck3"
+            layout="@layout/common_check_style" />
+        <include
+            android:id="@+id/blueCheck4"
+            layout="@layout/common_check_style" />
+        <com.google.android.material.textview.MaterialTextView
+            style="@style/TextHeavy20"
+            android:textSize="16sp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp"
+            android:text="@string/bluetooth_5_features"
+            tools:ignore="RelativeOverlap" />
+        <include
+            android:id="@+id/blueCheck01"
+            layout="@layout/common_check_style" />
+        <include
+            android:id="@+id/blueCheck02"
+            layout="@layout/common_check_style" />
+        <include
+            android:id="@+id/blueCheck03"
+            layout="@layout/common_check_style" />
+        <include
+            android:id="@+id/blueCheck04"
+            layout="@layout/common_check_style" />
+        <include
+            android:id="@+id/blueCheck05"
+            layout="@layout/common_check_style" />
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/myphoneinfo/src/main/res/layout/hard_memory.xml b/myphoneinfo/src/main/res/layout/hard_memory.xml
new file mode 100644
index 0000000..f3437d3
--- /dev/null
+++ b/myphoneinfo/src/main/res/layout/hard_memory.xml
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:background="@drawable/dashboard_model_background"
+        android:orientation="vertical"
+        android:paddingBottom="30dp"
+        android:visibility="visible">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="15dp"
+            android:paddingTop="15dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/titleMem"
+                    style="@style/TextHeavy20"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/memory"
+                    tools:ignore="RelativeOverlap" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="1" />
+
+                <ImageView
+                    android:layout_width="23dp"
+                    android:layout_height="23dp"
+                    android:layout_gravity="center_vertical"
+                    android:src="@mipmap/setting" />
+            </LinearLayout>
+
+            <include
+                android:id="@+id/memText1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                layout="@layout/mem_text_style" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/ram1"
+                    style="@style/LeftContent"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="2.22 GB used"
+                    tools:ignore="RelativeOverlap" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="1" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/ram2"
+                    style="@style/LeftContent"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="3.75 GB free"
+                    tools:ignore="RelativeOverlap" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <SeekBar
+            android:id="@+id/seekbar"
+            android:layout_width="match_parent"
+            android:layout_height="10dp"
+            android:maxHeight="10dp"
+            android:minHeight="10dp"
+            android:padding="0dp"
+            android:progress="50"
+            android:progressDrawable="@drawable/progress_bg"
+            android:thumb="@drawable/progress_oval"
+            android:thumbOffset="0dp" />
+
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_marginTop="30dp"
+            android:layout_marginHorizontal="15dp">
+            <include
+                android:id="@+id/memText3"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                layout="@layout/mem_text_style" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/ram3"
+                    style="@style/LeftContent"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="2.22 GB used"
+                    tools:ignore="RelativeOverlap" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="1" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/ram4"
+                    style="@style/LeftContent"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="3.75 GB free"
+                    tools:ignore="RelativeOverlap" />
+            </LinearLayout>
+        </LinearLayout>
+
+                        <SeekBar
+                            android:id="@+id/seekbar2"
+                            android:layout_width="match_parent"
+                            android:layout_height="10dp"
+                            android:maxHeight="10dp"
+                            android:minHeight="10dp"
+                            android:padding="0dp"
+                            android:progress="50"
+                            android:progressDrawable="@drawable/progress_bg"
+                            android:thumb="@drawable/progress_oval"
+                            android:thumbOffset="0dp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:background="@drawable/dashboard_model_background"
+        android:orientation="vertical"
+        android:paddingBottom="30dp"
+        android:visibility="visible">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="15dp"
+            android:paddingTop="15dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/titleStor"
+                    style="@style/TextHeavy20"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/storage"
+                    tools:ignore="RelativeOverlap" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="1" />
+
+                <ImageView
+                    android:layout_width="23dp"
+                    android:layout_height="23dp"
+                    android:layout_gravity="center_vertical"
+                    android:src="@mipmap/setting" />
+            </LinearLayout>
+
+            <include
+                android:id="@+id/storText1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                layout="@layout/mem_text_style" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/stor1"
+                    style="@style/LeftContent"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="2.22 GB used"
+                    tools:ignore="RelativeOverlap" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="1" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/stor2"
+                    style="@style/LeftContent"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="3.75 GB free"
+                    tools:ignore="RelativeOverlap" />
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+        <SeekBar
+            android:id="@+id/seekbar3"
+            android:layout_width="match_parent"
+            android:layout_height="10dp"
+            android:maxHeight="10dp"
+            android:minHeight="10dp"
+            android:padding="0dp"
+            android:progress="50"
+            android:progressDrawable="@drawable/progress_bg"
+            android:thumb="@drawable/progress_oval"
+            android:thumbOffset="0dp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="15dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:src="@mipmap/radius1" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    style="@style/LeftContent"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="11dp"
+                    android:text="@string/apps_and_data"
+                    android:textColor="@color/dialog_value_color"
+                    tools:ignore="RelativeOverlap" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="1" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/radius1"
+                    style="@style/LeftContent"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="11dp"
+                    android:text="18.77 GB"
+                    android:textColor="@color/right_color"
+                    tools:ignore="RelativeOverlap" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:src="@mipmap/radius2" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    style="@style/LeftContent"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="11dp"
+                    android:text="@string/system"
+                    android:textColor="@color/dialog_value_color"
+                    tools:ignore="RelativeOverlap" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="1" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/radius2"
+                    style="@style/LeftContent"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="11dp"
+                    android:text="18.77 GB"
+                    android:textColor="@color/right_color"
+                    tools:ignore="RelativeOverlap" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:src="@mipmap/radius3" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    style="@style/LeftContent"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="11dp"
+                    android:text="@string/free"
+                    android:textColor="@color/dialog_value_color"
+                    tools:ignore="RelativeOverlap" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="1" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/radius3"
+                    style="@style/LeftContent"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="11dp"
+                    android:text="18.77 GB"
+                    android:textColor="@color/right_color"
+                    tools:ignore="RelativeOverlap" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="15dp">
+
+            <com.google.android.material.textview.MaterialTextView
+                style="@style/TextSecondaryTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="30dp"
+                android:text="@string/internal_storage"
+                tools:ignore="RelativeOverlap" />
+            <include
+                android:id="@+id/interText1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dp"
+                layout="@layout/mem_text_style" />
+            <include
+                android:id="@+id/interText2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                layout="@layout/mem_text_style" />
+            <include
+                android:id="@+id/interText3"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dp"
+                layout="@layout/mem_text_style" />
+               />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="15dp"
+            android:orientation="horizontal">
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/stor3"
+                style="@style/LeftContent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="2.22 GB used"
+                tools:ignore="RelativeOverlap" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:layout_weight="1" />
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/stor4"
+                style="@style/LeftContent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="3.75 GB free"
+                tools:ignore="RelativeOverlap" />
+        </LinearLayout>
+
+        <SeekBar
+            android:id="@+id/seekbar5"
+            android:layout_width="match_parent"
+            android:layout_height="10dp"
+            android:maxHeight="10dp"
+            android:minHeight="10dp"
+            android:padding="0dp"
+            android:progress="50"
+            android:progressDrawable="@drawable/progress_bg"
+            android:thumb="@drawable/progress_oval"
+            android:thumbOffset="0dp" />
+
+        <LinearLayout
+            android:id="@+id/disktext"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:orientation="vertical"
+            android:paddingHorizontal="15dp">
+
+            <com.google.android.material.textview.MaterialTextView
+                style="@style/LeftContent"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="16sp"
+                android:text="@string/disk_partitions" />
+            <TextView
+                android:id="@+id/cpuBtn"
+                style="@style/TextDialogSubTitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="21dp"
+                android:background="@drawable/hard_bg"
+                android:paddingHorizontal="12dp"
+                android:paddingVertical="8dp"
+                android:textSize="14sp"
+                android:textStyle="normal"
+                android:text="@string/show"
+                android:textAlignment="center"
+                android:textColor="@color/module_title_color" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/myphoneinfo/src/main/res/layout/item_blue_tooth.xml b/myphoneinfo/src/main/res/layout/item_blue_tooth.xml
new file mode 100644
index 0000000..1d524dc
--- /dev/null
+++ b/myphoneinfo/src/main/res/layout/item_blue_tooth.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginVertical="4dp"
+        android:orientation="horizontal">
+        <com.google.android.material.textview.MaterialTextView
+            style="@style/LeftContent"
+            android:id="@+id/textTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="start"
+            android:textSize="12sp"
+            android:text="NUCBOX_K8" />
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1"/>
+        <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/textContent"
+            style="@style/LeftContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="start"
+            android:textSize="12sp"
+            android:textColor="@color/right_color"
+            android:text="D0:12:55:2C:43:FB" />
+</LinearLayout>
\ No newline at end of file
diff --git a/myphoneinfo/src/main/res/layout/item_common_temp.xml b/myphoneinfo/src/main/res/layout/item_common_temp.xml
index f1dd71c..ace8fe7 100644
--- a/myphoneinfo/src/main/res/layout/item_common_temp.xml
+++ b/myphoneinfo/src/main/res/layout/item_common_temp.xml
@@ -25,7 +25,7 @@
             android:layout_height="1dp"/>
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/textContent"
-            style="@style/TextContentLeft"
+            style="@style/LeftContent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="NA℃"
diff --git a/myphoneinfo/src/main/res/layout/mem_text_style.xml b/myphoneinfo/src/main/res/layout/mem_text_style.xml
new file mode 100644
index 0000000..e0e3a21
--- /dev/null
+++ b/myphoneinfo/src/main/res/layout/mem_text_style.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_marginTop="20dp"
+    android:orientation="horizontal">
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/textTitle"
+            style="@style/LeftContent"
+            android:layout_weight="1"
+            android:layout_width="0dp"
+            android:textSize="16sp"
+            android:layout_height="wrap_content"
+            android:text="@string/model" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/textContent"
+            style="@style/LeftContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:text="@string/apps"
+            android:textColor="@color/right_color"
+            tools:ignore="RelativeOverlap" />
+</LinearLayout>
\ No newline at end of file
diff --git a/myphoneinfo/src/main/res/mipmap-xhdpi/indicator_img.png b/myphoneinfo/src/main/res/mipmap-xhdpi/indicator_img.png
new file mode 100644
index 0000000..979cfba
Binary files /dev/null and b/myphoneinfo/src/main/res/mipmap-xhdpi/indicator_img.png differ
diff --git a/myphoneinfo/src/main/res/mipmap-xhdpi/radius2.png b/myphoneinfo/src/main/res/mipmap-xhdpi/radius2.png
index 97b1159..eaa7a95 100644
Binary files a/myphoneinfo/src/main/res/mipmap-xhdpi/radius2.png and b/myphoneinfo/src/main/res/mipmap-xhdpi/radius2.png differ
diff --git a/myphoneinfo/src/main/res/mipmap-xhdpi/setting.png b/myphoneinfo/src/main/res/mipmap-xhdpi/setting.png
index 549347a..5b57b86 100644
Binary files a/myphoneinfo/src/main/res/mipmap-xhdpi/setting.png and b/myphoneinfo/src/main/res/mipmap-xhdpi/setting.png differ
diff --git a/myphoneinfo/src/main/res/values/colors.xml b/myphoneinfo/src/main/res/values/colors.xml
index 2b90eaf..5213510 100644
--- a/myphoneinfo/src/main/res/values/colors.xml
+++ b/myphoneinfo/src/main/res/values/colors.xml
@@ -8,8 +8,7 @@
     <color name="forground_color">#FFFFFF</color>
     <color name="background_color">#f4f4f4</color>
     <color name="module_title_color">#3B948A</color>
-    <color name="left_color">#626262</color>
-    <color name="right_color">#757575</color>
+
     <color name="check_color">#484848</color>
     <color name="dialog_label_color">#666666</color>
     <color name="dialog_value_color">#757575</color>
@@ -20,4 +19,8 @@
     <color name="slide_left">#F8F8F8</color>
     <color name="dash_color">#76B4AD</color>
     <color name="yellow_color">#FFD54F</color>
+    <color name="left_color">#858989</color>
+    <color name="dialog_cancel">#F2F2F2</color>
+    <color name="right_color">#C1C5C2</color>
+    <color name="btn_30_trans">#C4DFDC</color>
 </resources>
\ No newline at end of file
diff --git a/myphoneinfo/src/main/res/values/strings.xml b/myphoneinfo/src/main/res/values/strings.xml
index 7e5e6fe..19a1370 100644
--- a/myphoneinfo/src/main/res/values/strings.xml
+++ b/myphoneinfo/src/main/res/values/strings.xml
@@ -66,16 +66,16 @@
     <string name="device">Device</string>
     <string name="product">Product</string>
     <string name="model">Model</string>
-    <string name="motherboard">Motherboard</string>
     <string name="manufacturer">Manufacturer</string>
-    <string name="baseband">Baseband</string>
+    <string name="baseband">Brand</string>
+    <string name="board">Board</string>
     <string name="operating_system">Operating System</string>
     <string name="android_version">Android Version</string>
     <string name="api">API</string>
     <string name="security_patch_level">Security Patch Level</string>
     <string name="version_number">Version Number</string>
     <string name="fingerprint">Fingerprint</string>
-    <string name="build_time">Build Time</string>
+    <string name="build_time">Build Date</string>
     <string name="initial_release">Initial Release</string>
     <string name="architecture">Architecture</string>
     <string name="instruction_set_architecture">Instruction Set Architecture</string>
@@ -92,10 +92,10 @@
     <string name="vendor">Vendor</string>
     <string name="version">Version</string>
     <string name="widevine">Widevine</string>
-    <string name="algorithm">Algorithm</string>
+    <string name="algorithm">Algorithms</string>
     <string name="device_id">Device ID</string>
     <string name="security_level">Security Level</string>
-    <string name="highest_hdcp_level">Highest HDCP Level</string>
+    <string name="highest_hdcp_level">Max HDCP level</string>
     <string name="identifier">Identifier</string>
     <string name="google_services_framework_id">Google Services Framework ID</string>
     <string name="connection">Connection</string>
@@ -115,7 +115,7 @@
     <string name="dns1">DNS1</string>
     <string name="dns2">DNS2</string>
     <string name="public_ip">Public IP</string>
-    <string name="show">SHOW</string>
+    <string name="show">Show</string>
     <string name="ok">OK</string>
     <string name="mobile_data">Mobile Data</string>
     <string name="dual_sim_dual_standby">Dual SIM dual standby</string>
@@ -187,6 +187,7 @@
     <string name="vulkan_support">Vulkan support</string>
     <string name="vulkan_API">Vulkan API version</string>
     <string name="extensions">Extensions</string>
+    <string name="opengl">OpenGL</string>
     <string name="memory">Memory</string>
     <string name="screen_density_d">Screen density (dpi)</string>
     <string name="screen_size_e">Screen size (estimated)</string>
@@ -287,5 +288,7 @@
     <string name="crop_factor">Crop factor</string>
     <string name="field_of_view">Field of view</string>
     <string name="iso_sensitivity_range">ISO sensitivity range</string>
-
+    <string name="google_play_services_version">Google Play Services version</string>
+    <string name="toybox">Toybox</string>
+    <string name="java_VM">Java VM</string>
 </resources>
\ No newline at end of file
diff --git a/myphoneinfo/src/main/res/values/styles.xml b/myphoneinfo/src/main/res/values/styles.xml
index 1770d7f..e9a44d1 100644
--- a/myphoneinfo/src/main/res/values/styles.xml
+++ b/myphoneinfo/src/main/res/values/styles.xml
@@ -84,14 +84,6 @@
         <item name="android:textColor">@color/right_color</item>
         <!--        <item name="fontFamily">@font/semibold</item>-->
     </style>
-    <!-- 左边内容字体-->
-    <style name="TextContentLeft" parent="TextAppearance.Material3.BodyLarge">
-        <item name="android:textSize">19sp</item>
-        <item name="fontFamily">@font/pingfang_heavy_0</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textColor">@color/left_color</item>
-        <!--        <item name="fontFamily">@font/semibold</item>-->
-    </style>
     <!-- 判断框字体-->
     <style name="TextCheck" parent="TextAppearance.Material3.BodyLarge">
         <item name="android:textSize">19sp</item>
@@ -205,6 +197,9 @@
         <item name="android:windowIsFloating">false</item> <!-- 使对话框全屏显示 -->
         <item name="android:windowSoftInputMode">stateAlwaysHidden</item> <!-- 隐藏软键盘 -->
     </style>
+
+
+
     <!-- 二编自定义 Text的样式 -->
     <!-- 自定义 侧边栏 的样式 -->
     <style name="SlideInLeftAnimation">
@@ -235,5 +230,17 @@
         <item name="android:textColor">@color/white</item>
         <item name="fontFamily">@font/pingfang_regular</item>
     </style>
+<!--    小标题字体-->
+    <style name="TextHeavy20" parent="TextAppearance.Material3.BodyLarge">
+        <item name="android:textSize">20sp</item>
+        <item name="fontFamily">@font/pingfang_heavy_0</item>
+        <item name="android:textColor">@color/module_title_color</item>
+    </style>
 
+    <!-- 左边内容字体-->
+    <style name="LeftContent" parent="TextAppearance.Material3.BodyLarge">
+    <item name="android:textSize">14sp</item>
+    <item name="fontFamily">@font/pingfang_bold</item>
+    <item name="android:textColor">@color/left_color</item>
+    </style>
 </resources>
\ No newline at end of file