Compare commits
9 Commits
v125010241
...
master
Author | SHA1 | Date | |
---|---|---|---|
0bb4fe6aed | |||
7df4c3368c | |||
c69635b5ae | |||
3a829df70e | |||
7a0202689f | |||
b20f6888f5 | |||
6b96eb358d | |||
dfc1bf9fa3 | |||
b173664ff0 |
.gitea/workflows
CHANGELOG.mdandroidApp/src
androidTest/kotlin/bou/amine/apps/readerforselfossv2/android
main/java/bou/amine/apps/readerforselfossv2/android/fragments
fastlane/metadata/android/en-US/changelogs
gradle.propertiesgradle/wrapper
@ -16,6 +16,7 @@ jobs:
|
|||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
ref: master
|
||||||
- name: Config git
|
- name: Config git
|
||||||
run: |
|
run: |
|
||||||
git config --global user.email aminecmi+giteadrone@pm.me
|
git config --global user.email aminecmi+giteadrone@pm.me
|
||||||
@ -50,7 +51,7 @@ jobs:
|
|||||||
followtags: true
|
followtags: true
|
||||||
ssh_key: ${{ secrets.PRIVATE_KEY }}
|
ssh_key: ${{ secrets.PRIVATE_KEY }}
|
||||||
tags: true
|
tags: true
|
||||||
branch: release
|
branch: master
|
||||||
- name: copy file via ssh password
|
- name: copy file via ssh password
|
||||||
uses: appleboy/scp-action@v0.1.7
|
uses: appleboy/scp-action@v0.1.7
|
||||||
with:
|
with:
|
||||||
|
21
CHANGELOG.md
21
CHANGELOG.md
@ -1,3 +1,24 @@
|
|||||||
|
**v125020411
|
||||||
|
|
||||||
|
- Merge pull request 'bump' (#182) from bump into master
|
||||||
|
- chore: non transiant R classes.
|
||||||
|
- Merge pull request 'fix: One more missing context.' (#181) from fix-one-more-context into master
|
||||||
|
- bump
|
||||||
|
- fix: One more missing context.
|
||||||
|
|
||||||
|
--------------------------------------------------------------------
|
||||||
|
|
||||||
|
**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.
|
||||||
|
@ -56,7 +56,7 @@ class HomeActivityTest {
|
|||||||
fun testMenuActions() {
|
fun testMenuActions() {
|
||||||
onView(withId(R.id.action_search)).perform(click())
|
onView(withId(R.id.action_search)).perform(click())
|
||||||
onView(
|
onView(
|
||||||
withId(R.id.search_src_text),
|
withId(com.google.android.material.R.id.search_src_text),
|
||||||
).check(matches(isFocused()))
|
).check(matches(isFocused()))
|
||||||
onView(isRoot()).perform(ViewActions.pressBack())
|
onView(isRoot()).perform(ViewActions.pressBack())
|
||||||
|
|
||||||
|
@ -118,8 +118,8 @@ class ArticleFragment :
|
|||||||
e.sendSilentlyWithAcra()
|
e.sendSilentlyWithAcra()
|
||||||
}
|
}
|
||||||
|
|
||||||
colorOnSurface = getColorFromAttr(R.attr.colorOnSurface)
|
colorOnSurface = getColorFromAttr(com.google.android.material.R.attr.colorOnSurface)
|
||||||
colorSurface = getColorFromAttr(R.attr.colorSurface)
|
colorSurface = getColorFromAttr(com.google.android.material.R.attr.colorSurface)
|
||||||
|
|
||||||
contentText = item.content
|
contentText = item.content
|
||||||
contentTitle = item.title.getHtmlDecoded()
|
contentTitle = item.title.getHtmlDecoded()
|
||||||
@ -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>
|
||||||
|
16
androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt
16
androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt
@ -83,7 +83,15 @@ class FilterSheetFragment :
|
|||||||
val sourceGroup = binding.sourcesGroup
|
val sourceGroup = binding.sourcesGroup
|
||||||
|
|
||||||
repository.getSourcesDetailsOrStats().forEachIndexed { _, source ->
|
repository.getSourcesDetailsOrStats().forEachIndexed { _, source ->
|
||||||
val c = Chip(context)
|
val c: Chip? =
|
||||||
|
maybeIfContext {
|
||||||
|
Chip(it)
|
||||||
|
} as Chip?
|
||||||
|
|
||||||
|
if (c == null) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
c.ellipsize = TextUtils.TruncateAt.END
|
c.ellipsize = TextUtils.TruncateAt.END
|
||||||
|
|
||||||
maybeIfContext {
|
maybeIfContext {
|
||||||
@ -145,7 +153,11 @@ class FilterSheetFragment :
|
|||||||
val tags = repository.getTags()
|
val tags = repository.getTags()
|
||||||
|
|
||||||
tags.forEachIndexed { _, tag ->
|
tags.forEachIndexed { _, tag ->
|
||||||
val c = Chip(context)
|
val c: Chip? = maybeIfContext { Chip(it) } as Chip?
|
||||||
|
if (c == null) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
c.ellipsize = TextUtils.TruncateAt.END
|
c.ellipsize = TextUtils.TruncateAt.END
|
||||||
c.text = tag.tag
|
c.text = tag.tag
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
plugins {
|
plugins {
|
||||||
//trick: for the same plugin versions in all sub-modules
|
// trick: for the same plugin versions in all sub-modules
|
||||||
id("com.android.application").version("8.7.3").apply(false)
|
id("com.android.application").version("8.8.0").apply(false)
|
||||||
id("com.android.library").version("8.7.3").apply(false)
|
id("com.android.library").version("8.8.0").apply(false)
|
||||||
id("org.jetbrains.kotlin.android").version("2.1.0").apply(false)
|
id("org.jetbrains.kotlin.android").version("2.1.0").apply(false)
|
||||||
kotlin("multiplatform").version("2.1.0").apply(false)
|
kotlin("multiplatform").version("2.1.0").apply(false)
|
||||||
id("com.mikepenz.aboutlibraries.plugin").version("10.5.1").apply(false)
|
id("com.mikepenz.aboutlibraries.plugin").version("10.5.1").apply(false)
|
||||||
@ -16,7 +16,6 @@ allprojects {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
tasks.register("clean", Delete::class) {
|
tasks.register("clean", Delete::class) {
|
||||||
delete(layout.buildDirectory)
|
delete(layout.buildDirectory)
|
||||||
}
|
}
|
||||||
|
@ -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
|
@ -0,0 +1,7 @@
|
|||||||
|
**v125020411**
|
||||||
|
|
||||||
|
- Merge pull request 'bump' (#182) from bump into master
|
||||||
|
- chore: non transiant R classes.
|
||||||
|
- Merge pull request 'fix: One more missing context.' (#181) from fix-one-more-context into master
|
||||||
|
- bump
|
||||||
|
- fix: One more missing context.
|
@ -19,7 +19,7 @@ kotlin.code.style=official
|
|||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
#android.nonTransitiveRClass=true
|
#android.nonTransitiveRClass=true
|
||||||
android.enableJetifier=false
|
android.enableJetifier=false
|
||||||
android.nonTransitiveRClass=false
|
android.nonTransitiveRClass=true
|
||||||
#MPP
|
#MPP
|
||||||
kotlin.mpp.enableCInteropCommonization=true
|
kotlin.mpp.enableCInteropCommonization=true
|
||||||
org.gradle.parallel=true
|
org.gradle.parallel=true
|
||||||
|
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
|||||||
#Mon Nov 25 22:48:24 CET 2024
|
#Sun Feb 09 14:44:52 CET 2025
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
Loading…
x
Reference in New Issue
Block a user