修改camera,接入接口

This commit is contained in:
yuqian 2025-12-23 15:51:43 +08:00
parent e3ef108511
commit 5f38f19103
18 changed files with 514 additions and 1502 deletions

View File

@ -28,11 +28,11 @@ class AppListAdapter: RecyclerView.Adapter<AppListAdapter.ListViewHolder>() {
holder.binding.view.setOnClickListener {
listener.onShowAppSelectDialog()
}
if(position==itemCount-1){
holder.binding.view2.visibility=View.VISIBLE
}else{
holder.binding.view2.visibility=View.GONE
}
// if(position==itemCount-1){
// holder.binding.view2.visibility=View.VISIBLE
// }else{
// holder.binding.view2.visibility=View.GONE
// }
}
fun setOnclickListener(listener: OnShowDialogListener) {
this.listener = listener

View File

@ -36,6 +36,12 @@ class AppsFragment : Fragment(),AppListAdapter.OnShowDialogListener {
binding.llTitle.setOnClickListener {
bottomDialog= BottomDialogFragment(type = "apps", sel = sel, invoke = {item->
sel = item
binding.tvTitle.text=when(item){
0 -> "User(23)"
1 -> "System(23)"
2 -> "All(23)"
else -> "User"
}
})
Log.d("sel", sel.toString())
bottomDialog.show(requireActivity().supportFragmentManager, "BottomDialogFragment")

View File

@ -5,14 +5,17 @@ import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.compose.material3.Text
import androidx.fragment.app.FragmentContainer
import com.google.android.material.textview.MaterialTextView
import com.xyzshell.andinfo.AndInfo
import com.xyzshell.myphoneinfo.R
import com.xyzshell.myphoneinfo.databinding.FragmentCameraBinding
import com.xyzshell.myphoneinfo.databinding.ItemCameraTypeBinding
import com.xyzshell.myphoneinfo.dialog.DialogCameraMore
class CameraFragment : Fragment() {
private lateinit var binding:FragmentCameraBinding;
private var dialogCamera0: DialogCameraMore? = null
private var dialogCamera1: DialogCameraMore? = null
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@ -28,24 +31,98 @@ class CameraFragment : Fragment() {
// Inflate the layout for this fragment
binding = FragmentCameraBinding.inflate(inflater, container, false)
initText()
binding.rearMore.setOnClickListener {
dialogCamera0= dialogCamera0?:DialogCameraMore(0)
dialogCamera0?.show(childFragmentManager, "DialogCameraMore0")
}
binding.frontMore.setOnClickListener {
dialogCamera1= dialogCamera1?:DialogCameraMore(1)
dialogCamera1?.show(childFragmentManager, "DialogCameraMore1")
}
// binding.frontMore.setOnClickListener {
// dialogCamera1= dialogCamera1?:DialogCameraMore(1)
// dialogCamera1?.show(childFragmentManager, "DialogCameraMore1")
// }
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)
val cameraInfo = AndInfo.instance.camera
val cameraIds = cameraInfo.cameraIds
if(!cameraIds.isEmpty()){
cameraIds.forEachIndexed { index, cameraId ->
val characteristics = cameraInfo.getCameraCharacteristics(cameraId)
characteristics?.let {
val cameraCardView = LayoutInflater.from(context).inflate(
R.layout.item_camera_type,
binding.llCamera,
false
)
val itemBinding = ItemCameraTypeBinding.bind(cameraCardView)
// 2. 设置标题(区分前后摄像头)
val facing = cameraInfo.getCameraFacing(it).toString()
val cameraName = when (facing) {
"FRONT" -> getString(R.string.front_camera_1) + "${index + 1}"
"BACK" -> getString(R.string.rear_camera_1)+"${index + 1}"
else -> "camera ${index + 1}"
}
itemBinding.titleCon.text = cameraName
// 3. 设置相机规格参数
cameraInfo.getPixelArraySize(it)?.let { size ->
itemBinding.conText1.text = "${size} MP"
}
cameraInfo.getAvailableApertures(it)?.let { apertures ->
if (apertures.isNotEmpty()) {
itemBinding.conText2.text = "f/${apertures[0]}" // 取第一个光圈值
}
}
// 4. 设置详细信息(使用 include 的文本)
itemBinding.camText1.textTitle.text=getString(R.string.resolution)
itemBinding.camText2.textTitle.text=getString(R.string.sensor_size)
itemBinding.camText3.textTitle.text=getString(R.string.pixel_size)
itemBinding.camText4.textTitle.text=getString(R.string._35mm_equivalent_focal_length)
itemBinding.camText5.textTitle.text=getString(R.string.shutter_speed)
itemBinding.camText6.textTitle.text=getString(R.string.iso_sensitivity_range)
itemBinding.rearCheck2.content.text=getString(R.string.flash)
itemBinding.rearCheck1.content.text=getString(R.string.optical_image_stabilization)
// checkBox2?.text = "光学防抖"
// checkBox2?.isChecked = capabilities?.contains("OPTICAL_IMAGE_STABILIZATION") ?: false
//像素阵列大小
cameraInfo.getPixelArraySize(it)?.let { size ->
itemBinding.camText1.textContent.text = size
}
// 传感器物理尺寸
cameraInfo.getSensorPhysicalSize(it)?.let { size ->
itemBinding.camText2.textContent.text=size
}
// 闪光灯
cameraInfo.hasFlashUnit(it)?.let { hasFlash ->
itemBinding.rearCheck2.image.isSelected=hasFlash
}
// 6. 设置"更多"按钮点击事件
itemBinding.rearMore.setOnClickListener {
var dialogCamera0: DialogCameraMore? = null
dialogCamera0= null ?:DialogCameraMore(cameraName)
dialogCamera0.show(childFragmentManager, "DialogCameraMore")
}
// 7. 添加到父容器
binding.llCamera.addView(cameraCardView)
}
}
}
binding.videoCheck1.content.text=getString(R.string.hight_speed_video)
binding.videoCheck2.content.text=getString(R.string.video_stabilization)
}
companion object {

View File

@ -30,20 +30,60 @@ private lateinit var binding:FragmentNetworkBinding
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
//connection
binding.networkLayout.wfText1.textTitle.text=getString(R.string.status)
binding.networkLayout.wfText2.textTitle.text=getString(R.string.network)
binding.networkLayout.wfText3.textTitle.text=getString(R.string.bssid)
binding.networkLayout.wfText4.textTitle.text=getString(R.string.function)
binding.networkLayout.wfText5.textTitle.text=getString(R.string.connection_speed)
binding.networkLayout.wfText6.textTitle.text=getString(R.string.signal_strength)
binding.networkLayout.wfText7.textTitle.text=getString(R.string.frequency)
binding.networkLayout.wfText8.textTitle.text=getString(R.string.frequency_band)
binding.networkLayout.wfText9.textTitle.text=getString(R.string.channel)
binding.networkLayout.wfText10.textTitle.text=getString(R.string.standard)
//dhcp
binding.networkLayout.dhText1.textTitle.text=getString(R.string.dhcp_server)
binding.networkLayout.dhText2.textTitle.text=getString(R.string.dhcp_lease_time)
binding.networkLayout.dhText3.textTitle.text=getString(R.string.gateway)
binding.networkLayout.dhText4.textTitle.text=getString(R.string.subnet_mask)
binding.networkLayout.dhText5.textTitle.text=getString(R.string.dns1)
binding.networkLayout.dhText6.textTitle.text=getString(R.string.dns2)
binding.networkLayout.dhText7.textTitle.text=getString(R.string.ip_address)
binding.networkLayout.dhText8.textTitle.text=getString(R.string.ipv6)
//mobel
binding.mdText1.textTitle.text=getString(R.string.dual_sim_dual_standby)
binding.mdText2.textTitle.text=getString(R.string.phone_type)
binding.mdText3.textTitle.text=getString(R.string.esim)
binding.conTexts.textTitle.text=getString(R.string.status)
binding.defText1.textTitle.text=getString(R.string.data)
binding.defText2.textTitle.text=getString(R.string.voice)
binding.defText3.textTitle.text=getString(R.string.short_message)
binding.simText1.textTitle.text=getString(R.string.status)
binding.simText2.textTitle.text=getString(R.string.nation)
binding.simText3.textTitle.text=getString(R.string.roaming)
binding.simText4.textTitle.text=getString(R.string.network_type)
if(status==0){
binding.noConnect.visibility=View.VISIBLE
binding.connectData.visibility=View.GONE
binding.wifiDev1.text="Disconnected"
binding.wifiList.visibility=View.GONE
binding.llPubShow.visibility=View.GONE
binding.networkLayout.wfText1.textContent.text="Disconnected"
binding.networkLayout.wifiList.visibility=View.GONE
binding.networkLayout.llPubShow.visibility=View.GONE
}else{
binding.noConnect.visibility=View.GONE
binding.connectData.visibility=View.VISIBLE
binding.wifiDev1.text="Connected"
binding.wifiList.visibility=View.VISIBLE
binding.llPubShow.visibility=View.VISIBLE
binding.networkLayout.wfText1.textContent.text="Connected"
binding.networkLayout.wifiList.visibility=View.VISIBLE
binding.networkLayout.llPubShow.visibility=View.VISIBLE
}
binding.pubShow.setOnClickListener{
binding.networkLayout.pubShow.setOnClickListener{
val tag = "showLoadFragment"
if (requireActivity().supportFragmentManager.findFragmentByTag(tag) == null) {
val showLoadFragment = ShowLoadFragment()

View File

@ -10,12 +10,8 @@ import com.xyzshell.myphoneinfo.base.BaseDialogFragment
import com.xyzshell.myphoneinfo.databinding.DialogCameraMoreBinding
import com.xyzshell.myphoneinfo.databinding.DialogCpuInfoBinding
class DialogCameraMore(private val type:Int) :BaseDialogFragment<DialogCameraMoreBinding>(DialogCameraMoreBinding::inflate){
override fun getTitle(): String = if(type==0){
resources.getString(R.string.rear_camera_1)}
else{
resources.getString(R.string.front_camera_1)
}
class DialogCameraMore(private val name:String) :BaseDialogFragment<DialogCameraMoreBinding>(DialogCameraMoreBinding::inflate){
override fun getTitle(): String = name
override fun getIconRes(): Int? =9

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/check_true" android:state_selected="true"/>
<item android:drawable="@mipmap/check_false"/>
</selector>

View File

@ -11,7 +11,7 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="center_vertical"
android:src="@mipmap/check_false" />
android:src="@drawable/check_selector" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/content"

View File

@ -32,7 +32,6 @@
android:paddingVertical="10dp"
android:orientation="horizontal">
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:id="@+id/tvTitle"
android:layout_height="wrap_content"

View File

@ -25,13 +25,13 @@
android:paddingVertical="15dp">
<ImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginTop="14dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@mipmap/attention" />
<com.google.android.material.textview.MaterialTextView
style="@style/TextButteryRight"
style="@style/LeftContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="23dp"
@ -41,444 +41,11 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llCamera"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:background="@drawable/dashboard_model_background"
android:orientation="vertical"
android:padding="15dp"
android:visibility="visible">
android:orientation="vertical"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/titleCon"
style="@style/TextHeavy20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/rear_camera_1"
tools:ignore="RelativeOverlap" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingVertical="30dp">
<ImageView
android:id="@+id/image"
android:layout_width="150dp"
android:layout_height="71dp"
android:src="@mipmap/camera"
android:textAlignment="center" />
<LinearLayout
android:id="@+id/connectData"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:orientation="vertical"
android:visibility="visible">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/conText1"
style="@style/TextSize37"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="48 MP"
android:textStyle="bold"
tools:ignore="RelativeOverlap" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/conText2"
style="@style/TextSize37"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="f/1.8"
android:textStyle="bold"
tools:ignore="RelativeOverlap" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="horizontal">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/cameraTitle2"
style="@style/LeftContent"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="@string/resolution"
android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/cameraDev2"
style="@style/TextContentRight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:text="@string/apps"
tools:ignore="RelativeOverlap" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="horizontal">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/cameraTitle3"
style="@style/LeftContent"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="@string/sensor_size"
android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/cameraDev3"
style="@style/TextContentRight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:text="@string/apps"
tools:ignore="RelativeOverlap" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="horizontal">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/cameraTitle4"
style="@style/LeftContent"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="@string/pixel_size"
android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/cameraDev4"
style="@style/TextContentRight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:text="@string/apps"
tools:ignore="RelativeOverlap" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="horizontal">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/cameraTitle5"
style="@style/LeftContent"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="@string/_35mm_equivalent_focal_length"
android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/cameraDev5"
style="@style/TextContentRight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:text="@string/apps"
tools:ignore="RelativeOverlap" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="horizontal">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/cameraTitle6"
style="@style/LeftContent"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="@string/shutter_speed"
android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/cameraDev6"
style="@style/TextContentRight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:text="@string/apps"
tools:ignore="RelativeOverlap" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="horizontal">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/cameraTitle7"
style="@style/LeftContent"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="@string/lso_sensitivity_range"
android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/cameraDev7"
style="@style/TextContentRight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:text="@string/apps"
tools:ignore="RelativeOverlap" />
</LinearLayout>
<include layout="@layout/common_check_style" android:id="@+id/rearCheck1"/>
<include layout="@layout/common_check_style" android:id="@+id/rearCheck2"/>
<LinearLayout
android:id="@+id/rearMore"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<com.google.android.material.textview.MaterialTextView
style="@style/TextHeavy20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/more"
tools:ignore="RelativeOverlap" />
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1"/>
<ImageView
android:layout_width="10dp"
android:layout_height="17dp"
android:layout_marginEnd="15dp"
android:src="@mipmap/more_camera"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:background="@drawable/dashboard_model_background"
android:orientation="vertical"
android:padding="15dp"
android:visibility="visible">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/titleFront"
style="@style/TextHeavy20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/front_camera_1"
tools:ignore="RelativeOverlap" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingVertical="30dp">
<ImageView
android:id="@+id/image2"
android:layout_width="150dp"
android:layout_height="71dp"
android:src="@mipmap/camera"
android:textAlignment="center" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:orientation="vertical"
android:visibility="visible">
<com.google.android.material.textview.MaterialTextView
style="@style/TextSize37"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="48 MP"
android:textStyle="bold"
tools:ignore="RelativeOverlap" />
<com.google.android.material.textview.MaterialTextView
style="@style/TextSize37"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="f/1.8"
android:textStyle="bold"
tools:ignore="RelativeOverlap" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="horizontal">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/camera1Title2"
style="@style/LeftContent"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="@string/resolution"
android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/camera1Dev2"
style="@style/TextContentRight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:text="@string/apps"
tools:ignore="RelativeOverlap" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="horizontal">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/camera1Title3"
style="@style/LeftContent"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="@string/sensor_size"
android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/camera1Dev3"
style="@style/TextContentRight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:text="@string/apps"
tools:ignore="RelativeOverlap" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="horizontal">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/camera1Title4"
style="@style/LeftContent"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="@string/pixel_size"
android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/camera1Dev4"
style="@style/TextContentRight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:text="@string/apps"
tools:ignore="RelativeOverlap" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="horizontal">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/camera1Title5"
style="@style/LeftContent"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="@string/_35mm_equivalent_focal_length"
android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/camera1Dev5"
style="@style/TextContentRight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:text="@string/apps"
tools:ignore="RelativeOverlap" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="horizontal">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/camera1Title6"
style="@style/LeftContent"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="@string/shutter_speed"
android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/camera1Dev6"
style="@style/TextContentRight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:text="@string/apps"
tools:ignore="RelativeOverlap" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="horizontal">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/camera1Title7"
style="@style/LeftContent"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="@string/lso_sensitivity_range"
android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/camera1Dev7"
style="@style/TextContentRight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:text="@string/apps"
tools:ignore="RelativeOverlap" />
</LinearLayout>
<include layout="@layout/common_check_style" android:id="@+id/frontCheck1"/>
<include layout="@layout/common_check_style" android:id="@+id/frontCheck2"/>
<LinearLayout
android:id="@+id/frontMore"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<com.google.android.material.textview.MaterialTextView
style="@style/TextHeavy20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/more"
tools:ignore="RelativeOverlap" />
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1"/>
<ImageView
android:layout_width="10dp"
android:layout_height="17dp"
android:layout_marginEnd="15dp"
android:src="@mipmap/more_camera"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

File diff suppressed because it is too large Load Diff

View File

@ -22,24 +22,25 @@
android:orientation="vertical">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tvName"
style="@style/TextTool21"
style="@style/TextHeavy20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start"
android:textSize="19sp"
android:textSize="16sp"
android:textColor="@color/left_color"
android:text="APKCombo Installer" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tvNum"
style="@style/TextContent"
style="@style/LeftContent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start"
android:textSize="15sp"
android:textColor="@color/right_color"
android:text="com.apkcombo.app" />
</LinearLayout>
</LinearLayout>
<View
android:id="@+id/view2"
android:layout_width="match_parent"
android:layout_height="100dp"/>
<!-- <View-->
<!-- android:id="@+id/view2"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="100dp"/>-->
</LinearLayout>

View File

@ -0,0 +1,116 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:background="@drawable/dashboard_model_background"
android:orientation="vertical"
android:padding="15dp"
android:visibility="visible">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/titleCon"
style="@style/TextHeavy20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/rear_camera_1"
tools:ignore="RelativeOverlap" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingVertical="30dp">
<LinearLayout
android:layout_width="150dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/camera"
android:textAlignment="center" />
<View
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="1dp"/>
</LinearLayout>
<LinearLayout
android:id="@+id/connectData"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:orientation="vertical"
android:visibility="visible">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/conText1"
style="@style/TextHeavy20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="48 MP"
android:textSize="18sp"
tools:ignore="RelativeOverlap" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/conText2"
style="@style/TextHeavy20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="f/1.8"
android:textSize="18sp"
tools:ignore="RelativeOverlap" />
</LinearLayout>
</LinearLayout>
<include
android:id="@+id/camText1"
layout="@layout/common_text_style" />
<include
android:id="@+id/camText2"
layout="@layout/common_text_style" />
<include
android:id="@+id/camText3"
layout="@layout/common_text_style" />
<include
android:id="@+id/camText4"
layout="@layout/common_text_style" />
<include
android:id="@+id/camText5"
layout="@layout/common_text_style" />
<include
android:id="@+id/camText6"
layout="@layout/common_text_style" />
<include layout="@layout/common_check_style" android:id="@+id/rearCheck1"/>
<include layout="@layout/common_check_style" android:id="@+id/rearCheck2"/>
<LinearLayout
android:id="@+id/rearMore"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<com.google.android.material.textview.MaterialTextView
style="@style/TextHeavy20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/more"
tools:ignore="RelativeOverlap" />
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1"/>
<ImageView
android:layout_width="10dp"
android:layout_height="17dp"
android:layout_marginEnd="15dp"
android:src="@mipmap/more_camera"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>

View File

@ -0,0 +1,186 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:background="@drawable/dashboard_model_background"
android:orientation="vertical"
android:padding="15dp"
android:visibility="visible">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/titleWifi"
style="@style/TextHeavy20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/wifi"
tools:ignore="RelativeOverlap" />
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1" />
<ImageView
android:layout_width="23dp"
android:layout_height="23dp"
android:layout_gravity="center_vertical"
android:src="@mipmap/setting" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="15dp">
<include
android:id="@+id/wfText1"
layout="@layout/common_text_style" />
<LinearLayout
android:id="@+id/wifiList"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/net2"
style="@style/TextHeavy20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="@string/network"
tools:ignore="RelativeOverlap" />
<include
android:id="@+id/wfText2"
layout="@layout/common_text_style" />
<include
android:id="@+id/wfText3"
layout="@layout/common_text_style" />
<include
android:id="@+id/wfText4"
layout="@layout/common_text_style" />
<include
android:id="@+id/wfText5"
layout="@layout/common_text_style" />
<include
android:id="@+id/wfText6"
layout="@layout/common_text_style" />
<include
android:id="@+id/wfText7"
layout="@layout/common_text_style" />
<include
android:id="@+id/wfText8"
layout="@layout/common_text_style" />
<include
android:id="@+id/wfText9"
layout="@layout/common_text_style" />
<include
android:id="@+id/wfText10"
layout="@layout/common_text_style" />
<com.google.android.material.textview.MaterialTextView
style="@style/TextHeavy20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="@string/dhcp"
tools:ignore="RelativeOverlap" />
<include
android:id="@+id/dhText1"
layout="@layout/common_text_style" />
<include
android:id="@+id/dhText2"
layout="@layout/common_text_style" />
<include
android:id="@+id/dhText3"
layout="@layout/common_text_style" />
<include
android:id="@+id/dhText4"
layout="@layout/common_text_style" />
<include
android:id="@+id/dhText5"
layout="@layout/common_text_style" />
<include
android:id="@+id/dhText6"
layout="@layout/common_text_style" />
<include
android:id="@+id/dhText7"
layout="@layout/common_text_style" />
<include
android:id="@+id/dhText8"
layout="@layout/common_text_style" />
</LinearLayout>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/wifiTitle2"
style="@style/TextHeavy20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="@string/hardware"
tools:ignore="RelativeOverlap" />
<include
android:id="@+id/hardCheck1"
layout="@layout/common_check_style" />
<include
android:id="@+id/hardCheck2"
layout="@layout/common_check_style" />
<include
android:id="@+id/hardCheck3"
layout="@layout/common_check_style" />
<include
android:id="@+id/hardCheck4"
layout="@layout/common_check_style" />
<include
android:id="@+id/hardCheck5"
layout="@layout/common_check_style" />
<include
android:id="@+id/hardCheck6"
layout="@layout/common_check_style" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/llPubShow"
android:visibility="visible"
android:layout_marginTop="15dp"
android:orientation="vertical">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/pubTitle"
style="@style/LeftContent"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="@string/public_ip"
android:textStyle="bold" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/pubShow"
style="@style/TextButteryRight"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:paddingHorizontal="12dp"
android:paddingVertical="8dp"
android:layout_marginTop="21dp"
android:background="@drawable/hard_bg"
android:textStyle="normal"
android:text="@string/show"
android:textAlignment="center"
tools:ignore="RelativeOverlap" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1015 B

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -31,6 +31,7 @@
<string name="network">Network</string>
<string name="wifi">Wi-Fi</string>
<string name="ip_address">IP address</string>
<string name="ipv6">IPV6</string>
<string name="link_speed">Link speed</string>
<string name="signal_strength">Signal strength</string>
<string name="mobile">Mobile</string>
@ -263,8 +264,8 @@
<string name="cluster">Cluster</string>
<string name="min_frequency">Min frequency</string>
<string name="more">More</string>
<string name="front_camera_1">Front camera 1</string>
<string name="rear_camera_1">Rear camera 1</string>
<string name="front_camera_1">Front camera</string>
<string name="rear_camera_1">Rear camera</string>
<string name="video_capture">Video capture</string>
<string name="profles">Profles</string>
<string name="hight_speed_video">High speed video</string>