Compare commits
5 Commits
v123102852
...
e58914ef58
Author | SHA1 | Date | |
---|---|---|---|
e58914ef58 | |||
a03f08fca1 | |||
8e9b87f00c | |||
f765224a86 | |||
14d2219eb8 |
@ -75,7 +75,7 @@ steps:
|
||||
- name: scpFiles
|
||||
image: appleboy/drone-scp
|
||||
settings:
|
||||
host: amine-louveau.fr
|
||||
host: amine-bouabdallaoui.fr
|
||||
username: ubuntu
|
||||
key:
|
||||
from_secret: privateKey
|
||||
@ -86,7 +86,7 @@ steps:
|
||||
- name: deploy
|
||||
image: appleboy/drone-ssh
|
||||
settings:
|
||||
host: amine-louveau.fr
|
||||
host: amine-bouabdallaoui.fr
|
||||
user: ubuntu
|
||||
key:
|
||||
from_secret: privateKey
|
||||
@ -120,7 +120,7 @@ steps:
|
||||
- ./gradlew :androidApp:assembleGithubConfigRelease
|
||||
- echo "---------------------------------------------------------"
|
||||
- echo "Get Key"
|
||||
- wget https://amine-louveau.fr/key
|
||||
- wget https://amine-bouabdallaoui.fr/key
|
||||
- echo "---------------------------------------------------------"
|
||||
- echo "Zipalign"
|
||||
- $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
|
||||
@ -142,7 +142,7 @@ steps:
|
||||
settings:
|
||||
api_key:
|
||||
from_secret: giteaAPI
|
||||
base_url: https://gitea.amine-louveau.fr
|
||||
base_url: https://gitea.amine-bouabdallaoui.fr
|
||||
files: signed.apk
|
||||
|
||||
- name: notify
|
||||
|
2
.github/CONTRIBUTING.md
vendored
2
.github/CONTRIBUTING.md
vendored
@ -10,7 +10,7 @@ Please read the guidelines before contributing, and follow them (or try to) when
|
||||
|
||||
There are many ways to contribute to this project, you could [translate the app](https://crowdin.com/project/readerforselfoss), report bugs, request missing features, suggest enhancements and changes to existing ones. You also can improve the README with useful tips that could help the other users.
|
||||
|
||||
You can fork the repository, and [help me solve some issues](https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/issues?q=is%3Aissue+is%3Aopen+label%3A%22Up+For+Grabs%22) or [develop new things](https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/issues)
|
||||
You can fork the repository, and [help me solve some issues](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/issues?q=is%3Aissue+is%3Aopen+label%3A%22Up+For+Grabs%22) or [develop new things](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/issues)
|
||||
|
||||
### What I can't help you with.
|
||||
|
||||
|
14
CHANGELOG.md
14
CHANGELOG.md
@ -1,3 +1,17 @@
|
||||
**v123102961**
|
||||
|
||||
- chore: domain changes.
|
||||
- Changelog for v123102852 [CI SKIP]
|
||||
|
||||
--------------------------------------------------------------------
|
||||
|
||||
**v123102852**
|
||||
|
||||
- chore: lint cleaning.
|
||||
- Changelog for v123102841 [CI SKIP]
|
||||
|
||||
--------------------------------------------------------------------
|
||||
|
||||
**v123102841**
|
||||
|
||||
- chore: cleaning ci steps and upgrading dependencies.
|
||||
|
12
README.md
12
README.md
@ -1,4 +1,4 @@
|
||||
# ReaderForSelfoss-multiplatform [](https://build.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform)
|
||||
# ReaderForSelfoss-multiplatform [](https://build.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform)
|
||||
|
||||
[](https://crowdin.com/project/readerforselfoss)
|
||||
|
||||
@ -22,15 +22,15 @@ If you are a user, you can still create new issues. I'll fix them when I can.
|
||||
|
||||
1. **You'll have to have a Selfoss instance running.** You'll find everything you need to install it [here](https://selfoss.aditu.de/).
|
||||
|
||||
2. Check the [Contribution guide](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md).
|
||||
2. Check the [Contribution guide](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md).
|
||||
|
||||
3. Build the project by following [these steps](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md#build-the-project) (you should have read them after the contribution guide)
|
||||
3. Build the project by following [these steps](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/.github/CONTRIBUTING.md#build-the-project) (you should have read them after the contribution guide)
|
||||
|
||||
## Useful links
|
||||
|
||||
- [Check what changed](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/CHANGELOG.md)
|
||||
- [See what I'm doing](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/projects/1)
|
||||
- [Create an issue, or request a new feature](https://gitea.amine-louveau.fr/Louvorg/ReaderforSelfoss-multiplatform/issues)
|
||||
- [Check what changed](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/src/branch/master/CHANGELOG.md)
|
||||
- [See what I'm doing](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/projects/1)
|
||||
- [Create an issue, or request a new feature](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderforSelfoss-multiplatform/issues)
|
||||
- [Help translation the app](https://crowdin.com/project/readerforselfoss)
|
||||
|
||||
## Contributors (V1) (Alphabetical order) ❤️
|
||||
|
9
androidApp/proguard-rules.pro
vendored
9
androidApp/proguard-rules.pro
vendored
@ -86,3 +86,12 @@
|
||||
|
||||
-dontwarn io.mockk.**
|
||||
-keep class io.mockk.** { *; }
|
||||
|
||||
|
||||
|
||||
# Kodein
|
||||
-keep, allowobfuscation, allowoptimization class org.kodein.type.TypeReference
|
||||
-keep, allowobfuscation, allowoptimization class org.kodein.type.JVMAbstractTypeToken$Companion$WrappingTest
|
||||
|
||||
-keep, allowobfuscation, allowoptimization class * extends org.kodein.type.TypeReference
|
||||
-keep, allowobfuscation, allowoptimization class * extends org.kodein.type.JVMAbstractTypeToken$Companion$WrappingTest
|
@ -1,6 +1,7 @@
|
||||
package bou.amine.apps.readerforselfossv2.android
|
||||
|
||||
import android.content.Intent
|
||||
import android.net.Uri
|
||||
import android.os.Bundle
|
||||
import android.view.Menu
|
||||
import android.view.MenuItem
|
||||
@ -565,6 +566,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
|
||||
|
||||
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
||||
when (item.itemId) {
|
||||
R.id.issue_tracker -> {
|
||||
val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(AppSettingsService.trackerUrl))
|
||||
startActivity(browserIntent)
|
||||
return true
|
||||
}
|
||||
R.id.action_filter -> {
|
||||
val filterSheetFragment = FilterSheetFragment()
|
||||
filterSheetFragment.show(supportFragmentManager, FilterSheetFragment.TAG)
|
||||
|
@ -4,6 +4,7 @@ import android.animation.Animator
|
||||
import android.animation.AnimatorListenerAdapter
|
||||
import android.annotation.SuppressLint
|
||||
import android.content.Intent
|
||||
import android.net.Uri
|
||||
import android.os.Bundle
|
||||
import android.text.TextUtils
|
||||
import android.view.Menu
|
||||
@ -254,10 +255,17 @@ class LoginActivity : AppCompatActivity(), DIAware {
|
||||
|
||||
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
||||
return when (item.itemId) {
|
||||
R.id.issue_tracker -> {
|
||||
val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(AppSettingsService.trackerUrl))
|
||||
startActivity(browserIntent)
|
||||
return true
|
||||
}
|
||||
R.id.about -> {
|
||||
LibsBuilder()
|
||||
.withAboutIconShown(true)
|
||||
.withAboutVersionShown(true)
|
||||
.withAboutSpecial2("Bug reports").withAboutSpecial2Description(AppSettingsService.trackerUrl)
|
||||
.withAboutSpecial1("Project Page").withAboutSpecial1Description(AppSettingsService.sourceUrl)
|
||||
.start(this)
|
||||
true
|
||||
}
|
||||
|
@ -132,7 +132,7 @@ class MyApp : MultiDexApplication(), DIAware {
|
||||
}
|
||||
httpSender {
|
||||
uri =
|
||||
"https://bugs.amine-louveau.fr/report" // best guess, you may need to adjust this
|
||||
"https://bugs.amine-bouabdallaoui.fr/report" // best guess, you may need to adjust this
|
||||
basicAuthLogin = "qMEscjj89Gwt6cPR"
|
||||
basicAuthPassword = "Yo58QFlGzFaWlBzP"
|
||||
httpMethod = HttpSender.Method.POST
|
||||
|
@ -36,6 +36,12 @@
|
||||
android:orderInCategory="101"
|
||||
android:title="@string/menu_home_refresh" />
|
||||
|
||||
<item
|
||||
android:id="@+id/issue_tracker"
|
||||
app:showAsAction="never"
|
||||
android:orderInCategory="103"
|
||||
android:title="@string/issue_tracker_link" />
|
||||
|
||||
<item android:id="@+id/action_disconnect"
|
||||
android:title="@string/action_disconnect"
|
||||
android:orderInCategory="104"
|
||||
|
@ -3,6 +3,13 @@
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
|
||||
|
||||
<item
|
||||
android:id="@+id/issue_tracker"
|
||||
app:showAsAction="never"
|
||||
android:orderInCategory="101"
|
||||
android:title="@string/issue_tracker_link" />
|
||||
|
||||
<item android:id="@+id/about"
|
||||
android:title="@string/action_about"
|
||||
android:orderInCategory="102"
|
||||
|
@ -17,7 +17,6 @@ plugins {
|
||||
|
||||
allprojects {
|
||||
repositories {
|
||||
// maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
|
||||
google()
|
||||
mavenCentral()
|
||||
maven { url = uri("https://www.jitpack.io") }
|
||||
|
@ -68,9 +68,9 @@ redirect_from: "/ReaderforSelfoss-multiplatform/"
|
||||
<div id="links">
|
||||
|
||||
|
||||
<a class="github-button" href="https://gitea.amine-louveau.fr/Louvorg/readerforselfoss-multiplatform" data-size="large" aria-label="Star aminecmi/readerforselfoss-multiplatform on GitHub">Star</a>
|
||||
<a class="github-button" href="https://gitea.amine-bouabdallaoui.fr/Louvorg/readerforselfoss-multiplatform" data-size="large" aria-label="Star aminecmi/readerforselfoss-multiplatform on GitHub">Star</a>
|
||||
</div>
|
||||
<meta itemprop="url" content="https://gitea.amine-louveau.fr/Louvorg/readerforselfoss-multiplatform">
|
||||
<meta itemprop="url" content="https://gitea.amine-bouabdallaoui.fr/Louvorg/readerforselfoss-multiplatform">
|
||||
<meta itemprop="applicationCategory" content="News & Magazines">
|
||||
</div>
|
||||
</body>
|
||||
|
@ -1,6 +1,5 @@
|
||||
pluginManagement {
|
||||
repositories {
|
||||
// maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
|
||||
google()
|
||||
gradlePluginPortal()
|
||||
mavenCentral()
|
||||
@ -9,7 +8,6 @@ pluginManagement {
|
||||
|
||||
dependencyResolutionManagement {
|
||||
repositories {
|
||||
// maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
|
||||
google()
|
||||
mavenCentral()
|
||||
}
|
||||
|
@ -40,7 +40,7 @@ class MercuryApi() {
|
||||
|
||||
suspend fun query(url: String): StatusAndData<MercuryModel.ParsedContent> =
|
||||
bodyOrFailure(
|
||||
client.get("https://amine-louveau.fr/parser.php") {
|
||||
client.get("https://amine-bouabdallaoui.fr/parser.php") {
|
||||
parameter("link", url)
|
||||
},
|
||||
)
|
||||
|
@ -480,9 +480,9 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
|
||||
companion object {
|
||||
const val translationUrl = "https://crwd.in/readerforselfoss"
|
||||
|
||||
const val sourceUrl = "https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform"
|
||||
const val sourceUrl = "https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform"
|
||||
|
||||
const val trackerUrl = "https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/issues"
|
||||
const val trackerUrl = "https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/issues"
|
||||
|
||||
const val syncChannelId = "sync-channel-id"
|
||||
|
||||
|
Reference in New Issue
Block a user