diff --git a/.idea/misc.xml b/.idea/misc.xml index b2c751a..a030bcc 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,52 @@ + + + + + diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e72c2c8..f8d4bf5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -44,6 +44,8 @@ dependencies { implementation(libs.material) implementation(libs.androidx.activity) implementation(libs.androidx.constraintlayout) + implementation(libs.androidx.navigation.fragment.ktx) + implementation(libs.androidx.navigation.ui.ktx) testImplementation(libs.junit) androidTestImplementation(libs.androidx.junit) androidTestImplementation(libs.androidx.espresso.core) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ccc1be3..3c8ac87 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,6 +12,28 @@ android:supportsRtl="true" android:theme="@style/Theme.DevCheck" tools:targetApi="31"> + + + + + + + diff --git a/app/src/main/java/com/tools/device/devcheck/adapter/CpuListAdapter.kt b/app/src/main/java/com/tools/device/devcheck/adapter/CpuListAdapter.kt index 8fa6243..6145b4d 100644 --- a/app/src/main/java/com/tools/device/devcheck/adapter/CpuListAdapter.kt +++ b/app/src/main/java/com/tools/device/devcheck/adapter/CpuListAdapter.kt @@ -5,15 +5,16 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.tools.device.devcheck.databinding.ItemListBinding +import com.tools.device.devcheck.databinding.ItemListCpuBinding -class ListAdapter: RecyclerView.Adapter() { +class CpuListAdapter: RecyclerView.Adapter() { private lateinit var context: Context override fun onCreateViewHolder( parent: ViewGroup, viewType: Int ): ListViewHolder { context = parent.context - val binding= ItemListBinding.inflate(LayoutInflater.from(context), parent, false) + val binding= ItemListCpuBinding.inflate(LayoutInflater.from(context), parent, false) return ListViewHolder(binding) } @@ -28,5 +29,5 @@ class ListAdapter: RecyclerView.Adapter() { return 3 } - class ListViewHolder(val binding: ItemListBinding): RecyclerView.ViewHolder(binding.root) + class ListViewHolder(val binding: ItemListCpuBinding): RecyclerView.ViewHolder(binding.root) } \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/adapter/ListAdapter.kt b/app/src/main/java/com/tools/device/devcheck/adapter/ListAdapter.kt index 36c157e..8fa6243 100644 --- a/app/src/main/java/com/tools/device/devcheck/adapter/ListAdapter.kt +++ b/app/src/main/java/com/tools/device/devcheck/adapter/ListAdapter.kt @@ -1,4 +1,32 @@ package com.tools.device.devcheck.adapter -class ListAdapter { +import android.content.Context +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import com.tools.device.devcheck.databinding.ItemListBinding + +class ListAdapter: RecyclerView.Adapter() { + private lateinit var context: Context + override fun onCreateViewHolder( + parent: ViewGroup, + viewType: Int + ): ListViewHolder { + context = parent.context + val binding= ItemListBinding.inflate(LayoutInflater.from(context), parent, false) + return ListViewHolder(binding) + } + + override fun onBindViewHolder( + holder: ListViewHolder, + position: Int + ) { + + } + + override fun getItemCount(): Int { + return 3 + } + + class ListViewHolder(val binding: ItemListBinding): RecyclerView.ViewHolder(binding.root) } \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/AnalysisActivity.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/AnalysisActivity.kt index 2e0e603..e6f93c7 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/AnalysisActivity.kt +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/AnalysisActivity.kt @@ -6,16 +6,14 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import com.tools.device.devcheck.R +import com.tools.device.devcheck.databinding.ActivityAnalysisBinding class AnalysisActivity : AppCompatActivity() { + private lateinit var binding: ActivityAnalysisBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - enableEdgeToEdge() - setContentView(R.layout.activity_analysis) - ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> - val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) - v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) - insets - } + binding = ActivityAnalysisBinding.inflate(layoutInflater) + setContentView(binding.root) + } } \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/BlueToothActivity.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/BlueToothActivity.kt index ae5c382..84a1c9c 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/BlueToothActivity.kt +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/BlueToothActivity.kt @@ -5,17 +5,22 @@ import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat +import androidx.recyclerview.widget.LinearLayoutManager import com.tools.device.devcheck.R +import com.tools.device.devcheck.adapter.ListAdapter +import com.tools.device.devcheck.databinding.ActivityBlueToothBinding class BlueToothActivity : AppCompatActivity() { + private lateinit var binding: ActivityBlueToothBinding + companion object{ + val TITLE_KEY="title" + } override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - enableEdgeToEdge() - setContentView(R.layout.activity_blue_tooth) - ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> - val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) - v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) - insets - } + binding = ActivityBlueToothBinding.inflate(layoutInflater) + setContentView(binding.root) + binding.recyclerView.adapter= ListAdapter() + binding.recyclerView.layoutManager= LinearLayoutManager(this) + binding.titleText.text=intent.getStringExtra(TITLE_KEY) } } \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/ColorsActivity.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/ColorsActivity.kt index b6249d8..6dc4c40 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/ColorsActivity.kt +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/ColorsActivity.kt @@ -1,12 +1,15 @@ package com.tools.device.devcheck.dashboard +import android.graphics.Color import android.os.Bundle +import android.view.View import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import com.tools.device.devcheck.R import com.tools.device.devcheck.databinding.ActivityColorsBinding +import androidx.core.graphics.toColorInt class ColorsActivity : AppCompatActivity() { private lateinit var binding:ActivityColorsBinding @@ -14,6 +17,19 @@ class ColorsActivity : AppCompatActivity() { super.onCreate(savedInstanceState) binding=ActivityColorsBinding.inflate(layoutInflater) setContentView(binding.root) + val colorList = listOf("#D9D9D9","#FF6262","#C3FF62","#62FFC8","#46CEFF","#9946FF","#FFE062","#FF9C46","#FF46D7","#101010") + binding.colorPage1.continueL.setOnClickListener { + binding.colorPage1.continueL.visibility= View.GONE + binding.colorPage1.colorL.visibility= View.VISIBLE + } + val colorView=listOf(binding.colorPage1.color1,binding.colorPage1.color2,binding.colorPage1.color3,binding.colorPage1.color4,binding.colorPage1.color5,binding.colorPage1.color6,binding.colorPage1.color7,binding.colorPage1.color8,binding.colorPage1.color9) + for (i in 0 until colorList.size-1) { + colorView[i].setOnClickListener { v-> + binding.colorPage1.root.visibility= View.GONE + binding.colorPage2.root.visibility= View.VISIBLE + binding.colorPage2.view.setBackgroundColor(colorList[i].toColorInt()) + } + } } } \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/CpuStatusActivity.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/CpuStatusActivity.kt index 32b41d9..aeb7e90 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/CpuStatusActivity.kt +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/CpuStatusActivity.kt @@ -1,21 +1,32 @@ package com.tools.device.devcheck.dashboard import android.os.Bundle -import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat -import com.tools.device.devcheck.R +import androidx.recyclerview.widget.LinearLayoutManager +import com.tools.device.devcheck.adapter.CpuListAdapter +import com.tools.device.devcheck.databinding.ActivityCpuStatusBinding +import com.tools.device.devcheck.dialog.CustomPopView + class CpuStatusActivity : AppCompatActivity() { + private lateinit var binding : ActivityCpuStatusBinding + private lateinit var customPopView: CustomPopView override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - enableEdgeToEdge() - setContentView(R.layout.activity_cpu_status) - ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> - val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) - v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) - insets + binding = ActivityCpuStatusBinding.inflate(layoutInflater) + setContentView(binding.root) + customPopView =CustomPopView(this,callback = {text-> + binding.popText.text = text + }) + binding.popClick.setOnClickListener { + customPopView.show(binding.topTitle) } + binding.cpuList.adapter= CpuListAdapter() + binding.cpuList.layoutManager= LinearLayoutManager(this) } + override fun onDestroy() { + if (customPopView.isShowing()) { + customPopView.dismiss(); + } + super.onDestroy()} } \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/DashboardFragment.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/DashboardFragment.kt index 6f47e43..07244e2 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/DashboardFragment.kt +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/DashboardFragment.kt @@ -1,5 +1,6 @@ package com.tools.device.devcheck.dashboard +import android.content.Intent import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -82,6 +83,9 @@ class DashboardFragment : BaseFragment() { } private fun initClick() { + binding.layoutCpu.moduleCpu.setOnClickListener { + startActivity(Intent(requireContext(), CpuStatusActivity::class.java)) + } binding.layoutCenter.run { relayoutBattery.setOnClickListener { dialogBattery = dialogBattery ?: DialogBattery() @@ -96,6 +100,12 @@ class DashboardFragment : BaseFragment() { dialogDisplay?.show(parentFragmentManager, "") } } + binding.layoutBottom.relayoutTools.setOnClickListener { + startActivity(Intent(requireContext(), ToolsActivity::class.java)) + } + binding.layoutBottom.relayoutTests.setOnClickListener { + startActivity(Intent(requireContext(), TestActivity::class.java)) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/HardWareFragment.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/HardWareFragment.kt index a395379..c9cf73d 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/HardWareFragment.kt +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/HardWareFragment.kt @@ -6,54 +6,81 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import com.tools.device.devcheck.R +import com.tools.device.devcheck.databinding.FragmentHardWareBinding -// TODO: Rename parameter arguments, choose names that match -// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER -private const val ARG_PARAM1 = "param1" -private const val ARG_PARAM2 = "param2" - -/** - * A simple [Fragment] subclass. - * Use the [HardWareFragment.newInstance] factory method to - * create an instance of this fragment. - */ class HardWareFragment : Fragment() { - // TODO: Rename and change types of parameters - private var param1: String? = null - private var param2: String? = null + private lateinit var binding: FragmentHardWareBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - arguments?.let { - param1 = it.getString(ARG_PARAM1) - param2 = it.getString(ARG_PARAM2) - } } override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_hard_ware, container, false) + binding = FragmentHardWareBinding.inflate(inflater, container, false) + initText() + return binding.root + } + + private fun initText() { + //processor + binding.text1.textTitle.text = getString(R.string.vendor) + binding.text1.textContent.text=getString(R.string.apps) + binding.text2.textTitle.text = getString(R.string.hardware) + binding.text3.textTitle.text = getString(R.string.cores) + binding.text4.textTitle.text = getString(R.string.CPU) + 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) + 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) + binding.cpuText6.textTitle.text=getString(R.string.total_l2) + 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) + + //display + binding.disText1.textTitle.text=getString(R.string.resolution) + binding.disText2.textTitle.text=getString(R.string.screen_density) + binding.disText3.textTitle.text=getString(R.string.screen_density_d) + binding.disText4.textTitle.text=getString(R.string.screen_size_e) + binding.disText5.textTitle.text=getString(R.string.aspect_ratio) + binding.disText6.textTitle.text=getString(R.string.refresh_rate) + binding.disText7.textTitle.text=getString(R.string.wide_color_gamut) + binding.disText8.textTitle.text=getString(R.string.hdr_support) + + //memory + binding.memText1.textTitle.text=getString(R.string.ram_size) + + //storage + binding.storText1.textTitle.text=getString(R.string.filesystem) + binding.storText2.textTitle.text=getString(R.string.block_size) + + //Audio + binding.check1.content.text=getString(R.string.low_audio) + binding.check2.content.text=getString(R.string.pro_audio) + binding.check3.content.text=getString(R.string.midl) + + + } companion object { - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment HardWareFragment. - */ - // TODO: Rename and change types and number of parameters @JvmStatic - fun newInstance(param1: String, param2: String) = + fun newInstance() = HardWareFragment().apply { arguments = Bundle().apply { - putString(ARG_PARAM1, param1) - putString(ARG_PARAM2, param2) + } } } diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/TestActivity.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/TestActivity.kt index de78f9f..0808267 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/TestActivity.kt +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/TestActivity.kt @@ -4,61 +4,99 @@ import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import com.tools.device.devcheck.R -import com.tools.device.devcheck.databinding.ActivityTextBinding -import com.tools.device.devcheck.databinding.ActivityToolsBinding +import com.tools.device.devcheck.databinding.ActivityTestBinding -class TextActivity : AppCompatActivity() { - private lateinit var binding: ActivityTextBinding +class TestActivity : AppCompatActivity() { + private lateinit var binding: ActivityTestBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - binding=ActivityTextBinding.inflate(layoutInflater) + binding = ActivityTestBinding.inflate(layoutInflater) setContentView(binding.root) - initView() + initView() initClick() } private fun initClick() { + binding.toolItem1.root.setOnClickListener { + intent = Intent(this, TestOtherActivity::class.java) + intent.putExtra(TestOtherActivity.TYPE_KEY, getString(R.string.flashlight)) + startActivity(intent) + } + binding.toolItem2.root.setOnClickListener { + intent = Intent(this, TestOtherActivity::class.java) + intent.putExtra(TestOtherActivity.TYPE_KEY, getString(R.string.vibration)) + startActivity(intent) + } + binding.toolItem3.root.setOnClickListener { + intent = Intent(this, TestOtherActivity::class.java) + intent.putExtra(TestOtherActivity.TYPE_KEY, getString(R.string.buttons)) + startActivity(intent) + } + binding.toolItem4.root.setOnClickListener { + intent = Intent(this, TouchActivity::class.java) + startActivity(intent) + } binding.toolItem5.root.setOnClickListener { - intent=Intent(this, ColorsActivity::class.java) + intent = Intent(this, ColorsActivity::class.java) + startActivity(intent) + } + binding.toolItem6.root.setOnClickListener { + intent = Intent(this, TestOtherActivity::class.java) + intent.putExtra(TestOtherActivity.TYPE_KEY, getString(R.string.backlight)) + startActivity(intent) + } + binding.toolItem7.root.setOnClickListener { + intent = Intent(this, TestOtherActivity::class.java) + intent.putExtra(TestOtherActivity.TYPE_KEY, getString(R.string.light_sensor)) + startActivity(intent) + } + binding.toolItem8.root.setOnClickListener { + intent = Intent(this, TestOtherActivity::class.java) + intent.putExtra(TestOtherActivity.TYPE_KEY, getString(R.string.proximity)) + startActivity(intent) + } + binding.toolItem9.root.setOnClickListener { + intent = Intent(this, TestOtherActivity::class.java) + intent.putExtra(TestOtherActivity.TYPE_KEY, getString(R.string.accelerometer)) startActivity(intent) } } - private fun initView(){ + private fun initView() { binding.toolItem1.ivIcon.setImageResource(R.drawable.flash) - binding.toolItem1.tvLabel.text=getString(R.string.flashlight) + binding.toolItem1.tvLabel.text = getString(R.string.flashlight) binding.toolItem1.ivEnd.setImageResource(R.drawable.vector) binding.toolItem2.ivIcon.setImageResource(R.drawable.vibration) - binding.toolItem2.tvLabel.text=getString(R.string.vibration) + binding.toolItem2.tvLabel.text = getString(R.string.vibration) binding.toolItem2.ivEnd.setImageResource(R.drawable.vector) binding.toolItem3.ivIcon.setImageResource(R.drawable.button) - binding.toolItem3.tvLabel.text=getString(R.string.buttons) + binding.toolItem3.tvLabel.text = getString(R.string.buttons) binding.toolItem3.ivEnd.setImageResource(R.drawable.vector) binding.toolItem4.ivIcon.setImageResource(R.drawable.multi) - binding.toolItem4.tvLabel.text=getString(R.string.multitouch) + binding.toolItem4.tvLabel.text = getString(R.string.multitouch) binding.toolItem4.ivEnd.setImageResource(R.drawable.vector) binding.toolItem5.ivIcon.setImageResource(R.drawable.display) - binding.toolItem5.tvLabel.text=getString(R.string.displays) + binding.toolItem5.tvLabel.text = getString(R.string.displays) binding.toolItem5.ivEnd.setImageResource(R.drawable.vector) binding.toolItem6.ivIcon.setImageResource(R.drawable.back) - binding.toolItem6.tvLabel.text=getString(R.string.backlight) + binding.toolItem6.tvLabel.text = getString(R.string.backlight) binding.toolItem6.ivEnd.setImageResource(R.drawable.vector) binding.toolItem7.ivIcon.setImageResource(R.drawable.light) - binding.toolItem7.tvLabel.text=getString(R.string.light_sensor) + binding.toolItem7.tvLabel.text = getString(R.string.light_sensor) binding.toolItem7.ivEnd.setImageResource(R.drawable.vector) binding.toolItem8.ivIcon.setImageResource(R.drawable.proxi) - binding.toolItem8.tvLabel.text=getString(R.string.proximity) + binding.toolItem8.tvLabel.text = getString(R.string.proximity) binding.toolItem8.ivEnd.setImageResource(R.drawable.vector) binding.toolItem9.ivIcon.setImageResource(R.drawable.acceler) - binding.toolItem9.tvLabel.text=getString(R.string.accelerometer) + binding.toolItem9.tvLabel.text = getString(R.string.accelerometer) binding.toolItem9.ivEnd.setImageResource(R.drawable.vector) } } \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/TestOtherActivity.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/TestOtherActivity.kt index a1a6cbb..e94107a 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/TestOtherActivity.kt +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/TestOtherActivity.kt @@ -1,21 +1,63 @@ package com.tools.device.devcheck.dashboard import android.os.Bundle +import android.view.View import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import com.tools.device.devcheck.R +import com.tools.device.devcheck.databinding.ActivityTestOtherBinding + +class TestOtherActivity : AppCompatActivity() { + private lateinit var binding: ActivityTestOtherBinding + + companion object { + var TYPE_KEY = "type" + } -class TextOtherActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - enableEdgeToEdge() - setContentView(R.layout.activity_text_other) - ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> - val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) - v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) - insets + binding = ActivityTestOtherBinding.inflate(layoutInflater) + setContentView(binding.root) + when (intent.getStringExtra(TYPE_KEY)) { + getString(R.string.flashlight) -> { + binding.title.text = getString(R.string.flashlight) + binding.icon.setImageResource(R.drawable.big_icon_1) + } + + getString(R.string.vibration) -> { + binding.title.text = getString(R.string.vibration) + binding.icon.setImageResource(R.drawable.big_icon_2) + } + + getString(R.string.buttons) -> { + binding.title.text = getString(R.string.buttons) + binding.icon.setImageResource(R.drawable.big_icon_3) + binding.button.visibility = View.VISIBLE + binding.titleDialog.text=getString(R.string.did_you_get_feedback) + } + + getString(R.string.backlight) -> { + binding.title.text = getString(R.string.backlight) + binding.icon.setImageResource(R.drawable.big_icon_4) + binding.backLight.visibility = View.VISIBLE + binding.titleDialog.text=getString(R.string.did_you_get_feedback) + } + getString(R.string.light_sensor)->{ + binding.title.text = getString(R.string.light_sensor) + binding.icon.visibility = View.GONE + binding.sensor.visibility = View.VISIBLE + } + getString(R.string.proximity)->{ + binding.title.text = getString(R.string.proximity) + binding.icon.visibility = View.GONE + binding.proximity.visibility = View.VISIBLE + } + getString(R.string.accelerometer)->{ + binding.title.text = getString(R.string.accelerometer) + binding.icon.visibility = View.GONE + } } } } \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/ToolsActivity.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/ToolsActivity.kt index 753fb05..9340064 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/ToolsActivity.kt +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/ToolsActivity.kt @@ -1,21 +1,63 @@ package com.tools.device.devcheck.dashboard +import android.content.Intent import android.os.Bundle +import android.util.Log +import android.view.View import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import com.tools.device.devcheck.R +import com.tools.device.devcheck.databinding.ActivityToolsBinding +import androidx.core.view.isVisible class ToolsActivity : AppCompatActivity() { + private lateinit var binding: ActivityToolsBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - enableEdgeToEdge() - setContentView(R.layout.activity_tools) - ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> - val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) - v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) - insets + binding = ActivityToolsBinding.inflate(layoutInflater) + setContentView(binding.root) + binding.toolItem1.ivIcon.setImageResource(R.drawable.key) + binding.toolItem1.tvLabel.text=getString(R.string.root_check) + binding.noDevice.visibility=View.GONE + + binding.toolItem2.ivIcon.setImageResource(R.drawable.blue_tooth) + binding.toolItem2.tvLabel.text=getString(R.string.bluetooth) + binding.llBlue.visibility=View.GONE + + + binding.toolItem3.ivIcon.setImageResource(R.drawable.cpu) + binding.toolItem3.tvLabel.text=getString(R.string.cpu_analysis) + initView() + } + + private fun initView() { + binding.toolItem1.root.setOnClickListener { + var isExpand = binding.noDevice.isVisible + if(isExpand){ + binding.noDevice.visibility=View.GONE + }else{ + binding.noDevice.visibility=View.VISIBLE + } + } + binding.toolItem2.root.setOnClickListener { + var isExpand = binding.llBlue.isVisible + if(isExpand){ + binding.llBlue.visibility=View.GONE + }else{ + binding.llBlue.visibility=View.VISIBLE + } + } + binding.llPair.setOnClickListener { + intent=Intent(this, BlueToothActivity::class.java) + intent.putExtra(BlueToothActivity.TITLE_KEY, getString(R.string.paired_devices)) + startActivity(intent) + } + binding.llNear.setOnClickListener { + intent=Intent(this, BlueToothActivity::class.java) + intent.putExtra(BlueToothActivity.TITLE_KEY, getString(R.string.nearby_devices)) + startActivity(intent) } } } \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/TouchActivity.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/TouchActivity.kt index d1bbe5a..1945bee 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/TouchActivity.kt +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/TouchActivity.kt @@ -6,16 +6,13 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import com.tools.device.devcheck.R +import com.tools.device.devcheck.databinding.ActivityTouchBinding class TouchActivity : AppCompatActivity() { + private lateinit var binding: ActivityTouchBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - enableEdgeToEdge() - setContentView(R.layout.activity_touch) - ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> - val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) - v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) - insets - } + binding = ActivityTouchBinding.inflate(layoutInflater) + setContentView(binding.root) } } \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/dialog/CustomPopView.kt b/app/src/main/java/com/tools/device/devcheck/dialog/CustomPopView.kt index b712674..1798a5b 100644 --- a/app/src/main/java/com/tools/device/devcheck/dialog/CustomPopView.kt +++ b/app/src/main/java/com/tools/device/devcheck/dialog/CustomPopView.kt @@ -1,4 +1,80 @@ package com.tools.device.devcheck.dialog -class CustomPopView { +import android.annotation.SuppressLint +import android.content.Context +import android.graphics.Color +import android.graphics.drawable.ColorDrawable +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.PopupWindow +import com.tools.device.devcheck.R +import com.tools.device.devcheck.databinding.PopupLayoutBinding +import androidx.core.graphics.drawable.toDrawable + +class CustomPopView(context: Context,private val callback: (String) -> Unit) { + private val context: Context = context + private lateinit var popupWindow: PopupWindow + private lateinit var binding: PopupLayoutBinding + + init { + initPopupWindow() + } + + @SuppressLint("ServiceCast") + private fun initPopupWindow() { + // 初始化布局 + val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater + binding = PopupLayoutBinding.inflate(inflater) + + // 设置PopupWindow + popupWindow = PopupWindow( + binding.root, + ViewGroup.LayoutParams.WRAP_CONTENT, + ViewGroup.LayoutParams.WRAP_CONTENT, + true + ) + + // 设置背景和动画 + popupWindow.setBackgroundDrawable(Color.TRANSPARENT.toDrawable()) + popupWindow.animationStyle = R.style.PopupAnimation + + binding.text1.setOnClickListener { + dismiss() + callback.invoke(binding.text1.text.toString()) + } + binding.text2.setOnClickListener { + dismiss() + callback.invoke(binding.text2.text.toString()) + } + } + // 显示PopView + fun show(anchorView: View) { + if (::popupWindow.isInitialized && !popupWindow.isShowing) { + popupWindow.showAsDropDown(anchorView) + } + } + + // 在指定位置显示 + fun showAtLocation(parent: View, gravity: Int, x: Int, y: Int) { + if (::popupWindow.isInitialized && !popupWindow.isShowing) { + popupWindow.showAtLocation(parent, gravity, x, y) + } + } + + // 隐藏PopView + fun dismiss() { + if (::popupWindow.isInitialized && popupWindow.isShowing) { + popupWindow.dismiss() + } + } + + // 设置PopView内容 + fun setContent(text: String) { + } + + // 判断是否正在显示 + fun isShowing(): Boolean { + return ::popupWindow.isInitialized && popupWindow.isShowing + } } \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/main/MainActivity.kt b/app/src/main/java/com/tools/device/devcheck/main/MainActivity.kt index 4502992..05305bd 100644 --- a/app/src/main/java/com/tools/device/devcheck/main/MainActivity.kt +++ b/app/src/main/java/com/tools/device/devcheck/main/MainActivity.kt @@ -10,6 +10,7 @@ import com.tools.device.devcheck.R import com.tools.device.devcheck.dashboard.BatteryFragment import com.tools.device.devcheck.dashboard.CameraFragment import com.tools.device.devcheck.dashboard.DashboardFragment +import com.tools.device.devcheck.dashboard.HardWareFragment import com.tools.device.devcheck.dashboard.NetworkFragment import com.tools.device.devcheck.dashboard.SystemShowFragment import com.tools.device.devcheck.databinding.ActivityMainBinding @@ -27,7 +28,7 @@ class MainActivity : BaseActivity() { adapter = ViewPagerAdapter( this@MainActivity, listOf( DashboardFragment.newInstance(), - DashboardFragment.newInstance(), + HardWareFragment.newInstance(), SystemShowFragment.newInstance(), BatteryFragment.newInstance(), NetworkFragment.newInstance(), diff --git a/app/src/main/res/anim/popup_enter.xml b/app/src/main/res/anim/popup_enter.xml index d05f36c..23a00e0 100644 --- a/app/src/main/res/anim/popup_enter.xml +++ b/app/src/main/res/anim/popup_enter.xml @@ -1,4 +1,15 @@ - + + \ No newline at end of file diff --git a/app/src/main/res/anim/popup_exit.xml b/app/src/main/res/anim/popup_exit.xml index d05f36c..3b1bb91 100644 --- a/app/src/main/res/anim/popup_exit.xml +++ b/app/src/main/res/anim/popup_exit.xml @@ -1,4 +1,15 @@ - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/hard_bg.xml b/app/src/main/res/drawable/hard_bg.xml index a8b409b..1fc9362 100644 --- a/app/src/main/res/drawable/hard_bg.xml +++ b/app/src/main/res/drawable/hard_bg.xml @@ -1,4 +1,6 @@ - + + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/drawable/is_working_btn.xml b/app/src/main/res/drawable/is_working_btn.xml index 5115b71..71d341c 100644 --- a/app/src/main/res/drawable/is_working_btn.xml +++ b/app/src/main/res/drawable/is_working_btn.xml @@ -1,4 +1,6 @@ - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/popup_background.xml b/app/src/main/res/drawable/popup_background.xml index 3ef8998..232d142 100644 --- a/app/src/main/res/drawable/popup_background.xml +++ b/app/src/main/res/drawable/popup_background.xml @@ -1,4 +1,5 @@ - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/progress_bg.xml b/app/src/main/res/drawable/progress_bg.xml index 866ea91..dc7d8c9 100644 --- a/app/src/main/res/drawable/progress_bg.xml +++ b/app/src/main/res/drawable/progress_bg.xml @@ -1,20 +1,29 @@ - + - - + + + + - + - + + + android:centerColor="#3B948A" + android:endColor="#3B948A" + android:startColor="#3B948A" /> diff --git a/app/src/main/res/drawable/progress_oval.xml b/app/src/main/res/drawable/progress_oval.xml index c28ebfd..c6111f9 100644 --- a/app/src/main/res/drawable/progress_oval.xml +++ b/app/src/main/res/drawable/progress_oval.xml @@ -1,9 +1,5 @@ - - - + \ No newline at end of file diff --git a/app/src/main/res/drawable/top_radius_bg.xml b/app/src/main/res/drawable/top_radius_bg.xml index 71d341c..431c81c 100644 --- a/app/src/main/res/drawable/top_radius_bg.xml +++ b/app/src/main/res/drawable/top_radius_bg.xml @@ -1,6 +1,7 @@ - - + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_blue_tooth.xml b/app/src/main/res/layout/activity_blue_tooth.xml index 6bd4831..6ed02ba 100644 --- a/app/src/main/res/layout/activity_blue_tooth.xml +++ b/app/src/main/res/layout/activity_blue_tooth.xml @@ -5,6 +5,61 @@ android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="#EDEDED" tools:context=".dashboard.BlueToothActivity"> + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_colors.xml b/app/src/main/res/layout/activity_colors.xml index edfdb7d..6b5afae 100644 --- a/app/src/main/res/layout/activity_colors.xml +++ b/app/src/main/res/layout/activity_colors.xml @@ -1,5 +1,5 @@ - + + - - - - - - - - - - - - - - - - - - - - - - - + android:orientation="vertical"> - + android:layout_marginBottom="18dp" + android:orientation="horizontal"> + + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_cpu_status.xml b/app/src/main/res/layout/activity_cpu_status.xml index 5d51c69..af7e3b6 100644 --- a/app/src/main/res/layout/activity_cpu_status.xml +++ b/app/src/main/res/layout/activity_cpu_status.xml @@ -5,6 +5,113 @@ android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="#EDEDED" tools:context=".dashboard.CpuStatusActivity"> + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_test.xml b/app/src/main/res/layout/activity_test.xml index f89724c..3cb1d89 100644 --- a/app/src/main/res/layout/activity_test.xml +++ b/app/src/main/res/layout/activity_test.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="#EDEDED" - tools:context=".dashboard.TextActivity"> + tools:context=".dashboard.TestActivity"> - - - - - - - - - + + + + + + + + + diff --git a/app/src/main/res/layout/activity_test_other.xml b/app/src/main/res/layout/activity_test_other.xml index a662f46..9b9de97 100644 --- a/app/src/main/res/layout/activity_test_other.xml +++ b/app/src/main/res/layout/activity_test_other.xml @@ -5,6 +5,286 @@ android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".dashboard.TextOtherActivity"> + android:background="#EDEDED" + tools:context=".dashboard.TestOtherActivity"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_tools.xml b/app/src/main/res/layout/activity_tools.xml index b849e78..76e4c70 100644 --- a/app/src/main/res/layout/activity_tools.xml +++ b/app/src/main/res/layout/activity_tools.xml @@ -5,6 +5,127 @@ android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="#EDEDED" tools:context=".dashboard.ToolsActivity"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_touch.xml b/app/src/main/res/layout/activity_touch.xml index c460925..25ace65 100644 --- a/app/src/main/res/layout/activity_touch.xml +++ b/app/src/main/res/layout/activity_touch.xml @@ -5,6 +5,68 @@ android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="#101010" tools:context=".dashboard.TouchActivity"> - + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/color_page_1.xml b/app/src/main/res/layout/color_page_1.xml index cdc89f2..fe5590a 100644 --- a/app/src/main/res/layout/color_page_1.xml +++ b/app/src/main/res/layout/color_page_1.xml @@ -1,6 +1,146 @@ - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/common_check_style.xml b/app/src/main/res/layout/common_check_style.xml index cdc89f2..14476eb 100644 --- a/app/src/main/res/layout/common_check_style.xml +++ b/app/src/main/res/layout/common_check_style.xml @@ -1,6 +1,25 @@ - + - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/common_text_style.xml b/app/src/main/res/layout/common_text_style.xml index cdc89f2..84759c9 100644 --- a/app/src/main/res/layout/common_text_style.xml +++ b/app/src/main/res/layout/common_text_style.xml @@ -1,6 +1,25 @@ - + - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/common_tool_item.xml b/app/src/main/res/layout/common_tool_item.xml index b2bef10..e5989ed 100644 --- a/app/src/main/res/layout/common_tool_item.xml +++ b/app/src/main/res/layout/common_tool_item.xml @@ -2,8 +2,8 @@ @@ -11,7 +11,7 @@ android:id="@+id/iv_icon" android:layout_width="30dp" android:layout_height="30dp" - android:src="@drawable/flash"/> + android:src="@drawable/key"/> - \ No newline at end of file diff --git a/app/src/main/res/layout/dashboard_module_cpu.xml b/app/src/main/res/layout/dashboard_module_cpu.xml index a097915..c94a102 100644 --- a/app/src/main/res/layout/dashboard_module_cpu.xml +++ b/app/src/main/res/layout/dashboard_module_cpu.xml @@ -44,6 +44,7 @@ @@ -168,7 +168,6 @@ 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" /> @@ -192,7 +191,6 @@ 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" /> @@ -216,7 +214,6 @@ 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" /> @@ -240,7 +237,6 @@ 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" /> @@ -264,7 +260,6 @@ 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" /> diff --git a/app/src/main/res/layout/fragment_camera.xml b/app/src/main/res/layout/fragment_camera.xml index 13c29d8..d9efa6d 100644 --- a/app/src/main/res/layout/fragment_camera.xml +++ b/app/src/main/res/layout/fragment_camera.xml @@ -117,7 +117,6 @@ 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" /> @@ -141,7 +140,6 @@ 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" /> @@ -165,7 +163,6 @@ 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" /> @@ -189,7 +186,6 @@ 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" /> @@ -213,7 +209,6 @@ 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" /> @@ -237,7 +232,6 @@ 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" /> @@ -259,7 +253,6 @@ style="@style/TextContentLeft" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" android:layout_marginStart="20dp" android:text="@string/optical_image_stabilization" android:textStyle="bold" @@ -282,7 +275,6 @@ style="@style/TextContentLeft" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" android:layout_marginStart="20dp" android:text="@string/flash" android:textStyle="bold" diff --git a/app/src/main/res/layout/fragment_hard_ware.xml b/app/src/main/res/layout/fragment_hard_ware.xml index 9d474bb..86b57d4 100644 --- a/app/src/main/res/layout/fragment_hard_ware.xml +++ b/app/src/main/res/layout/fragment_hard_ware.xml @@ -1,14 +1,1119 @@ - + android:layout_height="wrap_content" + android:background="@color/background_color" + tools:context=".dashboard.DashboardFragment"> - - + android:layout_height="wrap_content"> - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_network.xml b/app/src/main/res/layout/fragment_network.xml index 3551348..9bb2fa8 100644 --- a/app/src/main/res/layout/fragment_network.xml +++ b/app/src/main/res/layout/fragment_network.xml @@ -44,8 +44,8 @@ android:layout_weight="1" /> @@ -141,8 +141,8 @@ android:layout_weight="1" /> @@ -171,7 +171,6 @@ 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" /> @@ -212,7 +211,6 @@ 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" /> @@ -237,7 +235,6 @@ 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" /> @@ -262,7 +259,6 @@ 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" /> @@ -287,7 +283,6 @@ 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" /> @@ -312,7 +307,6 @@ 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" /> @@ -337,7 +331,6 @@ 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" /> @@ -362,7 +355,6 @@ 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" /> @@ -387,7 +379,6 @@ 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" /> @@ -412,7 +403,6 @@ 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" /> @@ -446,7 +436,6 @@ 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" /> @@ -471,7 +460,6 @@ 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" /> @@ -496,7 +484,6 @@ 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" /> @@ -521,7 +508,6 @@ 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" /> @@ -546,7 +532,6 @@ 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" /> @@ -571,7 +556,6 @@ 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" /> @@ -596,7 +580,6 @@ 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" /> @@ -621,7 +604,6 @@ 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" /> @@ -646,7 +628,6 @@ 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" /> @@ -671,7 +652,6 @@ 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" /> @@ -695,17 +675,16 @@ android:orientation="horizontal"> @@ -888,8 +860,8 @@ android:layout_weight="1" /> @@ -912,7 +884,6 @@ 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" /> @@ -936,7 +907,6 @@ 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" /> @@ -960,7 +930,6 @@ 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" /> @@ -991,7 +960,6 @@ 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" /> @@ -1022,7 +990,6 @@ 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" /> @@ -1046,7 +1013,6 @@ 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" /> @@ -1070,7 +1036,6 @@ 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" /> @@ -1101,7 +1066,6 @@ 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" /> @@ -1125,7 +1089,6 @@ 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" /> @@ -1149,7 +1112,6 @@ 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" /> @@ -1173,7 +1135,6 @@ 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" /> @@ -1204,7 +1165,6 @@ 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" /> @@ -1228,7 +1188,6 @@ 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" /> diff --git a/app/src/main/res/layout/fragment_system_show.xml b/app/src/main/res/layout/fragment_system_show.xml index cbc86d2..d038c83 100644 --- a/app/src/main/res/layout/fragment_system_show.xml +++ b/app/src/main/res/layout/fragment_system_show.xml @@ -315,7 +315,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/apps" - android:layout_gravity="center" tools:ignore="RelativeOverlap" /> @@ -429,7 +426,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/apps" - android:layout_gravity="center" tools:ignore="RelativeOverlap" /> diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml index da7e7a2..8dd9fc5 100644 --- a/app/src/main/res/layout/item_list.xml +++ b/app/src/main/res/layout/item_list.xml @@ -3,6 +3,8 @@ android:layout_width="match_parent" android:background="@drawable/dashboard_model_background" android:padding="22dp" + android:layout_marginHorizontal="8dp" + android:layout_marginVertical="4dp" android:layout_height="wrap_content"> + + - + android:textStyle="bold" + android:text="00:35:37" /> + + android:textStyle="bold" + android:text="50.0%" /> \ No newline at end of file diff --git a/app/src/main/res/layout/popup_layout.xml b/app/src/main/res/layout/popup_layout.xml index cdc89f2..771b4d6 100644 --- a/app/src/main/res/layout/popup_layout.xml +++ b/app/src/main/res/layout/popup_layout.xml @@ -1,6 +1,32 @@ - + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index d318934..8665cdb 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -12,6 +12,7 @@ #444544 #626262 #757575 + #484848 #666666 #757575 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c2ca462..5be2d74 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -115,7 +115,7 @@ DNS1 DNS2 Public IP - Show + SHOW ok Mobile Data Dual SIM dual standby @@ -146,6 +146,73 @@ Number of touches: Screen will change colors. Look forburn-in or any pixels that stand out Tap to continue + Tests + RESET + Flashlight + Vibration + Buttons + Multitouch + Display + Backlight + Light sensor + Proximity + Accelerometer + Root check + Bluetooth + CPU Analysis + Device is not rooted + Nearby devices + Paired devices + Is it working? + Yes + No + Does everything look okay? + Did you get feedback for each button? + Press each volume button + Slide to adjust brightness + Cover the top portion of the screen + Status: + Second cluster + First cluster + CPU time-in-state + Processor + Cores + CPU + Process + ABI + Supported ABls + Frequencies + Total L2 cache size + Bus width + Vulkan support + Vulkan API version + Extensions + Memory + Screen density (dpi) + Screen size (estimated) + Refresh rate + Wide color gamut + HDR support + RAM size + ZRAM + Size + Filesystem + Block size + Apps and data + System + Free + Internal storage + Disk partitions + Bluetooth support + Audio + Low latency audio + Pro audio support + MIDl support + Codecs + Other + Input devices + Bluetooth 4 features + Bluetooth 5 features \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 8de697b..144fb0f 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -83,6 +83,14 @@ @color/left_color + + + + + + + \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9bbda1f..e9b10a9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,6 +9,8 @@ appcompat = "1.7.1" material = "1.12.0" activity = "1.10.1" constraintlayout = "2.2.1" +navigationFragmentKtx = "2.9.3" +navigationUiKtx = "2.9.3" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } @@ -19,6 +21,8 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version material = { group = "com.google.android.material", name = "material", version.ref = "material" } androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" } androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" } +androidx-navigation-fragment-ktx = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigationFragmentKtx" } +androidx-navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigationUiKtx" } [plugins] android-application = { id = "com.android.application", version.ref = "agp" }