Commit 10052745 authored by 周文华's avatar 周文华

【调整】1.调整项目色系。2.调整部分图片

parent 90aa5be7
...@@ -76,7 +76,7 @@ open class BaseActivity2 : AppCompatActivity() { ...@@ -76,7 +76,7 @@ open class BaseActivity2 : AppCompatActivity() {
} }
protected open fun immersive() { protected open fun immersive() {
StatusBarHelps.immersive(this, getColor(R.color.color_ffb764)) StatusBarHelps.immersive(this, getColor(R.color.color_8eb0ff))
} }
protected fun showAnimationAd( protected fun showAnimationAd(
...@@ -90,7 +90,7 @@ open class BaseActivity2 : AppCompatActivity() { ...@@ -90,7 +90,7 @@ open class BaseActivity2 : AppCompatActivity() {
val animationView = findViewById<ConstraintLayout>(R.id.animation) val animationView = findViewById<ConstraintLayout>(R.id.animation)
animationView.setOnClickListener { } animationView.setOnClickListener { }
if (isShowAnimation) { if (isShowAnimation) {
StatusBarHelps.immersive(this, getColor(R.color.color_ffb764)) StatusBarHelps.immersive(this, getColor(R.color.color_8eb0ff))
showAnimation(animationView, lottieType, complete) showAnimation(animationView, lottieType, complete)
} else { } else {
complete?.invoke() complete?.invoke()
......
...@@ -78,6 +78,6 @@ class CleanDetailAdapter( ...@@ -78,6 +78,6 @@ class CleanDetailAdapter(
} }
private fun setSelection(imageView: ImageView, item: FileBean) { private fun setSelection(imageView: ImageView, item: FileBean) {
imageView.setImageResource(if (item.isSelected) R.mipmap.icon_yuan_junk_s else R.mipmap.icon_yuan_n) imageView.setImageResource(if (item.isSelected) R.mipmap.ic_check_s else R.mipmap.ic_check_n)
} }
} }
\ No newline at end of file
...@@ -72,7 +72,7 @@ class CleanJunkAdapter( ...@@ -72,7 +72,7 @@ class CleanJunkAdapter(
holder.binding.tvLength.text = Utils.getSize(data.length) holder.binding.tvLength.text = Utils.getSize(data.length)
holder.binding.ivIcon.setImageResource(data.icon) holder.binding.ivIcon.setImageResource(data.icon)
holder.binding.ivIndicator.setImageResource(if (expand) R.mipmap.icon_up_setting else R.mipmap.icon_down_setting) holder.binding.ivIndicator.setImageResource(if (expand) R.mipmap.icon_up_setting else R.mipmap.icon_down_setting)
holder.binding.ivSelect.setImageResource(if (data.isSelected) R.mipmap.icon_yixuan_s else R.mipmap.icon_yixuan_n) holder.binding.ivSelect.setImageResource(if (data.isSelected) R.mipmap.ic_check_s else R.mipmap.ic_check_n)
holder.binding.clItem.setBackgroundResource(if (expand && child[groupPosition].isNotEmpty()) R.drawable.white_background_top else R.drawable.white_background) holder.binding.clItem.setBackgroundResource(if (expand && child[groupPosition].isNotEmpty()) R.drawable.white_background_top else R.drawable.white_background)
holder.binding.ivSelect.setOnClickListener { holder.binding.ivSelect.setOnClickListener {
data.isSelected = !data.isSelected data.isSelected = !data.isSelected
...@@ -108,7 +108,7 @@ class CleanJunkAdapter( ...@@ -108,7 +108,7 @@ class CleanJunkAdapter(
val groupData = group[groupPosition] val groupData = group[groupPosition]
holder.binding.tvName.text = data.name holder.binding.tvName.text = data.name
holder.binding.tvLength.text = Utils.getSize(data.length) holder.binding.tvLength.text = Utils.getSize(data.length)
holder.binding.ivSelect.setImageResource(if (data.isSelected) R.mipmap.icon_yuan_junk_s else R.mipmap.icon_yuan_n) holder.binding.ivSelect.setImageResource(if (data.isSelected) R.mipmap.ic_check_s else R.mipmap.ic_check_n)
holder.itemView.setBackgroundResource(if (childPosition == child[groupPosition].size - 1) R.drawable.white_background_bottom else R.color.white) holder.itemView.setBackgroundResource(if (childPosition == child[groupPosition].size - 1) R.drawable.white_background_bottom else R.color.white)
holder.itemView.setOnClickListener { holder.itemView.setOnClickListener {
data.isSelected = !data.isSelected data.isSelected = !data.isSelected
......
...@@ -91,7 +91,7 @@ class ScreenshotCleanActivity : BaseActivity2() { ...@@ -91,7 +91,7 @@ class ScreenshotCleanActivity : BaseActivity2() {
} }
private fun updateView(isSelection: Boolean) { private fun updateView(isSelection: Boolean) {
binding.ivSelectAll.setImageResource(if (isSelectAll) R.mipmap.icon_yuan_junk_s else R.mipmap.icon_all_photo_off) binding.ivSelectAll.setImageResource(if (isSelectAll) R.mipmap.ic_check_s else R.mipmap.icon_all_photo_off)
binding.tvDelete.setBackgroundResource(if (isSelection) R.drawable.gradient_4 else R.drawable.gradient_not_clickable_4) binding.tvDelete.setBackgroundResource(if (isSelection) R.drawable.gradient_4 else R.drawable.gradient_not_clickable_4)
val delete = getString(R.string.delete) val delete = getString(R.string.delete)
val text = if (total > 0) "${delete} (${Utils.getSize(total)})" else delete val text = if (total > 0) "${delete} (${Utils.getSize(total)})" else delete
......
...@@ -103,10 +103,10 @@ class ScreenshotCleanAdapter( ...@@ -103,10 +103,10 @@ class ScreenshotCleanAdapter(
.apply(options) .apply(options)
.into(holder.binding.ivImage) .into(holder.binding.ivImage)
holder.binding.tvSize.text = Utils.getSize(data.length) holder.binding.tvSize.text = Utils.getSize(data.length)
holder.binding.ivSelect.setImageResource(if (data.isSelected) R.mipmap.icon_yuan_junk_s else R.mipmap.icon_yuan_n) holder.binding.ivSelect.setImageResource(if (data.isSelected) R.mipmap.ic_check_s else R.mipmap.ic_check_n)
holder.binding.clContainer.setOnClickListener { holder.binding.clContainer.setOnClickListener {
data.isSelected = !data.isSelected data.isSelected = !data.isSelected
holder.binding.ivSelect.setImageResource(if (data.isSelected) R.mipmap.icon_yuan_junk_s else R.mipmap.icon_yuan_n) holder.binding.ivSelect.setImageResource(if (data.isSelected) R.mipmap.ic_check_s else R.mipmap.ic_check_n)
_selectionData.value = child.flatten() _selectionData.value = child.flatten()
} }
} }
......
...@@ -46,10 +46,10 @@ class SimilarPhotosAdapter( ...@@ -46,10 +46,10 @@ class SimilarPhotosAdapter(
.override(largePhotoWidth, largePhotoHeight) .override(largePhotoWidth, largePhotoHeight)
.apply(options) .apply(options)
.into(holder.binding.ivFirstPhoto) .into(holder.binding.ivFirstPhoto)
holder.binding.ivSelect.setImageResource(if (item.items[0].isSelect) R.mipmap.icon_xuanzhong_photo_on else R.mipmap.icon_weixuanzhong_photo_off) holder.binding.ivSelect.setImageResource(if (item.items[0].isSelect) R.mipmap.ic_check_s_photo else R.mipmap.ic_check_n_photo)
holder.binding.ivFirstPhoto.setOnClickListener { holder.binding.ivFirstPhoto.setOnClickListener {
item.items[0].isSelect = !item.items[0].isSelect item.items[0].isSelect = !item.items[0].isSelect
holder.binding.ivSelect.setImageResource(if (item.items[0].isSelect) R.mipmap.icon_xuanzhong_photo_on else R.mipmap.icon_weixuanzhong_photo_off) holder.binding.ivSelect.setImageResource(if (item.items[0].isSelect) R.mipmap.ic_check_s_photo else R.mipmap.ic_check_n_photo)
setItemClick(item, item.items[0], 0, holder) setItemClick(item, item.items[0], 0, holder)
} }
......
...@@ -32,10 +32,10 @@ class SimilarPhotosChildAdapter( ...@@ -32,10 +32,10 @@ class SimilarPhotosChildAdapter(
holder.binding.ivPhoto.layoutParams.width = imageWidth holder.binding.ivPhoto.layoutParams.width = imageWidth
holder.binding.ivPhoto.layoutParams.height = (imageWidth * 0.91).toInt() holder.binding.ivPhoto.layoutParams.height = (imageWidth * 0.91).toInt()
holder.binding.ivSelect.setImageResource(if (item.isSelect) R.mipmap.icon_xuanzhong_photo_on else R.mipmap.icon_yuan_n) holder.binding.ivSelect.setImageResource(if (item.isSelect) R.mipmap.ic_check_s_photo else R.mipmap.ic_check_n)
holder.itemView.setOnClickListener { holder.itemView.setOnClickListener {
item.isSelect = !item.isSelect item.isSelect = !item.isSelect
holder.binding.ivSelect.setImageResource(if (item.isSelect) R.mipmap.icon_xuanzhong_photo_on else R.mipmap.icon_yuan_n) holder.binding.ivSelect.setImageResource(if (item.isSelect) R.mipmap.ic_check_s_photo else R.mipmap.ic_check_n)
callback?.onClicked(it, position, item) callback?.onClicked(it, position, item)
} }
......
...@@ -80,7 +80,7 @@ class WhatsappCleanDetailActivity : BaseActivity2() { ...@@ -80,7 +80,7 @@ class WhatsappCleanDetailActivity : BaseActivity2() {
} }
private fun updateView(isSelection: Boolean) { private fun updateView(isSelection: Boolean) {
binding.ivSelectAll.setImageResource(if (isSelectAll) R.mipmap.icon_yuan_junk_s else R.mipmap.icon_all_photo_off) binding.ivSelectAll.setImageResource(if (isSelectAll) R.mipmap.ic_check_s else R.mipmap.icon_all_photo_off)
binding.tvDelete.setBackgroundResource(if (isSelection) R.drawable.gradient_4 else R.drawable.gradient_not_clickable_4) binding.tvDelete.setBackgroundResource(if (isSelection) R.drawable.gradient_4 else R.drawable.gradient_not_clickable_4)
val value = Utils.getSizeArray(total) val value = Utils.getSizeArray(total)
binding.tvSize.text = value[0] binding.tvSize.text = value[0]
......
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background"> <item android:id="@android:id/background">
<shape> <shape>
<solid android:color="@color/color_ffcda0" /> <solid android:color="#EBEDFF" />
<corners android:radius="8dp" /> <corners android:radius="8dp" />
</shape> </shape>
</item> </item>
<item android:id="@android:id/progress"> <item android:id="@android:id/progress">
<scale android:scaleWidth="100%"> <scale android:scaleWidth="100%">
<shape> <shape>
<solid android:color="@color/white" /> <solid android:color="@color/color_6473f8" />
<corners android:radius="8dp" /> <corners android:radius="8dp" />
</shape> </shape>
</scale> </scale>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient <gradient
android:startColor="@color/color_ff6400" android:startColor="@color/color_8eb0ff"
android:endColor="@color/color_ff8200" android:endColor="@color/color_6473f8"
android:angle="0" android:angle="0"
android:centerX="0.5" android:centerX="0.5"
android:centerY="0.5" /> android:centerY="0.5" />
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<gradient <gradient
android:startColor="@color/color_ff6400" android:startColor="@color/color_8eb0ff"
android:endColor="@color/color_ff8200" android:endColor="@color/color_6473f8"
android:angle="0" android:angle="0"
android:centerX="0.5" android:centerX="0.5"
android:centerY="0.5" /> android:centerY="0.5" />
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<gradient <gradient
android:startColor="@color/color_ff6400" android:startColor="@color/color_8eb0ff"
android:endColor="@color/color_ff8200" android:endColor="@color/color_6473f8"
android:angle="0" android:angle="0"
android:centerX="0.5" android:centerX="0.5"
android:centerY="0.5" /> android:centerY="0.5" />
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient <gradient
android:startColor="@color/color_ff6400" android:startColor="@color/color_8eb0ff"
android:endColor="@color/color_ff8200" android:endColor="@color/color_6473f8"
android:angle="0" android:angle="0"
android:centerX="0.5" android:centerX="0.5"
android:centerY="0.5" /> android:centerY="0.5" />
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient <gradient
android:startColor="@color/color_ffb764" android:startColor="@color/color_8eb0ff"
android:endColor="@color/color_ffae52" android:endColor="@color/color_6473f8"
android:angle="270" android:angle="270"
android:centerX="0.5" android:centerX="0.5"
android:centerY="0.5" /> android:centerY="0.5" />
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient <gradient
android:startColor="@color/color_ffb462" android:startColor="#EBEDFF"
android:endColor="@color/color_ffc889" android:endColor="#EBEDFF"
android:angle="0" android:angle="0"
android:centerX="0.5" android:centerX="0.5"
android:centerY="0.5" /> android:centerY="0.5" />
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:src="@mipmap/icon_weixuanzhong_photo_off" android:src="@mipmap/ic_check_n_photo"
app:layout_constraintTop_toTopOf="@id/iv_image" app:layout_constraintTop_toTopOf="@id/iv_image"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintEnd_toEndOf="parent" />
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:src="@mipmap/icon_weixuanzhong_photo_off" android:src="@mipmap/ic_check_n_photo"
app:layout_constraintTop_toTopOf="@id/iv_image" app:layout_constraintTop_toTopOf="@id/iv_image"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintEnd_toEndOf="parent" />
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
android:id="@+id/iv_audio_select" android:id="@+id/iv_audio_select"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@mipmap/icon_weixuanzhong_photo_off" android:src="@mipmap/ic_check_n_photo"
app:layout_constraintTop_toTopOf="@id/ll_audio" app:layout_constraintTop_toTopOf="@id/ll_audio"
app:layout_constraintBottom_toBottomOf="@id/ll_audio" app:layout_constraintBottom_toBottomOf="@id/ll_audio"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintEnd_toEndOf="parent" />
......
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_item" android:id="@+id/cl_item"
...@@ -51,9 +52,9 @@ ...@@ -51,9 +52,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:text="67.4MB" tools:text="67.4MB"
android:textSize="12sp" android:textSize="12sp"
android:textColor="@color/color_aeb4bd" android:textColor="@color/color_ff613e"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/iv_select" /> app:layout_constraintEnd_toStartOf="@id/iv_select" />
...@@ -62,7 +63,7 @@ ...@@ -62,7 +63,7 @@
android:id="@+id/iv_select" android:id="@+id/iv_select"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@mipmap/icon_weixuan_junk" android:src="@mipmap/ic_check_n"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintEnd_toEndOf="parent" />
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:src="@mipmap/icon_weixuanzhong_photo_off" android:src="@mipmap/ic_check_n_photo"
app:layout_constraintTop_toTopOf="@id/iv_first_photo" app:layout_constraintTop_toTopOf="@id/iv_first_photo"
app:layout_constraintEnd_toEndOf="@id/iv_first_photo" /> app:layout_constraintEnd_toEndOf="@id/iv_first_photo" />
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:src="@mipmap/icon_weixuanzhong_photo_off" android:src="@mipmap/ic_check_n_photo"
app:layout_constraintTop_toTopOf="@id/iv_photo" app:layout_constraintTop_toTopOf="@id/iv_photo"
app:layout_constraintEnd_toEndOf="@id/iv_photo" /> app:layout_constraintEnd_toEndOf="@id/iv_photo" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:src="@mipmap/icon_ad_pop" android:src="@mipmap/icon_ad_pop"
android:tint="@color/colorPrimary"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
...@@ -53,7 +54,7 @@ ...@@ -53,7 +54,7 @@
app:layout_constraintStart_toEndOf="@id/ad_icon" app:layout_constraintStart_toEndOf="@id/ad_icon"
app:layout_constraintEnd_toStartOf="@id/ad_call_to_action" /> app:layout_constraintEnd_toStartOf="@id/ad_call_to_action" />
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/ad_call_to_action" android:id="@+id/ad_call_to_action"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
......
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ad_small_icon" android:id="@+id/ad_small_icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:tint="@color/colorPrimary"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@mipmap/icon_ad_pop" android:src="@mipmap/icon_ad_pop"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
...@@ -81,7 +82,7 @@ ...@@ -81,7 +82,7 @@
android:layout_height="33dp" /> android:layout_height="33dp" />
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
<Button <androidx.appcompat.widget.AppCompatButton
android:id="@+id/ad_call_to_action" android:id="@+id/ad_call_to_action"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="38dp" android:layout_height="38dp"
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:background="#FDBA55" android:background="@color/colorPrimary"
android:paddingHorizontal="3dp" android:paddingHorizontal="3dp"
android:paddingVertical="2dp" android:paddingVertical="2dp"
android:text="Ad" android:text="Ad"
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginHorizontal="12dp" android:layout_marginHorizontal="12dp"
android:background="@drawable/bg_f3a10f_10" android:background="@drawable/gradient_26"
android:gravity="center" android:gravity="center"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/white" android:textColor="@color/white"
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:background="#FDBA55" android:background="@color/colorPrimary"
android:paddingHorizontal="3dp" android:paddingHorizontal="3dp"
android:paddingVertical="2dp" android:paddingVertical="2dp"
android:text="Ad" android:text="Ad"
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="35dp" android:layout_height="35dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:background="@drawable/bg_17a1ff_35" android:background="@drawable/gradient_26"
android:gravity="center" android:gravity="center"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/white" android:textColor="@color/white"
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:background="#FF923E" android:background="@color/colorPrimary"
android:padding="2dp" android:padding="2dp"
android:text="Ad" android:text="Ad"
android:textColor="@color/white" android:textColor="@color/white"
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
android:layout_height="26dp" android:layout_height="26dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginHorizontal="12dp" android:layout_marginHorizontal="12dp"
android:background="@drawable/bg_ff8a00_10" android:background="@drawable/gradient_26"
android:gravity="center" android:gravity="center"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="15sp" android:textSize="15sp"
......
...@@ -3,9 +3,14 @@ ...@@ -3,9 +3,14 @@
<color name="black">#FF000000</color> <color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color> <color name="white">#FFFFFFFF</color>
<color name="colorPrimary">@color/color_fd891e</color> <color name="colorPrimary">@color/color_2b91f1</color>
<color name="color_ff613e">#FF613E</color>
<color name="color_e75506">#E75506</color> <color name="color_e75506">#E75506</color>
<color name="color_f78950">#F78950</color> <color name="color_f78950">#F78950</color>
<color name="color_8eb0ff">#8EB0FF</color>
<color name="color_6473f8">#6473F8</color>
<color name="color_2b91f1">#2B91F1</color> <color name="color_2b91f1">#2B91F1</color>
<color name="color_fd891e">#FD891E</color> <color name="color_fd891e">#FD891E</color>
<color name="color_ff6400">#FF6400</color> <color name="color_ff6400">#FF6400</color>
......
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