Skip to content

A
appzxhy
Commit 8334eeb2 authored by wanglei's avatar wanglei
Browse files
Options

[拆包]修改电池信息界面

parent f784fd90
Hide whitespace changes
Inline Side-by-side
Showing with 443 additions and 139 deletions
app/src/main/java/com/base/appzxhy/business/helper/NewComUtils.kt
View file @ 8334eeb2
......@@ -115,7 +115,6 @@ object NewComUtils {
handleCfgCallBack()
}
override fun onResponse(call: Call, response: Response) {
if (response.isSuccessful) {
......
app/src/main/java/com/base/appzxhy/business/service/StayJobService.kt
View file @ 8334eeb2
......@@ -114,7 +114,7 @@ class StayJobService : JobService() {
return false
}
val notifyInterval = if (BuildConfig.DEBUG) 5000L else PopupConfigBean.popupConfigBean.notifyForegroundInterval
val notifyInterval = if (BuildConfig.DEBUG) 1000L else PopupConfigBean.popupConfigBean.notifyForegroundInterval
private inner class Timer() : CountDownTimer(notifyInterval, 1000) {
override fun onTick(millisUntilFinished: Long) {
......
app/src/main/java/com/base/appzxhy/business/service/StayNotification.kt
View file @ 8334eeb2
......@@ -13,10 +13,11 @@ import android.widget.RemoteViews
import androidx.core.app.NotificationCompat
import androidx.core.graphics.drawable.IconCompat
import com.base.appzxhy.R
import com.base.appzxhy.bean.FeatureBean.Companion.ANTIVIRUS
import com.base.appzxhy.bean.FeatureBean.Companion.BATTERY_INFO
import com.base.appzxhy.bean.FeatureBean.Companion.JUNK_CLEAN
import com.base.appzxhy.bean.FeatureBean.Companion.RECOVERY_DOCUMENTS
import com.base.appzxhy.bean.FeatureBean.Companion.RECOVERY_PHOTOS
import com.base.appzxhy.bean.FeatureBean.Companion.RECOVERY_VIDEOS
import com.base.appzxhy.bean.FeatureBean.Companion.LARGE_FILE_CLEAN
import com.base.appzxhy.bean.FeatureBean.Companion.getFunctionTodayUsed
import com.base.appzxhy.ui.main.MainActivity
import com.base.appzxhy.ui.splash.SplashActivity
import kotlin.random.Random
......@@ -26,20 +27,38 @@ object StayNotification {
private fun customRemoteViews(context: Context, contentView: RemoteViews, expendView: RemoteViews) {
arrayOf(R.id.llClean, R.id.llVideo, R.id.llPhoto, R.id.llDocument).forEach {
val img1 = if (getFunctionTodayUsed(JUNK_CLEAN)) R.drawable.icon_clean_push_s else R.drawable.icon_clean_push_s_r
val img2 = if (getFunctionTodayUsed(ANTIVIRUS)) R.drawable.icon_antivirus_push_s else R.drawable.icon_antivirus_push_s_r
val img3 = if (getFunctionTodayUsed(BATTERY_INFO)) R.drawable.icon_battery_push_s else R.drawable.icon_battery_push_s_r
val img4 =
if (getFunctionTodayUsed(LARGE_FILE_CLEAN)) R.drawable.icon_large_file_clean_push_s else R.drawable.icon_large_file_clean_push_s_r
contentView.setImageViewResource(R.id.iv1, img1)
contentView.setImageViewResource(R.id.iv2, img2)
contentView.setImageViewResource(R.id.iv3, img3)
contentView.setImageViewResource(R.id.iv4, img4)
expendView.setImageViewResource(R.id.iv1, img1)
expendView.setImageViewResource(R.id.iv2, img2)
expendView.setImageViewResource(R.id.iv3, img3)
expendView.setImageViewResource(R.id.iv4, img4)
arrayOf(R.id.ll1, R.id.ll2, R.id.ll3, R.id.ll4).forEach {
val requestCode = Random.nextInt(1800)
val intent = Intent(context, SplashActivity::class.java).apply {
if (it == R.id.llClean) {
if (it == R.id.ll1) {
putExtra("actionId", JUNK_CLEAN)
}
if (it == R.id.llVideo) {
putExtra("actionId", RECOVERY_VIDEOS)
if (it == R.id.ll2) {
putExtra("actionId", ANTIVIRUS)
}
if (it == R.id.llPhoto) {
putExtra("actionId", RECOVERY_PHOTOS)
if (it == R.id.ll3) {
putExtra("actionId", BATTERY_INFO)
}
if (it == R.id.llDocument) {
putExtra("actionId", RECOVERY_DOCUMENTS)
if (it == R.id.ll4) {
putExtra("actionId", LARGE_FILE_CLEAN)
}
}
val pendingIntent =
......
app/src/main/java/com/base/appzxhy/ui/adapter/AdAdapter.kt
View file @ 8334eeb2
......@@ -17,7 +17,9 @@ class AdAdapter(
item ?: return
val flAd: NativeParentView? = holder.itemView.findViewById(R.id.flAd)
flAd?.let { AdsMgr.showNative(it, R.layout.layout_admob_native_custom) }
flAd?.let {
AdsMgr.showNative(it, R.layout.layout_admob_native_custom)
}
}
override fun onCreateViewHolder(
......
app/src/main/java/com/base/appzxhy/ui/batteryinfo/BatteryInfoActivity.kt
View file @ 8334eeb2
......@@ -2,18 +2,26 @@ package com.base.appzxhy.ui.batteryinfo
import android.content.Intent
import android.content.IntentFilter
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.recyclerview.widget.ConcatAdapter
import com.base.appzxhy.R
import com.base.appzxhy.base.BaseActivity
import com.base.appzxhy.base.LottieEnum
import com.base.appzxhy.bean.FeatureBean.Companion.BATTERY_INFO
import com.base.appzxhy.bean.FeatureBean.Companion.setFunctionTodayUsed
import com.base.appzxhy.bean.config.AdConfigBean
import com.base.appzxhy.databinding.ActivityBatteryInfo2Binding
import com.base.appzxhy.ui.adapter.AdAdapter
import com.base.appzxhy.utils.LogEx
import com.base.appzxhy.utils.Utils
import kotlin.random.Random
class BatteryInfoActivity : BaseActivity<ActivityBatteryInfo2Binding>(ActivityBatteryInfo2Binding::inflate) {
private val concatAdapter = ConcatAdapter()
private val batteryHeadAdapter = BatteryHeadAdapter()
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)
......@@ -22,8 +30,8 @@ class BatteryInfoActivity : BaseActivity<ActivityBatteryInfo2Binding>(ActivityBa
BatteryInfoBean(R.drawable.icon_voltage, "3.6V", "Voltage"),
BatteryInfoBean(R.drawable.icon_technology, "Li-Poly", "Technology"),
BatteryInfoBean(R.drawable.icon_battery, "0mAh", "Battery Capacity"),
BatteryInfoBean(R.drawable.icon_electric_current, "NA", "Electric Current"),
BatteryInfoBean(R.drawable.icon_current_average, "NA", "Current Average"),
// BatteryInfoBean(R.drawable.icon_electric_current, "NA", "Electric Current"),
// BatteryInfoBean(R.drawable.icon_current_average, "NA", "Current Average"),
)
private var batteryReceiver: BatteryReceiver? = null
......@@ -33,6 +41,16 @@ class BatteryInfoActivity : BaseActivity<ActivityBatteryInfo2Binding>(ActivityBa
batteryReceiver?.let { unregisterReceiver(batteryReceiver) }
}
override fun useDefaultImmersive() {
ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets ->
val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
v.setPadding(systemBars.left, 0, systemBars.right, systemBars.bottom)
binding.clTop.setPadding(0, systemBars.top, 0, 0)
insetsCallBack?.invoke(systemBars)
insets
}
}
override fun initView() {
super.initView()
showAdAnimation(LottieEnum.BATTERY_INFO_LOTTIE) {
......@@ -44,12 +62,21 @@ class BatteryInfoActivity : BaseActivity<ActivityBatteryInfo2Binding>(ActivityBa
binding.rv.adapter = concatAdapter
concatAdapter.addAdapter(batteryHeadAdapter)
batteryHeadAdapter.submitList(
listOf(BatteryHead(1, 0))
listOf(BatteryOtherBean(hashMapOf()))
)
concatAdapter.addAdapter(adAdapter)
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)
}
override fun initListener() {
......@@ -101,7 +128,12 @@ class BatteryInfoActivity : BaseActivity<ActivityBatteryInfo2Binding>(ActivityBa
batteryHeadAdapter.submitList(
listOf(
BatteryHead(wTime / 60, wTime % 60)
BatteryOtherBean(
HashMap<String, Any>().apply {
put("hour", wTime / 60)
put("min", wTime % 60)
}
)
)
)
......@@ -113,13 +145,30 @@ class BatteryInfoActivity : BaseActivity<ActivityBatteryInfo2Binding>(ActivityBa
batteryInfoList[1].tvValue = "${voltage}V"
batteryInfoList[3].tvValue = "${(BatteryReceiver.mAh * percent).toInt()}mAh"
batteryInfoList[4].tvValue = "${BatteryReceiver.mA.toInt()}mA"
batteryInfoList[5].tvValue = "${BatteryReceiver.avmA.toInt()}mA"
batteryInfoAdapter.submitList(
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(
batteryInfoList
BatteryOtherBean(
HashMap<String, Any>().apply {
put("current1", current1)
put("current2", current2)
}
)
)
)
}
}
\ No newline at end of file
app/src/main/java/com/base/appzxhy/ui/batteryinfo/BatteryHeadAdapter.kt → app/src/main/java/com/base/appzxhy/ui/batteryinfo/BatteryOtherAdapter.kt
View file @ 8334eeb2
......@@ -8,33 +8,56 @@ import android.text.style.AbsoluteSizeSpan
import android.text.style.StyleSpan
import android.view.ViewGroup
import com.base.appzxhy.R
import com.base.appzxhy.databinding.ItemBatteryElectricBinding
import com.base.appzxhy.databinding.ItemBatteryHeadBinding
import com.base.appzxhy.ui.adapter.CommonViewHolder
import com.base.appzxhy.utils.XmlEx.inflate
import com.chad.library.adapter4.BaseQuickAdapter
class BatteryHead(
val hour: Int,
val min: Int,
class BatteryOtherBean(
val map: HashMap<String, Any>,
)
class BatteryHeadAdapter : BaseQuickAdapter<BatteryHead, CommonViewHolder>() {
class BatteryOtherAdapter(
val layout: Int
) : BaseQuickAdapter<BatteryOtherBean, CommonViewHolder>() {
override fun onBindViewHolder(
holder: CommonViewHolder,
position: Int,
item: BatteryHead?
item: BatteryOtherBean?
) {
item ?: return
val binding = ItemBatteryHeadBinding.bind(holder.itemView)
val h = if (item.hour < 10) "0${item.hour}" else item.hour.toString()
val min = if (item.min < 10) "0${item.min}" else item.min.toString()
val text1 = "$h h "
val text2 = "$min m"
when (layout) {
R.layout.item_battery_head -> {
val binding = ItemBatteryHeadBinding.bind(holder.itemView)
val hour = (item.map["hour"] as Int?) ?: 0
val min = (item.map["min"] as Int?) ?: 0
val h = if (hour < 10) "0${hour}" else hour.toString()
val m = if (min < 10) "0${min}" else min.toString()
val text1 = "$h h "
val text2 = "$m m"
binding.tvTime.text = buildSpannableString(text1, h)
binding.tvTime.append(buildSpannableString(text2, m))
}
R.layout.item_battery_electric -> {
val binding = ItemBatteryElectricBinding.bind(holder.itemView)
val current1 = "%.1f".format((item.map["current1"] as Float?) ?: 0.0)
val current2 = "%.1f".format((item.map["current2"] as Float?) ?: 0.0)
val text1 = "$current1 mA"
val text2 = "$current2 mA"
binding.tvRealTimeCurrent.text = buildSpannableString(text1, current1)
binding.tvAveCurrent.text = buildSpannableString(text2, current2)
}
}
binding.tvTime.text = buildSpannableString(text1, h)
binding.tvTime.append(buildSpannableString(text2, min))
}
override fun onCreateViewHolder(
......@@ -42,10 +65,10 @@ class BatteryHeadAdapter : BaseQuickAdapter<BatteryHead, CommonViewHolder>() {
parent: ViewGroup,
viewType: Int
): CommonViewHolder {
return CommonViewHolder(R.layout.item_battery_head.inflate(parent))
return CommonViewHolder(layout.inflate(parent))
}
fun buildSpannableString(fullString: String, tagString: String): SpannableString {
fun buildSpannableString(fullString: String, tagString: String, size: Int = 32): SpannableString {
val spannableString = SpannableString(fullString)
val start = fullString.indexOf(tagString)
val end = start + tagString.length
......@@ -57,7 +80,7 @@ class BatteryHeadAdapter : BaseQuickAdapter<BatteryHead, CommonViewHolder>() {
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
)
spannableString.setSpan(
AbsoluteSizeSpan(32, true),
AbsoluteSizeSpan(size, true),
start, end,
SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE
)
......
app/src/main/java/com/base/appzxhy/ui/batteryinfo/BatteryReceiver.kt
View file @ 8334eeb2
......@@ -75,11 +75,13 @@ class BatteryReceiver(
var currentMicroA = batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW)
if (currentMicroA != Int.Companion.MIN_VALUE) {
mA = currentMicroA / 1000f // 转换为毫安
mA = currentMicroA.toFloat()
// / 1000f // 转换为毫安
}
val avCurrentMicroA = batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_AVERAGE)
if (avCurrentMicroA != Int.Companion.MIN_VALUE) {
avmA = avCurrentMicroA / 1000f // 转换为毫安
avmA = avCurrentMicroA.toFloat()
// / 1000f // 转换为毫安
}
block?.invoke()
......
app/src/main/java/com/base/appzxhy/ui/language/LanguageActivity.kt
View file @ 8334eeb2
package com.base.appzxhy.ui.language
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import com.base.appzxhy.R
import com.base.appzxhy.SpConstObject.appLanguageCountrySp
import com.base.appzxhy.SpConstObject.appLanguageSp
......@@ -39,6 +41,16 @@ class LanguageActivity : BaseActivity<ActivityLanguageBinding>(ActivityLanguageB
s
}
override fun useDefaultImmersive() {
ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets ->
val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
v.setPadding(systemBars.left, 0, systemBars.right, systemBars.bottom)
binding.flTop.setPadding(0, systemBars.top, 0, 0)
insetsCallBack?.invoke(systemBars)
insets
}
}
override fun initView() {
super.initView()
AdsMgr.showNative(binding.flAd, R.layout.layout_admob_native_custom)
......
app/src/main/java/com/base/appzxhy/ui/splash/SplashActivity.kt
View file @ 8334eeb2
......@@ -227,7 +227,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(ActivitySplashBinding
when {
!isGuided -> {
// isGuided = true
isGuided = true
goToAc(LanguageActivity::class.java)
finish()
}
......
app/src/main/res/layout/activity_language.xml
View file @ 8334eeb2
......@@ -8,45 +8,52 @@
tools:context=".ui.language.LanguageActivity">
<androidx.cardview.widget.CardView
android:id="@+id/flTop"
android:id="@+id/card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|start"
android:layout_marginVertical="@dimen/dp_16"
android:layout_marginStart="@dimen/dp_16"
android:text="@string/select_a_language"
android:textColor="#1A1A1A"
android:textSize="@dimen/sp_20"
android:textStyle="bold" />
<LinearLayout
android:id="@+id/llNext"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:layout_marginEnd="@dimen/dp_16"
android:gravity="center_vertical"
android:orientation="horizontal">
<FrameLayout
android:id="@+id/flTop"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/next"
android:textColor="#2DD29E"
android:layout_gravity="center_vertical|start"
android:layout_marginVertical="@dimen/dp_16"
android:layout_marginStart="@dimen/dp_16"
android:text="@string/select_a_language"
android:textColor="#1A1A1A"
android:textSize="@dimen/sp_20"
android:textStyle="bold" />
<androidx.appcompat.widget.AppCompatImageView
<LinearLayout
android:id="@+id/llNext"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/jiangtou_3" />
android:layout_gravity="center_vertical|end"
android:layout_marginEnd="@dimen/dp_16"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/next"
android:textColor="#2DD29E"
android:textSize="@dimen/sp_20"
android:textStyle="bold" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/jiangtou_3" />
</LinearLayout>
</LinearLayout>
</FrameLayout>
</androidx.cardview.widget.CardView>
......@@ -57,7 +64,7 @@
android:layout_marginVertical="@dimen/dp_8"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintBottom_toTopOf="@id/flAd"
app:layout_constraintTop_toBottomOf="@id/flTop"
app:layout_constraintTop_toBottomOf="@id/card"
tools:listitem="@layout/item_language" />
<com.base.appzxhy.business.ads.NativeParentView
......
app/src/main/res/layout/item_battery_electric.xml 0 → 100644
View file @ 8334eeb2
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16">
<TextView
android:id="@+id/tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/electric_current"
android:textColor="#262626"
android:textSize="@dimen/sp_20"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
app:layout_constraintTop_toBottomOf="@id/tv">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/real_time_current"
android:textColor="#262626"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tvRealTimeCurrent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0.0 mA"
android:textColor="#262626" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/average_current"
android:textColor="#262626"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tvAveCurrent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0.0 mA"
android:textColor="#262626" />
</LinearLayout>
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/item_battery_estimated.xml 0 → 100644
View file @ 8334eeb2
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="@dimen/dp_20">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_35"
android:layout_marginEnd="@dimen/dp_50"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/iv"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tvTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="00 h 00 m"
android:textColor="@color/black"
android:textSize="@dimen/sp_17" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:text="@string/left_with_current_power_consumption"
android:textColor="#666666"
android:textSize="@dimen/sp_16" />
</LinearLayout>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv"
android:layout_width="@dimen/dp_98"
android:layout_height="@dimen/dp_118"
android:layout_marginEnd="@dimen/dp_18"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/dianchi" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/item_battery_head.xml
View file @ 8334eeb2
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="@dimen/dp_20">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_35"
android:layout_marginEnd="@dimen/dp_50"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/iv"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tvTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="00 h 00 m"
android:textColor="@color/black"
android:textSize="@dimen/sp_17" />
android:layout_height="@dimen/dp_98"
android:layout_marginHorizontal="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
app:cardBackgroundColor="#F0FFFA"
app:cardCornerRadius="@dimen/dp_10">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:text="@string/left_with_current_power_consumption"
android:textColor="#666666"
android:textSize="@dimen/sp_16" />
</LinearLayout>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv"
android:layout_width="@dimen/dp_98"
android:layout_height="@dimen/dp_118"
android:layout_marginEnd="@dimen/dp_18"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/dianchi" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
android:layout_marginStart="@dimen/dp_35"
android:layout_marginEnd="@dimen/dp_50"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tvTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="00 h 00 m"
android:textColor="@color/black"
android:textSize="@dimen/sp_17" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_2"
android:text="@string/estimated_battery"
android:textColor="#666666"
android:textSize="@dimen/sp_14" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
\ No newline at end of file
app/src/main/res/layout/stay_notification_big.xml
View file @ 8334eeb2
......@@ -4,10 +4,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="@dimen/dp_5"
android:paddingBottom="@dimen/dp_2"
tools:ignore="DisableBaselineAlignment">
<LinearLayout
android:id="@+id/llClean"
android:id="@+id/ll1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
......@@ -20,16 +22,10 @@
android:layout_height="wrap_content">
<ImageView
android:id="@+id/iv1"
android:layout_width="@dimen/dp_45"
android:layout_height="@dimen/dp_45"
android:src="@drawable/icon_clean_stay"
tools:ignore="ContentDescription" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:src="@drawable/icon_tixing"
android:src="@drawable/icon_clean_push_s"
tools:ignore="ContentDescription" />
</FrameLayout>
......@@ -45,7 +41,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llPhoto"
android:id="@+id/ll2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
......@@ -54,9 +50,10 @@
tools:ignore="UseCompoundDrawables">
<ImageView
android:id="@+id/iv2"
android:layout_width="@dimen/dp_45"
android:layout_height="@dimen/dp_45"
android:src="@drawable/icon_photos_stay"
android:src="@drawable/icon_antivirus_push_s"
tools:ignore="ContentDescription" />
<TextView
......@@ -64,13 +61,13 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_2"
android:includeFontPadding="false"
android:text="@string/photos"
android:text="@string/antivirus"
android:textColor="#1A1A1A"
android:textSize="@dimen/sp_15" />
</LinearLayout>
<LinearLayout
android:id="@+id/llVideo"
android:id="@+id/ll3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
......@@ -79,9 +76,10 @@
tools:ignore="UseCompoundDrawables">
<ImageView
android:id="@+id/iv3"
android:layout_width="@dimen/dp_45"
android:layout_height="@dimen/dp_45"
android:src="@drawable/icon_videos_stay"
android:src="@drawable/icon_battery_push_s"
tools:ignore="ContentDescription" />
<TextView
......@@ -89,13 +87,13 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_2"
android:includeFontPadding="false"
android:text="@string/videos"
android:text="@string/battery"
android:textColor="#1A1A1A"
android:textSize="@dimen/sp_15" />
</LinearLayout>
<LinearLayout
android:id="@+id/llDocument"
android:id="@+id/ll4"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
......@@ -104,17 +102,20 @@
tools:ignore="UseCompoundDrawables">
<ImageView
android:id="@+id/iv4"
android:layout_width="@dimen/dp_45"
android:layout_height="@dimen/dp_45"
android:src="@drawable/icon_documents_stay"
android:src="@drawable/icon_large_file_clean_push_s"
tools:ignore="ContentDescription" />
<TextView
android:gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_2"
android:ellipsize="end"
android:includeFontPadding="false"
android:text="@string/documents"
android:text="@string/large_file_clean"
android:textColor="#1A1A1A"
android:textSize="@dimen/sp_15" />
......
app/src/main/res/layout/stay_notification_small.xml
View file @ 8334eeb2
......@@ -4,13 +4,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="@dimen/dp_2"
tools:ignore="DisableBaselineAlignment">
<LinearLayout
android:id="@+id/llClean"
android:id="@+id/ll1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_weight="4"
android:gravity="center_horizontal"
android:orientation="vertical"
tools:ignore="UseCompoundDrawables">
......@@ -20,17 +21,12 @@
android:layout_height="wrap_content">
<ImageView
android:id="@+id/iv1"
android:layout_width="@dimen/dp_35"
android:layout_height="@dimen/dp_35"
android:src="@drawable/icon_clean_stay"
android:src="@drawable/icon_clean_push_s"
tools:ignore="ContentDescription" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:src="@drawable/icon_tixing"
tools:ignore="ContentDescription" />
</FrameLayout>
<TextView
......@@ -40,22 +36,23 @@
android:includeFontPadding="false"
android:text="@string/clean"
android:textColor="#1A1A1A"
android:textSize="@dimen/sp_12" />
android:textSize="@dimen/sp_11" />
</LinearLayout>
<LinearLayout
android:id="@+id/llPhoto"
android:id="@+id/ll2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_weight="4"
android:gravity="center_horizontal"
android:orientation="vertical"
tools:ignore="UseCompoundDrawables">
<ImageView
android:id="@+id/iv2"
android:layout_width="@dimen/dp_35"
android:layout_height="@dimen/dp_35"
android:src="@drawable/icon_photos_stay"
android:src="@drawable/icon_antivirus_push_s"
tools:ignore="ContentDescription,ImageContrastCheck" />
<TextView
......@@ -63,24 +60,25 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_2"
android:includeFontPadding="false"
android:text="@string/photos"
android:text="@string/antivirus"
android:textColor="#1A1A1A"
android:textSize="@dimen/sp_12" />
android:textSize="@dimen/sp_11" />
</LinearLayout>
<LinearLayout
android:id="@+id/llVideo"
android:id="@+id/ll3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_weight="4"
android:gravity="center_horizontal"
android:orientation="vertical"
tools:ignore="UseCompoundDrawables">
<ImageView
android:id="@+id/iv3"
android:layout_width="@dimen/dp_35"
android:layout_height="@dimen/dp_35"
android:src="@drawable/icon_videos_stay"
android:src="@drawable/icon_battery_push_s"
tools:ignore="ContentDescription" />
<TextView
......@@ -88,24 +86,25 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_2"
android:includeFontPadding="false"
android:text="@string/videos"
android:text="@string/battery"
android:textColor="#1A1A1A"
android:textSize="@dimen/sp_12" />
android:textSize="@dimen/sp_11" />
</LinearLayout>
<LinearLayout
android:id="@+id/llDocument"
android:id="@+id/ll4"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_weight="5"
android:gravity="center_horizontal"
android:orientation="vertical"
tools:ignore="UseCompoundDrawables">
<ImageView
android:id="@+id/iv4"
android:layout_width="@dimen/dp_35"
android:layout_height="@dimen/dp_35"
android:src="@drawable/icon_documents_stay"
android:src="@drawable/icon_large_file_clean_push_s"
tools:ignore="ContentDescription,ImageContrastCheck" />
<TextView
......@@ -113,9 +112,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_2"
android:includeFontPadding="false"
android:text="@string/documents"
android:text="@string/large_file_clean"
android:textColor="#1A1A1A"
android:textSize="@dimen/sp_12" />
android:textSize="@dimen/sp_11" />
</LinearLayout>
......
app/src/main/res/values/dimens.xml
View file @ 8334eeb2
......@@ -55,4 +55,5 @@
<dimen name="sp_24">24sp</dimen>
<dimen name="dp_1">1dp</dimen>
<dimen name="sp_22">22sp</dimen>
<dimen name="sp_11">11sp</dimen>
</resources>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @ 8334eeb2
......@@ -205,6 +205,11 @@ Please rest assured that we will handle your information in strict accordance wi
<string name="get_started">Get Started</string>
<string name="loading">loading...</string>
<string name="try_it_new">Try it New</string>
<string name="battery">Battery</string>
<string name="estimated_battery">Estimated battery</string>
<string name="electric_current">Electric current</string>
<string name="real_time_current">Real-time current</string>
<string name="average_current">Average current</string>
</resources>
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