diff --git a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/adapter/AppListAdapter.kt b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/adapter/AppListAdapter.kt index 4d58685..d360ee3 100644 --- a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/adapter/AppListAdapter.kt +++ b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/adapter/AppListAdapter.kt @@ -2,16 +2,21 @@ package com.xyzshell.myphoneinfo.adapter import android.app.Activity import android.content.Context +import android.graphics.drawable.Drawable +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView +import com.xyzshell.andinfo.libs.AppDetails import com.xyzshell.myphoneinfo.databinding.ItemAppListBinding class AppListAdapter: RecyclerView.Adapter() { private lateinit var context: Context private lateinit var listener: OnShowDialogListener + + private var list: List = emptyList() override fun onCreateViewHolder( parent: ViewGroup, viewType: Int @@ -25,26 +30,29 @@ class AppListAdapter: RecyclerView.Adapter() { holder: ListViewHolder, position: Int ) { + holder.binding.tvName.text = list[position].appName + holder.binding.tvNum.text = list[position].packageName + holder.binding.ivIcon.setImageDrawable(list[position].icon as Drawable) holder.binding.view.setOnClickListener { - listener.onShowAppSelectDialog() + listener.onShowAppSelectDialog(list[position]) } -// if(position==itemCount-1){ -// holder.binding.view2.visibility=View.VISIBLE -// }else{ -// holder.binding.view2.visibility=View.GONE -// } + } fun setOnclickListener(listener: OnShowDialogListener) { this.listener = listener } + fun setList(list :List){ + this.list = list + notifyDataSetChanged() + } override fun getItemCount(): Int { - return 13 + return list.size } class ListViewHolder(val binding: ItemAppListBinding): RecyclerView.ViewHolder(binding.root) interface OnShowDialogListener { - fun onShowAppSelectDialog() + fun onShowAppSelectDialog(item:AppDetails) } } \ No newline at end of file diff --git a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/custom/PermissionChecker.kt b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/custom/PermissionChecker.kt index 63ada71..72012f0 100644 --- a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/custom/PermissionChecker.kt +++ b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/custom/PermissionChecker.kt @@ -8,6 +8,8 @@ import android.os.Build import android.util.Log import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat +import com.xyzshell.andinfo.AndInfo +import com.xyzshell.andinfo.libs.PermissionInfo object PermissionChecker { /** @@ -19,38 +21,8 @@ object PermissionChecker { permission ) == PackageManager.PERMISSION_GRANTED } - /** - * 检查Wi-Fi权限 - */ - fun hasWifiPermission(context: Context): Boolean { - val permissions = mutableListOf(Manifest.permission.ACCESS_WIFI_STATE) - - // Android 10+ 需要位置权限 - if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) { - permissions.add(Manifest.permission.ACCESS_FINE_LOCATION) - } - - return permissions.all { hasPermission(context, it) } - } - - /** - * 检查电话权限 - */ - fun hasPhonePermission(context: Context): Boolean { - return hasPermission(context, Manifest.permission.READ_PHONE_STATE) - } - - /** - * 检查所有权限 - */ -// fun hasWifiAndPhonePermissions(context: Context): Boolean { -// return hasWifiPermission(context) && hasPhonePermission(context) -// } - - - /** - * 获取缺少的权限列表 + * 获取network缺少的权限列表 */ fun getMissingPermissions(context: Context): List { val permissions = mutableListOf() @@ -73,6 +45,7 @@ object PermissionChecker { Log.d("PermissionChecker", "missingPermissions: $permissions") return permissions } + fun requestSimple( activity: Activity, onGranted: () -> Unit = {}, diff --git a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/AppsFragment.kt b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/AppsFragment.kt index fcb3717..e8a5bd8 100644 --- a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/AppsFragment.kt +++ b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/AppsFragment.kt @@ -7,6 +7,8 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.LinearLayoutManager +import com.xyzshell.andinfo.AndInfo +import com.xyzshell.andinfo.libs.AppDetails import com.xyzshell.myphoneinfo.R import com.xyzshell.myphoneinfo.adapter.AppListAdapter import com.xyzshell.myphoneinfo.databinding.FragmentAppsBinding @@ -30,6 +32,9 @@ class AppsFragment : Fragment(),AppListAdapter.OnShowDialogListener { // Inflate the layout for this fragment binding = FragmentAppsBinding.inflate(inflater, container, false) val adapter= AppListAdapter() + val installedApps = AndInfo.instance.app.getInstalledApps() + val userSize=installedApps.size + adapter.setList(installedApps) adapter.setOnclickListener(this) binding.recyclerView.adapter = adapter binding.recyclerView.layoutManager = LinearLayoutManager(requireContext()) @@ -37,10 +42,10 @@ class AppsFragment : Fragment(),AppListAdapter.OnShowDialogListener { bottomDialog= BottomDialogFragment(type = "apps", sel = sel, invoke = {item-> sel = item binding.tvTitle.text=when(item){ - 0 -> "User(23)" + 0 -> "User$userSize" 1 -> "System(23)" 2 -> "All(23)" - else -> "User" + else -> "None" } }) Log.d("sel", sel.toString()) @@ -60,8 +65,9 @@ class AppsFragment : Fragment(),AppListAdapter.OnShowDialogListener { } } - override fun onShowAppSelectDialog() { + override fun onShowAppSelectDialog(item: AppDetails) { dialogFragment = AppDialogFragment() + dialogFragment.show(requireActivity().supportFragmentManager, "AppDialogFragment") } } \ No newline at end of file diff --git a/myphoneinfo/src/main/res/layout/activity_colors.xml b/myphoneinfo/src/main/res/layout/activity_colors.xml index 6b5afae..f811c2e 100644 --- a/myphoneinfo/src/main/res/layout/activity_colors.xml +++ b/myphoneinfo/src/main/res/layout/activity_colors.xml @@ -19,7 +19,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/does_everything" - style="@style/TextSecondaryTitle" + style="@style/TextHeavy20" android:textColor="@color/white" android:layout_marginBottom="28dp" /> @@ -29,7 +29,7 @@ android:layout_marginBottom="18dp" android:orientation="horizontal"> + style="@style/TextHeavy20"/> + style="@style/LeftContent"/> + style="@style/LeftContent"/> + style="@style/TextHeavy20"/> @@ -53,7 +53,7 @@ android:id="@+id/textMore2" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/TextDialogLabel" + style="@style/LeftContent" android:textStyle="bold" android:text="@string/reset_"/> @@ -80,7 +80,7 @@ android:id="@+id/textMore3" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/TextDialogLabel" + style="@style/LeftContent" android:textStyle="bold" android:text="@string/export"/> @@ -102,7 +102,7 @@ android:id="@+id/textMore4" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/TextDialogLabel" + style="@style/LeftContent" android:textStyle="bold" android:text="@string/share"/> @@ -124,7 +124,7 @@ android:id="@+id/textMore5" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/TextDialogLabel" + style="@style/LeftContent" android:textStyle="bold" android:text="@string/faq"/> @@ -146,7 +146,7 @@ android:id="@+id/textMore6" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/TextDialogLabel" + style="@style/LeftContent" android:textStyle="bold" android:text="@string/about"/> diff --git a/myphoneinfo/src/main/res/layout/activity_temperature.xml b/myphoneinfo/src/main/res/layout/activity_temperature.xml index b358d46..5b0dad7 100644 --- a/myphoneinfo/src/main/res/layout/activity_temperature.xml +++ b/myphoneinfo/src/main/res/layout/activity_temperature.xml @@ -36,7 +36,7 @@ android:text="@string/temperatures" android:textStyle="normal" android:layout_marginStart="5dp" - style="@style/TextTool25"/> + style="@style/TextHeavy20"/> + style="@style/LeftContent"/> + android:textColor="@color/black" + style="@style/TextHeavy20"/> @@ -209,7 +220,7 @@ android:layout_height="wrap_content" android:text="5.0 cm" android:textStyle="normal" - style="@style/TextSecondaryTitle" + style="@style/TextHeavy20" android:textSize="59sp" /> @@ -229,7 +240,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Far" - style="@style/TextSecondaryTitle" + style="@style/TextHeavy20" android:textStyle="normal" android:textColor="@color/right_color" /> @@ -239,7 +250,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cover_the_top" - style="@style/TextSecondaryTitle" + style="@style/TextHeavy20" android:textStyle="normal" android:textColor="@color/right_color" /> @@ -260,7 +271,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/is_it_working" - style="@style/TextSecondaryTitle" + style="@style/TextHeavy20" + android:textSize="16sp" android:textColor="@color/right_color" android:layout_marginBottom="28dp" /> @@ -269,10 +281,11 @@ android:layout_height="wrap_content" android:orientation="horizontal"> @@ -281,10 +294,11 @@ android:layout_height="1dp" android:layout_weight="1"/> diff --git a/myphoneinfo/src/main/res/layout/activity_tools.xml b/myphoneinfo/src/main/res/layout/activity_tools.xml index 6af8e62..13e2b6b 100644 --- a/myphoneinfo/src/main/res/layout/activity_tools.xml +++ b/myphoneinfo/src/main/res/layout/activity_tools.xml @@ -57,7 +57,7 @@ android:text="@string/device_is_not" android:textAlignment="center" android:paddingBottom="48dp" - style="@style/TextTool25"/> + style="@style/TextHeavy20"/> @@ -25,7 +25,7 @@ android:id="@+id/num" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/TextSecondaryTitle" + style="@style/TextHeavy20" android:textColor="@color/white" android:text="8" android:textAlignment="center" @@ -41,7 +41,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/is_it_working" - style="@style/TextSecondaryTitle" + style="@style/TextHeavy20" android:textColor="@color/white" android:layout_marginBottom="28dp" /> @@ -51,7 +51,7 @@ android:layout_marginBottom="18dp" android:orientation="horizontal"> @@ -27,7 +27,7 @@ android:id="@+id/num" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/TextSecondaryTitle" + style="@style/TextHeavy20" android:textColor="@color/white" android:text="8" android:textAlignment="center" @@ -128,7 +128,7 @@ + android:text="Read call status and mobile network information" + android:textSize="12sp" + android:textColor="@color/color_red" /> \ No newline at end of file diff --git a/myphoneinfo/src/main/res/layout/common_check_style2.xml b/myphoneinfo/src/main/res/layout/common_check_style2.xml new file mode 100644 index 0000000..98252f3 --- /dev/null +++ b/myphoneinfo/src/main/res/layout/common_check_style2.xml @@ -0,0 +1,25 @@ + + + + + + + \ No newline at end of file diff --git a/myphoneinfo/src/main/res/layout/common_check_style3.xml b/myphoneinfo/src/main/res/layout/common_check_style3.xml new file mode 100644 index 0000000..a111c68 --- /dev/null +++ b/myphoneinfo/src/main/res/layout/common_check_style3.xml @@ -0,0 +1,25 @@ + + + + + + + \ No newline at end of file diff --git a/myphoneinfo/src/main/res/layout/common_dialog_item.xml b/myphoneinfo/src/main/res/layout/common_dialog_item.xml index d8ede61..119fdeb 100644 --- a/myphoneinfo/src/main/res/layout/common_dialog_item.xml +++ b/myphoneinfo/src/main/res/layout/common_dialog_item.xml @@ -9,7 +9,7 @@ - - + app:layout_constraintTop_toTopOf="@id/image_icon" + app:layout_constraintBottom_toBottomOf="@id/image_icon"/> @@ -49,7 +43,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/tv1" - app:valueText="com.bjbyhd.screenreader-huawei" + app:valueText="" app:labelText="@string/package_name"/> + android:text="@string/permissions" /> - - + android:textColor="#878787" /> + + + + + + + + + + + + android:textColor="#878787" /> + + + - - - - - - - - - - + app:layout_constraintTop_toBottomOf="@id/contentContainer" + app:layout_constraintBottom_toBottomOf="parent" + android:layout_marginBottom="10dp" + android:orientation="horizontal"> + + + + diff --git a/myphoneinfo/src/main/res/layout/dialog_app_install.xml b/myphoneinfo/src/main/res/layout/dialog_app_install.xml index b02b11c..95d7fa5 100644 --- a/myphoneinfo/src/main/res/layout/dialog_app_install.xml +++ b/myphoneinfo/src/main/res/layout/dialog_app_install.xml @@ -22,7 +22,7 @@ diff --git a/myphoneinfo/src/main/res/layout/dialog_disk_part.xml b/myphoneinfo/src/main/res/layout/dialog_disk_part.xml index fed8a75..404e32c 100644 --- a/myphoneinfo/src/main/res/layout/dialog_disk_part.xml +++ b/myphoneinfo/src/main/res/layout/dialog_disk_part.xml @@ -21,7 +21,7 @@ android:orientation="vertical"> - + diff --git a/myphoneinfo/src/main/res/layout/item_list.xml b/myphoneinfo/src/main/res/layout/item_list.xml index 8dd9fc5..3190569 100644 --- a/myphoneinfo/src/main/res/layout/item_list.xml +++ b/myphoneinfo/src/main/res/layout/item_list.xml @@ -8,7 +8,7 @@ android:layout_height="wrap_content"> @@ -49,7 +49,7 @@ android:id="@+id/textSleep" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/TextDialogLabel" + style="@style/LeftContent" android:textStyle="bold" android:text="@string/hide_deep_sleep"/> @@ -79,7 +79,7 @@ android:id="@+id/textMore1" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/TextDialogLabel" + style="@style/LeftContent" android:textStyle="bold" android:text="@string/metric_units"/> @@ -98,7 +98,7 @@ android:id="@+id/textMore2" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/TextDialogLabel" + style="@style/LeftContent" android:textStyle="bold" android:text="@string/reset_"/> @@ -122,7 +122,7 @@ android:id="@+id/textMore3" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/TextDialogLabel" + style="@style/LeftContent" android:textStyle="bold" android:text="@string/export"/> @@ -141,7 +141,7 @@ android:id="@+id/textMore4" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/TextDialogLabel" + style="@style/LeftContent" android:textStyle="bold" android:text="@string/share"/> @@ -160,7 +160,7 @@ android:id="@+id/textMore5" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/TextDialogLabel" + style="@style/LeftContent" android:textStyle="bold" android:text="@string/faq"/> @@ -179,7 +179,7 @@ android:id="@+id/textMore6" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/TextDialogLabel" + style="@style/LeftContent" android:textStyle="bold" android:text="@string/about"/> diff --git a/myphoneinfo/src/main/res/mipmap-xhdpi/per_no.png b/myphoneinfo/src/main/res/mipmap-xhdpi/per_no.png index d24a3bf..00dd670 100644 Binary files a/myphoneinfo/src/main/res/mipmap-xhdpi/per_no.png and b/myphoneinfo/src/main/res/mipmap-xhdpi/per_no.png differ diff --git a/myphoneinfo/src/main/res/mipmap-xhdpi/per_special.png b/myphoneinfo/src/main/res/mipmap-xhdpi/per_special.png index f0ec807..9a23ee0 100644 Binary files a/myphoneinfo/src/main/res/mipmap-xhdpi/per_special.png and b/myphoneinfo/src/main/res/mipmap-xhdpi/per_special.png differ diff --git a/myphoneinfo/src/main/res/mipmap-xhdpi/per_yes.png b/myphoneinfo/src/main/res/mipmap-xhdpi/per_yes.png index df017f7..d33baf2 100644 Binary files a/myphoneinfo/src/main/res/mipmap-xhdpi/per_yes.png and b/myphoneinfo/src/main/res/mipmap-xhdpi/per_yes.png differ diff --git a/myphoneinfo/src/main/res/values/colors.xml b/myphoneinfo/src/main/res/values/colors.xml index 5213510..ca37d8f 100644 --- a/myphoneinfo/src/main/res/values/colors.xml +++ b/myphoneinfo/src/main/res/values/colors.xml @@ -6,7 +6,6 @@ #7F7F7F #1E8C29 #FFFFFF - #f4f4f4 #3B948A #484848 @@ -23,4 +22,8 @@ #F2F2F2 #C1C5C2 #C4DFDC + #EF4444 + #FFD54F + #3B948A + #F4F4F4 \ No newline at end of file diff --git a/myphoneinfo/src/main/res/values/strings.xml b/myphoneinfo/src/main/res/values/strings.xml index 9c801e5..c2221ee 100644 --- a/myphoneinfo/src/main/res/values/strings.xml +++ b/myphoneinfo/src/main/res/values/strings.xml @@ -63,6 +63,7 @@ Deep sleep: Cancel + Manage Settings Device Product @@ -233,9 +234,9 @@ Installed UID Permissions - = Allowed - = Special access - = Not allowed + Allowed + Special access + Not allowed Temperatures Magnetic field Orientation diff --git a/myphoneinfo/src/main/res/values/styles.xml b/myphoneinfo/src/main/res/values/styles.xml index e9a44d1..f6b59b2 100644 --- a/myphoneinfo/src/main/res/values/styles.xml +++ b/myphoneinfo/src/main/res/values/styles.xml @@ -6,187 +6,6 @@ false 14sp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -