diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3c8ac87..20e8803 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,6 +12,12 @@ 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 new file mode 100644 index 0000000..6150384 --- /dev/null +++ b/app/src/main/java/com/tools/device/devcheck/adapter/AppListAdapter.kt @@ -0,0 +1,45 @@ +package com.tools.device.devcheck.adapter + +import android.app.Activity +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.databinding.ItemAppListBinding +import com.tools.device.devcheck.databinding.ItemListBinding + +class AppListAdapter: RecyclerView.Adapter() { + private lateinit var context: Context + private lateinit var listener: OnShowDialogListener + override fun onCreateViewHolder( + parent: ViewGroup, + viewType: Int + ): ListViewHolder { + context = parent.context + val binding= ItemAppListBinding.inflate(LayoutInflater.from(context), parent, false) + return ListViewHolder(binding) + } + + override fun onBindViewHolder( + holder: ListViewHolder, + position: Int + ) { + holder.binding.view.setOnClickListener { + listener.onShowAppSelectDialog() + } + } + fun setOnclickListener(listener: OnShowDialogListener) { + this.listener = listener + } + + override fun getItemCount(): Int { + return 3 + } + + class ListViewHolder(val binding: ItemAppListBinding): RecyclerView.ViewHolder(binding.root) + interface OnShowDialogListener { + fun onShowAppSelectDialog() + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/adapter/TempAdapter.kt b/app/src/main/java/com/tools/device/devcheck/adapter/TempAdapter.kt new file mode 100644 index 0000000..1ea2809 --- /dev/null +++ b/app/src/main/java/com/tools/device/devcheck/adapter/TempAdapter.kt @@ -0,0 +1,33 @@ +package com.tools.device.devcheck.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import com.tools.device.devcheck.databinding.ItemCommonTempBinding +import com.tools.device.devcheck.databinding.ItemListBinding + +class TempAdapter: RecyclerView.Adapter() { + private lateinit var context: Context + override fun onCreateViewHolder( + parent: ViewGroup, + viewType: Int + ): ListViewHolder { + context = parent.context + val binding= ItemCommonTempBinding.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: ItemCommonTempBinding): RecyclerView.ViewHolder(binding.root) +} \ No newline at end of file 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 f2bba58..41794f0 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 @@ -10,6 +10,7 @@ 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.DialogBaseBinding abstract class BaseDialogFragment( @@ -22,6 +23,7 @@ abstract class BaseDialogFragment( protected val binding get() = _contentBinding!! abstract fun getTitle(): String + open fun getIconRes(): Int? = null @@ -45,8 +47,19 @@ abstract class BaseDialogFragment( super.onViewCreated(view, savedInstanceState) baseBinding.dialogTitle.text = getTitle() - getIconRes()?.let { - baseBinding.imageIcon.setImageResource(it) + getIconRes()?.let {iconRes -> + when (iconRes) { + 1 -> baseBinding.imageIcon.setImageResource(R.drawable.battery_ic) // 替换为实际的资源ID + 2 -> baseBinding.imageIcon.setImageResource(R.drawable.wifi) + 3 -> baseBinding.imageIcon.setImageResource(R.drawable.app_full_ic) + 4 -> baseBinding.imageIcon.setImageResource(R.drawable.display) + 5 -> baseBinding.imageIcon.setImageResource(R.drawable.blue_tooth_ic) + 6 -> baseBinding.imageIcon.setImageResource(R.drawable.mem_ic) + 7-> baseBinding.imageIcon.setImageResource(R.drawable.setting_ic) + 8 -> baseBinding.imageIcon.setImageResource(R.drawable.storyge) + // 添加更多数字对应的图片... + else -> baseBinding.imageIcon.setImageResource(R.drawable.main_logo) + } baseBinding.imageIcon.visibility = View.VISIBLE } baseBinding.textCancel.setOnClickListener { diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/AppDialogFragment.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/AppDialogFragment.kt new file mode 100644 index 0000000..8907fad --- /dev/null +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/AppDialogFragment.kt @@ -0,0 +1,64 @@ +package com.tools.device.devcheck.dashboard + +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 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() { + + 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 + } +} + + 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 new file mode 100644 index 0000000..a9bee0b --- /dev/null +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/AppsFragment.kt @@ -0,0 +1,86 @@ +package com.tools.device.devcheck.dashboard + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +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 + +class AppsFragment : Fragment(),AppListAdapter.OnShowDialogListener { + private lateinit var binding: FragmentAppsBinding + private lateinit var dialogFragment: AppDialogFragment + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflate the layout for this fragment + binding = FragmentAppsBinding.inflate(inflater, container, false) + initButtons() + val adapter= AppListAdapter() + adapter.setOnclickListener(this) + binding.recyclerView.adapter = adapter + binding.recyclerView.layoutManager = LinearLayoutManager(requireContext()) + return binding.root + } + + companion object { + @JvmStatic + fun newInstance() = + AppsFragment().apply { + arguments = Bundle().apply { + + } + } + } + private fun initButtons() { + switchTab(0) + binding.llUser.setOnClickListener { switchTab(0) } + binding.llSystem.setOnClickListener { switchTab(1) } + binding.llAll.setOnClickListener { switchTab(2) } + } + + private fun switchTab(n: Int) { + when(n){ + 0->{ + binding.back1.visibility = View.VISIBLE + binding.back2.visibility = View.INVISIBLE + binding.back3.visibility = View.INVISIBLE + binding.imgUser.isSelected = true + binding.imgSystem.isSelected = false + binding.imgAll.isSelected = false + binding.tvTitle.text=getString(R.string.user_apps)+"("+30+")" + } + 1->{ + binding.back1.visibility = View.INVISIBLE + binding.back2.visibility = View.VISIBLE + binding.back3.visibility = View.INVISIBLE + binding.imgUser.isSelected = false + binding.imgSystem.isSelected = true + binding.imgAll.isSelected = false + binding.tvTitle.text=getString(R.string.system_apps)+"("+30+")" + } + 2->{ + binding.back1.visibility = View.INVISIBLE + binding.back2.visibility = View.INVISIBLE + binding.back3.visibility = View.VISIBLE + binding.imgUser.isSelected = false + binding.imgSystem.isSelected = false + binding.imgAll.isSelected = true + binding.tvTitle.text=getString(R.string.installed_apps)+"("+30+")" + } + } + } + + override fun onShowAppSelectDialog() { + dialogFragment = AppDialogFragment() + dialogFragment?.show(requireActivity().supportFragmentManager, "AppDialogFragment") + } +} \ 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 07244e2..3086b3d 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 @@ -21,6 +21,11 @@ class DashboardFragment : BaseFragment() { private var dialogBattery: DialogBattery? = null private var dialogNetwork: DialogNetwork? = null private var dialogDisplay: DialogDisplay? = null + private var dialogOperating: DialogOperating? = null + private var dialogAppInstall: DialogAppInstall? = null + private var dialogMemory: DialogMemory? = null + private var dialogStorage: DialogStorage? = null + companion object { @JvmStatic @@ -83,7 +88,7 @@ class DashboardFragment : BaseFragment() { } private fun initClick() { - binding.layoutCpu.moduleCpu.setOnClickListener { + binding.layoutCpu.showCpu.setOnClickListener { startActivity(Intent(requireContext(), CpuStatusActivity::class.java)) } binding.layoutCenter.run { @@ -99,13 +104,32 @@ class DashboardFragment : BaseFragment() { dialogDisplay = dialogDisplay?: DialogDisplay() dialogDisplay?.show(parentFragmentManager, "") } + relayoutApps.setOnClickListener { + dialogAppInstall = dialogAppInstall ?: DialogAppInstall() + dialogAppInstall?.show(parentFragmentManager, "") + } + relayoutRam.setOnClickListener { + dialogMemory = dialogMemory ?: DialogMemory() + dialogMemory?.show(parentFragmentManager, "") + } + relayoutStorage.setOnClickListener { + dialogStorage = dialogStorage ?: DialogStorage() + dialogStorage?.show(parentFragmentManager, "") + } } - binding.layoutBottom.relayoutTools.setOnClickListener { - startActivity(Intent(requireContext(), ToolsActivity::class.java)) - } - binding.layoutBottom.relayoutTests.setOnClickListener { - startActivity(Intent(requireContext(), TestActivity::class.java)) + binding.layoutBottom.run { + relayoutTools.setOnClickListener { + startActivity(Intent(requireContext(), ToolsActivity::class.java)) + } + relayoutTests.setOnClickListener { + startActivity(Intent(requireContext(), TestActivity::class.java)) + } + relayoutPhoneInfo.setOnClickListener { + dialogOperating = dialogOperating ?: DialogOperating() + dialogOperating?.show(parentFragmentManager, "") + } } + } } \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/DialogAppInstall.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/DialogAppInstall.kt new file mode 100644 index 0000000..7315fc7 --- /dev/null +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/DialogAppInstall.kt @@ -0,0 +1,29 @@ +package com.tools.device.devcheck.dashboard + +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) + + override fun getIconRes(): Int=3 + + 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/dashboard/DialogBattery.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/DialogBattery.kt index ba8a534..8a8c298 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/DialogBattery.kt +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/DialogBattery.kt @@ -9,9 +9,7 @@ import com.tools.device.devcheck.databinding.DialogBatteryBinding class DialogBattery :BaseDialogFragment(DialogBatteryBinding::inflate){ override fun getTitle(): String = resources.getString(R.string.battery) - override fun getIconRes(): Int? { - return super.getIconRes() - } + override fun getIconRes(): Int? =1 override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/DialogDisplay.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/DialogDisplay.kt index 74cf831..01e2a1d 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/DialogDisplay.kt +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/DialogDisplay.kt @@ -11,9 +11,7 @@ import com.tools.device.devcheck.databinding.DialogNetworkBinding class DialogDisplay :BaseDialogFragment(DialogDisplayBinding::inflate){ override fun getTitle(): String = resources.getString(R.string.display) - override fun getIconRes(): Int? { - return super.getIconRes() - } + override fun getIconRes(): Int=4 override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/DialogMemory.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/DialogMemory.kt new file mode 100644 index 0000000..04ec805 --- /dev/null +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/DialogMemory.kt @@ -0,0 +1,28 @@ +package com.tools.device.devcheck.dashboard + +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) + + override fun getIconRes(): Int=6 + + 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/dashboard/DialogNetwork.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/DialogNetwork.kt index dd1f093..f814f18 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/DialogNetwork.kt +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/DialogNetwork.kt @@ -10,9 +10,7 @@ import com.tools.device.devcheck.databinding.DialogNetworkBinding class DialogNetwork :BaseDialogFragment(DialogNetworkBinding::inflate){ override fun getTitle(): String = resources.getString(R.string.network) - override fun getIconRes(): Int? { - return super.getIconRes() - } + override fun getIconRes(): Int=2 override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/DialogOperating.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/DialogOperating.kt new file mode 100644 index 0000000..3287464 --- /dev/null +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/DialogOperating.kt @@ -0,0 +1,28 @@ +package com.tools.device.devcheck.dashboard + +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){ + override fun getTitle(): String = resources.getString(R.string.operating_system) + + override fun getIconRes(): Int? =7 + + 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/dashboard/DialogStorage.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/DialogStorage.kt new file mode 100644 index 0000000..021aff7 --- /dev/null +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/DialogStorage.kt @@ -0,0 +1,28 @@ +package com.tools.device.devcheck.dashboard + +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){ + override fun getTitle(): String = resources.getString(R.string.storage) + + override fun getIconRes(): Int? =8 + + 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/dashboard/SensorsFragment.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/SensorsFragment.kt new file mode 100644 index 0000000..2fbddf1 --- /dev/null +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/SensorsFragment.kt @@ -0,0 +1,95 @@ +package com.tools.device.devcheck.dashboard + +import android.content.Intent +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.tools.device.devcheck.R +import com.tools.device.devcheck.databinding.FragmentSensorsBinding + +class SensorsFragment : Fragment() { +private lateinit var binding: FragmentSensorsBinding + + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflate the layout for this fragment + binding = FragmentSensorsBinding.inflate(inflater, container, false) + initView() + binding.sensor1.root.setOnClickListener { + val intent = Intent(requireContext(), TemperatureActivity::class.java) + startActivity(intent) + } + return binding.root + } + + private fun initView() { + binding.sensor1.sensorName.text=getString(R.string.temperatures) + binding.sensor2.sensorName.text=getString(R.string.accelerometer) + binding.sensor3.sensorName.text=getString(R.string.magnetic_field) + binding.sensor4.sensorName.text=getString(R.string.orientation) + binding.sensor5.sensorName.text=getString(R.string.light) + binding.sensor6.sensorName.text=getString(R.string.proximity) + binding.sensor7.sensorName.text=getString(R.string.gravity) + binding.sensor8.sensorName.text=getString(R.string.linear_acceleration) + binding.sensor9.sensorName.text=getString(R.string.rotation_vector) + binding.sensor10.sensorName.text=getString(R.string.step_counter) + + binding.hallText1.textTitle.text=getString(R.string.manufacturer) + binding.hallText2.textTitle.text=getString(R.string.type) + binding.hallText3.textTitle.text=getString(R.string.resolution) + binding.hallText4.textTitle.text=getString(R.string.maximum_range) + binding.hallText5.textTitle.text=getString(R.string.power) + binding.hallText6.textTitle.text=getString(R.string.wakeup_sensor) + + binding.signText1.textTitle.text=getString(R.string.manufacturer) + binding.signText2.textTitle.text=getString(R.string.type) + binding.signText3.textTitle.text=getString(R.string.resolution) + binding.signText4.textTitle.text=getString(R.string.maximum_range) + binding.signText5.textTitle.text=getString(R.string.power) + binding.signText6.textTitle.text=getString(R.string.wakeup_sensor) + + binding.geoText1.textTitle.text=getString(R.string.manufacturer) + binding.geoText2.textTitle.text=getString(R.string.type) + binding.geoText3.textTitle.text=getString(R.string.resolution) + binding.geoText4.textTitle.text=getString(R.string.maximum_range) + binding.geoText5.textTitle.text=getString(R.string.power) + binding.geoText6.textTitle.text=getString(R.string.wakeup_sensor) + + binding.rpcText1.textTitle.text=getString(R.string.manufacturer) + binding.rpcText2.textTitle.text=getString(R.string.type) + binding.rpcText3.textTitle.text=getString(R.string.resolution) + binding.rpcText4.textTitle.text=getString(R.string.maximum_range) + binding.rpcText5.textTitle.text=getString(R.string.power) + binding.rpcText6.textTitle.text=getString(R.string.wakeup_sensor) + + } + + 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 SensorsFragment. + */ + // TODO: Rename and change types and number of parameters + @JvmStatic + fun newInstance() = + SensorsFragment().apply { + arguments = Bundle().apply { + + } + } + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..7671470 --- /dev/null +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/TemperatureActivity.kt @@ -0,0 +1,22 @@ +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 androidx.recyclerview.widget.LinearLayoutManager +import com.tools.device.devcheck.R +import com.tools.device.devcheck.adapter.TempAdapter +import com.tools.device.devcheck.databinding.ActivityTemperatureBinding + +class TemperatureActivity : AppCompatActivity() { + private lateinit var binding: ActivityTemperatureBinding + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = ActivityTemperatureBinding.inflate(layoutInflater) + setContentView(binding.root) + binding.rvTemperature.adapter = TempAdapter() + binding.rvTemperature.layoutManager =LinearLayoutManager(this) + } +} \ 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 05305bd..fbe575c 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 @@ -7,11 +7,13 @@ import androidx.viewpager2.widget.ViewPager2 import com.google.android.material.tabs.TabLayoutMediator import com.tools.device.devcheck.base.BaseActivity import com.tools.device.devcheck.R +import com.tools.device.devcheck.dashboard.AppsFragment 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.SensorsFragment import com.tools.device.devcheck.dashboard.SystemShowFragment import com.tools.device.devcheck.databinding.ActivityMainBinding @@ -32,9 +34,9 @@ class MainActivity : BaseActivity() { SystemShowFragment.newInstance(), BatteryFragment.newInstance(), NetworkFragment.newInstance(), - DashboardFragment.newInstance(), + AppsFragment.newInstance(), CameraFragment.newInstance(), - DashboardFragment.newInstance() + SensorsFragment.newInstance() ) ) registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() { diff --git a/app/src/main/res/drawable/all_false.png b/app/src/main/res/drawable/all_false.png new file mode 100644 index 0000000..6e53a9a Binary files /dev/null and b/app/src/main/res/drawable/all_false.png differ diff --git a/app/src/main/res/drawable/all_ic_sel.xml b/app/src/main/res/drawable/all_ic_sel.xml new file mode 100644 index 0000000..6a8884e --- /dev/null +++ b/app/src/main/res/drawable/all_ic_sel.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/all_true.png b/app/src/main/res/drawable/all_true.png new file mode 100644 index 0000000..43b0da6 Binary files /dev/null and b/app/src/main/res/drawable/all_true.png differ diff --git a/app/src/main/res/drawable/app_full_ic.png b/app/src/main/res/drawable/app_full_ic.png new file mode 100644 index 0000000..8dd9ebe Binary files /dev/null and b/app/src/main/res/drawable/app_full_ic.png differ diff --git a/app/src/main/res/drawable/app_ic.png b/app/src/main/res/drawable/app_ic.png new file mode 100644 index 0000000..c3d6571 Binary files /dev/null and b/app/src/main/res/drawable/app_ic.png differ diff --git a/app/src/main/res/drawable/app_install.png b/app/src/main/res/drawable/app_install.png new file mode 100644 index 0000000..bc8d478 Binary files /dev/null and b/app/src/main/res/drawable/app_install.png differ diff --git a/app/src/main/res/drawable/battery_ic.png b/app/src/main/res/drawable/battery_ic.png new file mode 100644 index 0000000..d66e452 Binary files /dev/null and b/app/src/main/res/drawable/battery_ic.png differ diff --git a/app/src/main/res/drawable/blue_tooth_ic.png b/app/src/main/res/drawable/blue_tooth_ic.png new file mode 100644 index 0000000..cb6b50f Binary files /dev/null and b/app/src/main/res/drawable/blue_tooth_ic.png differ diff --git a/app/src/main/res/drawable/dashboard_model_background.xml b/app/src/main/res/drawable/dashboard_model_background.xml index 66fa06b..32bb609 100644 --- a/app/src/main/res/drawable/dashboard_model_background.xml +++ b/app/src/main/res/drawable/dashboard_model_background.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/dashboard_model_background_top.xml b/app/src/main/res/drawable/dashboard_model_background_top.xml new file mode 100644 index 0000000..f30b600 --- /dev/null +++ b/app/src/main/res/drawable/dashboard_model_background_top.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/dashboard_model_left_both.xml b/app/src/main/res/drawable/dashboard_model_left_both.xml new file mode 100644 index 0000000..8889cc9 --- /dev/null +++ b/app/src/main/res/drawable/dashboard_model_left_both.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/dashboard_tool_background.xml b/app/src/main/res/drawable/dashboard_tool_background.xml new file mode 100644 index 0000000..64f1258 --- /dev/null +++ b/app/src/main/res/drawable/dashboard_tool_background.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/display_ic.png b/app/src/main/res/drawable/display_ic.png new file mode 100644 index 0000000..9909b0e Binary files /dev/null and b/app/src/main/res/drawable/display_ic.png differ diff --git a/app/src/main/res/drawable/go_sensor.png b/app/src/main/res/drawable/go_sensor.png new file mode 100644 index 0000000..8808dcd Binary files /dev/null and b/app/src/main/res/drawable/go_sensor.png differ diff --git a/app/src/main/res/drawable/green_rec.xml b/app/src/main/res/drawable/green_rec.xml new file mode 100644 index 0000000..130f225 --- /dev/null +++ b/app/src/main/res/drawable/green_rec.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/item_point.png b/app/src/main/res/drawable/item_point.png new file mode 100644 index 0000000..858a311 Binary files /dev/null and b/app/src/main/res/drawable/item_point.png differ diff --git a/app/src/main/res/drawable/main_logo.png b/app/src/main/res/drawable/main_logo.png new file mode 100644 index 0000000..c257397 Binary files /dev/null and b/app/src/main/res/drawable/main_logo.png differ diff --git a/app/src/main/res/drawable/mem_ic.png b/app/src/main/res/drawable/mem_ic.png new file mode 100644 index 0000000..27c08f8 Binary files /dev/null and b/app/src/main/res/drawable/mem_ic.png differ diff --git a/app/src/main/res/drawable/per_no.png b/app/src/main/res/drawable/per_no.png new file mode 100644 index 0000000..d24a3bf Binary files /dev/null and b/app/src/main/res/drawable/per_no.png differ diff --git a/app/src/main/res/drawable/per_special.png b/app/src/main/res/drawable/per_special.png new file mode 100644 index 0000000..f0ec807 Binary files /dev/null and b/app/src/main/res/drawable/per_special.png differ diff --git a/app/src/main/res/drawable/per_yes.png b/app/src/main/res/drawable/per_yes.png new file mode 100644 index 0000000..df017f7 Binary files /dev/null and b/app/src/main/res/drawable/per_yes.png differ diff --git a/app/src/main/res/drawable/radius_bg.png b/app/src/main/res/drawable/radius_bg.png new file mode 100644 index 0000000..ba849a8 Binary files /dev/null and b/app/src/main/res/drawable/radius_bg.png differ diff --git a/app/src/main/res/drawable/setting_ic.png b/app/src/main/res/drawable/setting_ic.png new file mode 100644 index 0000000..c9f7fdd Binary files /dev/null and b/app/src/main/res/drawable/setting_ic.png differ diff --git a/app/src/main/res/drawable/storyge.png b/app/src/main/res/drawable/storyge.png new file mode 100644 index 0000000..4051312 Binary files /dev/null and b/app/src/main/res/drawable/storyge.png differ diff --git a/app/src/main/res/drawable/stroke_bg.png b/app/src/main/res/drawable/stroke_bg.png new file mode 100644 index 0000000..d479b93 Binary files /dev/null and b/app/src/main/res/drawable/stroke_bg.png differ diff --git a/app/src/main/res/drawable/system_false.png b/app/src/main/res/drawable/system_false.png new file mode 100644 index 0000000..81249b4 Binary files /dev/null and b/app/src/main/res/drawable/system_false.png differ diff --git a/app/src/main/res/drawable/system_ic_sel.xml b/app/src/main/res/drawable/system_ic_sel.xml new file mode 100644 index 0000000..f738ddb --- /dev/null +++ b/app/src/main/res/drawable/system_ic_sel.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/system_true.png b/app/src/main/res/drawable/system_true.png new file mode 100644 index 0000000..d15beb6 Binary files /dev/null and b/app/src/main/res/drawable/system_true.png differ diff --git a/app/src/main/res/drawable/test_ic.png b/app/src/main/res/drawable/test_ic.png new file mode 100644 index 0000000..5243453 Binary files /dev/null and b/app/src/main/res/drawable/test_ic.png differ diff --git a/app/src/main/res/drawable/tool_ic.png b/app/src/main/res/drawable/tool_ic.png new file mode 100644 index 0000000..51c9993 Binary files /dev/null and b/app/src/main/res/drawable/tool_ic.png differ diff --git a/app/src/main/res/drawable/user_false.png b/app/src/main/res/drawable/user_false.png new file mode 100644 index 0000000..4614760 Binary files /dev/null and b/app/src/main/res/drawable/user_false.png differ diff --git a/app/src/main/res/drawable/user_ic_sel.xml b/app/src/main/res/drawable/user_ic_sel.xml new file mode 100644 index 0000000..32f91e9 --- /dev/null +++ b/app/src/main/res/drawable/user_ic_sel.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/user_true.png b/app/src/main/res/drawable/user_true.png new file mode 100644 index 0000000..94afc5a Binary files /dev/null and b/app/src/main/res/drawable/user_true.png differ diff --git a/app/src/main/res/drawable/wifi_ic.png b/app/src/main/res/drawable/wifi_ic.png new file mode 100644 index 0000000..a8a933b Binary files /dev/null and b/app/src/main/res/drawable/wifi_ic.png differ diff --git a/app/src/main/res/font/candal.ttf b/app/src/main/res/font/candal.ttf new file mode 100644 index 0000000..d16c5d4 Binary files /dev/null and b/app/src/main/res/font/candal.ttf differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index fa936d0..cecfa95 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -29,28 +29,26 @@ android:layout_alignBottom="@id/text_app_name" android:contentDescription="Sidebar" android:padding="5dp" - android:src="@mipmap/ic_launcher" /> + android:src="@drawable/main_logo" /> - - + style="@style/TextTitleBig" + android:text="@string/app_name" /> + android:paddingHorizontal="7dp" + android:layout_marginEnd="10dp" + android:src="@drawable/more_point"/> @@ -61,14 +59,14 @@ android:background="@color/forground_color" app:tabGravity="center" app:layout_collapseMode="pin" - app:tabIndicatorColor="@color/main_tab_indicatorColor" + app:tabIndicatorColor="@color/module_title_color" app:tabIndicatorFullWidth="true" app:tabIndicatorHeight="@dimen/tab_indicator_height" app:tabMaxWidth="100dp" app:tabMinWidth="100dp" app:tabMode="scrollable" app:tabRippleColor="@null" - app:tabSelectedTextColor="@color/main_tab_selected" + app:tabSelectedTextColor="@color/module_title_color" app:tabTextColor="@color/main_tab_unselected" /> diff --git a/app/src/main/res/layout/activity_temperature.xml b/app/src/main/res/layout/activity_temperature.xml new file mode 100644 index 0000000..e073d5b --- /dev/null +++ b/app/src/main/res/layout/activity_temperature.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/common_check_style1.xml b/app/src/main/res/layout/common_check_style1.xml new file mode 100644 index 0000000..e8a2216 --- /dev/null +++ b/app/src/main/res/layout/common_check_style1.xml @@ -0,0 +1,27 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/common_dialog_item.xml b/app/src/main/res/layout/common_dialog_item.xml index 0fa933b..93687e2 100644 --- a/app/src/main/res/layout/common_dialog_item.xml +++ b/app/src/main/res/layout/common_dialog_item.xml @@ -3,9 +3,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:paddingStart="20dp" + android:paddingStart="25dp" android:paddingTop="12dp" - android:paddingEnd="20dp"> + android:paddingEnd="25dp"> + android:text="333" + android:layout_marginBottom="6dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/common_sensor_style.xml b/app/src/main/res/layout/common_sensor_style.xml new file mode 100644 index 0000000..038bde3 --- /dev/null +++ b/app/src/main/res/layout/common_sensor_style.xml @@ -0,0 +1,41 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dashboard_module_bottom.xml b/app/src/main/res/layout/dashboard_module_bottom.xml index a840613..cda0cb2 100644 --- a/app/src/main/res/layout/dashboard_module_bottom.xml +++ b/app/src/main/res/layout/dashboard_module_bottom.xml @@ -12,9 +12,9 @@ android:id="@+id/relayout_tests" android:layout_width="0dp" android:layout_height="wrap_content" - android:background="@drawable/dashboard_model_background" + android:background="@drawable/dashboard_model_left_both" android:gravity="center" - android:orientation="vertical" + android:orientation="horizontal" android:paddingHorizontal="@dimen/dashboard_model_padding_horizontal" android:paddingVertical="@dimen/dashboard_model_padding_vertical" app:layout_constraintHorizontal_weight="1" @@ -24,14 +24,16 @@ + android:layout_height="35dp" + android:src="@drawable/test_ic" /> @@ -43,9 +45,9 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="@dimen/common_module_interval_small" - android:background="@drawable/dashboard_model_background" + android:background="@drawable/dashboard_tool_background" android:gravity="center" - android:orientation="vertical" + android:orientation="horizontal" android:paddingHorizontal="@dimen/dashboard_model_padding_horizontal" android:paddingVertical="@dimen/dashboard_model_padding_vertical" app:layout_constraintHorizontal_weight="1" @@ -55,8 +57,8 @@ + android:layout_height="35dp" + android:src="@drawable/tool_ic" /> - + style="@style/TextDeviceLogo" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="OPPO" + android:layout_marginHorizontal="20dp" + android:layout_centerVertical="true" + tools:ignore="RelativeOverlap" /> @@ -141,10 +152,10 @@ + android:src="@drawable/item_point" /> diff --git a/app/src/main/res/layout/dashboard_module_center.xml b/app/src/main/res/layout/dashboard_module_center.xml index c824e63..e33f0bf 100644 --- a/app/src/main/res/layout/dashboard_module_center.xml +++ b/app/src/main/res/layout/dashboard_module_center.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/common_module_interval_medium" + android:layout_marginTop="@dimen/dashboard_model_padding_horizontal" android:orientation="vertical"> + android:src="@drawable/item_point" /> + android:src="@drawable/battery_ic" /> + android:src="@drawable/item_point" /> + android:src="@drawable/wifi_ic" /> + android:src="@drawable/item_point" /> + android:src="@drawable/app_ic" /> + android:src="@drawable/item_point" /> + android:src="@drawable/display_ic" /> + android:src="@drawable/item_point" /> + android:src="@drawable/radius_bg" /> + android:src="@drawable/item_point" /> + android:src="@drawable/stroke_bg" /> + android:paddingHorizontal="5dp" + android:src="@drawable/item_point" /> diff --git a/app/src/main/res/layout/dialog_app_click.xml b/app/src/main/res/layout/dialog_app_click.xml new file mode 100644 index 0000000..46555e4 --- /dev/null +++ b/app/src/main/res/layout/dialog_app_click.xml @@ -0,0 +1,193 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/dialog_app_install.xml b/app/src/main/res/layout/dialog_app_install.xml new file mode 100644 index 0000000..065894f --- /dev/null +++ b/app/src/main/res/layout/dialog_app_install.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_base.xml b/app/src/main/res/layout/dialog_base.xml index 5b2551d..664e8d2 100644 --- a/app/src/main/res/layout/dialog_base.xml +++ b/app/src/main/res/layout/dialog_base.xml @@ -8,11 +8,11 @@ @@ -20,18 +20,19 @@ android:id="@+id/view_line" android:layout_width="match_parent" android:layout_height="1dp" - android:layout_marginTop="60dp" + android:layout_marginTop="80dp" android:background="@color/module_title_color" app:layout_constraintTop_toTopOf="parent" /> @@ -63,8 +64,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="10dp" + android:layout_marginBottom="10dp" android:text="@string/settings" app:layout_constraintRight_toRightOf="parent" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/contentContainer" /> diff --git a/app/src/main/res/layout/dialog_memory.xml b/app/src/main/res/layout/dialog_memory.xml new file mode 100644 index 0000000..e530255 --- /dev/null +++ b/app/src/main/res/layout/dialog_memory.xml @@ -0,0 +1,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_operating.xml b/app/src/main/res/layout/dialog_operating.xml new file mode 100644 index 0000000..a930718 --- /dev/null +++ b/app/src/main/res/layout/dialog_operating.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_storage.xml b/app/src/main/res/layout/dialog_storage.xml new file mode 100644 index 0000000..052e2f1 --- /dev/null +++ b/app/src/main/res/layout/dialog_storage.xml @@ -0,0 +1,279 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_apps.xml b/app/src/main/res/layout/fragment_apps.xml new file mode 100644 index 0000000..c412f66 --- /dev/null +++ b/app/src/main/res/layout/fragment_apps.xml @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_hard_ware.xml b/app/src/main/res/layout/fragment_hard_ware.xml index 86b57d4..e2b5c2f 100644 --- a/app/src/main/res/layout/fragment_hard_ware.xml +++ b/app/src/main/res/layout/fragment_hard_ware.xml @@ -218,7 +218,7 @@ tools:ignore="RelativeOverlap" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_app_list.xml b/app/src/main/res/layout/item_app_list.xml new file mode 100644 index 0000000..1998989 --- /dev/null +++ b/app/src/main/res/layout/item_app_list.xml @@ -0,0 +1,37 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_common_temp.xml b/app/src/main/res/layout/item_common_temp.xml new file mode 100644 index 0000000..74ae56f --- /dev/null +++ b/app/src/main/res/layout/item_common_temp.xml @@ -0,0 +1,33 @@ + + + + + + + \ 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 8665cdb..0c91d86 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -3,16 +3,15 @@ #FF000000 #FFFFFFFF #1E8C29 - #C3C0C0 + #7F7F7F #1E8C29 - #1E8C29 #FFFFFF #EDEDED #3B948A - #444544 #626262 #757575 #484848 #666666 #757575 + #2B2B2B \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 667f2e4..e90d92f 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -2,7 +2,7 @@ 20sp 15sp - 13sp + 14sp @@ -12,8 +12,8 @@ 3dp 3dp - 13dp - 2dp + 10dp + 0dp 8dp 15dp @@ -26,7 +26,7 @@ 8dp - 3dp + 5dp 7dp 10dp \ 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 5be2d74..9a6ec8e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -213,6 +213,42 @@ Input devices Bluetooth 4 features Bluetooth 5 features - + Security patch + Build + EMUI + Instruction sets + System apps + User apps + Installed apps + size + User + All + ScreenReader + Package name + Target SDK + Minimum SDK + Installer type + Installed + UID + Permissions + = Allowed + = Special access + = Not allowed + Temperatures + Magnetic field + Orientation + Light + Gravity + Linear acceleration + Rotation vector + Step counter + HALL sensor + Type + Maximum range + Power + Wakeup sensor + Signifcant Motion + Geomagnetic Rotation Vector + RPC sensor \ 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 144fb0f..edf5221 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,30 +1,35 @@ - - + + @@ -39,7 +44,7 @@ @@ -56,6 +62,7 @@ @@ -63,6 +70,7 @@ @@ -95,7 +103,7 @@ @@ -190,4 +198,10 @@ @anim/popup_enter @anim/popup_exit + + + \ No newline at end of file