Skip to content

A
appzxhy
Commit 8618a47a authored by wanglei's avatar wanglei
Browse files
Options

[拆包]拆包

parent 26faf931
Hide whitespace changes
Inline Side-by-side
Showing with 173 additions and 429 deletions
app/src/main/java/com/base/appzxhy/ui/batteryinfo/BatteryInfoActivity.kt
View file @ 8618a47a
...@@ -10,27 +10,11 @@ import com.base.appzxhy.base.BaseActivity ...@@ -10,27 +10,11 @@ import com.base.appzxhy.base.BaseActivity
import com.base.appzxhy.base.LottieEnum import com.base.appzxhy.base.LottieEnum
import com.base.appzxhy.bean.FeatureBean.Companion.BATTERY_INFO import com.base.appzxhy.bean.FeatureBean.Companion.BATTERY_INFO
import com.base.appzxhy.bean.FeatureBean.Companion.setFunctionTodayUsed import com.base.appzxhy.bean.FeatureBean.Companion.setFunctionTodayUsed
import com.base.appzxhy.business.ads.AdsMgr
import com.base.appzxhy.databinding.ActivityBatteryInfoBinding import com.base.appzxhy.databinding.ActivityBatteryInfoBinding
import com.base.appzxhy.utils.Utils import com.base.appzxhy.utils.Utils
class BatteryInfoActivity : BaseActivity<ActivityBatteryInfoBinding>(ActivityBatteryInfoBinding::inflate) { class BatteryInfoActivity : BaseActivity<ActivityBatteryInfoBinding>(ActivityBatteryInfoBinding::inflate) {
// private val concatAdapter = ConcatAdapter()
// private val batteryHeadAdapter = BatteryOtherAdapter(R.layout.item_battery_head)
// private val batteryElectricAdapter = BatteryOtherAdapter(R.layout.item_battery_electric)
// private val batteryInfoAdapter = BatteryInfoAdapter()
// private val adAdapter = AdAdapter(R.layout.item_ad)
private val batteryInfoList = listOf(
BatteryInfoBean(R.drawable.icon_good, "GOOD", "Battery Health"),
BatteryInfoBean(R.drawable.icon_mah, "0 mAh / 0 mAh", "Battery Capacity"),
BatteryInfoBean(R.drawable.icon_li, "Li-ion", "Battery Type"),
BatteryInfoBean(R.drawable.icon_mv, "3818 mV", "Voltage"),
// BatteryInfoBean(R.drawable.icon_electric_current, "NA", "Electric Current"),
// BatteryInfoBean(R.drawable.icon_current_average, "NA", "Current Average"),
)
private var batteryReceiver: BatteryReceiver? = null private var batteryReceiver: BatteryReceiver? = null
override fun onDestroy() { override fun onDestroy() {
...@@ -51,29 +35,10 @@ class BatteryInfoActivity : BaseActivity<ActivityBatteryInfoBinding>(ActivityBat ...@@ -51,29 +35,10 @@ class BatteryInfoActivity : BaseActivity<ActivityBatteryInfoBinding>(ActivityBat
override fun initView() { override fun initView() {
super.initView() super.initView()
showAdAnimation(LottieEnum.BATTERY_INFO_LOTTIE) { showAdAnimation(LottieEnum.BATTERY_INFO_LOTTIE) {
// adAdapter.submitList(listOf(""))
} }
AdsMgr.showNative(binding.flAd, R.layout.layout_admob_native_custom)
batteryReceiver = BatteryReceiver { updateBatteryInfo() } batteryReceiver = BatteryReceiver { updateBatteryInfo() }
registerReceiver(batteryReceiver, IntentFilter(Intent.ACTION_BATTERY_CHANGED)) registerReceiver(batteryReceiver, IntentFilter(Intent.ACTION_BATTERY_CHANGED))
// binding.rv.adapter = concatAdapter
// concatAdapter.addAdapter(batteryHeadAdapter)
// batteryHeadAdapter.submitList(
// listOf(BatteryOtherBean(hashMapOf()))
// )
//
// if (AdConfigBean.adsConfigBean.isAdShow) {
// concatAdapter.addAdapter(adAdapter)
// }
// concatAdapter.addAdapter(batteryInfoAdapter)
// batteryInfoAdapter.submitList(listOf(batteryInfoList))
//
// concatAdapter.addAdapter(batteryElectricAdapter)
// batteryElectricAdapter.submitList(
// listOf(BatteryOtherBean(hashMapOf()))
// )
setFunctionTodayUsed(BATTERY_INFO) setFunctionTodayUsed(BATTERY_INFO)
} }
...@@ -94,77 +59,32 @@ class BatteryInfoActivity : BaseActivity<ActivityBatteryInfoBinding>(ActivityBat ...@@ -94,77 +59,32 @@ class BatteryInfoActivity : BaseActivity<ActivityBatteryInfoBinding>(ActivityBat
val temperature = Utils.divide(BatteryReceiver.temperature, 10) val temperature = Utils.divide(BatteryReceiver.temperature, 10)
val voltage = Utils.divide(BatteryReceiver.voltage, 1000) val voltage = Utils.divide(BatteryReceiver.voltage, 1000)
binding.tvBattery.text = "${battery}%" binding.tvBattery.text = "${battery}%"
binding.tvStandbyHour.text = "%02d".format(wTime / 60) // binding.tvStandbyHour.text = "%02d".format(wTime / 60)
binding.tvStandbyMinute.text = "%02d".format(wTime % 60) // binding.tvStandbyMinute.text = "%02d".format(wTime % 60)
binding.tvVideoHour.text = "%02d".format(vTime / 60) // binding.tvVideoHour.text = "%02d".format(vTime / 60)
binding.tvVideoMinute.text = "%02d".format(vTime % 60) // binding.tvVideoMinute.text = "%02d".format(vTime % 60)
binding.tvMusicHour.text = "%02d".format(mTime / 60) // binding.tvMusicHour.text = "%02d".format(mTime / 60)
binding.tvMusicMinute.text = "%02d".format(mTime % 60) // binding.tvMusicMinute.text = "%02d".format(mTime % 60)
binding.tvTemperature.text = "$temperature℃" binding.tvTemperature.text = "$temperature℃"
binding.tvVoltage.text = "${voltage}V" binding.tvVoltage.text = "${voltage}V"
binding.tvPower.text = "${(BatteryReceiver.mAh * percent).toInt()}mAh" binding.tvCapacity1.text = "${(BatteryReceiver.mAh * percent).toInt()}mAh"
binding.tvBatteryType.text = BatteryReceiver.technology binding.tvCapacity2.text = "${(BatteryReceiver.mAh * percent).toInt()}mAh"
binding.tvBatteryCapacity.text = "${BatteryReceiver.mAh.toInt()}mAh" // binding.tvBatteryType.text = BatteryReceiver.technology
binding.tvBatteryStatus.text = getString(if (BatteryReceiver.isCharging) R.string.charging else R.string.normal) // binding.tvBatteryCapacity.text = "${BatteryReceiver.mAh.toInt()}mAh"
val resource = if (battery > 80) { // binding.tvBatteryStatus.text = getString(if (BatteryReceiver.isCharging) R.string.charging else R.string.normal)
R.drawable.dianchi100 // val resource = if (battery > 80) {
} else if (battery > 60) { // R.drawable.dianchi100
R.drawable.dianchi80 // } else if (battery > 60) {
} else if (battery > 40) { // R.drawable.dianchi80
R.drawable.dianchi60 // } else if (battery > 40) {
} else if (battery > 20) { // R.drawable.dianchi60
R.drawable.dianchi40 // } else if (battery > 20) {
} else { // R.drawable.dianchi40
R.drawable.dianchi20 // } else {
} // R.drawable.dianchi20
binding.ivBattery.setImageResource(resource) // }
// binding.ivBattery.setImageResource(resource)
} }
// private fun updateBatteryInfo() {
// val percent = BatteryReceiver.level / BatteryReceiver.scale.toFloat()
// val remainingCapacity = BatteryReceiver.mAh * percent
// val wTime = (remainingCapacity / 3.0f).toInt()
//
// batteryHeadAdapter.submitList(
// listOf(
// BatteryOtherBean(
// HashMap<String, Any>().apply {
// put("hour", wTime / 60)
// put("min", wTime % 60)
// }
// )
// )
// )
//
//
// batteryInfoList[1].tvValue = "${remainingCapacity.toInt()} / ${BatteryReceiver.mAh.toInt()} mAh"
//
// val voltage = Utils.divide(BatteryReceiver.voltage, 1)
// batteryInfoList[3].tvValue = "$voltage mV"
//
//
// batteryInfoAdapter.submitList(listOf(batteryInfoList))
//
// var current1 = BatteryReceiver.mA
// if (current1 == 0f) {
// current1 = Random.nextInt(50, 350).toFloat()
// }
// var current2 = BatteryReceiver.avmA
// if (current2 == 0f) {
// current2 = Random.nextInt(50, 300).toFloat()
// }
//
// LogEx.logDebug(TAG, "current1=$current1 current2=$current2")
// batteryElectricAdapter.submitList(
// listOf(
// BatteryOtherBean(
// HashMap<String, Any>().apply {
// put("current1", current1)
// put("current2", current2)
// }
// )
// )
// )
//
// }
} }
\ No newline at end of file
app/src/main/res/drawable/bg_f8f5ff_12.xml 0 → 100644
View file @ 8618a47a
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#F8F5FF"/>
<corners android:radius="@dimen/dp_12"/>
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_battery_info.xml
View file @ 8618a47a
...@@ -59,37 +59,36 @@ ...@@ -59,37 +59,36 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/cl_top"> app:layout_constraintTop_toBottomOf="@id/cl_top">
<androidx.constraintlayout.widget.ConstraintLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:paddingBottom="@dimen/dp_20" android:layout_height="wrap_content"
android:layout_height="wrap_content"> android:orientation="vertical"
android:paddingBottom="@dimen/dp_20">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_battery" android:id="@+id/cl_battery"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/colorPrimary"
android:paddingBottom="85dp"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_battery" android:id="@+id/iv_battery"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="40dp" android:layout_marginTop="@dimen/dp_16"
android:src="@drawable/dianchi20" android:src="@drawable/dianchi"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_battery" android:id="@+id/tv_battery"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:text="0%" android:text="0%"
android:textColor="#ffffff" android:textColor="@color/black"
android:textSize="36sp" android:textSize="36sp"
app:layout_constraintBottom_toBottomOf="@id/iv_battery" app:layout_constraintBottom_toBottomOf="@id/iv_battery"
app:layout_constraintEnd_toEndOf="@id/iv_battery" app:layout_constraintEnd_toEndOf="@id/iv_battery"
...@@ -97,204 +96,45 @@ ...@@ -97,204 +96,45 @@
app:layout_constraintTop_toTopOf="@id/iv_battery" app:layout_constraintTop_toTopOf="@id/iv_battery"
tools:ignore="HardcodedText,TextContrastCheck" /> tools:ignore="HardcodedText,TextContrastCheck" />
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_40"
android:orientation="horizontal"
android:paddingHorizontal="38dp"
app:layout_constraintTop_toBottomOf="@id/iv_battery">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_daiji_battery" />
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_standby_hour"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="32"
android:textColor="@color/white"
android:textSize="18sp"
tools:ignore="HardcodedText,TextContrastCheck" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="h"
android:textColor="@color/white"
android:textSize="14sp"
tools:ignore="HardcodedText,TextContrastCheck" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_standby_minute"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="24"
android:textColor="@color/white"
android:textSize="18sp"
tools:ignore="HardcodedText,TextContrastCheck" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="m"
android:textColor="@color/white"
android:textSize="14sp"
tools:ignore="HardcodedText,TextContrastCheck" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_video_battery" />
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_video_hour"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="32"
android:textColor="@color/white"
android:textSize="18sp"
tools:ignore="HardcodedText,TextContrastCheck" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="h"
android:textColor="@color/white"
android:textSize="14sp"
tools:ignore="HardcodedText,TextContrastCheck" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_video_minute"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="24"
android:textColor="@color/white"
android:textSize="18sp"
tools:ignore="HardcodedText,TextContrastCheck" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="m"
android:textColor="@color/white"
android:textSize="14sp"
tools:ignore="HardcodedText,TextContrastCheck" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat </androidx.constraintlayout.widget.ConstraintLayout>
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatImageView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/icon_music_battery" /> android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_20"
android:text="Good"
android:textColor="@color/colorPrimary"
android:textSize="@dimen/sp_30"
android:textStyle="bold" />
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_8"
<androidx.appcompat.widget.AppCompatTextView android:text="@string/battery_status"
android:id="@+id/tv_music_hour" android:textColor="@color/color_181b1f"
android:layout_width="wrap_content" android:textSize="18sp"
android:layout_height="wrap_content" android:textStyle="bold" />
android:text="32"
android:textColor="@color/white"
android:textSize="18sp"
tools:ignore="HardcodedText,TextContrastCheck" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="h"
android:textColor="@color/white"
android:textSize="14sp"
tools:ignore="HardcodedText,TextContrastCheck" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_music_minute"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="24"
android:textColor="@color/white"
android:textSize="18sp"
tools:ignore="HardcodedText,TextContrastCheck" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="m"
android:textColor="@color/white"
android:textSize="14sp"
tools:ignore="HardcodedText,TextContrastCheck" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/ll_battery_status" android:id="@+id/ll_battery_status"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp" android:layout_marginHorizontal="15dp"
android:layout_marginTop="-65dp" android:layout_marginTop="@dimen/dp_30"
android:background="@drawable/white_background" android:background="@drawable/bg_f8f5ff_12"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@id/cl_battery"> app:layout_constraintTop_toBottomOf="@id/cl_battery">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
android:text="@string/battery_status"
android:textColor="@color/color_181b1f"
android:textSize="18sp"
android:textStyle="bold" />
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/ll_battery_type" android:id="@+id/ll_battery_type"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingHorizontal="30dp" android:paddingHorizontal="30dp"
android:paddingBottom="24dp"> android:paddingBottom="24dp">
...@@ -376,7 +216,7 @@ ...@@ -376,7 +216,7 @@
android:src="@drawable/icon_ah_battery" /> android:src="@drawable/icon_ah_battery" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_power" android:id="@+id/tvCapacity1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
...@@ -399,174 +239,150 @@ ...@@ -399,174 +239,150 @@
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
<com.base.appzxhy.business.ads.NativeParentView <TextView
android:id="@+id/flAd" android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp" android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="10dp" android:layout_marginTop="@dimen/dp_20"
app:layout_constraintTop_toBottomOf="@id/ll_battery_status"> android:text="Battery system information"
android:textColor="#1A1A1A"
<ImageView android:textSize="@dimen/sp_16"
android:layout_width="match_parent" android:textStyle="bold" />
android:layout_height="wrap_content"
android:src="@drawable/zhanwei1" <LinearLayout
tools:ignore="ContentDescription,ImageContrastCheck" /> android:layout_width="match_parent"
</com.base.appzxhy.business.ads.NativeParentView>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_health"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="15dp" android:layout_marginHorizontal="@dimen/dp_16"
android:layout_marginTop="11dp" android:layout_marginTop="@dimen/dp_16"
android:layout_marginEnd="5dp" android:layout_marginBottom="@dimen/dp_12"
android:background="@drawable/white_background" android:gravity="center_vertical"
android:paddingHorizontal="20dp" android:orientation="horizontal">
android:paddingVertical="16dp"
app:layout_constraintEnd_toStartOf="@id/cl_battery_status"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/flAd">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/tv_health_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/health" app:srcCompat="@drawable/icon_health" />
android:textColor="@color/color_aeb4bd"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="TextContrastCheck" />
<androidx.appcompat.widget.AppCompatTextView <TextView
android:id="@+id/tv_health" android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_8"
android:layout_weight="1"
android:includeFontPadding="false"
android:text="Health"
android:textColor="#1A1A1A"
android:textSize="@dimen/sp_14" />
<TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:text="Good"
android:text="@string/good" android:textColor="#1A1A1A"
android:textColor="@color/color_666666" android:textSize="@dimen/sp_14"
android:textSize="16sp" android:textStyle="bold" />
android:textStyle="bold" </LinearLayout>
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_health_content" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <LinearLayout
android:id="@+id/cl_battery_status" android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="5dp" android:layout_marginHorizontal="@dimen/dp_16"
android:layout_marginTop="11dp" android:layout_marginTop="@dimen/dp_16"
android:layout_marginEnd="15dp" android:layout_marginBottom="@dimen/dp_12"
android:background="@drawable/white_background" android:gravity="center_vertical"
android:paddingHorizontal="20dp" android:orientation="horizontal">
android:paddingVertical="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/cl_health"
app:layout_constraintTop_toBottomOf="@id/flAd">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/tv_battery_status_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/battery_status" app:srcCompat="@drawable/icon_status" />
android:textColor="@color/color_aeb4bd"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="TextContrastCheck" />
<androidx.appcompat.widget.AppCompatTextView <TextView
android:id="@+id/tv_battery_status" android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_8"
android:layout_weight="1"
android:includeFontPadding="false"
android:text="Battery Status"
android:textColor="#1A1A1A"
android:textSize="@dimen/sp_14" />
<TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:text="Normal"
android:text="@string/normal" android:textColor="#1A1A1A"
android:textColor="@color/color_666666" android:textSize="@dimen/sp_14"
android:textSize="16sp" android:textStyle="bold" />
android:textStyle="bold" </LinearLayout>
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_battery_status_content" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <LinearLayout
android:id="@+id/cl_battery_type" android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="15dp" android:layout_marginHorizontal="@dimen/dp_16"
android:layout_marginTop="11dp" android:layout_marginTop="@dimen/dp_16"
android:layout_marginEnd="5dp" android:layout_marginBottom="@dimen/dp_12"
android:background="@drawable/white_background" android:gravity="center_vertical"
android:paddingHorizontal="20dp" android:orientation="horizontal">
android:paddingVertical="16dp"
app:layout_constraintEnd_toStartOf="@id/cl_battery_capacity"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cl_health">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/tv_battery_type_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/battery_type" app:srcCompat="@drawable/icon_type" />
android:textColor="@color/color_aeb4bd"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView <TextView
android:id="@+id/tv_battery_type" android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_8"
android:layout_weight="1"
android:includeFontPadding="false"
android:text="Battery Type"
android:textColor="#1A1A1A"
android:textSize="@dimen/sp_14" />
<TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="Li-poly" android:text="Li-poly"
android:textColor="@color/color_666666" android:textColor="#1A1A1A"
android:textSize="16sp" android:textSize="@dimen/sp_14"
android:textStyle="bold" android:textStyle="bold" />
app:layout_constraintStart_toStartOf="parent" </LinearLayout>
app:layout_constraintTop_toBottomOf="@id/tv_battery_type_content"
tools:ignore="HardcodedText" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <LinearLayout
android:id="@+id/cl_battery_capacity" android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="5dp" android:layout_marginHorizontal="@dimen/dp_16"
android:layout_marginTop="11dp" android:layout_marginTop="@dimen/dp_16"
android:layout_marginEnd="15dp" android:layout_marginBottom="@dimen/dp_12"
android:background="@drawable/white_background" android:gravity="center_vertical"
android:paddingHorizontal="20dp" android:orientation="horizontal">
android:paddingVertical="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/cl_battery_type"
app:layout_constraintTop_toBottomOf="@id/cl_battery_status">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/tv_battery_capacity_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/battery_capacity" app:srcCompat="@drawable/icon_capacity" />
android:textColor="@color/color_aeb4bd"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView <TextView
android:id="@+id/tv_battery_capacity" android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_8"
android:layout_weight="1"
android:includeFontPadding="false"
android:text="Battery Capacity"
android:textColor="#1A1A1A"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tvCapacity2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:text="Good"
android:text="4900mAh" android:textColor="#1A1A1A"
android:textColor="@color/color_666666" android:textSize="@dimen/sp_14"
android:textSize="16sp" android:textStyle="bold" />
android:textStyle="bold" </LinearLayout>
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_battery_capacity_content"
tools:ignore="HardcodedText" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
......
app/src/main/res/values/colors.xml
View file @ 8618a47a
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<color name="white">#FFFFFFFF</color> <color name="white">#FFFFFFFF</color>
<color name="transparent">#00000000</color> <color name="transparent">#00000000</color>
<color name="colorPrimary">#5C1FED</color> <color name="colorPrimary">#5C1FED</color>
<color name="colorDisEnable">#F0F3FA</color> <color name="colorDisEnable">#EFEBFA</color>
<color name="color_66000000">#66000000</color> <color name="color_66000000">#66000000</color>
<color name="color_1a1a1a">#1A1A1A</color> <color name="color_1a1a1a">#1A1A1A</color>
......
app/src/main/res/values/dimens.xml
View file @ 8618a47a
...@@ -73,4 +73,5 @@ ...@@ -73,4 +73,5 @@
<dimen name="dp_52">52dp</dimen> <dimen name="dp_52">52dp</dimen>
<dimen name="dp_120">120dp</dimen> <dimen name="dp_120">120dp</dimen>
<dimen name="sp_32">32sp</dimen> <dimen name="sp_32">32sp</dimen>
<dimen name="sp_30">30sp</dimen>
</resources> </resources>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment