Skip to content

P
PDF Viewer Scanner White
Commit ad694826 authored by wanglei's avatar wanglei
Browse files
Options

...

parent 79c9e404
Hide whitespace changes
Inline Side-by-side
Showing with 224 additions and 178 deletions
app/src/main/java/com/base/pdfviewerscannerwhite/ui/main/DocumentFragment.kt
View file @ ad694826
...@@ -262,6 +262,7 @@ class DocumentFragment( ...@@ -262,6 +262,7 @@ class DocumentFragment(
uiMode = UI_MODE_SEARCH uiMode = UI_MODE_SEARCH
(requireActivity() as MainActivity).callback.isEnabled = true (requireActivity() as MainActivity).callback.isEnabled = true
binding.card.elevation = 0f
binding.tvTittle.visibility = View.INVISIBLE binding.tvTittle.visibility = View.INVISIBLE
binding.ivPaixu.visibility = View.INVISIBLE binding.ivPaixu.visibility = View.INVISIBLE
binding.ivXuanze.visibility = View.INVISIBLE binding.ivXuanze.visibility = View.INVISIBLE
...@@ -281,6 +282,7 @@ class DocumentFragment( ...@@ -281,6 +282,7 @@ class DocumentFragment(
uiMode = UI_MODE_NORMAL uiMode = UI_MODE_NORMAL
(requireActivity() as MainActivity).callback.isEnabled = false (requireActivity() as MainActivity).callback.isEnabled = false
binding.card.elevation = resources.getDimension(R.dimen.dp_5)
binding.editSearch.visibility = View.INVISIBLE binding.editSearch.visibility = View.INVISIBLE
binding.flFanhui.visibility = View.INVISIBLE binding.flFanhui.visibility = View.INVISIBLE
binding.flSearch.visibility = View.INVISIBLE binding.flSearch.visibility = View.INVISIBLE
......
app/src/main/java/com/base/pdfviewerscannerwhite/ui/main/DocumentPageFragment.kt
View file @ ad694826
...@@ -61,10 +61,15 @@ class DocumentPageFragment() : BaseFragment<FragmentDocumentPageBinding>(), Docu ...@@ -61,10 +61,15 @@ class DocumentPageFragment() : BaseFragment<FragmentDocumentPageBinding>(), Docu
super.setListener() super.setListener()
binding.swipeRefreshLayout.setOnRefreshListener { binding.swipeRefreshLayout.setOnRefreshListener {
binding.swipeRefreshLayout.isRefreshing = true binding.swipeRefreshLayout.isRefreshing = true
refreshData() binding.llEmpty.visibility = View.INVISIBLE
binding.progressBar.visibility = View.VISIBLE
binding.progressBar.isIndeterminate = true
refreshData(false)
lifecycleScope.launch(Dispatchers.Main) { lifecycleScope.launch(Dispatchers.Main) {
delay(1500) delay(900)
binding.swipeRefreshLayout.isRefreshing = false binding.swipeRefreshLayout.isRefreshing = false
binding.progressBar.visibility = View.GONE
binding.llEmpty.isVisible = isEmpty
} }
} }
} }
...@@ -75,7 +80,10 @@ class DocumentPageFragment() : BaseFragment<FragmentDocumentPageBinding>(), Docu ...@@ -75,7 +80,10 @@ class DocumentPageFragment() : BaseFragment<FragmentDocumentPageBinding>(), Docu
refreshData() refreshData()
} }
fun refreshData() = lifecycleScope.launch(Dispatchers.IO) {
var isEmpty: Boolean = false
fun refreshData(showEmpty: Boolean = true) = lifecycleScope.launch(Dispatchers.IO) {
isEmpty = false
if (isInitialized && !isHidden && !MainPresenter.mainRefreshData) { if (isInitialized && !isHidden && !MainPresenter.mainRefreshData) {
LogEx.logDebug(TAG, "type=$type refreshData dataType=$dataType") LogEx.logDebug(TAG, "type=$type refreshData dataType=$dataType")
val mainActivity = (requireActivity() as MainActivity?) val mainActivity = (requireActivity() as MainActivity?)
...@@ -95,14 +103,16 @@ class DocumentPageFragment() : BaseFragment<FragmentDocumentPageBinding>(), Docu ...@@ -95,14 +103,16 @@ class DocumentPageFragment() : BaseFragment<FragmentDocumentPageBinding>(), Docu
} }
launch(Dispatchers.Main) { launch(Dispatchers.Main) {
binding.llEmpty.isVisible = arrayList.isEmpty() if (showEmpty) {
binding.llEmpty.isVisible = arrayList.isEmpty()
}
val flag = AdmobHelper.isShowRvNativeAd() val flag = AdmobHelper.isShowRvNativeAd()
LogEx.logDebug(TAG, "isShowRvNativeAd flag=$flag") LogEx.logDebug(TAG, "isShowRvNativeAd flag=$flag")
if (arrayList.isEmpty()) { if (arrayList.isEmpty()) {
isEmpty = true
binding.flAd.visibility = View.VISIBLE binding.flAd.visibility = View.VISIBLE
if (flag) { if (flag) {
AdmobNativeUtils.showNativeAd(requireActivity(), binding.flAd, R.layout.layout_admob_document) AdmobNativeUtils.showNativeAd(requireActivity(), binding.flAd, R.layout.layout_admob_document)
} }
......
app/src/main/res/layout/fragment_document.xml
View file @ ad694826
...@@ -5,206 +5,226 @@ ...@@ -5,206 +5,226 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.cardview.widget.CardView
android:id="@+id/cl_top" android:id="@+id/card"
app:cardElevation="5dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<FrameLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/fl_fanhui" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:padding="15dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/fanhui_b"
tools:ignore="ContentDescription" />
</FrameLayout>
<EditText
android:id="@+id/edit_search"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="20dp"
android:background="@drawable/bg_f8f9fe_10"
android:hint="Enter the file name to search for"
android:imeOptions="actionDone"
android:paddingHorizontal="18dp"
android:singleLine="true"
android:textColor="@color/black"
android:textColorHint="#B8B9BD"
android:textSize="14sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/iv_search"
app:layout_constraintStart_toEndOf="@id/fl_fanhui"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="Autofill,HardcodedText,RtlSymmetry,TextFields" />
<TextView
android:id="@+id/tv_tittle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:text="@string/document"
android:textColor="@color/black"
android:textSize="19sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="HardcodedText" />
<ImageView
android:id="@+id/iv_paixu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:src="@mipmap/h_paixu"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/iv_xuanze"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<ImageView
android:id="@+id/iv_xuanze"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:src="@mipmap/h_xuanze"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/iv_search"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<ImageView
android:id="@+id/iv_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:src="@mipmap/h_sousuo"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<ImageView
android:id="@+id/iv_all_selector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/bg_selector_select"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/iv_search"
app:layout_constraintStart_toStartOf="@id/iv_search"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
</androidx.constraintlayout.widget.ConstraintLayout> <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_top"
android:layout_width="match_parent"
android:layout_height="60dp"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout <FrameLayout
android:id="@+id/ll_main_content" android:id="@+id/fl_fanhui"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="wrap_content"
android:orientation="vertical" android:padding="15dp"
app:layout_constraintBottom_toBottomOf="parent" android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/cl_top"> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<!-- 外层FrameLayout设置背景用来限定水波纹大小--> <ImageView
<FrameLayout android:layout_width="wrap_content"
android:id="@+id/cl_tabLayout" android:layout_height="wrap_content"
android:layout_width="match_parent" android:src="@mipmap/fanhui_b"
android:layout_height="50dp" tools:ignore="ContentDescription" />
android:background="#00000000"> </FrameLayout>
<com.angcyo.tablayout.DslTabLayout <EditText
android:id="@+id/tabLayout_document" android:id="@+id/edit_search"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="50dp" android:layout_height="40dp"
app:tab_badge_gravity="center" android:layout_marginStart="10dp"
app:tab_badge_offset_x="20dp" android:layout_marginEnd="20dp"
app:tab_draw_indicator="true" android:background="@drawable/bg_f8f9fe_10"
app:tab_enable_text_color="true" android:hint="Enter the file name to search for"
app:tab_indicator_drawable="@drawable/indicator_bottom_line" android:imeOptions="actionDone"
app:tab_indicator_height="3dp" android:paddingHorizontal="18dp"
app:tab_item_is_equ_width="true"> android:singleLine="true"
android:textColor="@color/black"
android:textColorHint="#B8B9BD"
android:textSize="14sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/iv_search"
app:layout_constraintStart_toEndOf="@id/fl_fanhui"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="Autofill,HardcodedText,RtlSymmetry,TextFields" />
<TextView <TextView
android:id="@+id/tv_tittle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/ripple_select" android:layout_marginStart="15dp"
android:clipChildren="false" android:text="@string/document"
android:clipToPadding="false" android:textColor="@color/black"
android:gravity="center" android:textSize="19sp"
android:text="PDF"
android:textSize="16sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
<TextView <ImageView
android:layout_width="match_parent" android:id="@+id/iv_paixu"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_marginEnd="16dp"
android:background="@drawable/ripple_select" android:src="@mipmap/h_paixu"
android:clipChildren="false" app:layout_constraintBottom_toBottomOf="parent"
android:clipToPadding="false" app:layout_constraintEnd_toStartOf="@id/iv_xuanze"
android:gravity="center" app:layout_constraintTop_toTopOf="parent"
android:paddingVertical="5dp" tools:ignore="ContentDescription" />
android:text="Word"
android:textSize="16sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView <ImageView
android:id="@+id/iv_xuanze"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/ripple_select" android:layout_marginEnd="16dp"
android:clipChildren="false" android:src="@mipmap/h_xuanze"
android:clipToPadding="false" app:layout_constraintBottom_toBottomOf="parent"
android:gravity="center" app:layout_constraintEnd_toStartOf="@id/iv_search"
android:text="Excel" app:layout_constraintTop_toTopOf="parent"
android:textSize="16sp" tools:ignore="ContentDescription" />
android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView <ImageView
android:id="@+id/iv_search"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/ripple_select" android:layout_marginEnd="16dp"
android:clipChildren="false" android:src="@mipmap/h_sousuo"
android:clipToPadding="false" app:layout_constraintBottom_toBottomOf="parent"
android:gravity="center" app:layout_constraintEnd_toEndOf="parent"
android:text="PPT" app:layout_constraintTop_toTopOf="parent"
android:textSize="16sp" tools:ignore="ContentDescription" />
android:textStyle="bold"
tools:ignore="HardcodedText" />
</com.angcyo.tablayout.DslTabLayout> <ImageView
android:id="@+id/iv_all_selector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/bg_selector_select"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/iv_search"
app:layout_constraintStart_toStartOf="@id/iv_search"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
</androidx.constraintlayout.widget.ConstraintLayout>
<View <LinearLayout
android:id="@+id/v_tabLayout_place" android:id="@+id/ll_main_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:visibility="gone" /> android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/cl_top">
</FrameLayout> <!-- 外层FrameLayout设置背景用来限定水波纹大小-->
<FrameLayout
android:id="@+id/cl_tabLayout"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="#00000000"
tools:ignore="UselessParent">
<androidx.viewpager2.widget.ViewPager2 <com.angcyo.tablayout.DslTabLayout
android:id="@+id/viewPager2" android:id="@+id/tabLayout_document"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="50dp"
android:layout_weight="1" /> app:tab_badge_gravity="center"
app:tab_badge_offset_x="20dp"
app:tab_draw_indicator="true"
app:tab_enable_text_color="true"
app:tab_indicator_drawable="@drawable/indicator_bottom_line"
app:tab_indicator_height="3dp"
app:tab_item_is_equ_width="true">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ripple_select"
android:clipChildren="false"
android:clipToPadding="false"
android:gravity="center"
android:text="PDF"
android:textSize="16sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/ripple_select"
android:clipChildren="false"
android:clipToPadding="false"
android:gravity="center"
android:paddingVertical="5dp"
android:text="Word"
android:textSize="16sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ripple_select"
android:clipChildren="false"
android:clipToPadding="false"
android:gravity="center"
android:text="Excel"
android:textSize="16sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ripple_select"
android:clipChildren="false"
android:clipToPadding="false"
android:gravity="center"
android:text="PPT"
android:textSize="16sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
</com.angcyo.tablayout.DslTabLayout>
<View
android:id="@+id/v_tabLayout_place"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
</FrameLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/viewPager2"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="5dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/card" />
</LinearLayout>
<FrameLayout <FrameLayout
android:id="@+id/fl_search" android:id="@+id/fl_search"
...@@ -213,7 +233,7 @@ ...@@ -213,7 +233,7 @@
android:background="@color/white" android:background="@color/white"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/cl_top"> app:layout_constraintTop_toBottomOf="@id/card">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_search" android:id="@+id/rv_search"
......
app/src/main/res/layout/fragment_document_page.xml
View file @ ad694826
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/white"
tools:context=".ui.main.DocumentPageFragment"> tools:context=".ui.main.DocumentPageFragment">
<LinearLayout <LinearLayout
...@@ -11,6 +12,18 @@ ...@@ -11,6 +12,18 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<ProgressBar
android:indeterminateDuration="1600"
android:id="@+id/progressBar"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true"
android:indeterminateBehavior="cycle"
android:indeterminateTint="#00B8DE"
android:indeterminateTintMode="src_atop"
android:visibility="gone" />
<FrameLayout <FrameLayout
android:id="@+id/fl_ad" android:id="@+id/fl_ad"
android:layout_width="match_parent" android:layout_width="match_parent"
......
app/src/main/res/values/dimens.xml
View file @ ad694826
...@@ -5,4 +5,5 @@ ...@@ -5,4 +5,5 @@
<dimen name="dp_200">200dp</dimen> <dimen name="dp_200">200dp</dimen>
<dimen name="dp_146">146dp</dimen> <dimen name="dp_146">146dp</dimen>
<dimen name="dp_345">345dp</dimen> <dimen name="dp_345">345dp</dimen>
<dimen name="dp_5">5dp</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