Compare commits
11 Commits
v125010201
...
80293a2248
| Author | SHA1 | Date | |
|---|---|---|---|
| 80293a2248 | |||
| 474b12120e | |||
| 6b96eb358d | |||
| dfc1bf9fa3 | |||
|
|
b173664ff0 | ||
| bc20a421ae | |||
| 794500355a | |||
| 44f9dd53d3 | |||
| 717d6b664c | |||
| e23289a3dc | |||
|
|
2f5ebe2420 |
138
.gitea/workflows/on_merge_on_release-test.yml
Normal file
138
.gitea/workflows/on_merge_on_release-test.yml
Normal file
@@ -0,0 +1,138 @@
|
|||||||
|
name: Create tag
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- test-releas
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
# build:
|
||||||
|
# uses: ./.gitea/workflows/common_build.yml
|
||||||
|
createTagAndChangelog:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: build
|
||||||
|
steps:
|
||||||
|
- name: Check out repository code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
- name: Config git
|
||||||
|
run: |
|
||||||
|
git config --global user.email aminecmi+giteadrone@pm.me
|
||||||
|
git config --global user.name giteadrone
|
||||||
|
- name: Creating the tag and generate changelog
|
||||||
|
run: |
|
||||||
|
# git fetch --tags -p
|
||||||
|
# PREV=$(git describe --tags --abbrev=0)
|
||||||
|
# ./build.sh --publish --from-ci
|
||||||
|
# VER=$(git describe --tags --abbrev=0)
|
||||||
|
# CHANGELOG=$(git log $PREV..HEAD --pretty="- %s")
|
||||||
|
# echo "**$VER
|
||||||
|
#
|
||||||
|
# $CHANGELOG
|
||||||
|
echo "AAAAAAAAAAA
|
||||||
|
|
||||||
|
--------------------------------------------------------------------
|
||||||
|
|
||||||
|
$(cat CHANGELOG.md)" > CHANGELOG.md
|
||||||
|
git add CHANGELOG.md
|
||||||
|
# touch ./fastlane/metadata/android/en\-US/changelogs/$VER.txt
|
||||||
|
# echo "**$VER**
|
||||||
|
|
||||||
|
# $CHANGELOG" > ./fastlane/metadata/android/en\-US/changelogs/$VER.txt
|
||||||
|
# git add ./fastlane/metadata/android/en\-US/changelogs/$VER.txt
|
||||||
|
git commit -m "Changelog for $VER"
|
||||||
|
git checkout master
|
||||||
|
git merge release
|
||||||
|
- name: Check out repository code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
ref: master
|
||||||
|
- name: Merge master in release
|
||||||
|
run: |
|
||||||
|
git merge release
|
||||||
|
- name: Push changes
|
||||||
|
uses: appleboy/git-push-action@v1.0.0
|
||||||
|
with:
|
||||||
|
author_name: giteadrone
|
||||||
|
author_email: aminecmi+giteadrone@pm.me
|
||||||
|
remote: ${{ secrets.REMOTE_URL }}
|
||||||
|
followtags: true
|
||||||
|
ssh_key: ${{ secrets.PRIVATE_KEY }}
|
||||||
|
tags: true
|
||||||
|
branch: master
|
||||||
|
# - name: copy file via ssh password
|
||||||
|
# uses: appleboy/scp-action@v0.1.7
|
||||||
|
# with:
|
||||||
|
# host: amine-bouabdallaoui.fr
|
||||||
|
# username: ubuntu
|
||||||
|
# key: ${{ secrets.PRIVATE_KEY }}
|
||||||
|
# source: "version.txt"
|
||||||
|
# target: "/home/ubuntu/"
|
||||||
|
# - name: deploy version file
|
||||||
|
# uses: appleboy/ssh-action@v1.2.0
|
||||||
|
# with:
|
||||||
|
# host: amine-bouabdallaoui.fr
|
||||||
|
# username: ubuntu
|
||||||
|
# key: ${{ secrets.PRIVATE_KEY }}
|
||||||
|
# script: cd /home/ubuntu && sudo rm -rf /var/www/amine/version.txt && sudo chown www-data:www-data ./version.txt && sudo mv version.txt /var/www/amine/
|
||||||
|
# release:
|
||||||
|
# runs-on: ubuntu-latest
|
||||||
|
# needs: createTagAndChangelog
|
||||||
|
# steps:
|
||||||
|
# - name: Check out repository code
|
||||||
|
# uses: actions/checkout@v4
|
||||||
|
# with:
|
||||||
|
# fetch-depth: 0
|
||||||
|
# - name: Fetch tags
|
||||||
|
# id: version
|
||||||
|
# run: |
|
||||||
|
# git fetch --tags -p
|
||||||
|
# PREV=$(git describe --tags --abbrev=0)
|
||||||
|
# echo $PREV
|
||||||
|
# echo "VERSION=$PREV" >> $GITHUB_OUTPUT
|
||||||
|
# - uses: actions/setup-java@v4
|
||||||
|
# with:
|
||||||
|
# distribution: 'temurin'
|
||||||
|
# java-version: '17'
|
||||||
|
# cache: gradle
|
||||||
|
# - name: Setup Android SDK
|
||||||
|
# uses: android-actions/setup-android@v3
|
||||||
|
# - name: Configure gradle...
|
||||||
|
# run: mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
|
||||||
|
# - name: setup go
|
||||||
|
# uses: https://github.com/actions/setup-go@v4
|
||||||
|
# with:
|
||||||
|
# go-version: '>=1.20.1'
|
||||||
|
# - name: Generate APK
|
||||||
|
# run: ./gradlew :androidApp:assembleGithubConfigRelease
|
||||||
|
# - name: Get Key
|
||||||
|
# run: wget ${{ secrets.KEY_URL }}
|
||||||
|
# - name: Zippalign
|
||||||
|
# run: |
|
||||||
|
# sdkmanager "build-tools;31.0.0"
|
||||||
|
# ls $ANDROID_HOME/build-tools
|
||||||
|
# $ANDROID_HOME/build-tools/31.0.0/zipalign -f -v 4 androidApp/build/outputs/apk/githubConfig/release/androidApp-githubConfig-release-unsigned.apk androidApp/build/outputs/apk/githubConfig/release/android-prod-released-ziped.apk
|
||||||
|
# - name: Sigh
|
||||||
|
# run: $ANDROID_HOME/build-tools/31.0.0/apksigner sign -v --out signed.apk --ks ./key --ks-key-alias ${{ secrets.KEY_ALIAS }} --ks-pass pass:${{ secrets.KEYSTORE_PASSWORD }} --v1-signing-enabled true --v2-signing-enabled true androidApp/build/outputs/apk/githubConfig/release/android-prod-released-ziped.apk
|
||||||
|
# - name: Verify
|
||||||
|
# run: $ANDROID_HOME/build-tools/31.0.0/apksigner verify signed.apk
|
||||||
|
# - name: Release
|
||||||
|
# uses: https://gitea.com/actions/gitea-release-action@main
|
||||||
|
# with:
|
||||||
|
# files: signed.apk
|
||||||
|
# token: ${{ secrets.API_KEY }}
|
||||||
|
# tag_name: ${{ steps.version.outputs.VERSION }}
|
||||||
|
# name: ${{ steps.version.outputs.VERSION }}
|
||||||
|
# - name: Send mail
|
||||||
|
# uses: https://github.com/dawidd6/action-send-mail@v4
|
||||||
|
# with:
|
||||||
|
# connection_url: ${{ secrets.MAIL_CONNECTION }}
|
||||||
|
# to: ${{ secrets.MAIL_TO }}
|
||||||
|
# from: ${{ secrets.MAIL_FROM }}
|
||||||
|
# subject: Mapping file
|
||||||
|
# priority: high
|
||||||
|
# convert_markdown: true
|
||||||
|
# body: Nouveau fichier de mapping pour la version ${{ steps.version.outputs.VERSION }}
|
||||||
|
# attachments: androidApp/build/outputs/mapping/githubConfigRelease/mapping.txt
|
||||||
20
CHANGELOG.md
20
CHANGELOG.md
@@ -1,3 +1,23 @@
|
|||||||
|
**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
|
||||||
|
|
||||||
|
- fix: Handle empty url issue.
|
||||||
|
- Merge pull request 'Removed the floating bar.' (#177) from floating-bar into master
|
||||||
|
- chore: changing actions in reader fragment.
|
||||||
|
- Changelog for v125010131
|
||||||
|
|
||||||
|
--------------------------------------------------------------------
|
||||||
|
|
||||||
**v125010131
|
**v125010131
|
||||||
|
|
||||||
- fix: reload the adapter when it's needed. Fixes #128. (#176)
|
- fix: reload the adapter when it's needed. Fixes #128. (#176)
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ import bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity
|
|||||||
import bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton
|
import bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.bottombar.maybeShow
|
import bou.amine.apps.readerforselfossv2.android.utils.bottombar.maybeShow
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.bottombar.removeBadge
|
import bou.amine.apps.readerforselfossv2.android.utils.bottombar.removeBadge
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowser
|
import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowserAsNewTask
|
||||||
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
||||||
import bou.amine.apps.readerforselfossv2.repository.Repository
|
import bou.amine.apps.readerforselfossv2.repository.Repository
|
||||||
import bou.amine.apps.readerforselfossv2.service.AppSettingsService
|
import bou.amine.apps.readerforselfossv2.service.AppSettingsService
|
||||||
@@ -599,7 +599,7 @@ class HomeActivity :
|
|||||||
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
||||||
when (item.itemId) {
|
when (item.itemId) {
|
||||||
R.id.issue_tracker -> {
|
R.id.issue_tracker -> {
|
||||||
baseContext.openUrlInBrowser(AppSettingsService.BUG_URL)
|
baseContext.openUrlInBrowserAsNewTask(AppSettingsService.BUG_URL)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,8 +33,9 @@ import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapFitCenter
|
|||||||
import bou.amine.apps.readerforselfossv2.android.utils.glide.getBitmapInputStream
|
import bou.amine.apps.readerforselfossv2.android.utils.glide.getBitmapInputStream
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.glide.getGlideImageForResource
|
import bou.amine.apps.readerforselfossv2.android.utils.glide.getGlideImageForResource
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.isUrlValid
|
import bou.amine.apps.readerforselfossv2.android.utils.isUrlValid
|
||||||
|
import bou.amine.apps.readerforselfossv2.android.utils.maybeIfContext
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.openItemUrlInBrowserAsNewTask
|
import bou.amine.apps.readerforselfossv2.android.utils.openItemUrlInBrowserAsNewTask
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowser
|
import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowserAsNewTask
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.shareLink
|
import bou.amine.apps.readerforselfossv2.android.utils.shareLink
|
||||||
import bou.amine.apps.readerforselfossv2.model.MercuryModel
|
import bou.amine.apps.readerforselfossv2.model.MercuryModel
|
||||||
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
||||||
@@ -117,8 +118,8 @@ class ArticleFragment :
|
|||||||
e.sendSilentlyWithAcra()
|
e.sendSilentlyWithAcra()
|
||||||
}
|
}
|
||||||
|
|
||||||
colorOnSurface = requireContext().getColorFromAttr(R.attr.colorOnSurface)
|
colorOnSurface = getColorFromAttr(R.attr.colorOnSurface)
|
||||||
colorSurface = requireContext().getColorFromAttr(R.attr.colorSurface)
|
colorSurface = getColorFromAttr(R.attr.colorSurface)
|
||||||
|
|
||||||
contentText = item.content
|
contentText = item.content
|
||||||
contentTitle = item.title.getHtmlDecoded()
|
contentTitle = item.title.getHtmlDecoded()
|
||||||
@@ -147,11 +148,11 @@ class ArticleFragment :
|
|||||||
handleContent()
|
handleContent()
|
||||||
} catch (e: InflateException) {
|
} catch (e: InflateException) {
|
||||||
e.sendSilentlyWithAcraWithName("webview not available")
|
e.sendSilentlyWithAcraWithName("webview not available")
|
||||||
try {
|
maybeIfContext {
|
||||||
AlertDialog
|
AlertDialog
|
||||||
.Builder(requireContext())
|
.Builder(it)
|
||||||
.setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
|
.setMessage(it.getString(R.string.webview_dialog_issue_message))
|
||||||
.setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
|
.setTitle(it.getString(R.string.webview_dialog_issue_title))
|
||||||
.setPositiveButton(
|
.setPositiveButton(
|
||||||
android.R.string.ok,
|
android.R.string.ok,
|
||||||
) { _, _ ->
|
) { _, _ ->
|
||||||
@@ -159,8 +160,6 @@ class ArticleFragment :
|
|||||||
requireActivity().finish()
|
requireActivity().finish()
|
||||||
}.create()
|
}.create()
|
||||||
.show()
|
.show()
|
||||||
} catch (e: IllegalStateException) {
|
|
||||||
e.sendSilentlyWithAcraWithName("Context required is null")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -182,7 +181,7 @@ class ArticleFragment :
|
|||||||
|
|
||||||
if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
|
if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
|
||||||
binding.imageView.visibility = View.VISIBLE
|
binding.imageView.visibility = View.VISIBLE
|
||||||
requireContext().bitmapFitCenter(contentImage, binding.imageView, appSettingsService)
|
maybeIfContext { it.bitmapFitCenter(contentImage, binding.imageView, appSettingsService) }
|
||||||
} else {
|
} else {
|
||||||
binding.imageView.visibility = View.GONE
|
binding.imageView.visibility = View.GONE
|
||||||
}
|
}
|
||||||
@@ -194,39 +193,39 @@ class ArticleFragment :
|
|||||||
fab.mainFabClosedIconColor = colorOnSurface
|
fab.mainFabClosedIconColor = colorOnSurface
|
||||||
fab.mainFabOpenedIconColor = colorOnSurface
|
fab.mainFabOpenedIconColor = colorOnSurface
|
||||||
|
|
||||||
handleFloatingToolbarActionItems()
|
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)
|
}
|
||||||
}
|
this@ArticleFragment.item.unread = false
|
||||||
this@ArticleFragment.item.unread = false
|
maybeIfContext {
|
||||||
Toast
|
Toast
|
||||||
.makeText(
|
.makeText(
|
||||||
requireContext(),
|
it,
|
||||||
R.string.marked_as_read,
|
R.string.marked_as_read,
|
||||||
Toast.LENGTH_LONG,
|
Toast.LENGTH_LONG,
|
||||||
).show()
|
).show()
|
||||||
} else {
|
}
|
||||||
CoroutineScope(Dispatchers.IO).launch {
|
} else {
|
||||||
repository.unmarkAsRead(this@ArticleFragment.item)
|
CoroutineScope(Dispatchers.IO).launch {
|
||||||
}
|
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("Context required is null")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
else -> Unit
|
else -> Unit
|
||||||
@@ -235,14 +234,14 @@ class ArticleFragment :
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun handleFloatingToolbarActionItems() {
|
private fun handleFloatingToolbarActionItems(c: Context) {
|
||||||
fab.addHomeMadeActionItem(
|
fab.addHomeMadeActionItem(
|
||||||
R.id.share_action,
|
R.id.share_action,
|
||||||
resources.getDrawable(R.drawable.ic_share_white_24dp),
|
resources.getDrawable(R.drawable.ic_share_white_24dp),
|
||||||
R.string.reader_action_share,
|
R.string.reader_action_share,
|
||||||
colorOnSurface,
|
colorOnSurface,
|
||||||
colorSurface,
|
colorSurface,
|
||||||
requireContext(),
|
c,
|
||||||
)
|
)
|
||||||
fab.addHomeMadeActionItem(
|
fab.addHomeMadeActionItem(
|
||||||
R.id.open_action,
|
R.id.open_action,
|
||||||
@@ -250,7 +249,7 @@ class ArticleFragment :
|
|||||||
R.string.reader_action_open,
|
R.string.reader_action_open,
|
||||||
colorOnSurface,
|
colorOnSurface,
|
||||||
colorSurface,
|
colorSurface,
|
||||||
requireContext(),
|
c,
|
||||||
)
|
)
|
||||||
fab.addHomeMadeActionItem(
|
fab.addHomeMadeActionItem(
|
||||||
R.id.unread_action,
|
R.id.unread_action,
|
||||||
@@ -258,7 +257,7 @@ class ArticleFragment :
|
|||||||
R.string.unmark,
|
R.string.unmark,
|
||||||
colorOnSurface,
|
colorOnSurface,
|
||||||
colorSurface,
|
colorSurface,
|
||||||
requireContext(),
|
c,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -311,9 +310,11 @@ class ArticleFragment :
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun handleLeadImage(leadImageUrl: String?) {
|
private fun handleLeadImage(leadImageUrl: String?) {
|
||||||
if (!leadImageUrl.isNullOrEmpty() && context != null) {
|
if (!leadImageUrl.isNullOrEmpty()) {
|
||||||
binding.imageView.visibility = View.VISIBLE
|
maybeIfContext {
|
||||||
requireContext().bitmapFitCenter(leadImageUrl, binding.imageView, appSettingsService)
|
binding.imageView.visibility = View.VISIBLE
|
||||||
|
it.bitmapFitCenter(leadImageUrl, binding.imageView, appSettingsService)
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
binding.imageView.visibility = View.GONE
|
binding.imageView.visibility = View.GONE
|
||||||
}
|
}
|
||||||
@@ -327,11 +328,10 @@ class ArticleFragment :
|
|||||||
view: WebView?,
|
view: WebView?,
|
||||||
url: String,
|
url: String,
|
||||||
): Boolean =
|
): Boolean =
|
||||||
if (context != null &&
|
if (url.isUrlValid() &&
|
||||||
url.isUrlValid() &&
|
|
||||||
binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE
|
binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE
|
||||||
) {
|
) {
|
||||||
requireContext().openUrlInBrowser(url)
|
maybeIfContext { it.openUrlInBrowserAsNewTask(url) }
|
||||||
true
|
true
|
||||||
} else {
|
} else {
|
||||||
false
|
false
|
||||||
@@ -374,23 +374,14 @@ class ArticleFragment :
|
|||||||
|
|
||||||
@Suppress("detekt:LongMethod", "detekt:ImplicitDefaultLocale")
|
@Suppress("detekt:LongMethod", "detekt:ImplicitDefaultLocale")
|
||||||
private fun htmlToWebview() {
|
private fun htmlToWebview() {
|
||||||
val context: Context
|
maybeIfContext {
|
||||||
try {
|
|
||||||
context = requireContext()
|
|
||||||
} catch (e: IllegalStateException) {
|
|
||||||
e.sendSilentlyWithAcraWithName("Context required is null")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
|
val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
|
||||||
val a: TypedArray = context.obtainStyledAttributes(resId, attrs)
|
val a: TypedArray = it.obtainStyledAttributes(resId, attrs)
|
||||||
|
|
||||||
binding.webcontent.settings.standardFontFamily = a.getString(0)
|
binding.webcontent.settings.standardFontFamily = a.getString(0)
|
||||||
binding.webcontent.visibility = View.VISIBLE
|
""
|
||||||
} catch (e: IllegalStateException) {
|
|
||||||
e.sendSilentlyWithAcraWithName("Context issue when setting attributes, but context wasn't null before")
|
|
||||||
}
|
}
|
||||||
|
binding.webcontent.visibility = View.VISIBLE
|
||||||
|
|
||||||
val colorSurfaceString =
|
val colorSurfaceString =
|
||||||
String.format(
|
String.format(
|
||||||
@@ -404,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),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
binding.webcontent.settings.useWideViewPort = true
|
||||||
|
binding.webcontent.settings.loadWithOverviewMode = true
|
||||||
|
binding.webcontent.settings.javaScriptEnabled = false
|
||||||
|
|
||||||
|
handleImageLoading()
|
||||||
try {
|
try {
|
||||||
binding.webcontent.settings.useWideViewPort = true
|
|
||||||
binding.webcontent.settings.loadWithOverviewMode = true
|
|
||||||
binding.webcontent.settings.javaScriptEnabled = false
|
|
||||||
|
|
||||||
handleImageLoading()
|
|
||||||
|
|
||||||
val gestureDetector =
|
val gestureDetector =
|
||||||
GestureDetector(
|
GestureDetector(
|
||||||
activity,
|
activity,
|
||||||
@@ -424,49 +414,50 @@ 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 =
|
||||||
var baseUrl: String? = null
|
WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
|
||||||
try {
|
|
||||||
val itemUrl = URL(url)
|
|
||||||
baseUrl = itemUrl.protocol + "://" + itemUrl.host
|
|
||||||
} catch (e: MalformedURLException) {
|
|
||||||
e.sendSilentlyWithAcraWithName("htmlToWebview > $url")
|
|
||||||
}
|
|
||||||
|
|
||||||
val fontName =
|
var baseUrl: String? = null
|
||||||
|
try {
|
||||||
|
val itemUrl = URL(url)
|
||||||
|
baseUrl = itemUrl.protocol + "://" + itemUrl.host
|
||||||
|
} catch (e: MalformedURLException) {
|
||||||
|
e.sendSilentlyWithAcraWithName("htmlToWebview > $url")
|
||||||
|
}
|
||||||
|
|
||||||
|
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(
|
||||||
" ",
|
" ",
|
||||||
"+",
|
"+",
|
||||||
)
|
)
|
||||||
}" rel="stylesheet">
|
}" rel="stylesheet">
|
||||||
|<style>
|
|<style>
|
||||||
| * {
|
| * {
|
||||||
| font-family: '$fontName';
|
| font-family: '$fontName';
|
||||||
| }
|
| }
|
||||||
|</style>
|
|</style>
|
||||||
""".trimMargin()
|
""".trimMargin()
|
||||||
} else {
|
} else {
|
||||||
""
|
""
|
||||||
}
|
}
|
||||||
|
try {
|
||||||
binding.webcontent.loadDataWithBaseURL(
|
binding.webcontent.loadDataWithBaseURL(
|
||||||
baseUrl,
|
baseUrl,
|
||||||
"""<html>
|
"""<html>
|
||||||
@@ -483,7 +474,7 @@ class ArticleFragment :
|
|||||||
| color: ${
|
| color: ${
|
||||||
String.format(
|
String.format(
|
||||||
"#%06X",
|
"#%06X",
|
||||||
WHITE_COLOR_HEX and context.resources.getColor(R.color.colorAccent),
|
WHITE_COLOR_HEX and (maybeIfContext { it.resources.getColor(R.color.colorAccent) } as Int),
|
||||||
)
|
)
|
||||||
} !important;
|
} !important;
|
||||||
| }
|
| }
|
||||||
@@ -540,10 +531,8 @@ class ArticleFragment :
|
|||||||
|
|
||||||
private fun openInBrowserAfterFailing() {
|
private fun openInBrowserAfterFailing() {
|
||||||
binding.progressBar.visibility = View.GONE
|
binding.progressBar.visibility = View.GONE
|
||||||
try {
|
maybeIfContext {
|
||||||
requireContext().openItemUrlInBrowserAsNewTask(this@ArticleFragment.item)
|
it.openItemUrlInBrowserAsNewTask(this@ArticleFragment.item)
|
||||||
} catch (e: IllegalStateException) {
|
|
||||||
e.sendSilentlyWithAcraWithName("Context required is null")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.android.fragments
|
package bou.amine.apps.readerforselfossv2.android.fragments
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import android.graphics.Color
|
import android.graphics.Color
|
||||||
import android.graphics.drawable.Drawable
|
import android.graphics.drawable.Drawable
|
||||||
import android.graphics.drawable.GradientDrawable
|
import android.graphics.drawable.GradientDrawable
|
||||||
@@ -17,6 +16,7 @@ import bou.amine.apps.readerforselfossv2.android.R
|
|||||||
import bou.amine.apps.readerforselfossv2.android.databinding.FilterFragmentBinding
|
import bou.amine.apps.readerforselfossv2.android.databinding.FilterFragmentBinding
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
|
import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.glide.imageIntoViewTarget
|
import bou.amine.apps.readerforselfossv2.android.utils.glide.imageIntoViewTarget
|
||||||
|
import bou.amine.apps.readerforselfossv2.android.utils.maybeIfContext
|
||||||
import bou.amine.apps.readerforselfossv2.repository.Repository
|
import bou.amine.apps.readerforselfossv2.repository.Repository
|
||||||
import bou.amine.apps.readerforselfossv2.service.AppSettingsService
|
import bou.amine.apps.readerforselfossv2.service.AppSettingsService
|
||||||
import bou.amine.apps.readerforselfossv2.utils.getColorHexCode
|
import bou.amine.apps.readerforselfossv2.utils.getColorHexCode
|
||||||
@@ -60,8 +60,8 @@ class FilterSheetFragment :
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
CoroutineScope(Dispatchers.Main).launch {
|
CoroutineScope(Dispatchers.Main).launch {
|
||||||
handleTagChips(requireContext())
|
handleTagChips()
|
||||||
handleSourceChips(requireContext())
|
handleSourceChips()
|
||||||
|
|
||||||
binding.progressBar2.visibility = GONE
|
binding.progressBar2.visibility = GONE
|
||||||
binding.filterView.visibility = VISIBLE
|
binding.filterView.visibility = VISIBLE
|
||||||
@@ -79,29 +79,31 @@ class FilterSheetFragment :
|
|||||||
return binding.root
|
return binding.root
|
||||||
}
|
}
|
||||||
|
|
||||||
private suspend fun handleSourceChips(context: Context) {
|
private suspend fun handleSourceChips() {
|
||||||
val sourceGroup = binding.sourcesGroup
|
val sourceGroup = binding.sourcesGroup
|
||||||
|
|
||||||
repository.getSourcesDetailsOrStats().forEachIndexed { _, source ->
|
repository.getSourcesDetailsOrStats().forEachIndexed { _, source ->
|
||||||
val c = Chip(context)
|
val c = Chip(context)
|
||||||
c.ellipsize = TextUtils.TruncateAt.END
|
c.ellipsize = TextUtils.TruncateAt.END
|
||||||
|
|
||||||
context.imageIntoViewTarget(
|
maybeIfContext {
|
||||||
source.getIcon(repository.baseUrl),
|
it.imageIntoViewTarget(
|
||||||
object : ViewTarget<Chip?, Drawable?>(c) {
|
source.getIcon(repository.baseUrl),
|
||||||
override fun onResourceReady(
|
object : ViewTarget<Chip?, Drawable?>(c) {
|
||||||
resource: Drawable,
|
override fun onResourceReady(
|
||||||
transition: Transition<in Drawable?>?,
|
resource: Drawable,
|
||||||
) {
|
transition: Transition<in Drawable?>?,
|
||||||
try {
|
) {
|
||||||
c.chipIcon = resource
|
try {
|
||||||
} catch (e: Exception) {
|
c.chipIcon = resource
|
||||||
e.sendSilentlyWithAcraWithName("sources > onResourceReady")
|
} catch (e: Exception) {
|
||||||
|
e.sendSilentlyWithAcraWithName("sources > onResourceReady")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
},
|
appSettingsService,
|
||||||
appSettingsService,
|
)
|
||||||
)
|
}
|
||||||
|
|
||||||
c.text = source.title.getHtmlDecoded()
|
c.text = source.title.getHtmlDecoded()
|
||||||
|
|
||||||
@@ -137,7 +139,7 @@ class FilterSheetFragment :
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private suspend fun handleTagChips(context: Context) {
|
private suspend fun handleTagChips() {
|
||||||
val tagGroup = binding.tagsGroup
|
val tagGroup = binding.tagsGroup
|
||||||
|
|
||||||
val tags = repository.getTags()
|
val tags = repository.getTags()
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import android.content.Intent
|
|||||||
import android.util.TypedValue
|
import android.util.TypedValue
|
||||||
import androidx.annotation.AttrRes
|
import androidx.annotation.AttrRes
|
||||||
import androidx.annotation.ColorInt
|
import androidx.annotation.ColorInt
|
||||||
|
import androidx.fragment.app.Fragment
|
||||||
import bou.amine.apps.readerforselfossv2.android.R
|
import bou.amine.apps.readerforselfossv2.android.R
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
|
import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
|
||||||
import bou.amine.apps.readerforselfossv2.utils.toStringUriWithHttp
|
import bou.amine.apps.readerforselfossv2.utils.toStringUriWithHttp
|
||||||
@@ -29,15 +30,30 @@ fun Context.shareLink(
|
|||||||
}
|
}
|
||||||
|
|
||||||
@ColorInt
|
@ColorInt
|
||||||
fun Context.getColorFromAttr(
|
fun Fragment.getColorFromAttr(
|
||||||
@AttrRes attrColor: Int,
|
@AttrRes attrColor: Int,
|
||||||
resolveRefs: Boolean = true,
|
resolveRefs: Boolean = true,
|
||||||
): Int {
|
): Int {
|
||||||
val typedValue = TypedValue()
|
val typedValue = TypedValue()
|
||||||
try {
|
maybeIfContextWithLog { this.requireContext().theme.resolveAttribute(attrColor, typedValue, resolveRefs) }
|
||||||
this.theme.resolveAttribute(attrColor, typedValue, resolveRefs)
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
e.sendSilentlyWithAcraWithName("ColorFromAttr")
|
|
||||||
}
|
|
||||||
return typedValue.data
|
return typedValue.data
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Suppress("detekt:SwallowedException")
|
||||||
|
fun Fragment.maybeIfContext(fn: (Context) -> Any): Any? {
|
||||||
|
try {
|
||||||
|
return fn(this.requireContext())
|
||||||
|
} catch (e: Exception) {
|
||||||
|
// Do nothing
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun Fragment.maybeIfContextWithLog(fn: (Context) -> Any): Any? {
|
||||||
|
try {
|
||||||
|
return fn(this.requireContext())
|
||||||
|
} catch (e: Exception) {
|
||||||
|
e.sendSilentlyWithAcraWithName("Fragment context issue...")
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -23,10 +23,11 @@ import kotlin.io.encoding.ExperimentalEncodingApi
|
|||||||
|
|
||||||
private const val PRELOAD_IMAGE_TIMEOUT = 10000
|
private const val PRELOAD_IMAGE_TIMEOUT = 10000
|
||||||
|
|
||||||
|
@Suppress("detekt:ReturnCount")
|
||||||
@OptIn(ExperimentalEncodingApi::class)
|
@OptIn(ExperimentalEncodingApi::class)
|
||||||
fun String.toGlideUrl(appSettingsService: AppSettingsService): GlideUrl {
|
fun String.toGlideUrl(appSettingsService: AppSettingsService): Any { // GlideUrl Or String
|
||||||
if (this.isEmptyOrNullOrNullString()) {
|
if (this.isEmptyOrNullOrNullString()) {
|
||||||
return GlideUrl("")
|
return ""
|
||||||
}
|
}
|
||||||
if (appSettingsService.getBasicUserName().isNotEmpty()) {
|
if (appSettingsService.getBasicUserName().isNotEmpty()) {
|
||||||
val authString = "${appSettingsService.getBasicUserName()}:${appSettingsService.getBasicPassword()}"
|
val authString = "${appSettingsService.getBasicUserName()}:${appSettingsService.getBasicPassword()}"
|
||||||
|
|||||||
@@ -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,6 @@
|
|||||||
|
**v125010201**
|
||||||
|
|
||||||
|
- fix: Handle empty url issue.
|
||||||
|
- Merge pull request 'Removed the floating bar.' (#177) from floating-bar into master
|
||||||
|
- chore: changing actions in reader fragment.
|
||||||
|
- Changelog for v125010131
|
||||||
@@ -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
|
||||||
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
|
||||||
|
|||||||
Reference in New Issue
Block a user