Skip to content

S
scanqrwhitecopy
Commit 9ea06a8c authored by 周文华's avatar 周文华
Browse files
Options

【调整】调整部分UI样式

parent 5822b199
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 92 deletions
app/src/main/java/com/base/scanqrclear/luma/ScreenshotCleanActivity.kt
View file @ 9ea06a8c
......@@ -92,7 +92,7 @@ class ScreenshotCleanActivity : BaseActivity2() {
private fun updateView(isSelection: Boolean) {
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_26 else R.drawable.btn_not_clickable)
val delete = getString(R.string.delete)
val text = if (total > 0) "${delete} (${Utils.getSize(total)})" else delete
binding.tvDelete.text = text
......
app/src/main/java/com/base/scanqrclear/luma/WhatsappCleanDetailActivity.kt
View file @ 9ea06a8c
......@@ -81,7 +81,7 @@ class WhatsappCleanDetailActivity : BaseActivity2() {
private fun updateView(isSelection: Boolean) {
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_26 else R.drawable.btn_not_clickable)
val value = Utils.getSizeArray(total)
binding.tvSize.text = value[0]
binding.tvUnit.text = value[1]
......
app/src/main/java/com/base/scanqrclear/ui/main/MainActivity.kt
View file @ 9ea06a8c
......@@ -126,7 +126,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
LogEx.logDebug(TAG, "actionId=$actionId")
when (actionId) {
ACTION_ID_STAY_SCAN, ACTION_ID_SCAN -> {
val defaultTab = binding.tabLayout.getTabAt(1)
val defaultTab = binding.tabLayout.getTabAt(0)
defaultTab?.select()
defaultTab?.setSelected()
}
......
app/src/main/res/drawable/gradient_not_clickable_4.xml → app/src/main/res/drawable/btn_not_clickable.xml
View file @ 9ea06a8c
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="@color/color_ffb462"
android:endColor="@color/color_ffc889"
android:angle="0"
android:centerX="0.5"
android:centerY="0.5" />
<corners android:radius="4dp" />
<solid android:color="#FFC9C9C9" />
<corners android:radius="26dp" />
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_screenshot_clean.xml
View file @ 9ea06a8c
......@@ -17,24 +17,23 @@
android:id="@+id/ll_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingTop="6dp"
android:paddingBottom="6dp"
app:layout_constraintTop_toTopOf="parent">
<FrameLayout
<ImageView
android:id="@+id/fl_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="11dp"
android:importantForAccessibility="no"
android:padding="4dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/icon_return_bar_nor" />
</FrameLayout>
android:src="@mipmap/icon_return_bar_nor"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
......@@ -43,9 +42,9 @@
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="@id/fl_back"
app:layout_constraintBottom_toBottomOf="@id/fl_back"
app:layout_constraintStart_toEndOf="@id/fl_back" />
app:layout_constraintStart_toEndOf="@id/fl_back"
app:layout_constraintTop_toTopOf="@id/fl_back" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.constraintlayout.widget.ConstraintLayout
......@@ -53,9 +52,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="34dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_title">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_size"
android:layout_width="wrap_content"
......@@ -63,9 +63,9 @@
android:text="0"
android:textColor="@color/white"
android:textSize="32sp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_unit"
......@@ -74,54 +74,61 @@
android:text="KB"
android:textColor="@color/white"
android:textSize="12sp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toEndOf="@id/tv_size" />
app:layout_constraintStart_toEndOf="@id/tv_size"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginBottom="67dp"
android:layout_marginBottom="60dp"
android:text="@string/screenshots_totally"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cl_size" />
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_marginTop="9dp"
android:background="@drawable/white_background_top"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<pokercc.android.expandablerecyclerview.ExpandableRecyclerView
android:id="@+id/expandable_files"
android:layout_width="match_parent"
android:layout_height="0dp"
android:paddingTop="8dp"
android:paddingBottom="12dp"
android:background="@color/white"
app:layout_constraintStart_toStartOf="parent"
android:paddingBottom="12dp"
app:layout_constraintBottom_toTopOf="@id/ll_bottom"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/cl_top"
app:layout_constraintBottom_toTopOf="@id/ll_bottom" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cl_top" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/kongzhuangtai"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:src="@mipmap/ic_empty"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/ll_bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:gravity="center"
android:background="@color/white"
android:gravity="center"
android:orientation="horizontal"
android:padding="16dp"
app:layout_constraintBottom_toBottomOf="parent">
<androidx.appcompat.widget.LinearLayoutCompat
......@@ -130,6 +137,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_select_all"
android:layout_width="wrap_content"
......@@ -149,19 +157,18 @@
android:id="@+id/tv_delete"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="16dp"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:layout_weight="1"
android:background="@drawable/btn_not_clickable"
android:gravity="center"
android:background="@drawable/gradient_not_clickable_4"
android:paddingVertical="10dp"
android:text="@string/delete"
android:textColor="@color/white"
android:textSize="14sp" />
android:textSize="18sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
<include
android:id="@+id/animation"
android:visibility="gone"
layout="@layout/custom_animation" />
layout="@layout/custom_animation"
android:visibility="gone" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_whatsapp_clean_detail.xml
View file @ 9ea06a8c
......@@ -141,13 +141,12 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="16dp"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:paddingVertical="10dp"
android:gravity="center"
android:background="@drawable/gradient_not_clickable_4"
android:background="@drawable/btn_not_clickable"
android:text="@string/delete"
android:textColor="@color/white"
android:textSize="14sp" />
android:textSize="18sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
......
app/src/main/res/layout/fragment_create.xml
View file @ 9ea06a8c
......@@ -39,6 +39,7 @@
android:background="@drawable/bg_gradient_zodiac"
android:paddingHorizontal="17dp"
android:paddingVertical="8dp"
android:gravity="center"
android:layout_marginEnd="16dp"
android:text="@string/zodiac"
android:textColor="@color/white"
......
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