diff --git a/app/src/main/java/com/all/pdfreader/pro/app/room/dao/PdfDocumentDao.kt b/app/src/main/java/com/all/pdfreader/pro/app/room/dao/PdfDocumentDao.kt index c416d77..c596496 100644 --- a/app/src/main/java/com/all/pdfreader/pro/app/room/dao/PdfDocumentDao.kt +++ b/app/src/main/java/com/all/pdfreader/pro/app/room/dao/PdfDocumentDao.kt @@ -29,6 +29,9 @@ interface PdfDocumentDao { @Query("SELECT * FROM pdf_documents ORDER BY lastOpenedTime DESC") fun getAllDocuments(): Flow> + @Query("SELECT * FROM pdf_documents WHERE lastOpenedTime > 0 ORDER BY lastOpenedTime DESC") + fun getRecentlyOpenedDocuments(): Flow> + @Query("SELECT * FROM pdf_documents ORDER BY lastOpenedTime DESC") suspend fun getAllDocumentsOnce(): List @@ -44,4 +47,8 @@ interface PdfDocumentDao { @Query("UPDATE pdf_documents SET isPassword = :hasPassword WHERE filePath = :filePath") suspend fun updateIsPassword(filePath: String, hasPassword: Boolean) + + @Query("UPDATE pdf_documents SET lastOpenedTime = :time WHERE filePath = :filePath") + suspend fun updateLastOpenTime(filePath: String, time: Long) + } \ No newline at end of file diff --git a/app/src/main/java/com/all/pdfreader/pro/app/room/repository/PdfRepository.kt b/app/src/main/java/com/all/pdfreader/pro/app/room/repository/PdfRepository.kt index 236b4ed..8589921 100644 --- a/app/src/main/java/com/all/pdfreader/pro/app/room/repository/PdfRepository.kt +++ b/app/src/main/java/com/all/pdfreader/pro/app/room/repository/PdfRepository.kt @@ -35,6 +35,9 @@ class PdfRepository private constructor(context: Context) { suspend fun getAllDocumentsOnce(): List = pdfDao.getAllDocumentsOnce() fun getAllDocuments(): Flow> = pdfDao.getAllDocuments() + fun getRecentlyOpenedDocuments(): Flow> = + pdfDao.getRecentlyOpenedDocuments() + fun getFavoriteDocuments(): Flow> = pdfDao.getFavoriteDocuments() fun searchDocuments(query: String): Flow> = pdfDao.searchDocuments(query) @@ -52,6 +55,11 @@ class PdfRepository private constructor(context: Context) { pdfDao.updateIsPassword(filePath, hasPassword) } + //更新最后打开时间，可以设置为0L，相当于更新成未打开过。 + suspend fun updateLastOpenTime(filePath: String, time: Long) { + pdfDao.updateLastOpenTime(filePath, time) + } + suspend fun updateFavoriteStatus(filePath: String, isFavorite: Boolean) { val document = pdfDao.getByPath(filePath)?.copy( isFavorite = isFavorite, @@ -112,7 +120,7 @@ class PdfRepository private constructor(context: Context) { suspend fun updateBookmark(bookmark: BookmarkEntity): Int = bookmarkDao.update(bookmark) suspend fun deleteBookmark(bookmark: BookmarkEntity): Int = bookmarkDao.delete(bookmark) suspend fun deleteAllBookmark(filePath: String): Int { - return bookmarkDao.deleteAllByPdf(filePath) + return bookmarkDao.deleteAllByPdf(filePath) } fun getBookmarksByPdf(filePath: String): Flow> = diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/MainActivity.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/act/MainActivity.kt index bb761a2..e8b5b63 100644 --- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/MainActivity.kt +++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/act/MainActivity.kt @@ -67,7 +67,6 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback supportFragmentManager.beginTransaction().hide(homeFragment).hide(recentlyFragment) .hide(favoriteFragment).hide(toolsFragment).show(activeFragment).commit() } - updateSelectedNav(activeFragment) } private fun initObserve() { @@ -79,28 +78,28 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback showToast(event.renameResult.errorMessage.toString()) } } - viewModel.fileActionEvent.observeEvent(this){ event -> + viewModel.fileActionEvent.observeEvent(this) { event -> if (event.deleteResult.success) { showToast(getString(R.string.delete_successfully)) } else { showToast(event.deleteResult.errorMessage.toString()) } } - viewModel.fileActionEvent.observeEvent(this){ event -> + viewModel.fileActionEvent.observeEvent(this) { event -> if (event.isFavorite) { showToast(getString(R.string.added_to_favorites)) } else { showToast(getString(R.string.removed_from_favorites)) } } - viewModel.fileActionEvent.observeEvent(this){ event -> + viewModel.fileActionEvent.observeEvent(this) { event -> if (event.file != null) { showToast(getString(R.string.duplicate_created_successfully)) } else { showToast(getString(R.string.duplicate_created_failed)) } } - viewModel.fileActionEvent.observeEvent(this){ event -> + viewModel.fileActionEvent.observeEvent(this) { event -> when (event.status) { FileActionEvent.SetPassword.Status.START -> { progressDialog = ProgressDialogFragment() @@ -118,7 +117,7 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback } } } - viewModel.fileActionEvent.observeEvent(this){ event -> + viewModel.fileActionEvent.observeEvent(this) { event -> when (event.status) { FileActionEvent.RemovePassword.Status.START -> { progressDialog = ProgressDialogFragment() @@ -185,26 +184,70 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback } private fun updateSelectedNav(fragment: Fragment) { - binding.homeIv.alpha = 0.5f - binding.recentlyIv.alpha = 0.5f - binding.favoriteIv.alpha = 0.5f - binding.toolsIv.alpha = 0.5f if (fragment is ToolsFrag) {//工具界面不展示权限 binding.pnLayout.visibility = View.GONE + } else { + if (!StoragePermissionHelper.hasBasicStoragePermission(this)) { + binding.pnLayout.visibility = View.VISIBLE + } } - val targetIcon = when (fragment) { - is HomeFrag -> binding.homeIv - is RecentlyFrag -> binding.recentlyIv - is FavoriteFrag -> binding.favoriteIv - is ToolsFrag -> binding.toolsIv - else -> null + if (fragment is HomeFrag) { + if (StoragePermissionHelper.hasBasicStoragePermission(this)) { + binding.topButtonLayout.visibility = View.VISIBLE + } else { + binding.topButtonLayout.visibility = View.GONE + } + } else { + binding.topButtonLayout.visibility = View.GONE } - targetIcon?.apply { - alpha = 1f - animate().scaleX(1.2f).scaleY(1.2f).setDuration(150).withEndAction { - animate().scaleX(1f).scaleY(1f).setDuration(150).start() - }.start() + when (fragment) { + is HomeFrag -> { + binding.homeIv.setImageResource(R.drawable.icon_home_sel_on) + binding.recentlyIv.setImageResource(R.drawable.icon_recently_sel_off) + binding.favoriteIv.setImageResource(R.drawable.collect) + binding.toolsIv.setImageResource(R.drawable.icon_tools_sel_off) + } + + is RecentlyFrag -> { + binding.homeIv.setImageResource(R.drawable.icon_home_sel_off) + binding.recentlyIv.setImageResource(R.drawable.icon_recently_sel_on) + binding.favoriteIv.setImageResource(R.drawable.collect) + binding.toolsIv.setImageResource(R.drawable.icon_tools_sel_off) + } + + is FavoriteFrag -> { + binding.homeIv.setImageResource(R.drawable.icon_home_sel_off) + binding.recentlyIv.setImageResource(R.drawable.icon_recently_sel_off) + binding.favoriteIv.setImageResource(R.drawable.collected) + binding.toolsIv.setImageResource(R.drawable.icon_tools_sel_off) + } + + is ToolsFrag -> { + binding.homeIv.setImageResource(R.drawable.icon_home_sel_off) + binding.recentlyIv.setImageResource(R.drawable.icon_recently_sel_off) + binding.favoriteIv.setImageResource(R.drawable.collect) + binding.toolsIv.setImageResource(R.drawable.icon_tools_sel_on) + } } + + +// binding.homeIv.alpha = 0.5f +// binding.recentlyIv.alpha = 0.5f +// binding.favoriteIv.alpha = 0.5f +// binding.toolsIv.alpha = 0.5f +// val targetIcon = when (fragment) { +// is HomeFrag -> binding.homeIv +// is RecentlyFrag -> binding.recentlyIv +// is FavoriteFrag -> binding.favoriteIv +// is ToolsFrag -> binding.toolsIv +// else -> null +// } +// targetIcon?.apply { +// alpha = 1f +// animate().scaleX(1.2f).scaleY(1.2f).setDuration(150).withEndAction { +// animate().scaleX(1f).scaleY(1f).setDuration(150).start() +// }.start() +// } } @@ -229,6 +272,7 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback dialog.show(supportFragmentManager, TAG) } } + updateSelectedNav(activeFragment) } private fun scanningStrategy() { 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 b916a26..f3b04b8 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 @@ -15,6 +15,7 @@ import com.all.pdfreader.pro.app.ui.dialog.BookmarksDialogFragment import com.all.pdfreader.pro.app.ui.dialog.PdfPasswordProtectionDialogFragment import com.all.pdfreader.pro.app.ui.dialog.ViewModelDialogFragment import com.all.pdfreader.pro.app.ui.view.CustomScrollHandle +import com.all.pdfreader.pro.app.util.AppUtils import com.all.pdfreader.pro.app.viewmodel.PdfViewModel import com.all.pdfreader.pro.app.viewmodel.observeEvent import com.github.barteksc.pdfviewer.listener.OnErrorListener @@ -124,6 +125,9 @@ class PdfViewActivity : BaseActivity(), OnLoadCompleteListener, OnPageChangeList }, 200) }).show(supportFragmentManager, "BookmarksDialogFragment") } + binding.shareBtn.setOnClickListener { + AppUtils.shareFile(this, File(pdfDocument.filePath)) + } } 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 index e388d94..0b7b1be 100644 --- 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 @@ -111,7 +111,7 @@ class BookmarksDialogFragment( } else { binding.addTv.text = getString(R.string.add) binding.addTv.setTextColor(requireActivity().getColor(R.color.white)) - binding.addBtn.setBackgroundResource(R.drawable.dr_click_btn_red_bg) + binding.addBtn.setBackgroundResource(R.drawable.dr_click_btn_bg) binding.addIv.setImageResource(R.drawable.add_icon_white) } } @@ -133,7 +133,7 @@ class BookmarksDialogFragment( adapter.removeAllItems() bookmarks = emptyList() updateUi() - }).show(parentFragmentManager, "DeleteDialogFragment") + }).show(parentFragmentManager, "deleteAllBookmark") } } diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/DeleteDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/DeleteDialogFragment.kt index 34bc5b4..7dbc7a0 100644 --- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/DeleteDialogFragment.kt +++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/DeleteDialogFragment.kt @@ -14,6 +14,7 @@ import com.all.pdfreader.pro.app.databinding.DialogDeleteBinding class DeleteDialogFragment( private val title: String, private val desc: String, + private val okBtnText: String? = null, private val onDeleteClick: () -> Unit ) : DialogFragment() { @@ -41,6 +42,11 @@ class DeleteDialogFragment( override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + if (okBtnText.isNullOrEmpty()) { + binding.okBtnTv.text = getString(R.string.delete) + } else { + binding.okBtnTv.text = okBtnText + } binding.deleteTitleTv.text = title binding.deleteDescTv.text = desc setupOnClick() diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ListMoreDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ListMoreDialogFragment.kt index 60f7581..1309f6e 100644 --- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ListMoreDialogFragment.kt +++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ListMoreDialogFragment.kt @@ -71,6 +71,11 @@ class ListMoreDialogFragment(val filePath: String) : BottomSheetDialogFragment() } private fun initUi() { + if (pdfDocument.lastOpenedTime > 0) { + binding.removeRecentBtn.visibility = View.VISIBLE + } else { + binding.removeRecentBtn.visibility = View.GONE + } binding.tvFileName.text = pdfDocument.fileName binding.tvFileSize.text = pdfDocument.fileSize.toFormatFileSize() binding.tvFileDate.text = pdfDocument.lastModified.toSlashDate() @@ -108,7 +113,7 @@ class ListMoreDialogFragment(val filePath: String) : BottomSheetDialogFragment() getString(R.string.delete_file_desc), onDeleteClick = { viewModel.deleteFile(pdfDocument.filePath) - }).show(parentFragmentManager, "DeleteDialogFragment") + }).show(parentFragmentManager, "deleteFile") dismiss() } binding.detailsBtn.setOnClickListener { @@ -166,6 +171,16 @@ class ListMoreDialogFragment(val filePath: String) : BottomSheetDialogFragment() } dismiss() } + binding.removeRecentBtn.setOnClickListener { + DeleteDialogFragment( + getString(R.string.remove_dialog_title), + getString(R.string.remove_dialog_desc), + getString(R.string.remove), + onDeleteClick = { + viewModel.removeRecent(pdfDocument.filePath) + }).show(parentFragmentManager, "removeRecent") + dismiss() + } } private fun updateCollectUi(b: Boolean) { diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/fragment/RecentlyFrag.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/fragment/RecentlyFrag.kt index b276eda..c6d987f 100644 --- a/app/src/main/java/com/all/pdfreader/pro/app/ui/fragment/RecentlyFrag.kt +++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/fragment/RecentlyFrag.kt @@ -4,11 +4,21 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.fragment.app.Fragment +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.lifecycleScope +import androidx.lifecycle.repeatOnLifecycle +import androidx.recyclerview.widget.LinearLayoutManager import com.all.pdfreader.pro.app.databinding.FragmentRecentlyBinding +import com.all.pdfreader.pro.app.room.repository.PdfRepository +import com.all.pdfreader.pro.app.ui.act.PdfViewActivity +import com.all.pdfreader.pro.app.ui.adapter.PdfAdapter +import com.all.pdfreader.pro.app.ui.dialog.ListMoreDialogFragment +import kotlinx.coroutines.launch -class RecentlyFrag : Fragment() { +class RecentlyFrag : BaseFrag() { + override val TAG: String = "RecentlyFrag" private lateinit var binding: FragmentRecentlyBinding + private lateinit var adapter: PdfAdapter override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? @@ -20,9 +30,37 @@ class RecentlyFrag : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) initView() + observeDocuments() } private fun initView() { + adapter = PdfAdapter(pdfList = mutableListOf(), onItemClick = { pdf -> + val intent = PdfViewActivity.createIntent(requireContext(), pdf.filePath) + startActivity(intent) + }, onMoreClick = { pdf -> + ListMoreDialogFragment(pdf.filePath).show(parentFragmentManager, TAG) + }) + binding.recyclerView.layoutManager = LinearLayoutManager(requireContext()) + binding.recyclerView.adapter = adapter + + // 下拉刷新示例 + binding.swipeRefreshLayout.setOnRefreshListener { + observeDocuments{ + binding.swipeRefreshLayout.isRefreshing = false + } + } + } + + private fun observeDocuments(onComplete: () -> Unit = {}) { + lifecycleScope.launch { + viewLifecycleOwner.lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) { + PdfRepository.getInstance().getRecentlyOpenedDocuments().collect { list -> + adapter.updateData(list) + onComplete() + logDebug("更新adapter数据") + } + } + } } } \ No newline at end of file diff --git a/app/src/main/java/com/all/pdfreader/pro/app/viewmodel/PdfViewModel.kt b/app/src/main/java/com/all/pdfreader/pro/app/viewmodel/PdfViewModel.kt index a1c5642..95adbb3 100644 --- a/app/src/main/java/com/all/pdfreader/pro/app/viewmodel/PdfViewModel.kt +++ b/app/src/main/java/com/all/pdfreader/pro/app/viewmodel/PdfViewModel.kt @@ -194,6 +194,12 @@ class PdfViewModel : ViewModel() { } } + fun removeRecent(filePath: String) { + viewModelScope.launch { + pdfRepository.updateLastOpenTime(filePath, 0L) + } + } + /** * 书签相关方法 */ @@ -218,7 +224,7 @@ class PdfViewModel : ViewModel() { } } - fun updateBookmark(bookmark: BookmarkEntity){ + fun updateBookmark(bookmark: BookmarkEntity) { viewModelScope.launch { val int = pdfRepository.updateBookmark(bookmark) val success = int > 0 diff --git a/app/src/main/res/drawable/collect.xml b/app/src/main/res/drawable/collect.xml index fc0c107..67829d7 100644 --- a/app/src/main/res/drawable/collect.xml +++ b/app/src/main/res/drawable/collect.xml @@ -1,9 +1,13 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M12,20.88L10.55,19.55C5.4,14.9 3,12.36 3,9.5C3,7.01 5.01,5 7.5,5C8.74,5 9.91,5.5 10.7,6.35L12,7.63L13.3,6.35C14.09,5.5 15.26,5 16.5,5C18.99,5 21,7.01 21,9.5C21,12.36 18.6,14.9 13.45,19.55L12,20.88Z" + android:strokeWidth="1.5" + android:fillColor="#00000000" + android:strokeColor="#CCCCCC" + android:strokeLineCap="round" + android:strokeLineJoin="round"/> diff --git a/app/src/main/res/drawable/collected.xml b/app/src/main/res/drawable/collected.xml index a13e03b..2acf841 100644 --- a/app/src/main/res/drawable/collected.xml +++ b/app/src/main/res/drawable/collected.xml @@ -1,9 +1,13 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M12,20.88L10.55,19.55C5.4,14.9 3,12.36 3,9.5C3,7.01 5.01,5 7.5,5C8.74,5 9.91,5.5 10.7,6.35L12,7.63L13.3,6.35C14.09,5.5 15.26,5 16.5,5C18.99,5 21,7.01 21,9.5C21,12.36 18.6,14.9 13.45,19.55L12,20.88Z" + android:strokeWidth="1.5" + android:fillColor="#E43521" + android:strokeColor="#E43521" + android:strokeLineCap="round" + android:strokeLineJoin="round"/> diff --git a/app/src/main/res/drawable/dr_bookmarks_bg.xml b/app/src/main/res/drawable/dr_bookmarks_bg.xml index 9829eae..845014f 100644 --- a/app/src/main/res/drawable/dr_bookmarks_bg.xml +++ b/app/src/main/res/drawable/dr_bookmarks_bg.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/dr_btn_not_clickable_bg.xml b/app/src/main/res/drawable/dr_btn_not_clickable_bg.xml index 6061c58..c4e3244 100644 --- a/app/src/main/res/drawable/dr_btn_not_clickable_bg.xml +++ b/app/src/main/res/drawable/dr_btn_not_clickable_bg.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/drawable/dr_cancel_btn_bg.xml b/app/src/main/res/drawable/dr_cancel_btn_bg.xml index f3621c9..b4189af 100644 --- a/app/src/main/res/drawable/dr_cancel_btn_bg.xml +++ b/app/src/main/res/drawable/dr_cancel_btn_bg.xml @@ -5,7 +5,7 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/app/src/main/res/drawable/dr_click_btn_bg.xml b/app/src/main/res/drawable/dr_click_btn_bg.xml index fd05e1f..ffaf102 100644 --- a/app/src/main/res/drawable/dr_click_btn_bg.xml +++ b/app/src/main/res/drawable/dr_click_btn_bg.xml @@ -4,7 +4,7 @@ - + @@ -12,7 +12,7 @@ - + diff --git a/app/src/main/res/drawable/dr_click_btn_red_bg.xml b/app/src/main/res/drawable/dr_click_btn_red_bg.xml deleted file mode 100644 index 99d7fb1..0000000 --- a/app/src/main/res/drawable/dr_click_btn_red_bg.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/icon_home_sel_off.xml b/app/src/main/res/drawable/icon_home_sel_off.xml new file mode 100644 index 0000000..219f249 --- /dev/null +++ b/app/src/main/res/drawable/icon_home_sel_off.xml @@ -0,0 +1,17 @@ + + + + diff --git a/app/src/main/res/drawable/icon_home_sel_on.xml b/app/src/main/res/drawable/icon_home_sel_on.xml new file mode 100644 index 0000000..f4af84a --- /dev/null +++ b/app/src/main/res/drawable/icon_home_sel_on.xml @@ -0,0 +1,17 @@ + + + + diff --git a/app/src/main/res/drawable/icon_notice.xml b/app/src/main/res/drawable/icon_notice.xml new file mode 100644 index 0000000..cb0ed7f --- /dev/null +++ b/app/src/main/res/drawable/icon_notice.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/app/src/main/res/drawable/icon_recently_sel_off.xml b/app/src/main/res/drawable/icon_recently_sel_off.xml new file mode 100644 index 0000000..3606d30 --- /dev/null +++ b/app/src/main/res/drawable/icon_recently_sel_off.xml @@ -0,0 +1,20 @@ + + + + diff --git a/app/src/main/res/drawable/icon_recently_sel_on.xml b/app/src/main/res/drawable/icon_recently_sel_on.xml new file mode 100644 index 0000000..10d240e --- /dev/null +++ b/app/src/main/res/drawable/icon_recently_sel_on.xml @@ -0,0 +1,20 @@ + + + + diff --git a/app/src/main/res/drawable/icon_tools_sel_off.xml b/app/src/main/res/drawable/icon_tools_sel_off.xml new file mode 100644 index 0000000..d91998f --- /dev/null +++ b/app/src/main/res/drawable/icon_tools_sel_off.xml @@ -0,0 +1,34 @@ + + + + + + + + + + diff --git a/app/src/main/res/drawable/icon_tools_sel_on.xml b/app/src/main/res/drawable/icon_tools_sel_on.xml new file mode 100644 index 0000000..a9e1008 --- /dev/null +++ b/app/src/main/res/drawable/icon_tools_sel_on.xml @@ -0,0 +1,34 @@ + + + + + + + + + + diff --git a/app/src/main/res/drawable/more.xml b/app/src/main/res/drawable/more.xml index 7a3cb3b..ddfb4ef 100644 --- a/app/src/main/res/drawable/more.xml +++ b/app/src/main/res/drawable/more.xml @@ -1,9 +1,45 @@ - + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/search.xml b/app/src/main/res/drawable/search.xml index 8cd097d..1aae517 100644 --- a/app/src/main/res/drawable/search.xml +++ b/app/src/main/res/drawable/search.xml @@ -1,9 +1,20 @@ - + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + + + diff --git a/app/src/main/res/drawable/sidebar.xml b/app/src/main/res/drawable/sidebar.xml index 48aceef..42630aa 100644 --- a/app/src/main/res/drawable/sidebar.xml +++ b/app/src/main/res/drawable/sidebar.xml @@ -1,9 +1,24 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + android:pathData="M3,6H21" + android:strokeWidth="1.5" + android:strokeColor="#000000" + android:strokeLineCap="round"/> + + + + diff --git a/app/src/main/res/drawable/sorting.xml b/app/src/main/res/drawable/sorting.xml index 453b0f2..39a4857 100644 --- a/app/src/main/res/drawable/sorting.xml +++ b/app/src/main/res/drawable/sorting.xml @@ -1,9 +1,14 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + android:pathData="M4,4H20V6.2C20,6.57 19.84,6.92 19.57,7.19L14.5,12V19L9.5,20.5V12.5L4.43,7.31C4.18,7.03 4,6.69 4,6.31V4Z" + android:strokeLineJoin="round" + android:strokeWidth="1.5" + android:fillColor="#00000000" + android:strokeColor="#000000" + android:strokeLineCap="round"/> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index ea33070..8e1892d 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -2,7 +2,7 @@ - + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" + android:layout_weight="1" + android:text="@string/app_name" + android:textColor="@color/black" + android:textSize="18sp" /> + android:id="@+id/topButtonLayout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal"> - + + + + + + + + + - - - - - - + android:src="@drawable/icon_notice" /> + + + android:background="@color/white" + android:layout_height="64dp" + android:orientation="horizontal"> + android:src="@drawable/icon_home_sel_on" /> + android:textSize="12sp" /> + android:src="@drawable/icon_recently_sel_off" /> + android:textSize="12sp" /> + android:src="@drawable/collect" /> + android:textSize="12sp" /> + android:src="@drawable/icon_tools_sel_off" /> + android:textSize="12sp" /> diff --git a/app/src/main/res/layout/adapter_pdf_item.xml b/app/src/main/res/layout/adapter_pdf_item.xml index c49f569..2302f89 100644 --- a/app/src/main/res/layout/adapter_pdf_item.xml +++ b/app/src/main/res/layout/adapter_pdf_item.xml @@ -106,7 +106,7 @@ diff --git a/app/src/main/res/layout/dialog_bookmarks.xml b/app/src/main/res/layout/dialog_bookmarks.xml index 3e4bde1..4b95cd7 100644 --- a/app/src/main/res/layout/dialog_bookmarks.xml +++ b/app/src/main/res/layout/dialog_bookmarks.xml @@ -46,7 +46,7 @@ android:id="@+id/addBtn" android:layout_width="wrap_content" android:layout_height="match_parent" - android:background="@drawable/dr_click_btn_red_bg" + android:background="@drawable/dr_click_btn_bg" android:gravity="center" android:orientation="horizontal" android:paddingStart="12dp" @@ -124,7 +124,7 @@ android:layout_width="wrap_content" android:layout_height="44dp" android:layout_marginTop="24dp" - android:background="@drawable/dr_click_btn_red_bg" + android:background="@drawable/dr_click_btn_bg" android:gravity="center" android:paddingStart="24dp" android:paddingEnd="24dp"> diff --git a/app/src/main/res/layout/dialog_delete.xml b/app/src/main/res/layout/dialog_delete.xml index ba016a6..28f37a1 100644 --- a/app/src/main/res/layout/dialog_delete.xml +++ b/app/src/main/res/layout/dialog_delete.xml @@ -57,10 +57,11 @@ android:layout_height="48dp" android:layout_marginStart="8dp" android:layout_weight="1" - android:background="@drawable/dr_click_btn_red_bg" + android:background="@drawable/dr_click_btn_bg" android:gravity="center"> + + + + + + + + - + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f902ec3..90a8b14 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -10,11 +10,17 @@ #99000000 #FFFFFFFF #E6E6E6 - #F6F6F6 + #FAFAFA #E0E0E0 #2c2c2c #666666 #80FFD699 #636366 #F1494F + #E43521 + #CCCCCC + #E43521 + #BB6D64 + #E43521 + #33E43521 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1c51d9e..8f380f7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -50,6 +50,10 @@ Add Bookmark Added Add + Remove + Remove from Recent + Remove from Recent? + The file(s) will be removed from Recent,not deleted Removed from Favorites Delete File Delete