prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
ztimms73
2021-06-17 23:33:52 +03:00
parent 75b1068d46
commit c71460fcd8
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/AndroidManifest.xml
View File

@@ -11,6 +11,13 @@
<uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<queries>
<intent>
<action android:name="android.speech.RecognitionService" />
</intent>
</queries>
<application <application
android:name="org.koitharu.kotatsu.KotatsuApp" android:name="org.koitharu.kotatsu.KotatsuApp"

6
app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt
View File

@@ -10,12 +10,12 @@ import com.google.android.material.chip.Chip
import com.google.android.material.chip.ChipDrawable import com.google.android.material.chip.ChipDrawable
import com.google.android.material.chip.ChipGroup import com.google.android.material.chip.ChipGroup
import org.koitharu.kotatsu.R import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.utils.ext.getThemeColor
class ChipsView @JvmOverloads constructor( class ChipsView @JvmOverloads constructor(
context: Context, context: Context,
attrs: AttributeSet? = null attrs: AttributeSet? = null,
) : ChipGroup(context, attrs) { defStyleAttr: Int = com.google.android.material.R.attr.chipGroupStyle
) : ChipGroup(context, attrs, defStyleAttr) {
private var isLayoutSuppressedCompat = false private var isLayoutSuppressedCompat = false
private var isLayoutCalledOnSuppressed = false private var isLayoutCalledOnSuppressed = false

13
app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
View File

@@ -60,6 +60,7 @@ class DetailsFragment : BaseFragment<FragmentDetailsBinding>(), View.OnClickList
.lifecycle(viewLifecycleOwner) .lifecycle(viewLifecycleOwner)
.enqueueWith(coil) .enqueueWith(coil)
textViewTitle.text = manga.title textViewTitle.text = manga.title
textViewSubtitle.textAndVisible = manga.altTitle
textViewAuthor.textAndVisible = manga.author textViewAuthor.textAndVisible = manga.author
textViewSource.text = manga.source.title textViewSource.text = manga.source.title
textViewDescription.text = textViewDescription.text =
@@ -88,8 +89,12 @@ class DetailsFragment : BaseFragment<FragmentDetailsBinding>(), View.OnClickList
} }
val file = manga.url.toUri().toFileOrNull() val file = manga.url.toUri().toFileOrNull()
if (file != null) { if (file != null) {
val size = file.length() viewLifecycleScope.launch {
textViewSize.text = FileSizeUtils.formatBytes(requireContext(), size) val size = withContext(Dispatchers.IO) {
file.length()
}
textViewSize.text = FileSizeUtils.formatBytes(requireContext(), size)
}
sizeContainer.isVisible = true sizeContainer.isVisible = true
} else { } else {
sizeContainer.isVisible = false sizeContainer.isVisible = false
@@ -117,9 +122,9 @@ class DetailsFragment : BaseFragment<FragmentDetailsBinding>(), View.OnClickList
private fun onFavouriteChanged(isFavourite: Boolean) { private fun onFavouriteChanged(isFavourite: Boolean) {
with(binding.buttonFavorite) { with(binding.buttonFavorite) {
if (isFavourite) { if (isFavourite) {
this?.setIconResource(R.drawable.ic_heart) this.setIconResource(R.drawable.ic_heart)
} else { } else {
this?.setIconResource(R.drawable.ic_heart_outline) this.setIconResource(R.drawable.ic_heart_outline)
} }
} }
} }

4
app/src/main/res/values/styles.xml
View File

@@ -1,4 +1,4 @@
<resources xmlns:tools="http://schemas.android.com/tools"> <resources>
<!-- Widget styles --> <!-- Widget styles -->
@@ -60,7 +60,7 @@
<!-- TextAppearance --> <!-- TextAppearance -->
<style name="TextAppearance.Kotatsu.ToolbarTitle" parent="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"> <style name="TextAppearance.Kotatsu.ToolbarTitle" parent="@style/TextAppearance.Widget.AppCompat.Toolbar.Title">
<item name="android:textSize" tools:ignore="SpUsage">20dp</item> <item name="android:textSize">20sp</item>
</style> </style>
<style name="TextAppearance.Kotatsu.Tab" parent="@style/TextAppearance.Design.Tab"> <style name="TextAppearance.Kotatsu.Tab" parent="@style/TextAppearance.Design.Tab">