Compare commits
3 Commits
v125010241
...
master
Author | SHA1 | Date | |
---|---|---|---|
6b96eb358d | |||
dfc1bf9fa3 | |||
b173664ff0 |
11
CHANGELOG.md
11
CHANGELOG.md
@ -1,3 +1,14 @@
|
|||||||
|
**v125010241
|
||||||
|
|
||||||
|
- Merge pull request 'fix: Link not opening.' (#178) from fix-open-link into master
|
||||||
|
- refactor: context fragments issues.
|
||||||
|
- logs: Context issues.
|
||||||
|
- fix: Handle empty url issue, again.
|
||||||
|
- fix: Link not opening.
|
||||||
|
- Changelog for v125010201
|
||||||
|
|
||||||
|
--------------------------------------------------------------------
|
||||||
|
|
||||||
**v125010201
|
**v125010201
|
||||||
|
|
||||||
- fix: Handle empty url issue.
|
- fix: Handle empty url issue.
|
||||||
|
@ -193,14 +193,13 @@ class ArticleFragment :
|
|||||||
fab.mainFabClosedIconColor = colorOnSurface
|
fab.mainFabClosedIconColor = colorOnSurface
|
||||||
fab.mainFabOpenedIconColor = colorOnSurface
|
fab.mainFabOpenedIconColor = colorOnSurface
|
||||||
|
|
||||||
maybeIfContext { context -> handleFloatingToolbarActionItems(context) }
|
maybeIfContext { handleFloatingToolbarActionItems(it) }
|
||||||
|
|
||||||
fab.setOnActionSelectedListener { actionItem ->
|
fab.setOnActionSelectedListener { actionItem ->
|
||||||
when (actionItem.id) {
|
when (actionItem.id) {
|
||||||
R.id.share_action -> requireActivity().shareLink(url, contentTitle)
|
R.id.share_action -> requireActivity().shareLink(url, contentTitle)
|
||||||
R.id.open_action -> requireActivity().openItemUrlInBrowserAsNewTask(this@ArticleFragment.item)
|
R.id.open_action -> requireActivity().openItemUrlInBrowserAsNewTask(this@ArticleFragment.item)
|
||||||
R.id.unread_action ->
|
R.id.unread_action ->
|
||||||
try {
|
|
||||||
if (this@ArticleFragment.item.unread) {
|
if (this@ArticleFragment.item.unread) {
|
||||||
CoroutineScope(Dispatchers.IO).launch {
|
CoroutineScope(Dispatchers.IO).launch {
|
||||||
repository.markAsRead(this@ArticleFragment.item)
|
repository.markAsRead(this@ArticleFragment.item)
|
||||||
@ -219,15 +218,14 @@ class ArticleFragment :
|
|||||||
repository.unmarkAsRead(this@ArticleFragment.item)
|
repository.unmarkAsRead(this@ArticleFragment.item)
|
||||||
}
|
}
|
||||||
this@ArticleFragment.item.unread = true
|
this@ArticleFragment.item.unread = true
|
||||||
|
maybeIfContext {
|
||||||
Toast
|
Toast
|
||||||
.makeText(
|
.makeText(
|
||||||
context,
|
it,
|
||||||
R.string.marked_as_unread,
|
R.string.marked_as_unread,
|
||||||
Toast.LENGTH_LONG,
|
Toast.LENGTH_LONG,
|
||||||
).show()
|
).show()
|
||||||
}
|
}
|
||||||
} catch (e: IllegalStateException) {
|
|
||||||
e.sendSilentlyWithAcraWithName("Toolbar context required is null")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
else -> Unit
|
else -> Unit
|
||||||
@ -313,8 +311,8 @@ class ArticleFragment :
|
|||||||
|
|
||||||
private fun handleLeadImage(leadImageUrl: String?) {
|
private fun handleLeadImage(leadImageUrl: String?) {
|
||||||
if (!leadImageUrl.isNullOrEmpty()) {
|
if (!leadImageUrl.isNullOrEmpty()) {
|
||||||
binding.imageView.visibility = View.VISIBLE
|
|
||||||
maybeIfContext {
|
maybeIfContext {
|
||||||
|
binding.imageView.visibility = View.VISIBLE
|
||||||
it.bitmapFitCenter(leadImageUrl, binding.imageView, appSettingsService)
|
it.bitmapFitCenter(leadImageUrl, binding.imageView, appSettingsService)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -397,13 +395,12 @@ class ArticleFragment :
|
|||||||
WHITE_COLOR_HEX and (if (colorOnSurface != DATA_NULL_UNDEFINED) colorOnSurface else 0),
|
WHITE_COLOR_HEX and (if (colorOnSurface != DATA_NULL_UNDEFINED) colorOnSurface else 0),
|
||||||
)
|
)
|
||||||
|
|
||||||
try {
|
|
||||||
binding.webcontent.settings.useWideViewPort = true
|
binding.webcontent.settings.useWideViewPort = true
|
||||||
binding.webcontent.settings.loadWithOverviewMode = true
|
binding.webcontent.settings.loadWithOverviewMode = true
|
||||||
binding.webcontent.settings.javaScriptEnabled = false
|
binding.webcontent.settings.javaScriptEnabled = false
|
||||||
|
|
||||||
handleImageLoading()
|
handleImageLoading()
|
||||||
|
try {
|
||||||
val gestureDetector =
|
val gestureDetector =
|
||||||
GestureDetector(
|
GestureDetector(
|
||||||
activity,
|
activity,
|
||||||
@ -417,15 +414,14 @@ class ArticleFragment :
|
|||||||
event,
|
event,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.webcontent.settings.layoutAlgorithm =
|
|
||||||
WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
|
|
||||||
} catch (e: IllegalStateException) {
|
} catch (e: IllegalStateException) {
|
||||||
e.sendSilentlyWithAcraWithName("Context is null but wasn't, and that's causing issues with webview config")
|
e.sendSilentlyWithAcraWithName("Gesture detector issue ?")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
binding.webcontent.settings.layoutAlgorithm =
|
||||||
|
WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
|
||||||
|
|
||||||
var baseUrl: String? = null
|
var baseUrl: String? = null
|
||||||
try {
|
try {
|
||||||
val itemUrl = URL(url)
|
val itemUrl = URL(url)
|
||||||
@ -434,16 +430,18 @@ class ArticleFragment :
|
|||||||
e.sendSilentlyWithAcraWithName("htmlToWebview > $url")
|
e.sendSilentlyWithAcraWithName("htmlToWebview > $url")
|
||||||
}
|
}
|
||||||
|
|
||||||
val fontName =
|
val fontName: String =
|
||||||
|
maybeIfContext {
|
||||||
when (font) {
|
when (font) {
|
||||||
getString(R.string.open_sans_font_id) -> "Open Sans"
|
it.getString(R.string.open_sans_font_id) -> "Open Sans"
|
||||||
getString(R.string.roboto_font_id) -> "Roboto"
|
it.getString(R.string.roboto_font_id) -> "Roboto"
|
||||||
getString(R.string.source_code_pro_font_id) -> "Source Code Pro"
|
it.getString(R.string.source_code_pro_font_id) -> "Source Code Pro"
|
||||||
else -> ""
|
else -> ""
|
||||||
}
|
}
|
||||||
|
}?.toString().orEmpty()
|
||||||
|
|
||||||
val fontLinkAndStyle =
|
val fontLinkAndStyle =
|
||||||
if (font.isNotEmpty()) {
|
if (fontName.isNotEmpty()) {
|
||||||
"""<link href="https://fonts.googleapis.com/css?family=${
|
"""<link href="https://fonts.googleapis.com/css?family=${
|
||||||
fontName.replace(
|
fontName.replace(
|
||||||
" ",
|
" ",
|
||||||
@ -459,7 +457,7 @@ class ArticleFragment :
|
|||||||
} else {
|
} else {
|
||||||
""
|
""
|
||||||
}
|
}
|
||||||
|
try {
|
||||||
binding.webcontent.loadDataWithBaseURL(
|
binding.webcontent.loadDataWithBaseURL(
|
||||||
baseUrl,
|
baseUrl,
|
||||||
"""<html>
|
"""<html>
|
||||||
|
@ -0,0 +1,8 @@
|
|||||||
|
**v125010241**
|
||||||
|
|
||||||
|
- Merge pull request 'fix: Link not opening.' (#178) from fix-open-link into master
|
||||||
|
- refactor: context fragments issues.
|
||||||
|
- logs: Context issues.
|
||||||
|
- fix: Handle empty url issue, again.
|
||||||
|
- fix: Link not opening.
|
||||||
|
- Changelog for v125010201
|
Loading…
x
Reference in New Issue
Block a user