From e03830a6a6928a68ba14a91afe67eaf1dd613882 Mon Sep 17 00:00:00 2001 From: ocean <503259349@qq.com> Date: Wed, 17 Sep 2025 10:00:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pro/app/ui/act/PdfViewActivity.kt | 3 + .../app/ui/dialog/BookmarksDialogFragment.kt | 78 +++++++++++++++++++ app/src/main/res/layout/activity_main.xml | 14 ++-- app/src/main/res/layout/activity_pdf_view.xml | 29 ++++++- app/src/main/res/layout/activity_splash.xml | 4 +- app/src/main/res/layout/adapter_pdf_item.xml | 6 +- app/src/main/res/layout/dialog_bookmarks.xml | 38 +++++++++ app/src/main/res/layout/dialog_delete.xml | 8 +- .../main/res/layout/dialog_file_details.xml | 24 +++--- app/src/main/res/layout/dialog_list_more.xml | 14 ++-- .../layout/dialog_pdf_password_protection.xml | 10 +-- .../res/layout/dialog_pdf_remove_password.xml | 10 +-- .../res/layout/dialog_pdf_set_password.xml | 12 +-- app/src/main/res/layout/dialog_permission.xml | 8 +- app/src/main/res/layout/dialog_progress.xml | 2 +- .../main/res/layout/dialog_rename_file.xml | 8 +- app/src/main/res/layout/dialog_sort.xml | 16 ++-- app/src/main/res/layout/dialog_view_model.xml | 2 +- 18 files changed, 214 insertions(+), 72 deletions(-) create mode 100644 app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/BookmarksDialogFragment.kt create mode 100644 app/src/main/res/layout/dialog_bookmarks.xml diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfViewActivity.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfViewActivity.kt index c96cc9a..c98197e 100644 --- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfViewActivity.kt +++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfViewActivity.kt @@ -94,6 +94,9 @@ class PdfViewActivity : BaseActivity(), OnLoadCompleteListener, OnPageChangeList supportFragmentManager, "ViewModelDialogFragment" ) } + binding.bookmarksBtn.setOnClickListener { + + } } private fun loadPdf() { diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/BookmarksDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/BookmarksDialogFragment.kt new file mode 100644 index 0000000..b067d53 --- /dev/null +++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/BookmarksDialogFragment.kt @@ -0,0 +1,78 @@ +package com.all.pdfreader.pro.app.ui.dialog + +import android.animation.ValueAnimator +import android.graphics.PorterDuff +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.view.animation.AccelerateDecelerateInterpolator +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.fragment.app.activityViewModels +import com.all.pdfreader.pro.app.R +import com.all.pdfreader.pro.app.databinding.DialogBookmarksBinding +import com.all.pdfreader.pro.app.databinding.DialogViewModelBinding +import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity +import com.all.pdfreader.pro.app.sp.AppStore +import com.all.pdfreader.pro.app.ui.view.CustomSwitchButton +import com.all.pdfreader.pro.app.ui.view.CustomSwitchButton.OnCheckedChangeListener +import com.all.pdfreader.pro.app.viewmodel.PdfViewModel +import com.google.android.material.bottomsheet.BottomSheetDialogFragment + +class BookmarksDialogFragment(val filePath: String) : BottomSheetDialogFragment() { + + private lateinit var binding: DialogBookmarksBinding + private val viewModel: PdfViewModel by activityViewModels()//为PdfViewActivity的PdfViewModel + private lateinit var pdfDocument: PdfDocumentEntity + private val appstore by lazy { AppStore(requireActivity()) } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + /** + * 让 BottomSheetDialogFragment 覆盖底部导航栏 + * 原理： + * 1.自定义样式，并继承自 @style/Theme.Design.BottomSheetDialog + * 2.xml布局设置fitsSystemWindows + */ + setStyle(STYLE_NORMAL, R.style.CustomBottomSheetDialogTheme) + } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? + ): View? { + binding = DialogBookmarksBinding.inflate(layoutInflater) + return binding.root + } + + override fun onStart() { + super.onStart() + dialog?.window?.findViewById(com.google.android.material.R.id.design_bottom_sheet) + ?.setBackgroundResource(R.drawable.dr_rc_top_12_bg_white) + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + viewModel.pdfDocument.value?.let { + pdfDocument = it + initUi() + setupOnClick() + } ?: run { + showToast(getString(R.string.file_not)) + dismiss() + } + } + + private fun initUi() { + } + + private fun setupOnClick() { + + } + + private fun showToast(message: String) { + Toast.makeText(requireActivity(), message, Toast.LENGTH_SHORT).show() + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 45522e4..0f007b9 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -115,7 +115,7 @@ @@ -124,7 +124,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:maxLines="2" android:text="@string/permission_notice" android:textColor="@color/black_60" @@ -142,7 +142,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/dr_click_btn_bg" - android:fontFamily="@font/poppins_semibold" + style="@style/TextViewFont_PopSemiBold" android:paddingStart="24dp" android:paddingTop="4dp" android:paddingEnd="24dp" @@ -175,7 +175,7 @@ android:id="@+id/home_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:text="@string/home" android:textColor="@color/black" android:textSize="14sp" /> @@ -199,7 +199,7 @@ android:id="@+id/recently_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:text="@string/recently" android:textColor="@color/black" android:textSize="14sp" /> @@ -223,7 +223,7 @@ android:id="@+id/favorite_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:text="@string/favorite" android:textColor="@color/black" android:textSize="14sp" /> @@ -247,7 +247,7 @@ android:id="@+id/tools_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:text="@string/tools" android:textColor="@color/black" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/activity_pdf_view.xml b/app/src/main/res/layout/activity_pdf_view.xml index 3ebd491..da3dbbc 100644 --- a/app/src/main/res/layout/activity_pdf_view.xml +++ b/app/src/main/res/layout/activity_pdf_view.xml @@ -89,7 +89,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:text="@string/view_model" android:textColor="@color/black" android:textSize="12sp" /> @@ -114,7 +114,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:text="@string/eye_protect" android:textColor="@color/black" android:textSize="12sp" /> @@ -137,12 +137,35 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:text="@string/bookmarks" android:textColor="@color/black" android:textSize="12sp" /> + + + + + + + diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index 98431ad..73fb9f2 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -19,7 +19,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" - android:fontFamily="@font/poppins_semibold" + style="@style/TextViewFont_PopSemiBold" android:text="@string/app_name" android:textColor="@color/black" android:textSize="28sp" /> @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:alpha="0.8" - android:fontFamily="@font/poppins_medium" + style="@style/TextViewFont_PopMedium" android:text="@string/splash_desc" android:textColor="@color/black" android:textSize="16sp" /> diff --git a/app/src/main/res/layout/adapter_pdf_item.xml b/app/src/main/res/layout/adapter_pdf_item.xml index e26fb08..c49f569 100644 --- a/app/src/main/res/layout/adapter_pdf_item.xml +++ b/app/src/main/res/layout/adapter_pdf_item.xml @@ -54,7 +54,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="middle" - android:fontFamily="@font/poppins_semibold" + style="@style/TextViewFont_PopSemiBold" android:maxLines="1" android:text="@string/app_name" android:textColor="@color/black" @@ -71,7 +71,7 @@ android:id="@+id/tvFileDate" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/poppins_medium" + style="@style/TextViewFont_PopMedium" android:text="2月27,2025" android:textColor="@color/black_60" android:textSize="14sp" /> @@ -81,7 +81,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" - android:fontFamily="@font/poppins_medium" + style="@style/TextViewFont_PopMedium" android:text="8.1MB" android:textColor="@color/black_60" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/dialog_bookmarks.xml b/app/src/main/res/layout/dialog_bookmarks.xml new file mode 100644 index 0000000..6f603f2 --- /dev/null +++ b/app/src/main/res/layout/dialog_bookmarks.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_delete.xml b/app/src/main/res/layout/dialog_delete.xml index 0a2c2aa..b0292a7 100644 --- a/app/src/main/res/layout/dialog_delete.xml +++ b/app/src/main/res/layout/dialog_delete.xml @@ -9,7 +9,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="24dp" - android:fontFamily="@font/poppins_semibold" + style="@style/TextViewFont_PopSemiBold" android:text="@string/delete_file_title" android:textColor="@color/black" android:textSize="18sp" /> @@ -20,7 +20,7 @@ android:layout_marginStart="24dp" android:layout_marginEnd="24dp" android:layout_marginBottom="8dp" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:text="@string/delete_file_desc" android:textColor="@color/black_80" android:textSize="16sp" /> @@ -43,7 +43,7 @@ @@ -61,7 +61,7 @@ diff --git a/app/src/main/res/layout/dialog_file_details.xml b/app/src/main/res/layout/dialog_file_details.xml index 4ef8f6e..4308879 100644 --- a/app/src/main/res/layout/dialog_file_details.xml +++ b/app/src/main/res/layout/dialog_file_details.xml @@ -26,7 +26,7 @@ @@ -34,7 +34,7 @@ @@ -49,7 +49,7 @@ @@ -59,7 +59,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="12dp" - android:fontFamily="@font/poppins_medium" + style="@style/TextViewFont_PopMedium" android:text="@string/file_name" android:textColor="@color/black" android:textSize="14sp" /> @@ -67,7 +67,7 @@ @@ -77,7 +77,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="12dp" - android:fontFamily="@font/poppins_medium" + style="@style/TextViewFont_PopMedium" android:text="@string/path" android:textColor="@color/black" android:textSize="14sp" /> @@ -85,7 +85,7 @@ @@ -95,7 +95,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="12dp" - android:fontFamily="@font/poppins_medium" + style="@style/TextViewFont_PopMedium" android:text="@string/last_modified" android:textColor="@color/black" android:textSize="14sp" /> @@ -103,7 +103,7 @@ @@ -113,7 +113,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="12dp" - android:fontFamily="@font/poppins_medium" + style="@style/TextViewFont_PopMedium" android:text="@string/last_viewed" android:textColor="@color/black" android:textSize="14sp" /> @@ -121,7 +121,7 @@ @@ -131,7 +131,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" - android:fontFamily="@font/poppins_medium" + style="@style/TextViewFont_PopMedium" android:text="@string/size" android:textColor="@color/black" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/dialog_list_more.xml b/app/src/main/res/layout/dialog_list_more.xml index f344cdc..9705928 100644 --- a/app/src/main/res/layout/dialog_list_more.xml +++ b/app/src/main/res/layout/dialog_list_more.xml @@ -66,7 +66,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="middle" - android:fontFamily="@font/poppins_medium" + style="@style/TextViewFont_PopMedium" android:maxLines="1" android:text="@string/app_name" android:textColor="@color/grey_text_color" @@ -82,7 +82,7 @@ android:id="@+id/tvFileDate" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:text="@string/app_name" android:textColor="@color/black_60" android:textSize="14sp" /> @@ -92,7 +92,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:text="@string/app_name" android:textColor="@color/black_60" android:textSize="14sp" /> @@ -140,7 +140,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:text="@string/rename_file" android:textColor="@color/grey_text_color" android:textSize="14sp" /> @@ -163,7 +163,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:text="@string/file_details" android:textColor="@color/grey_text_color" android:textSize="14sp" /> @@ -186,7 +186,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:text="@string/share_file" android:textColor="@color/grey_text_color" android:textSize="14sp" /> @@ -209,7 +209,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:text="@string/print_pdf" android:textColor="@color/grey_text_color" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/dialog_pdf_password_protection.xml b/app/src/main/res/layout/dialog_pdf_password_protection.xml index d5ee6e7..ec90984 100644 --- a/app/src/main/res/layout/dialog_pdf_password_protection.xml +++ b/app/src/main/res/layout/dialog_pdf_password_protection.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" - android:fontFamily="@font/poppins_semibold" + style="@style/TextViewFont_PopSemiBold" android:text="@string/password_protection" android:textColor="@color/black" android:textSize="20sp" /> @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:text="@string/password_protection_dialog_desc" android:textColor="@color/black_80" android:textSize="14sp" /> @@ -44,7 +44,7 @@ android:id="@+id/etPassword" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:inputType="textPassword" android:textSize="16sp" /> @@ -64,7 +64,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="8dp" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:padding="12dp" android:text="@string/cancel" android:textColor="@color/black_80" /> @@ -73,7 +73,7 @@ android:id="@+id/tvConfirm" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/poppins_medium" + style="@style/TextViewFont_PopMedium" android:padding="12dp" android:text="@string/ok" android:textColor="@color/black" /> diff --git a/app/src/main/res/layout/dialog_pdf_remove_password.xml b/app/src/main/res/layout/dialog_pdf_remove_password.xml index 350cbfd..9966e8e 100644 --- a/app/src/main/res/layout/dialog_pdf_remove_password.xml +++ b/app/src/main/res/layout/dialog_pdf_remove_password.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" - android:fontFamily="@font/poppins_semibold" + style="@style/TextViewFont_PopSemiBold" android:text="@string/remove_password" android:textColor="@color/black" android:textSize="20sp" /> @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:text="@string/remove_password_dialog_desc" android:textColor="@color/black_60" android:textSize="14sp" /> @@ -45,7 +45,7 @@ android:id="@+id/etPassword" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:inputType="textPassword" android:textSize="16sp" /> @@ -64,7 +64,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="8dp" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:padding="12dp" android:text="@string/cancel" android:textColor="@color/black_80" @@ -74,7 +74,7 @@ android:id="@+id/tvConfirm" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/poppins_medium" + style="@style/TextViewFont_PopMedium" android:padding="12dp" android:text="@string/ok" android:textColor="@color/black" diff --git a/app/src/main/res/layout/dialog_pdf_set_password.xml b/app/src/main/res/layout/dialog_pdf_set_password.xml index 47429be..486e70c 100644 --- a/app/src/main/res/layout/dialog_pdf_set_password.xml +++ b/app/src/main/res/layout/dialog_pdf_set_password.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" - android:fontFamily="@font/poppins_semibold" + style="@style/TextViewFont_PopSemiBold" android:text="@string/set_pdf_password" android:textColor="@color/black" android:textSize="20sp" /> @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:text="@string/set_pdf_password_dialog_desc" android:textColor="@color/black_60" android:textSize="14sp" /> @@ -45,7 +45,7 @@ android:id="@+id/etPassword" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:inputType="textPassword" android:textSize="16sp" /> @@ -71,7 +71,7 @@ android:id="@+id/etConfirmPassword" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:inputType="textPassword" android:textSize="16sp" /> @@ -90,7 +90,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="8dp" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:padding="12dp" android:text="@string/cancel" android:textColor="@color/black_80" @@ -100,7 +100,7 @@ android:id="@+id/tvConfirm" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/poppins_medium" + style="@style/TextViewFont_PopMedium" android:padding="12dp" android:text="@string/ok" android:textColor="@color/black" diff --git a/app/src/main/res/layout/dialog_permission.xml b/app/src/main/res/layout/dialog_permission.xml index f5a0468..27640eb 100644 --- a/app/src/main/res/layout/dialog_permission.xml +++ b/app/src/main/res/layout/dialog_permission.xml @@ -39,7 +39,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" - android:fontFamily="@font/poppins_semibold" + style="@style/TextViewFont_PopSemiBold" android:gravity="center" android:text="@string/permission_required" android:textColor="@color/black" @@ -50,7 +50,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:gravity="center" android:text="@string/permission_required_desc_1" android:textColor="@color/black_80" @@ -76,7 +76,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:gravity="center_vertical" android:text="@string/permission_required_desc_2" android:textColor="@color/black_80" @@ -106,7 +106,7 @@ diff --git a/app/src/main/res/layout/dialog_progress.xml b/app/src/main/res/layout/dialog_progress.xml index e505c98..e7788ce 100644 --- a/app/src/main/res/layout/dialog_progress.xml +++ b/app/src/main/res/layout/dialog_progress.xml @@ -11,7 +11,7 @@ android:id="@+id/tvTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/poppins_medium" + style="@style/TextViewFont_PopMedium" android:gravity="center" android:text="@string/processing" android:textColor="@color/black" diff --git a/app/src/main/res/layout/dialog_rename_file.xml b/app/src/main/res/layout/dialog_rename_file.xml index 81ccfc7..15904a5 100644 --- a/app/src/main/res/layout/dialog_rename_file.xml +++ b/app/src/main/res/layout/dialog_rename_file.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" - android:fontFamily="@font/poppins_semibold" + style="@style/TextViewFont_PopSemiBold" android:text="@string/rename_file" android:textColor="@color/black" android:textSize="20sp" /> @@ -35,7 +35,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="text" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:textSize="16sp" /> @@ -54,7 +54,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="8dp" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:padding="12dp" android:text="@string/cancel" android:textColor="@color/black_80" /> @@ -63,7 +63,7 @@ android:id="@+id/tvConfirm" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/poppins_medium" + style="@style/TextViewFont_PopMedium" android:padding="12dp" android:text="@string/ok" android:textColor="@color/black" /> diff --git a/app/src/main/res/layout/dialog_sort.xml b/app/src/main/res/layout/dialog_sort.xml index 340de54..12f306c 100644 --- a/app/src/main/res/layout/dialog_sort.xml +++ b/app/src/main/res/layout/dialog_sort.xml @@ -11,7 +11,7 @@ android:text="@string/sort_by" android:textColor="@color/black" android:textSize="18sp" - android:fontFamily="@font/poppins_semibold"/> + style="@style/TextViewFont_PopSemiBold"/> @@ -68,7 +68,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:layout_weight="1" android:text="@string/file_name" android:textColor="@color/black" @@ -101,7 +101,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_weight="1" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:text="@string/file_size" android:textColor="@color/black" android:textSize="16sp" /> @@ -146,7 +146,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_weight="1" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:text="@string/ascending" android:textColor="@color/black" android:textSize="16sp" /> @@ -179,7 +179,7 @@ android:layout_marginStart="16dp" android:layout_weight="1" android:text="@string/descending" - android:fontFamily="@font/poppins_regular" + style="@style/TextViewFont_PopRegular" android:textColor="@color/black" android:textSize="16sp" /> @@ -214,7 +214,7 @@ android:text="@string/cancel" android:textColor="@color/black" android:textSize="16sp" - android:fontFamily="@font/poppins_semibold" /> + style="@style/TextViewFont_PopSemiBold" /> + style="@style/TextViewFont_PopSemiBold" /> diff --git a/app/src/main/res/layout/dialog_view_model.xml b/app/src/main/res/layout/dialog_view_model.xml index 0dca78f..f04cb17 100644 --- a/app/src/main/res/layout/dialog_view_model.xml +++ b/app/src/main/res/layout/dialog_view_model.xml @@ -26,10 +26,10 @@