Compare commits
11 Commits
v125010291
...
master
Author | SHA1 | Date | |
---|---|---|---|
2564b19726 | |||
61c7bb20cc | |||
6a0f5baf0a | |||
39f9505c00 | |||
6a6d447456 | |||
0bb4fe6aed | |||
7df4c3368c | |||
c69635b5ae | |||
3a829df70e | |||
7a0202689f | |||
b20f6888f5 |
.gitea/workflows
.gitignoreCHANGELOG.mdandroidApp/src
androidTest/kotlin/bou/amine/apps/readerforselfossv2/android
main/java/bou/amine/apps/readerforselfossv2/android
fastlane/metadata/android/en-US/changelogs
gradle.propertiesgradle/wrapper
@ -26,9 +26,10 @@ jobs:
|
||||
- uses: KengoTODA/actions-setup-docker-compose@v1
|
||||
with:
|
||||
version: "2.23.3"
|
||||
- name: run selfoss
|
||||
run: |
|
||||
docker compose -f .gitea/workflows/assets/docker-compose.yml up -d
|
||||
# TESTS ARE RUN LOCALLY
|
||||
# - name: run selfoss
|
||||
# run: |
|
||||
# docker compose -f .gitea/workflows/assets/docker-compose.yml up -d
|
||||
- name: coverage
|
||||
run: |
|
||||
./gradlew :koverHtmlReport
|
||||
@ -39,7 +40,8 @@ jobs:
|
||||
retention-days: 1
|
||||
overwrite: true
|
||||
include-hidden-files: true
|
||||
- name: Clean
|
||||
if: always()
|
||||
run: |
|
||||
docker compose -f .gitea/workflows/assets/docker-compose.yml stop
|
||||
# TESTS ARE RUN LOCALLY
|
||||
# - name: Clean
|
||||
# if: always()
|
||||
# run: |
|
||||
# docker compose -f .gitea/workflows/assets/docker-compose.yml stop
|
||||
|
@ -16,6 +16,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
ref: master
|
||||
- name: Config git
|
||||
run: |
|
||||
git config --global user.email aminecmi+giteadrone@pm.me
|
||||
@ -50,7 +51,7 @@ jobs:
|
||||
followtags: true
|
||||
ssh_key: ${{ secrets.PRIVATE_KEY }}
|
||||
tags: true
|
||||
branch: release
|
||||
branch: master
|
||||
- name: copy file via ssh password
|
||||
uses: appleboy/scp-action@v0.1.7
|
||||
with:
|
||||
|
2
.gitignore
vendored
2
.gitignore
vendored
@ -324,3 +324,5 @@ crowdin.properties
|
||||
|
||||
.kotlin/
|
||||
build-cache/
|
||||
|
||||
act
|
||||
|
20
CHANGELOG.md
20
CHANGELOG.md
@ -1,3 +1,23 @@
|
||||
**v125020471
|
||||
|
||||
- chore: no more docker-compose.
|
||||
- bump: gradle plugin.
|
||||
- Merge pull request 'fix: check index exists.' (#183) from fix-index into master
|
||||
- fix: check index exists.
|
||||
- Changelog for v125020411
|
||||
|
||||
--------------------------------------------------------------------
|
||||
|
||||
**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
|
||||
|
@ -56,7 +56,7 @@ class HomeActivityTest {
|
||||
fun testMenuActions() {
|
||||
onView(withId(R.id.action_search)).perform(click())
|
||||
onView(
|
||||
withId(R.id.search_src_text),
|
||||
withId(com.google.android.material.R.id.search_src_text),
|
||||
).check(matches(isFocused()))
|
||||
onView(isRoot()).perform(ViewActions.pressBack())
|
||||
|
||||
|
@ -161,6 +161,7 @@ class ReaderActivity :
|
||||
override fun onPageSelected(position: Int) {
|
||||
super.onPageSelected(position)
|
||||
|
||||
if (!allItems.isNullOrEmpty() && allItems.size >= position) {
|
||||
if (allItems[position].starred) {
|
||||
canRemoveFromFavorite()
|
||||
} else {
|
||||
@ -168,6 +169,7 @@ class ReaderActivity :
|
||||
}
|
||||
readItem(allItems[position])
|
||||
}
|
||||
}
|
||||
},
|
||||
)
|
||||
}
|
||||
|
@ -118,8 +118,8 @@ class ArticleFragment :
|
||||
e.sendSilentlyWithAcra()
|
||||
}
|
||||
|
||||
colorOnSurface = getColorFromAttr(R.attr.colorOnSurface)
|
||||
colorSurface = getColorFromAttr(R.attr.colorSurface)
|
||||
colorOnSurface = getColorFromAttr(com.google.android.material.R.attr.colorOnSurface)
|
||||
colorSurface = getColorFromAttr(com.google.android.material.R.attr.colorSurface)
|
||||
|
||||
contentText = item.content
|
||||
contentTitle = item.title.getHtmlDecoded()
|
||||
|
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
|
||||
|
||||
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
|
||||
|
||||
maybeIfContext {
|
||||
@ -145,7 +153,11 @@ class FilterSheetFragment :
|
||||
val tags = repository.getTags()
|
||||
|
||||
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.text = tag.tag
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
plugins {
|
||||
//trick: for the same plugin versions in all sub-modules
|
||||
id("com.android.application").version("8.7.3").apply(false)
|
||||
id("com.android.library").version("8.7.3").apply(false)
|
||||
// trick: for the same plugin versions in all sub-modules
|
||||
id("com.android.application").version("8.8.1").apply(false)
|
||||
id("com.android.library").version("8.8.1").apply(false)
|
||||
id("org.jetbrains.kotlin.android").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)
|
||||
@ -16,7 +16,6 @@ allprojects {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
tasks.register("clean", Delete::class) {
|
||||
delete(layout.buildDirectory)
|
||||
}
|
||||
|
@ -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.
|
@ -0,0 +1,7 @@
|
||||
**v125020471**
|
||||
|
||||
- chore: no more docker-compose.
|
||||
- bump: gradle plugin.
|
||||
- Merge pull request 'fix: check index exists.' (#183) from fix-index into master
|
||||
- fix: check index exists.
|
||||
- Changelog for v125020411
|
@ -19,7 +19,7 @@ kotlin.code.style=official
|
||||
android.useAndroidX=true
|
||||
#android.nonTransitiveRClass=true
|
||||
android.enableJetifier=false
|
||||
android.nonTransitiveRClass=false
|
||||
android.nonTransitiveRClass=true
|
||||
#MPP
|
||||
kotlin.mpp.enableCInteropCommonization=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
|
||||
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
|
||||
zipStorePath=wrapper/dists
|
||||
|
Loading…
x
Reference in New Issue
Block a user