Skip to content

S
Solar Master Ace
Commit bd6767e7 authored by wanglei's avatar wanglei
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/zxhy/solarmasterace/adapter/ViewHolder.kt
#	app/src/main/java/com/zxhy/solarmasterace/data/FileBean.kt
#	app/src/main/java/com/zxhy/solarmasterace/filebrowser/CardFileAdapter.kt
#	app/src/main/java/com/zxhy/solarmasterace/filebrowser/DupImageAdapter.kt
#	app/src/main/java/com/zxhy/solarmasterace/filebrowser/FileBrowserActivity.kt
#	app/src/main/java/com/zxhy/solarmasterace/filebrowser/FileGridAdapter.kt
#	app/src/main/java/com/zxhy/solarmasterace/filedetails/FileDetailActivity.kt
#	app/src/main/java/com/zxhy/solarmasterace/internalstorage/InternalStorageActivity.kt
#	app/src/main/java/com/zxhy/solarmasterace/quicktools/FileEx.kt
#	app/src/main/java/com/zxhy/solarmasterace/quicktools/FileHelper.kt
#	app/src/main/java/com/zxhy/solarmasterace/tools/RecentImageAdapter.kt
#	app/src/main/java/com/zxhy/solarmasterace/tools/ToolsFragment.kt
#	app/src/main/res/layout/activity_file_browser.xml
#	app/src/main/res/layout/activity_file_detail.xml
#	app/src/main/res/layout/activity_internal_storage.xml
parents bdd01dc6 bf2a6d39
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 0 deletions
app/src/main/res/layout/item_card_large_file.xml 0 → 100644
View file @ bd6767e7
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_margin="8dp"
app:cardCornerRadius="8dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/iv_icon"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription,InvalidId" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="@id/iv_icon"
app:layout_constraintLeft_toRightOf="@id/iv_icon"
app:layout_constraintRight_toLeftOf="@id/iv_selector"
app:layout_constraintTop_toTopOf="@id/iv_icon">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:singleLine="true"
android:textColor="#FF333333"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textColor="#FF999999"
android:textSize="13sp" />
</LinearLayout>
<ImageView
android:id="@+id/iv_selector"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_marginEnd="16dp"
android:src="@drawable/bg_circle_selector"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
\ 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