diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 20e8803..dae2466 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,6 +12,9 @@ android:supportsRtl="true" android:theme="@style/Theme.DevCheck" tools:targetApi="31"> + diff --git a/app/src/main/java/com/tools/device/devcheck/adapter/AppListAdapter.kt b/app/src/main/java/com/tools/device/devcheck/adapter/AppListAdapter.kt index 6150384..cefdb38 100644 --- a/app/src/main/java/com/tools/device/devcheck/adapter/AppListAdapter.kt +++ b/app/src/main/java/com/tools/device/devcheck/adapter/AppListAdapter.kt @@ -5,7 +5,7 @@ import android.content.Context import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.tools.device.devcheck.dashboard.AppDialogFragment +import com.tools.device.devcheck.dialog.AppDialogFragment import com.tools.device.devcheck.databinding.ItemAppListBinding import com.tools.device.devcheck.databinding.ItemListBinding diff --git a/app/src/main/java/com/tools/device/devcheck/base/BaseDialogFragment.kt b/app/src/main/java/com/tools/device/devcheck/base/BaseDialogFragment.kt index 41794f0..60573f9 100644 --- a/app/src/main/java/com/tools/device/devcheck/base/BaseDialogFragment.kt +++ b/app/src/main/java/com/tools/device/devcheck/base/BaseDialogFragment.kt @@ -24,7 +24,9 @@ abstract class BaseDialogFragment( abstract fun getTitle(): String - open fun getIconRes(): Int? = null + abstract fun getIconRes(): Int? + + open fun getDoubleBtn(): Boolean? = true open fun onPositiveClick() {} @@ -57,11 +59,22 @@ abstract class BaseDialogFragment( 6 -> baseBinding.imageIcon.setImageResource(R.drawable.mem_ic) 7-> baseBinding.imageIcon.setImageResource(R.drawable.setting_ic) 8 -> baseBinding.imageIcon.setImageResource(R.drawable.storyge) + 9 -> baseBinding.imageIcon.setImageResource(R.drawable.camera_ic) + 10 -> baseBinding.imageIcon.setImageResource(R.drawable.input_ic) // 添加更多数字对应的图片... else -> baseBinding.imageIcon.setImageResource(R.drawable.main_logo) } baseBinding.imageIcon.visibility = View.VISIBLE } + if(getDoubleBtn() == true){ + baseBinding.textCancel.visibility = View.VISIBLE + baseBinding.textSettings.visibility = View.VISIBLE + baseBinding.textOk.visibility = View.GONE + }else{ + baseBinding.textCancel.visibility = View.GONE + baseBinding.textSettings.visibility = View.GONE + baseBinding.textOk.visibility = View.VISIBLE + } baseBinding.textCancel.setOnClickListener { onPositiveClick() dismiss() @@ -70,6 +83,9 @@ abstract class BaseDialogFragment( onNegativeClick() dismiss() } + baseBinding.textOk.setOnClickListener { + dismiss() + } } override fun onStart() { 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 e6f93c7..4442aaf 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 @@ -1,19 +1,51 @@ package com.tools.device.devcheck.dashboard +import android.content.Intent 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 com.tools.device.devcheck.databinding.ActivityAnalysisBinding +import com.tools.device.devcheck.dialog.DialogCpuInfo class AnalysisActivity : AppCompatActivity() { private lateinit var binding: ActivityAnalysisBinding + private var dialogCpuInfo: DialogCpuInfo? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) binding = ActivityAnalysisBinding.inflate(layoutInflater) setContentView(binding.root) + binding.timeShow.setOnClickListener { + startActivity(Intent(this, CpuStatusActivity::class.java)) + } + initText() + initShow() + } + private fun initShow() { + binding.infoShow.setOnClickListener { + dialogCpuInfo = dialogCpuInfo ?: DialogCpuInfo() + dialogCpuInfo?.show(supportFragmentManager, "") + } + } + + private fun initText() { + //processor + binding.proText1.textTitle.text=getString(R.string.hardware) + binding.proText2.textTitle.text=getString(R.string.manufacturer) + binding.proText3.textTitle.text=getString(R.string.marketing_name) + binding.proText4.textTitle.text=getString(R.string.process) + binding.proText5.textTitle.text=getString(R.string.cores) + binding.proText6.textTitle.text=getString(R.string.CPU) + binding.proText7.textTitle.text=getString(R.string.frequencies) + binding.proText8.textTitle.text=getString(R.string.architecture) + binding.proText9.textTitle.text=getString(R.string.ABI) + binding.proText10.textTitle.text=getString(R.string.supported_ABls) + binding.proText11.textTitle.text=getString(R.string.features) + //cluster1 + binding.clu1Text1.textTitle.text=getString(R.string.type) + binding.clu1Text2.textTitle.text=getString(R.string.vendor) + binding.clu1Text3.textTitle.text=getString(R.string.cluster) + binding.clu1Text4.textTitle.text=getString(R.string.max_frequency) + binding.clu1Text5.textTitle.text=getString(R.string.min_frequency) } } \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/AppsFragment.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/AppsFragment.kt index a9bee0b..3dfafe9 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/AppsFragment.kt +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/AppsFragment.kt @@ -9,6 +9,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.tools.device.devcheck.R import com.tools.device.devcheck.adapter.AppListAdapter import com.tools.device.devcheck.databinding.FragmentAppsBinding +import com.tools.device.devcheck.dialog.AppDialogFragment class AppsFragment : Fragment(),AppListAdapter.OnShowDialogListener { private lateinit var binding: FragmentAppsBinding diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/CameraFragment.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/CameraFragment.kt index 9f05549..4f29150 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/CameraFragment.kt +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/CameraFragment.kt @@ -25,9 +25,19 @@ class CameraFragment : Fragment() { ): View? { // Inflate the layout for this fragment binding = FragmentCameraBinding.inflate(inflater, container, false) + initText() return binding.root } + private fun initText() { + binding.rearCheck1.content.text=getString(R.string.optical_image_stabilization) + binding.rearCheck2.content.text=getString(R.string.flash) + binding.frontCheck1.content.text=getString(R.string.optical_image_stabilization) + binding.frontCheck2.content.text=getString(R.string.flash) + binding.videoCheck1.content.text=getString(R.string.hight_speed_video) + binding.videoCheck2.content.text=getString(R.string.video_stabilization) + } + companion object { @JvmStatic 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 aeb7e90..2350fb8 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 @@ -11,18 +11,26 @@ import com.tools.device.devcheck.dialog.CustomPopView class CpuStatusActivity : AppCompatActivity() { private lateinit var binding : ActivityCpuStatusBinding private lateinit var customPopView: CustomPopView + private lateinit var popSleepView: CustomPopView override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) binding = ActivityCpuStatusBinding.inflate(layoutInflater) setContentView(binding.root) - customPopView =CustomPopView(this,callback = {text-> + customPopView =CustomPopView(this,0,callback = {text-> binding.popText.text = text + }) + popSleepView = CustomPopView(this,1,callback = {text-> + }) binding.popClick.setOnClickListener { customPopView.show(binding.topTitle) } + binding.moreBtn.setOnClickListener { + popSleepView.show(binding.moreBtn) + } binding.cpuList.adapter= CpuListAdapter() binding.cpuList.layoutManager= LinearLayoutManager(this) + binding.backBtn.setOnClickListener { finish() } } override fun onDestroy() { if (customPopView.isShowing()) { 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 3086b3d..140adcc 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 @@ -8,6 +8,13 @@ import android.view.ViewGroup import androidx.recyclerview.widget.GridLayoutManager import com.tools.device.devcheck.base.BaseFragment import com.tools.device.devcheck.databinding.FragmentDashboardBinding +import com.tools.device.devcheck.dialog.DialogAppInstall +import com.tools.device.devcheck.dialog.DialogBattery +import com.tools.device.devcheck.dialog.DialogDisplay +import com.tools.device.devcheck.dialog.DialogMemory +import com.tools.device.devcheck.dialog.DialogNetwork +import com.tools.device.devcheck.dialog.DialogOperating +import com.tools.device.devcheck.dialog.DialogStorage private const val ARG_PARAM1 = "param1" @@ -91,6 +98,9 @@ class DashboardFragment : BaseFragment() { binding.layoutCpu.showCpu.setOnClickListener { startActivity(Intent(requireContext(), CpuStatusActivity::class.java)) } + binding.layoutCpu.moduleCpu.setOnClickListener { + startActivity(Intent(requireContext(), TemperatureActivity::class.java)) + } binding.layoutCenter.run { relayoutBattery.setOnClickListener { dialogBattery = dialogBattery ?: DialogBattery() 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 c9cf73d..bc0d26f 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 @@ -1,5 +1,6 @@ package com.tools.device.devcheck.dashboard +import android.content.Intent import android.os.Bundle import androidx.fragment.app.Fragment import android.view.LayoutInflater @@ -7,9 +8,13 @@ import android.view.View import android.view.ViewGroup import com.tools.device.devcheck.R import com.tools.device.devcheck.databinding.FragmentHardWareBinding +import com.tools.device.devcheck.dialog.DialogBlueTooth +import com.tools.device.devcheck.dialog.DialogInput class HardWareFragment : Fragment() { private lateinit var binding: FragmentHardWareBinding + private var dialogBlueTooth: DialogBlueTooth? = null + private var dialogInput: DialogInput? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -20,6 +25,22 @@ class HardWareFragment : Fragment() { savedInstanceState: Bundle? ): View? { binding = FragmentHardWareBinding.inflate(inflater, container, false) + binding.cpuBtn.setOnClickListener { + var intent=Intent(requireContext(), AnalysisActivity::class.java) + startActivity(intent) + } + binding.pair1.setOnClickListener { + dialogBlueTooth= dialogBlueTooth?: DialogBlueTooth() + dialogBlueTooth?.show(childFragmentManager, "BlueTooth1") + } + binding.pair2.setOnClickListener { + dialogBlueTooth= dialogBlueTooth?: DialogBlueTooth() + dialogBlueTooth?.show(childFragmentManager, "BlueTooth2") + } + binding.othertext.setOnClickListener { + dialogInput=dialogInput?: DialogInput() + dialogInput?.show(childFragmentManager, "Input") + } initText() return binding.root } diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/SensorEachActivity.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/SensorEachActivity.kt new file mode 100644 index 0000000..f5bb36a --- /dev/null +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/SensorEachActivity.kt @@ -0,0 +1,36 @@ +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 com.tools.device.devcheck.databinding.ActivitySensorEachBinding + +class SensorEachActivity : AppCompatActivity() { + companion object{ + const val TOP_TITLE = "title" + } + private lateinit var binding: ActivitySensorEachBinding + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = ActivitySensorEachBinding.inflate(layoutInflater) + setContentView(binding.root) + val stringExtra = intent.getStringExtra(TOP_TITLE) + binding.title.text = stringExtra + binding.imgBack.setOnClickListener { + finish() + } + initText() + } + + private fun initText() { + binding.infoText1.textTitle.text = getString(R.string.manufacturer) + binding.infoText2.textTitle.text = getString(R.string.model) + binding.infoText3.textTitle.text = getString(R.string.resolution) + binding.infoText4.textTitle.text = getString(R.string.maximum_range) + binding.infoText5.textTitle.text = getString(R.string.power) + binding.infoText6.textTitle.text = getString(R.string.wakeup_sensor) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/SensorsFragment.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/SensorsFragment.kt index 2fbddf1..d5fc097 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/SensorsFragment.kt +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/SensorsFragment.kt @@ -29,6 +29,51 @@ private lateinit var binding: FragmentSensorsBinding val intent = Intent(requireContext(), TemperatureActivity::class.java) startActivity(intent) } + binding.sensor2.root.setOnClickListener { + val intent = Intent(requireContext(), SensorEachActivity::class.java) + intent.putExtra(SensorEachActivity.TOP_TITLE, getString(R.string.accelerometer)) + startActivity(intent) + } + binding.sensor3.root.setOnClickListener { + val intent = Intent(requireContext(), SensorEachActivity::class.java) + intent.putExtra(SensorEachActivity.TOP_TITLE, getString(R.string.magnetic_field)) + startActivity(intent) + } + binding.sensor4.root.setOnClickListener { + val intent = Intent(requireContext(), SensorEachActivity::class.java) + intent.putExtra(SensorEachActivity.TOP_TITLE, getString(R.string.orientation)) + startActivity(intent) + } + binding.sensor5.root.setOnClickListener { + val intent = Intent(requireContext(), SensorEachActivity::class.java) + intent.putExtra(SensorEachActivity.TOP_TITLE, getString(R.string.light)) + startActivity(intent) + } + binding.sensor6.root.setOnClickListener { + val intent = Intent(requireContext(), SensorEachActivity::class.java) + intent.putExtra(SensorEachActivity.TOP_TITLE, getString(R.string.proximity)) + startActivity(intent) + } + binding.sensor7.root.setOnClickListener { + val intent = Intent(requireContext(), SensorEachActivity::class.java) + intent.putExtra(SensorEachActivity.TOP_TITLE, getString(R.string.gravity)) + startActivity(intent) + } + binding.sensor8.root.setOnClickListener { + val intent = Intent(requireContext(), SensorEachActivity::class.java) + intent.putExtra(SensorEachActivity.TOP_TITLE, getString(R.string.linear_acceleration)) + startActivity(intent) + } + binding.sensor9.root.setOnClickListener { + val intent = Intent(requireContext(), SensorEachActivity::class.java) + intent.putExtra(SensorEachActivity.TOP_TITLE, getString(R.string.rotation_vector)) + startActivity(intent) + } + binding.sensor10.root.setOnClickListener { + val intent = Intent(requireContext(), SensorEachActivity::class.java) + intent.putExtra(SensorEachActivity.TOP_TITLE, getString(R.string.step_counter)) + startActivity(intent) + } return binding.root } diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/TemperatureActivity.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/TemperatureActivity.kt index 7671470..72e25da 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/TemperatureActivity.kt +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/TemperatureActivity.kt @@ -1,6 +1,7 @@ package com.tools.device.devcheck.dashboard import android.os.Bundle +import android.view.Gravity import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity import androidx.core.view.ViewCompat @@ -9,14 +10,25 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.tools.device.devcheck.R import com.tools.device.devcheck.adapter.TempAdapter import com.tools.device.devcheck.databinding.ActivityTemperatureBinding +import com.tools.device.devcheck.dialog.CustomPopView class TemperatureActivity : AppCompatActivity() { private lateinit var binding: ActivityTemperatureBinding + private lateinit var customPopView: CustomPopView override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) binding = ActivityTemperatureBinding.inflate(layoutInflater) setContentView(binding.root) + binding.imageBack.setOnClickListener { + finish() + } binding.rvTemperature.adapter = TempAdapter() binding.rvTemperature.layoutManager =LinearLayoutManager(this) + customPopView =CustomPopView(this,3,callback = {text-> + + }) + binding.imageTool.setOnClickListener { + customPopView.show(binding.imageTool) + } } } \ 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 9340064..24f958f 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 @@ -59,5 +59,12 @@ class ToolsActivity : AppCompatActivity() { intent.putExtra(BlueToothActivity.TITLE_KEY, getString(R.string.nearby_devices)) startActivity(intent) } + binding.tool3.setOnClickListener { + intent=Intent(this, AnalysisActivity::class.java) + startActivity(intent) + } + binding.ivBack.setOnClickListener { + finish() + } } } \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/AppDialogFragment.kt b/app/src/main/java/com/tools/device/devcheck/dialog/AppDialogFragment.kt similarity index 90% rename from app/src/main/java/com/tools/device/devcheck/dashboard/AppDialogFragment.kt rename to app/src/main/java/com/tools/device/devcheck/dialog/AppDialogFragment.kt index 8907fad..f335b62 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/AppDialogFragment.kt +++ b/app/src/main/java/com/tools/device/devcheck/dialog/AppDialogFragment.kt @@ -1,4 +1,4 @@ -package com.tools.device.devcheck.dashboard +package com.tools.device.devcheck.dialog import android.graphics.Color import android.os.Bundle @@ -9,10 +9,7 @@ import android.view.ViewGroup import android.view.WindowManager import androidx.core.graphics.drawable.toDrawable import androidx.fragment.app.DialogFragment -import androidx.viewbinding.ViewBinding -import com.tools.device.devcheck.R import com.tools.device.devcheck.databinding.DialogAppClickBinding -import com.tools.device.devcheck.databinding.DialogBaseBinding class AppDialogFragment : DialogFragment() { @@ -59,6 +56,4 @@ class AppDialogFragment : DialogFragment() { super.onDestroyView() _binding = null } -} - - +} \ 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 1798a5b..a6926e3 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 @@ -3,7 +3,6 @@ package com.tools.device.devcheck.dialog 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 @@ -12,8 +11,9 @@ 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) { +class CustomPopView(context: Context,type: Int,private val callback: (String) -> Unit) { private val context: Context = context + private val type: Int = type private lateinit var popupWindow: PopupWindow private lateinit var binding: PopupLayoutBinding @@ -39,15 +39,53 @@ class CustomPopView(context: Context,private val callback: (String) -> Unit) { 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()) + setType() + } + + private fun setType() {//0：簇1或簇2 1：隐藏深度休眠 2：主页更多 + when (type) { + 0 -> { + binding.popCluster.visibility = View.VISIBLE + binding.popSleep.visibility = View.GONE + binding.popMore.visibility = View.GONE + binding.text1.setOnClickListener { + dismiss() + callback.invoke(binding.text1.text.toString()) + } + binding.text2.setOnClickListener { + dismiss() + callback.invoke(binding.text2.text.toString()) + } + } + 1 -> { + binding.popCluster.visibility = View.GONE + binding.popSleep.visibility = View.VISIBLE + binding.popMore.visibility = View.GONE + binding.textSleep.setOnClickListener { + dismiss() + callback.invoke(binding.textSleep.text.toString()) + } + } + 2 -> { + binding.popCluster.visibility = View.GONE + binding.popSleep.visibility = View.GONE + binding.popMore.visibility = View.VISIBLE + binding.textMore1.setOnClickListener {} + binding.textMore2.setOnClickListener {} + binding.textMore3.setOnClickListener {} + binding.textMore4.setOnClickListener {} + binding.textMore5.setOnClickListener {} + binding.textMore6.setOnClickListener {} + } + 3 -> { + binding.popCluster.visibility = View.GONE + binding.popSleep.visibility = View.GONE + binding.popMore.visibility = View.VISIBLE + binding.llHide.visibility = View.GONE + } } } + // 显示PopView fun show(anchorView: View) { if (::popupWindow.isInitialized && !popupWindow.isShowing) { diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/DialogAppInstall.kt b/app/src/main/java/com/tools/device/devcheck/dialog/DialogAppInstall.kt similarity index 80% rename from app/src/main/java/com/tools/device/devcheck/dashboard/DialogAppInstall.kt rename to app/src/main/java/com/tools/device/devcheck/dialog/DialogAppInstall.kt index 7315fc7..481bd63 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/DialogAppInstall.kt +++ b/app/src/main/java/com/tools/device/devcheck/dialog/DialogAppInstall.kt @@ -1,12 +1,10 @@ -package com.tools.device.devcheck.dashboard +package com.tools.device.devcheck.dialog import android.os.Bundle import android.view.View import com.tools.device.devcheck.R import com.tools.device.devcheck.base.BaseDialogFragment import com.tools.device.devcheck.databinding.DialogAppInstallBinding -import com.tools.device.devcheck.databinding.DialogBatteryBinding -import com.tools.device.devcheck.databinding.DialogNetworkBinding class DialogAppInstall :BaseDialogFragment(DialogAppInstallBinding::inflate){ override fun getTitle(): String = resources.getString(R.string.installed_apps) diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/DialogBattery.kt b/app/src/main/java/com/tools/device/devcheck/dialog/DialogBattery.kt similarity index 94% rename from app/src/main/java/com/tools/device/devcheck/dashboard/DialogBattery.kt rename to app/src/main/java/com/tools/device/devcheck/dialog/DialogBattery.kt index 8a8c298..5904a2a 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/DialogBattery.kt +++ b/app/src/main/java/com/tools/device/devcheck/dialog/DialogBattery.kt @@ -1,4 +1,4 @@ -package com.tools.device.devcheck.dashboard +package com.tools.device.devcheck.dialog import android.os.Bundle import android.view.View diff --git a/app/src/main/java/com/tools/device/devcheck/dialog/DialogBlueTooth.kt b/app/src/main/java/com/tools/device/devcheck/dialog/DialogBlueTooth.kt new file mode 100644 index 0000000..da14cef --- /dev/null +++ b/app/src/main/java/com/tools/device/devcheck/dialog/DialogBlueTooth.kt @@ -0,0 +1,27 @@ +package com.tools.device.devcheck.dialog + +import android.os.Bundle +import android.view.View +import com.tools.device.devcheck.R +import com.tools.device.devcheck.base.BaseDialogFragment +import com.tools.device.devcheck.databinding.DialogBlueToothBinding + +class DialogBlueTooth :BaseDialogFragment(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) + + } + + override fun onNegativeClick() { + super.onNegativeClick() + + } + + override fun onPositiveClick() { + super.onPositiveClick() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/dialog/DialogCpuInfo.kt b/app/src/main/java/com/tools/device/devcheck/dialog/DialogCpuInfo.kt new file mode 100644 index 0000000..e5d3950 --- /dev/null +++ b/app/src/main/java/com/tools/device/devcheck/dialog/DialogCpuInfo.kt @@ -0,0 +1,57 @@ +package com.tools.device.devcheck.dialog + +import android.graphics.Typeface +import android.os.Bundle +import android.text.SpannableString +import android.text.style.StyleSpan +import android.view.View +import com.tools.device.devcheck.R +import com.tools.device.devcheck.base.BaseDialogFragment +import com.tools.device.devcheck.databinding.DialogCpuInfoBinding + +class DialogCpuInfo :BaseDialogFragment(DialogCpuInfoBinding::inflate){ + override fun getTitle(): String = resources.getString(R.string.proc_cpuinfo) + + override fun getIconRes(): Int? =6 + + override fun getDoubleBtn(): Boolean? = false + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + binding.cpuTv01.text=setColonBoldText("Processor :AArch64 Processor rev 2(aarch64)") + binding.cpuTv02.text=setColonBoldText("processor :1") + binding.cpuTv03.text=setColonBoldText("BogoMIPS :3.84" ) + binding.cpuTv04.text=setColonBoldText("Features :fp asimd evtstrm aes pmull sha1 sha2 crc32 cpuid") + binding.cpuTv05.text=setColonBoldText("CPU implementer :0×41") + binding.cpuTv06.text=setColonBoldText("CPU architecture :8") + binding.cpuTv07.text=setColonBoldText("CPU variant :0×0") + binding.cpuTv08.text=setColonBoldText("CPU part :0×d03") + binding.cpuTv09.text=setColonBoldText("CPU revision :4") + binding.hardwareTv.text=setColonBoldText("Hardware :vendor Kirin710") + } + fun setColonBoldText( text: String) : SpannableString { + val colonIndex = text.indexOf(":") + if (colonIndex != -1) { + val spannableString = SpannableString(text) + // 将冒号之前的部分设置为加粗 + spannableString.setSpan( + StyleSpan(Typeface.BOLD), + 0, + colonIndex, + SpannableString.SPAN_INCLUSIVE_INCLUSIVE + ) + return spannableString + } else { + return SpannableString(text) + } + } + + override fun onNegativeClick() { + super.onNegativeClick() + + } + + override fun onPositiveClick() { + super.onPositiveClick() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/DialogDisplay.kt b/app/src/main/java/com/tools/device/devcheck/dialog/DialogDisplay.kt similarity index 80% rename from app/src/main/java/com/tools/device/devcheck/dashboard/DialogDisplay.kt rename to app/src/main/java/com/tools/device/devcheck/dialog/DialogDisplay.kt index 01e2a1d..3eb9d3c 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/DialogDisplay.kt +++ b/app/src/main/java/com/tools/device/devcheck/dialog/DialogDisplay.kt @@ -1,12 +1,10 @@ -package com.tools.device.devcheck.dashboard +package com.tools.device.devcheck.dialog import android.os.Bundle import android.view.View import com.tools.device.devcheck.R import com.tools.device.devcheck.base.BaseDialogFragment -import com.tools.device.devcheck.databinding.DialogBatteryBinding import com.tools.device.devcheck.databinding.DialogDisplayBinding -import com.tools.device.devcheck.databinding.DialogNetworkBinding class DialogDisplay :BaseDialogFragment(DialogDisplayBinding::inflate){ override fun getTitle(): String = resources.getString(R.string.display) diff --git a/app/src/main/java/com/tools/device/devcheck/dialog/DialogInput.kt b/app/src/main/java/com/tools/device/devcheck/dialog/DialogInput.kt new file mode 100644 index 0000000..7276146 --- /dev/null +++ b/app/src/main/java/com/tools/device/devcheck/dialog/DialogInput.kt @@ -0,0 +1,83 @@ +package com.tools.device.devcheck.dialog + +import android.graphics.Typeface +import android.os.Bundle +import android.text.SpannableString +import android.text.style.StyleSpan +import android.view.View +import com.tools.device.devcheck.R +import com.tools.device.devcheck.base.BaseDialogFragment +import com.tools.device.devcheck.databinding.DialogCpuInfoBinding +import com.tools.device.devcheck.databinding.DialogInputBinding + +class DialogInput :BaseDialogFragment(DialogInputBinding::inflate){ + override fun getTitle(): String = resources.getString(R.string.input_devices) + + override fun getIconRes(): Int? =10 + + override fun getDoubleBtn(): Boolean? = false + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + binding.text1.textTitle.text = "input_mt_wrapper" + binding.text1.textContent.text = "Input Device 1:\n" + + "input_mt_wrapper\n" + + "Descriptor:\n" + + "a988c03908bee014d816\n" + + "71ffdd909090304130b5\n" + + "Generation: 14\n" + + "Location: built-in\n" + + "Keyboard Type:\n" + + "non-alphabetic\n" + + "Has Vibrator: false\n" + + "Has mic: false\n" + + "Sources: 0x1103\n" + + "(keyboard touchscreen)\n" + + "AXISX:\n" + + "source=0x1002 min=0.0\n" + + "max=719.0 flat=0.0\n" + + "fuzz=0.0 resolution=0.0\n" + + "AXISY:\n" + + "source=0x1002 min=0.0\n" + + "max=1559.0 flat=0.0\n" + + "fuzz=0.0 resolution=0.0\n" + + "AXIS PRESSURE:\n" + + "source-0x1002 min=0.0\n" + + "max=1.0 flat=0.0 fuzz=0.0\n" + + "resolution=0.0\n" + + "AXIS_SIZE:\n" + + "source=0x1002 min=0.0\n" + + "max=1.0 flat=0.0 fuzz=0.0\n" + + "resolution=0.0\n" + + "AXIS TOUCH_MAJOR:\n" + + "source=0x1002 min=0.0\n" + + "max=1718.1385 flat=0.0\n" + + "fuzz=0.0 resolution=0.0\n" + + "AXISTOUCH_MINOR:\n" + + "source=0x1002 min=0.0\n" + + "max=1718.1385 flat=0.0\n" + + "fuzz=0.0 resolution=0.0\n" + + "AXIS TOOL MAJOR:\n" + + "source=0×1002 min=0.0\n" + + "max=1718.1385 flat=0.0\n" + + "fuzz=0.0 resolution=0.0\n" + + "AXIS TOOL MINOR:\n" + + "source=0x1002 min=0.0\n" + + "max=1718.1385 flat-0.0\n" + + "fuzz=0.0 resolution=0.0\n" + + "AXIS_ORIENTATION:\n" + + "source=0x1002\n" + + "min=-1.5707964\n" + + "max=1.5707964 flat=0.0\n" + + "fuzz=0.0 resolution=0.0" + } + + override fun onNegativeClick() { + super.onNegativeClick() + + } + + override fun onPositiveClick() { + super.onPositiveClick() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/DialogMemory.kt b/app/src/main/java/com/tools/device/devcheck/dialog/DialogMemory.kt similarity index 79% rename from app/src/main/java/com/tools/device/devcheck/dashboard/DialogMemory.kt rename to app/src/main/java/com/tools/device/devcheck/dialog/DialogMemory.kt index 04ec805..8c18880 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/DialogMemory.kt +++ b/app/src/main/java/com/tools/device/devcheck/dialog/DialogMemory.kt @@ -1,12 +1,10 @@ -package com.tools.device.devcheck.dashboard +package com.tools.device.devcheck.dialog import android.os.Bundle import android.view.View import com.tools.device.devcheck.R import com.tools.device.devcheck.base.BaseDialogFragment -import com.tools.device.devcheck.databinding.DialogBatteryBinding import com.tools.device.devcheck.databinding.DialogMemoryBinding -import com.tools.device.devcheck.databinding.DialogNetworkBinding class DialogMemory :BaseDialogFragment(DialogMemoryBinding::inflate){ override fun getTitle(): String = resources.getString(R.string.memory) diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/DialogNetwork.kt b/app/src/main/java/com/tools/device/devcheck/dialog/DialogNetwork.kt similarity index 86% rename from app/src/main/java/com/tools/device/devcheck/dashboard/DialogNetwork.kt rename to app/src/main/java/com/tools/device/devcheck/dialog/DialogNetwork.kt index f814f18..c2fb88b 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/DialogNetwork.kt +++ b/app/src/main/java/com/tools/device/devcheck/dialog/DialogNetwork.kt @@ -1,10 +1,9 @@ -package com.tools.device.devcheck.dashboard +package com.tools.device.devcheck.dialog import android.os.Bundle import android.view.View import com.tools.device.devcheck.R import com.tools.device.devcheck.base.BaseDialogFragment -import com.tools.device.devcheck.databinding.DialogBatteryBinding import com.tools.device.devcheck.databinding.DialogNetworkBinding class DialogNetwork :BaseDialogFragment(DialogNetworkBinding::inflate){ diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/DialogOperating.kt b/app/src/main/java/com/tools/device/devcheck/dialog/DialogOperating.kt similarity index 86% rename from app/src/main/java/com/tools/device/devcheck/dashboard/DialogOperating.kt rename to app/src/main/java/com/tools/device/devcheck/dialog/DialogOperating.kt index 3287464..81a74b7 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/DialogOperating.kt +++ b/app/src/main/java/com/tools/device/devcheck/dialog/DialogOperating.kt @@ -1,10 +1,9 @@ -package com.tools.device.devcheck.dashboard +package com.tools.device.devcheck.dialog import android.os.Bundle import android.view.View import com.tools.device.devcheck.R import com.tools.device.devcheck.base.BaseDialogFragment -import com.tools.device.devcheck.databinding.DialogBatteryBinding import com.tools.device.devcheck.databinding.DialogOperatingBinding class DialogOperating :BaseDialogFragment(DialogOperatingBinding::inflate){ diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/DialogStorage.kt b/app/src/main/java/com/tools/device/devcheck/dialog/DialogStorage.kt similarity index 86% rename from app/src/main/java/com/tools/device/devcheck/dashboard/DialogStorage.kt rename to app/src/main/java/com/tools/device/devcheck/dialog/DialogStorage.kt index 021aff7..1e40c19 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/DialogStorage.kt +++ b/app/src/main/java/com/tools/device/devcheck/dialog/DialogStorage.kt @@ -1,10 +1,9 @@ -package com.tools.device.devcheck.dashboard +package com.tools.device.devcheck.dialog import android.os.Bundle import android.view.View import com.tools.device.devcheck.R import com.tools.device.devcheck.base.BaseDialogFragment -import com.tools.device.devcheck.databinding.DialogBatteryBinding import com.tools.device.devcheck.databinding.DialogStorageBinding class DialogStorage :BaseDialogFragment(DialogStorageBinding::inflate){ diff --git a/app/src/main/java/com/tools/device/devcheck/dialog/TempDialogFragment.kt b/app/src/main/java/com/tools/device/devcheck/dialog/TempDialogFragment.kt new file mode 100644 index 0000000..235fe48 --- /dev/null +++ b/app/src/main/java/com/tools/device/devcheck/dialog/TempDialogFragment.kt @@ -0,0 +1,59 @@ +package com.tools.device.devcheck.dialog + +import android.graphics.Color +import android.os.Bundle +import android.view.Gravity +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.view.WindowManager +import androidx.core.graphics.drawable.toDrawable +import androidx.fragment.app.DialogFragment +import com.tools.device.devcheck.databinding.DialogAppClickBinding + +class TempDialogFragment : DialogFragment() { + + private var _binding: DialogAppClickBinding? = null + private val baseBinding get() = _binding!! + + + open fun onPositiveClick() {} + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + _binding = DialogAppClickBinding.inflate(inflater, container, false) + return baseBinding.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + baseBinding.textCancel.setOnClickListener { + onPositiveClick() + dismiss() + } + } + + override fun onStart() { + super.onStart() + dialog?.window?.let { window -> + window.setBackgroundDrawable(Color.TRANSPARENT.toDrawable()) + + val params = window.attributes + val displayMetrics = resources.displayMetrics + val margin = (10 * displayMetrics.density).toInt() + params.width = displayMetrics.widthPixels - margin * 2 + params.height = WindowManager.LayoutParams.WRAP_CONTENT + window.attributes = params + window.setGravity(Gravity.CENTER) + } + } + + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } +} \ 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 fbe575c..c23a80d 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 @@ -16,11 +16,12 @@ import com.tools.device.devcheck.dashboard.NetworkFragment import com.tools.device.devcheck.dashboard.SensorsFragment import com.tools.device.devcheck.dashboard.SystemShowFragment import com.tools.device.devcheck.databinding.ActivityMainBinding +import com.tools.device.devcheck.dialog.CustomPopView class MainActivity : BaseActivity() { override fun inflateBinding(inflater: LayoutInflater): ActivityMainBinding = ActivityMainBinding.inflate(inflater) - + private lateinit var customPopView: CustomPopView override fun initView() { super.initView() binding.run { @@ -55,7 +56,12 @@ class MainActivity : BaseActivity() { // } }.attach() } + customPopView =CustomPopView(this,2,callback = {text-> + }) + binding.imageTool.setOnClickListener { + customPopView.show(binding.imageTool) + } } override fun initData() { diff --git a/app/src/main/res/drawable/camera_ic.png b/app/src/main/res/drawable/camera_ic.png new file mode 100644 index 0000000..f05bc0a Binary files /dev/null and b/app/src/main/res/drawable/camera_ic.png differ diff --git a/app/src/main/res/drawable/input_ic.png b/app/src/main/res/drawable/input_ic.png new file mode 100644 index 0000000..f0d96f0 Binary files /dev/null and b/app/src/main/res/drawable/input_ic.png differ diff --git a/app/src/main/res/drawable/more_1_icon.png b/app/src/main/res/drawable/more_1_icon.png new file mode 100644 index 0000000..0e38630 Binary files /dev/null and b/app/src/main/res/drawable/more_1_icon.png differ diff --git a/app/src/main/res/drawable/more_2_icon.png b/app/src/main/res/drawable/more_2_icon.png new file mode 100644 index 0000000..d84b9dd Binary files /dev/null and b/app/src/main/res/drawable/more_2_icon.png differ diff --git a/app/src/main/res/drawable/more_3_icon.png b/app/src/main/res/drawable/more_3_icon.png new file mode 100644 index 0000000..7ed9b63 Binary files /dev/null and b/app/src/main/res/drawable/more_3_icon.png differ diff --git a/app/src/main/res/drawable/more_4_icon.png b/app/src/main/res/drawable/more_4_icon.png new file mode 100644 index 0000000..acb46d5 Binary files /dev/null and b/app/src/main/res/drawable/more_4_icon.png differ diff --git a/app/src/main/res/drawable/more_5_icon.png b/app/src/main/res/drawable/more_5_icon.png new file mode 100644 index 0000000..934de78 Binary files /dev/null and b/app/src/main/res/drawable/more_5_icon.png differ diff --git a/app/src/main/res/drawable/more_6_icon.png b/app/src/main/res/drawable/more_6_icon.png new file mode 100644 index 0000000..07ecf7d Binary files /dev/null and b/app/src/main/res/drawable/more_6_icon.png differ diff --git a/app/src/main/res/drawable/more_camera.png b/app/src/main/res/drawable/more_camera.png new file mode 100644 index 0000000..51f2739 Binary files /dev/null and b/app/src/main/res/drawable/more_camera.png differ diff --git a/app/src/main/res/drawable/radius_black.png b/app/src/main/res/drawable/radius_black.png new file mode 100644 index 0000000..ef6fba8 Binary files /dev/null and b/app/src/main/res/drawable/radius_black.png differ diff --git a/app/src/main/res/drawable/radius_green.png b/app/src/main/res/drawable/radius_green.png new file mode 100644 index 0000000..ec7751f Binary files /dev/null and b/app/src/main/res/drawable/radius_green.png differ diff --git a/app/src/main/res/drawable/radius_sel.xml b/app/src/main/res/drawable/radius_sel.xml new file mode 100644 index 0000000..db96eb0 --- /dev/null +++ b/app/src/main/res/drawable/radius_sel.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sleep_icon.png b/app/src/main/res/drawable/sleep_icon.png new file mode 100644 index 0000000..3f91fb4 Binary files /dev/null and b/app/src/main/res/drawable/sleep_icon.png differ diff --git a/app/src/main/res/layout/activity_analysis.xml b/app/src/main/res/layout/activity_analysis.xml index 93b9710..5bdb5fc 100644 --- a/app/src/main/res/layout/activity_analysis.xml +++ b/app/src/main/res/layout/activity_analysis.xml @@ -5,6 +5,246 @@ android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/background_color" tools:context=".dashboard.AnalysisActivity"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 af7e3b6..4de3c6d 100644 --- a/app/src/main/res/layout/activity_cpu_status.xml +++ b/app/src/main/res/layout/activity_cpu_status.xml @@ -23,6 +23,7 @@ android:gravity="center_vertical" android:orientation="horizontal"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_temperature.xml b/app/src/main/res/layout/activity_temperature.xml index e073d5b..e16fb84 100644 --- a/app/src/main/res/layout/activity_temperature.xml +++ b/app/src/main/res/layout/activity_temperature.xml @@ -18,10 +18,12 @@ @@ -119,6 +120,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/custom_tab.xml b/app/src/main/res/layout/custom_tab.xml deleted file mode 100644 index 38381b1..0000000 --- a/app/src/main/res/layout/custom_tab.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_app_click.xml b/app/src/main/res/layout/dialog_app_click.xml index 46555e4..31267f3 100644 --- a/app/src/main/res/layout/dialog_app_click.xml +++ b/app/src/main/res/layout/dialog_app_click.xml @@ -35,17 +35,13 @@ android:text="@string/screenreader" app:layout_constraintLeft_toRightOf="@id/image_icon" app:layout_constraintTop_toTopOf="parent" /> - - @@ -172,10 +168,6 @@ - - - - + app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/app/src/main/res/layout/dialog_base.xml b/app/src/main/res/layout/dialog_base.xml index 664e8d2..8301ecc 100644 --- a/app/src/main/res/layout/dialog_base.xml +++ b/app/src/main/res/layout/dialog_base.xml @@ -1,51 +1,65 @@ - - - + + + + - - + android:background="@color/module_title_color" /> - - - + android:layout_height="0dp" + android:layout_weight="1" + android:fillViewport="true"> + + + + + + android:visibility="gone" /> + android:layout_marginEnd="20dp" + android:visibility="gone" /> + + - + + diff --git a/app/src/main/res/layout/dialog_blue_tooth.xml b/app/src/main/res/layout/dialog_blue_tooth.xml new file mode 100644 index 0000000..1ee6cde --- /dev/null +++ b/app/src/main/res/layout/dialog_blue_tooth.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_cpu_info.xml b/app/src/main/res/layout/dialog_cpu_info.xml new file mode 100644 index 0000000..7bc9223 --- /dev/null +++ b/app/src/main/res/layout/dialog_cpu_info.xml @@ -0,0 +1,295 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_input.xml b/app/src/main/res/layout/dialog_input.xml new file mode 100644 index 0000000..8e124e7 --- /dev/null +++ b/app/src/main/res/layout/dialog_input.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_temp.xml b/app/src/main/res/layout/dialog_temp.xml new file mode 100644 index 0000000..475ad51 --- /dev/null +++ b/app/src/main/res/layout/dialog_temp.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_camera.xml b/app/src/main/res/layout/fragment_camera.xml index d9efa6d..5b11749 100644 --- a/app/src/main/res/layout/fragment_camera.xml +++ b/app/src/main/res/layout/fragment_camera.xml @@ -55,7 +55,7 @@ style="@style/TextDeviceBig" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Rear camera 1" + android:text="@string/rear_camera_1" tools:ignore="RelativeOverlap" /> + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_hard_ware.xml b/app/src/main/res/layout/fragment_hard_ware.xml index e2b5c2f..b1f50f3 100644 --- a/app/src/main/res/layout/fragment_hard_ware.xml +++ b/app/src/main/res/layout/fragment_hard_ware.xml @@ -100,6 +100,7 @@ layout="@layout/common_text_style" /> - - - - - - - - + android:src="@drawable/check_true" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 0c91d86..53651a2 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -14,4 +14,5 @@ #666666 #757575 #2B2B2B + #B1B1B1 \ 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 9a6ec8e..0dcad0d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -116,7 +116,7 @@ DNS2 Public IP SHOW - ok + OK Mobile Data Dual SIM dual standby eSIM @@ -250,5 +250,33 @@ Signifcant Motion Geomagnetic Rotation Vector RPC sensor + Info + ST-LI3DH + CPU Times + /proc/cpuinfo + Marketing name + Features + Cluster 1 + CPU0 + Cluster 2 + Cluster + Min frequency + More + Front camera 1 + Rear camera 1 + Video capture + Profles + High speed video + Video stabilization + Hide deep sleep + Metric units + Reset + Export + Share + FAQ + About + Set as: + Temperature1 + Temperature2 \ No newline at end of file