Compare commits
21 Commits
afcc55e907
...
0eed9a8d07
| Author | SHA1 | Date | |
|---|---|---|---|
|
0eed9a8d07 | ||
|
9603860bae | ||
|
|
75b566a38d | ||
|
|
fb572dbb27 | ||
|
|
34028949d7 | ||
|
|
44a0469b17 | ||
|
|
c87473e8f1 | ||
|
|
de43abf019 | ||
|
|
e60f3a9d91 | ||
|
|
255fbcb12f | ||
|
|
0caeb94e64 | ||
|
|
6f6a42b878 | ||
|
|
67d54f0dd7 | ||
|
|
437aa0abec | ||
|
|
216c639a23 | ||
|
|
7258452625 | ||
|
|
d0d82751e2 | ||
|
|
3b8f4991e9 | ||
|
|
2547ce824a | ||
|
|
59eb399cfa | ||
|
|
495b101355 |
@ -18,4 +18,4 @@ steps:
|
|||||||
- name: build
|
- name: build
|
||||||
image: mingc/android-build-box:latest
|
image: mingc/android-build-box:latest
|
||||||
commands:
|
commands:
|
||||||
- ./gradlew :androidApp:build -PignoreGitVersion=true -P appLoginUrl="\"URL\"" -P appLoginUsername="\"LOGIN\"" -P appLoginPassword="\"PASS\""
|
- ./gradlew :androidApp:build -PignoreGitVersion=true -P appLoginUrl="\"URL\"" -P appLoginUsername="\"LOGIN\"" -P appLoginPassword="\"PASS\"" -P pushCache=false
|
||||||
@ -78,12 +78,6 @@ android {
|
|||||||
|
|
||||||
// tests
|
// tests
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
|
||||||
javaCompileOptions {
|
|
||||||
annotationProcessorOptions {
|
|
||||||
arguments += mapOf("room.schemaLocation" to "$projectDir/schemas")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
buildTypes {
|
buildTypes {
|
||||||
getByName("release") {
|
getByName("release") {
|
||||||
@ -196,16 +190,14 @@ dependencies {
|
|||||||
|
|
||||||
implementation("androidx.core:core-ktx:1.8.0")
|
implementation("androidx.core:core-ktx:1.8.0")
|
||||||
|
|
||||||
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1")
|
// implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1")
|
||||||
implementation("androidx.lifecycle:lifecycle-common-java8:2.5.1")
|
// implementation("androidx.lifecycle:lifecycle-common-java8:2.5.1")
|
||||||
implementation("androidx.lifecycle:lifecycle-runtime:2.5.1")
|
// implementation("androidx.lifecycle:lifecycle-runtime:2.5.1")
|
||||||
implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
|
implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
|
||||||
|
|
||||||
implementation("androidx.room:room-ktx:2.4.0-beta01")
|
|
||||||
kapt("androidx.room:room-compiler:2.4.0-beta01")
|
|
||||||
|
|
||||||
implementation("android.arch.work:work-runtime-ktx:1.0.1")
|
|
||||||
|
|
||||||
// Network information
|
// Network information
|
||||||
implementation("com.github.ln-12:multiplatform-connectivity-status:1.3.0")
|
implementation("com.github.ln-12:multiplatform-connectivity-status:1.3.0")
|
||||||
|
|
||||||
|
// SQLDELIGHT
|
||||||
|
implementation("com.squareup.sqldelight:android-driver:1.5.3")
|
||||||
}
|
}
|
||||||
@ -1,96 +0,0 @@
|
|||||||
{
|
|
||||||
"formatVersion": 1,
|
|
||||||
"database": {
|
|
||||||
"version": 1,
|
|
||||||
"identityHash": "08ca537d7ac9d4dd216e8e395d70801a",
|
|
||||||
"entities": [
|
|
||||||
{
|
|
||||||
"tableName": "tags",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`tag` TEXT NOT NULL, `color` TEXT NOT NULL, `unread` INTEGER NOT NULL, PRIMARY KEY(`tag`))",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "tag",
|
|
||||||
"columnName": "tag",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "color",
|
|
||||||
"columnName": "color",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "unread",
|
|
||||||
"columnName": "unread",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"columnNames": [
|
|
||||||
"tag"
|
|
||||||
],
|
|
||||||
"autoGenerate": false
|
|
||||||
},
|
|
||||||
"indices": [],
|
|
||||||
"foreignKeys": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tableName": "sources",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `tags` TEXT NOT NULL, `spout` TEXT NOT NULL, `error` TEXT NOT NULL, `icon` TEXT NOT NULL, PRIMARY KEY(`id`))",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "id",
|
|
||||||
"columnName": "id",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "title",
|
|
||||||
"columnName": "title",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "tags",
|
|
||||||
"columnName": "tags",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "spout",
|
|
||||||
"columnName": "spout",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "error",
|
|
||||||
"columnName": "error",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "icon",
|
|
||||||
"columnName": "icon",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"columnNames": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"autoGenerate": false
|
|
||||||
},
|
|
||||||
"indices": [],
|
|
||||||
"foreignKeys": []
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"views": [],
|
|
||||||
"setupQueries": [
|
|
||||||
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
|
|
||||||
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"08ca537d7ac9d4dd216e8e395d70801a\")"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,176 +0,0 @@
|
|||||||
{
|
|
||||||
"formatVersion": 1,
|
|
||||||
"database": {
|
|
||||||
"version": 2,
|
|
||||||
"identityHash": "6fa6944b04100d68eab61039876a8804",
|
|
||||||
"entities": [
|
|
||||||
{
|
|
||||||
"tableName": "tags",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`tag` TEXT NOT NULL, `color` TEXT NOT NULL, `unread` INTEGER NOT NULL, PRIMARY KEY(`tag`))",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "tag",
|
|
||||||
"columnName": "tag",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "color",
|
|
||||||
"columnName": "color",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "unread",
|
|
||||||
"columnName": "unread",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"columnNames": [
|
|
||||||
"tag"
|
|
||||||
],
|
|
||||||
"autoGenerate": false
|
|
||||||
},
|
|
||||||
"indices": [],
|
|
||||||
"foreignKeys": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tableName": "sources",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `tags` TEXT NOT NULL, `spout` TEXT NOT NULL, `error` TEXT NOT NULL, `icon` TEXT NOT NULL, PRIMARY KEY(`id`))",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "id",
|
|
||||||
"columnName": "id",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "title",
|
|
||||||
"columnName": "title",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "tags",
|
|
||||||
"columnName": "tags",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "spout",
|
|
||||||
"columnName": "spout",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "error",
|
|
||||||
"columnName": "error",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "icon",
|
|
||||||
"columnName": "icon",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"columnNames": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"autoGenerate": false
|
|
||||||
},
|
|
||||||
"indices": [],
|
|
||||||
"foreignKeys": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tableName": "items",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `datetime` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `thumbnail` TEXT NOT NULL, `icon` TEXT NOT NULL, `link` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL, `tags` TEXT NOT NULL, PRIMARY KEY(`id`))",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "id",
|
|
||||||
"columnName": "id",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "datetime",
|
|
||||||
"columnName": "datetime",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "title",
|
|
||||||
"columnName": "title",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "content",
|
|
||||||
"columnName": "content",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "unread",
|
|
||||||
"columnName": "unread",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "starred",
|
|
||||||
"columnName": "starred",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "thumbnail",
|
|
||||||
"columnName": "thumbnail",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "icon",
|
|
||||||
"columnName": "icon",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "link",
|
|
||||||
"columnName": "link",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "sourcetitle",
|
|
||||||
"columnName": "sourcetitle",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "tags",
|
|
||||||
"columnName": "tags",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"columnNames": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"autoGenerate": false
|
|
||||||
},
|
|
||||||
"indices": [],
|
|
||||||
"foreignKeys": []
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"views": [],
|
|
||||||
"setupQueries": [
|
|
||||||
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
|
|
||||||
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"6fa6944b04100d68eab61039876a8804\")"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,226 +0,0 @@
|
|||||||
{
|
|
||||||
"formatVersion": 1,
|
|
||||||
"database": {
|
|
||||||
"version": 3,
|
|
||||||
"identityHash": "7ad9c4961992c13b670128485ebb3efc",
|
|
||||||
"entities": [
|
|
||||||
{
|
|
||||||
"tableName": "tags",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`tag` TEXT NOT NULL, `color` TEXT NOT NULL, `unread` INTEGER NOT NULL, PRIMARY KEY(`tag`))",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "tag",
|
|
||||||
"columnName": "tag",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "color",
|
|
||||||
"columnName": "color",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "unread",
|
|
||||||
"columnName": "unread",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"columnNames": [
|
|
||||||
"tag"
|
|
||||||
],
|
|
||||||
"autoGenerate": false
|
|
||||||
},
|
|
||||||
"indices": [],
|
|
||||||
"foreignKeys": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tableName": "sources",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `tags` TEXT NOT NULL, `spout` TEXT NOT NULL, `error` TEXT NOT NULL, `icon` TEXT NOT NULL, PRIMARY KEY(`id`))",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "id",
|
|
||||||
"columnName": "id",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "title",
|
|
||||||
"columnName": "title",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "tags",
|
|
||||||
"columnName": "tags",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "spout",
|
|
||||||
"columnName": "spout",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "error",
|
|
||||||
"columnName": "error",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "icon",
|
|
||||||
"columnName": "icon",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"columnNames": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"autoGenerate": false
|
|
||||||
},
|
|
||||||
"indices": [],
|
|
||||||
"foreignKeys": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tableName": "items",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `datetime` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `thumbnail` TEXT NOT NULL, `icon` TEXT NOT NULL, `link` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL, `tags` TEXT NOT NULL, PRIMARY KEY(`id`))",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "id",
|
|
||||||
"columnName": "id",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "datetime",
|
|
||||||
"columnName": "datetime",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "title",
|
|
||||||
"columnName": "title",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "content",
|
|
||||||
"columnName": "content",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "unread",
|
|
||||||
"columnName": "unread",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "starred",
|
|
||||||
"columnName": "starred",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "thumbnail",
|
|
||||||
"columnName": "thumbnail",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "icon",
|
|
||||||
"columnName": "icon",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "link",
|
|
||||||
"columnName": "link",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "sourcetitle",
|
|
||||||
"columnName": "sourcetitle",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "tags",
|
|
||||||
"columnName": "tags",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"columnNames": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"autoGenerate": false
|
|
||||||
},
|
|
||||||
"indices": [],
|
|
||||||
"foreignKeys": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tableName": "actions",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `articleid` TEXT NOT NULL, `read` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `unstarred` INTEGER NOT NULL)",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "id",
|
|
||||||
"columnName": "id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "articleId",
|
|
||||||
"columnName": "articleid",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "read",
|
|
||||||
"columnName": "read",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "unread",
|
|
||||||
"columnName": "unread",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "starred",
|
|
||||||
"columnName": "starred",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "unstarred",
|
|
||||||
"columnName": "unstarred",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"columnNames": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"autoGenerate": true
|
|
||||||
},
|
|
||||||
"indices": [],
|
|
||||||
"foreignKeys": []
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"views": [],
|
|
||||||
"setupQueries": [
|
|
||||||
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
|
|
||||||
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"7ad9c4961992c13b670128485ebb3efc\")"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,226 +0,0 @@
|
|||||||
{
|
|
||||||
"formatVersion": 1,
|
|
||||||
"database": {
|
|
||||||
"version": 4,
|
|
||||||
"identityHash": "9cf8b03d32f80dfd58160599a1df197d",
|
|
||||||
"entities": [
|
|
||||||
{
|
|
||||||
"tableName": "tags",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`tag` TEXT NOT NULL, `color` TEXT NOT NULL, `unread` INTEGER NOT NULL, PRIMARY KEY(`tag`))",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "tag",
|
|
||||||
"columnName": "tag",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "color",
|
|
||||||
"columnName": "color",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "unread",
|
|
||||||
"columnName": "unread",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"columnNames": [
|
|
||||||
"tag"
|
|
||||||
],
|
|
||||||
"autoGenerate": false
|
|
||||||
},
|
|
||||||
"indices": [],
|
|
||||||
"foreignKeys": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tableName": "sources",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `tags` TEXT NOT NULL, `spout` TEXT NOT NULL, `error` TEXT NOT NULL, `icon` TEXT NOT NULL, PRIMARY KEY(`id`))",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "id",
|
|
||||||
"columnName": "id",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "title",
|
|
||||||
"columnName": "title",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "tags",
|
|
||||||
"columnName": "tags",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "spout",
|
|
||||||
"columnName": "spout",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "error",
|
|
||||||
"columnName": "error",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "icon",
|
|
||||||
"columnName": "icon",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"columnNames": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"autoGenerate": false
|
|
||||||
},
|
|
||||||
"indices": [],
|
|
||||||
"foreignKeys": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tableName": "items",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `datetime` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `thumbnail` TEXT, `icon` TEXT, `link` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL, `tags` TEXT NOT NULL, PRIMARY KEY(`id`))",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "id",
|
|
||||||
"columnName": "id",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "datetime",
|
|
||||||
"columnName": "datetime",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "title",
|
|
||||||
"columnName": "title",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "content",
|
|
||||||
"columnName": "content",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "unread",
|
|
||||||
"columnName": "unread",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "starred",
|
|
||||||
"columnName": "starred",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "thumbnail",
|
|
||||||
"columnName": "thumbnail",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "icon",
|
|
||||||
"columnName": "icon",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "link",
|
|
||||||
"columnName": "link",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "sourcetitle",
|
|
||||||
"columnName": "sourcetitle",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "tags",
|
|
||||||
"columnName": "tags",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"columnNames": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"autoGenerate": false
|
|
||||||
},
|
|
||||||
"indices": [],
|
|
||||||
"foreignKeys": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tableName": "actions",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `articleid` TEXT NOT NULL, `read` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `unstarred` INTEGER NOT NULL)",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "id",
|
|
||||||
"columnName": "id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "articleId",
|
|
||||||
"columnName": "articleid",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "read",
|
|
||||||
"columnName": "read",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "unread",
|
|
||||||
"columnName": "unread",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "starred",
|
|
||||||
"columnName": "starred",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "unstarred",
|
|
||||||
"columnName": "unstarred",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"columnNames": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"autoGenerate": true
|
|
||||||
},
|
|
||||||
"indices": [],
|
|
||||||
"foreignKeys": []
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"views": [],
|
|
||||||
"setupQueries": [
|
|
||||||
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
|
|
||||||
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"9cf8b03d32f80dfd58160599a1df197d\")"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,226 +0,0 @@
|
|||||||
{
|
|
||||||
"formatVersion": 1,
|
|
||||||
"database": {
|
|
||||||
"version": 4,
|
|
||||||
"identityHash": "9cf8b03d32f80dfd58160599a1df197d",
|
|
||||||
"entities": [
|
|
||||||
{
|
|
||||||
"tableName": "tags",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`tag` TEXT NOT NULL, `color` TEXT NOT NULL, `unread` INTEGER NOT NULL, PRIMARY KEY(`tag`))",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "tag",
|
|
||||||
"columnName": "tag",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "color",
|
|
||||||
"columnName": "color",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "unread",
|
|
||||||
"columnName": "unread",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"columnNames": [
|
|
||||||
"tag"
|
|
||||||
],
|
|
||||||
"autoGenerate": false
|
|
||||||
},
|
|
||||||
"indices": [],
|
|
||||||
"foreignKeys": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tableName": "sources",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `tags` TEXT NOT NULL, `spout` TEXT NOT NULL, `error` TEXT NOT NULL, `icon` TEXT NOT NULL, PRIMARY KEY(`id`))",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "id",
|
|
||||||
"columnName": "id",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "title",
|
|
||||||
"columnName": "title",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "tags",
|
|
||||||
"columnName": "tags",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "spout",
|
|
||||||
"columnName": "spout",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "error",
|
|
||||||
"columnName": "error",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "icon",
|
|
||||||
"columnName": "icon",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"columnNames": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"autoGenerate": false
|
|
||||||
},
|
|
||||||
"indices": [],
|
|
||||||
"foreignKeys": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tableName": "items",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `datetime` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `thumbnail` TEXT, `icon` TEXT, `link` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL, `tags` TEXT NOT NULL, PRIMARY KEY(`id`))",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "id",
|
|
||||||
"columnName": "id",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "datetime",
|
|
||||||
"columnName": "datetime",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "title",
|
|
||||||
"columnName": "title",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "content",
|
|
||||||
"columnName": "content",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "unread",
|
|
||||||
"columnName": "unread",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "starred",
|
|
||||||
"columnName": "starred",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "thumbnail",
|
|
||||||
"columnName": "thumbnail",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "icon",
|
|
||||||
"columnName": "icon",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "link",
|
|
||||||
"columnName": "link",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "sourcetitle",
|
|
||||||
"columnName": "sourcetitle",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "tags",
|
|
||||||
"columnName": "tags",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"columnNames": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"autoGenerate": false
|
|
||||||
},
|
|
||||||
"indices": [],
|
|
||||||
"foreignKeys": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"tableName": "actions",
|
|
||||||
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`articleid` TEXT NOT NULL, `read` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `unstarred` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
|
|
||||||
"fields": [
|
|
||||||
{
|
|
||||||
"fieldPath": "articleId",
|
|
||||||
"columnName": "articleid",
|
|
||||||
"affinity": "TEXT",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "read",
|
|
||||||
"columnName": "read",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "unread",
|
|
||||||
"columnName": "unread",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "starred",
|
|
||||||
"columnName": "starred",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "unstarred",
|
|
||||||
"columnName": "unstarred",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldPath": "id",
|
|
||||||
"columnName": "id",
|
|
||||||
"affinity": "INTEGER",
|
|
||||||
"notNull": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"primaryKey": {
|
|
||||||
"columnNames": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"autoGenerate": true
|
|
||||||
},
|
|
||||||
"indices": [],
|
|
||||||
"foreignKeys": []
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"views": [],
|
|
||||||
"setupQueries": [
|
|
||||||
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
|
|
||||||
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '9cf8b03d32f80dfd58160599a1df197d')"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -11,6 +11,7 @@ import bou.amine.apps.readerforselfossv2.android.themes.AppColors
|
|||||||
import bou.amine.apps.readerforselfossv2.android.themes.Toppings
|
import bou.amine.apps.readerforselfossv2.android.themes.Toppings
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.Config
|
import bou.amine.apps.readerforselfossv2.android.utils.Config
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.isBaseUrlValid
|
import bou.amine.apps.readerforselfossv2.android.utils.isBaseUrlValid
|
||||||
|
import bou.amine.apps.readerforselfossv2.model.NetworkUnavailableException
|
||||||
import bou.amine.apps.readerforselfossv2.repository.Repository
|
import bou.amine.apps.readerforselfossv2.repository.Repository
|
||||||
import com.ftinc.scoop.Scoop
|
import com.ftinc.scoop.Scoop
|
||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
@ -109,10 +110,19 @@ class AddSourceActivity : AppCompatActivity(), DIAware {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
fun handleSpoutFailure(networkIssue: Boolean = false) {
|
||||||
|
Toast.makeText(
|
||||||
|
this@AddSourceActivity,
|
||||||
|
if (networkIssue) R.string.cant_get_spouts_no_network else R.string.cant_get_spouts,
|
||||||
|
Toast.LENGTH_SHORT
|
||||||
|
).show()
|
||||||
|
mProgress.visibility = View.GONE
|
||||||
|
}
|
||||||
|
|
||||||
CoroutineScope(Dispatchers.Main).launch {
|
CoroutineScope(Dispatchers.Main).launch {
|
||||||
|
try {
|
||||||
val items = repository.getSpouts()
|
val items = repository.getSpouts()
|
||||||
if (items != null) {
|
if (items != null) {
|
||||||
|
|
||||||
val itemsStrings = items.map { it.value.name }
|
val itemsStrings = items.map { it.value.name }
|
||||||
for ((key, value) in items) {
|
for ((key, value) in items) {
|
||||||
spoutsKV[value.name] = key
|
spoutsKV[value.name] = key
|
||||||
@ -130,12 +140,10 @@ class AddSourceActivity : AppCompatActivity(), DIAware {
|
|||||||
spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
|
spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
|
||||||
spoutsSpinner.adapter = spinnerArrayAdapter
|
spoutsSpinner.adapter = spinnerArrayAdapter
|
||||||
} else {
|
} else {
|
||||||
Toast.makeText(
|
handleSpoutFailure()
|
||||||
this@AddSourceActivity,
|
}
|
||||||
R.string.cant_get_spouts,
|
} catch (e: NetworkUnavailableException) {
|
||||||
Toast.LENGTH_SHORT
|
handleSpoutFailure(networkIssue = true)
|
||||||
).show()
|
|
||||||
mProgress.visibility = View.GONE
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -18,7 +18,6 @@ import androidx.appcompat.widget.SearchView
|
|||||||
import androidx.core.view.doOnNextLayout
|
import androidx.core.view.doOnNextLayout
|
||||||
import androidx.drawerlayout.widget.DrawerLayout
|
import androidx.drawerlayout.widget.DrawerLayout
|
||||||
import androidx.recyclerview.widget.*
|
import androidx.recyclerview.widget.*
|
||||||
import androidx.room.Room
|
|
||||||
import androidx.work.Constraints
|
import androidx.work.Constraints
|
||||||
import androidx.work.ExistingPeriodicWorkPolicy
|
import androidx.work.ExistingPeriodicWorkPolicy
|
||||||
import androidx.work.PeriodicWorkRequestBuilder
|
import androidx.work.PeriodicWorkRequestBuilder
|
||||||
@ -28,15 +27,6 @@ import bou.amine.apps.readerforselfossv2.android.adapters.ItemListAdapter
|
|||||||
import bou.amine.apps.readerforselfossv2.android.adapters.ItemsAdapter
|
import bou.amine.apps.readerforselfossv2.android.adapters.ItemsAdapter
|
||||||
import bou.amine.apps.readerforselfossv2.android.background.LoadingWorker
|
import bou.amine.apps.readerforselfossv2.android.background.LoadingWorker
|
||||||
import bou.amine.apps.readerforselfossv2.android.databinding.ActivityHomeBinding
|
import bou.amine.apps.readerforselfossv2.android.databinding.ActivityHomeBinding
|
||||||
import bou.amine.apps.readerforselfossv2.android.model.getIcon
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.model.getTitleDecoded
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.AndroidDeviceDatabase
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.AndroidDeviceDatabaseService
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.database.AppDatabase
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.entities.ActionEntity
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_1_2
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_2_3
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_3_4
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity
|
import bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity
|
||||||
import bou.amine.apps.readerforselfossv2.android.themes.AppColors
|
import bou.amine.apps.readerforselfossv2.android.themes.AppColors
|
||||||
import bou.amine.apps.readerforselfossv2.android.themes.Toppings
|
import bou.amine.apps.readerforselfossv2.android.themes.Toppings
|
||||||
@ -44,13 +34,10 @@ import bou.amine.apps.readerforselfossv2.android.utils.Config
|
|||||||
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.customtabs.CustomTabActivityHelper
|
import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.persistence.toEntity
|
import bou.amine.apps.readerforselfossv2.dao.ACTION
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.persistence.toView
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.viewmodel.AppViewModel
|
|
||||||
import bou.amine.apps.readerforselfossv2.repository.Repository
|
import bou.amine.apps.readerforselfossv2.repository.Repository
|
||||||
import bou.amine.apps.readerforselfossv2.rest.SelfossModel
|
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
||||||
import bou.amine.apps.readerforselfossv2.utils.ItemType
|
import bou.amine.apps.readerforselfossv2.utils.*
|
||||||
import bou.amine.apps.readerforselfossv2.utils.longHash
|
|
||||||
import com.ashokvarma.bottomnavigation.BottomNavigationBar
|
import com.ashokvarma.bottomnavigation.BottomNavigationBar
|
||||||
import com.ashokvarma.bottomnavigation.BottomNavigationItem
|
import com.ashokvarma.bottomnavigation.BottomNavigationItem
|
||||||
import com.ashokvarma.bottomnavigation.TextBadgeItem
|
import com.ashokvarma.bottomnavigation.TextBadgeItem
|
||||||
@ -83,8 +70,6 @@ import kotlin.concurrent.thread
|
|||||||
|
|
||||||
class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAware {
|
class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAware {
|
||||||
|
|
||||||
private lateinit var dataBase: AndroidDeviceDatabase
|
|
||||||
private lateinit var dbService: AndroidDeviceDatabaseService
|
|
||||||
private val MENU_PREFERENCES = 12302
|
private val MENU_PREFERENCES = 12302
|
||||||
private val DRAWER_ID_TAGS = 100101L
|
private val DRAWER_ID_TAGS = 100101L
|
||||||
private val DRAWER_ID_HIDDEN_TAGS = 101100L
|
private val DRAWER_ID_HIDDEN_TAGS = 101100L
|
||||||
@ -129,8 +114,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
|
|||||||
|
|
||||||
private lateinit var tagsBadge: Map<Long, Int>
|
private lateinit var tagsBadge: Map<Long, Int>
|
||||||
|
|
||||||
private lateinit var db: AppDatabase
|
|
||||||
|
|
||||||
private lateinit var config: Config
|
private lateinit var config: Config
|
||||||
|
|
||||||
override val di by closestDI()
|
override val di by closestDI()
|
||||||
@ -169,15 +152,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
|
|||||||
binding.drawerContainer.addDrawerListener(mDrawerToggle)
|
binding.drawerContainer.addDrawerListener(mDrawerToggle)
|
||||||
mDrawerToggle.syncState()
|
mDrawerToggle.syncState()
|
||||||
|
|
||||||
db = Room.databaseBuilder(
|
|
||||||
applicationContext,
|
|
||||||
AppDatabase::class.java, "selfoss-database"
|
|
||||||
).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()
|
|
||||||
|
|
||||||
customTabActivityHelper = CustomTabActivityHelper()
|
customTabActivityHelper = CustomTabActivityHelper()
|
||||||
|
|
||||||
dataBase = AndroidDeviceDatabase(applicationContext)
|
|
||||||
|
|
||||||
handleBottomBar()
|
handleBottomBar()
|
||||||
handleDrawer()
|
handleDrawer()
|
||||||
|
|
||||||
@ -186,6 +162,12 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
|
|||||||
handleSettings()
|
handleSettings()
|
||||||
|
|
||||||
getElementsAccordingToTab()
|
getElementsAccordingToTab()
|
||||||
|
|
||||||
|
|
||||||
|
CoroutineScope(Dispatchers.Main).launch {
|
||||||
|
repository.tryToCacheItemsAndGetNewOnes()
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun handleSwipeRefreshLayout() {
|
private fun handleSwipeRefreshLayout() {
|
||||||
@ -336,7 +318,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
|
|||||||
|
|
||||||
handleRecurringTask()
|
handleRecurringTask()
|
||||||
|
|
||||||
handleOfflineActions()
|
CoroutineScope(Dispatchers.Main).launch {
|
||||||
|
repository.handleDBActions()
|
||||||
|
}
|
||||||
|
|
||||||
getElementsAccordingToTab()
|
getElementsAccordingToTab()
|
||||||
}
|
}
|
||||||
@ -466,6 +450,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: refactor this.
|
||||||
private fun handleDrawerItems() {
|
private fun handleDrawerItems() {
|
||||||
tagsBadge = emptyMap()
|
tagsBadge = emptyMap()
|
||||||
fun handleDrawerData(maybeDrawerData: DrawerData?, loadedFromCache: Boolean = false) {
|
fun handleDrawerData(maybeDrawerData: DrawerData?, loadedFromCache: Boolean = false) {
|
||||||
@ -486,7 +471,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
|
|||||||
|
|
||||||
val drawerItem = PrimaryDrawerItem()
|
val drawerItem = PrimaryDrawerItem()
|
||||||
.apply {
|
.apply {
|
||||||
nameText = it.getTitleDecoded()
|
nameText = it.tag.getHtmlDecoded()
|
||||||
identifier = it.tag.longHash()
|
identifier = it.tag.longHash()
|
||||||
iconDrawable = gd
|
iconDrawable = gd
|
||||||
badgeStyle = BadgeStyle().apply {
|
badgeStyle = BadgeStyle().apply {
|
||||||
@ -562,7 +547,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
|
|||||||
} else {
|
} else {
|
||||||
for (source in maybeSources) {
|
for (source in maybeSources) {
|
||||||
val item = PrimaryDrawerItem().apply {
|
val item = PrimaryDrawerItem().apply {
|
||||||
nameText = source.getTitleDecoded()
|
nameText = source.title.getHtmlDecoded()
|
||||||
identifier = source.id.toLong()
|
identifier = source.id.toLong()
|
||||||
iconUrl = source.getIcon(repository.baseUrl)
|
iconUrl = source.getIcon(repository.baseUrl)
|
||||||
onDrawerItemClickListener = { _,_,_ ->
|
onDrawerItemClickListener = { _,_,_ ->
|
||||||
@ -650,17 +635,12 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
|
|||||||
if (!loadedFromCache) {
|
if (!loadedFromCache) {
|
||||||
if (maybeDrawerData.tags != null) {
|
if (maybeDrawerData.tags != null) {
|
||||||
thread {
|
thread {
|
||||||
val tagEntities = maybeDrawerData.tags.map { it.toEntity() }
|
repository.resetDBTagsWithData(maybeDrawerData.tags)
|
||||||
db.drawerDataDao().deleteAllTags()
|
|
||||||
db.drawerDataDao().insertAllTags(*tagEntities.toTypedArray())
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (maybeDrawerData.sources != null) {
|
if (maybeDrawerData.sources != null) {
|
||||||
thread {
|
thread {
|
||||||
val sourceEntities =
|
repository.resetDBSourcesWithData(maybeDrawerData.sources)
|
||||||
maybeDrawerData.sources.map { it.toEntity() }
|
|
||||||
db.drawerDataDao().deleteAllSources()
|
|
||||||
db.drawerDataDao().insertAllSources(*sourceEntities.toTypedArray())
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -718,8 +698,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
|
|||||||
)
|
)
|
||||||
|
|
||||||
thread {
|
thread {
|
||||||
val drawerData = DrawerData(db.drawerDataDao().tags().map { it.toView() },
|
val drawerData = DrawerData(repository.getDBTags().map { it.toView() },
|
||||||
db.drawerDataDao().sources().map { it.toView() })
|
repository.getDBSources().map { it.toView() })
|
||||||
runOnUiThread {
|
runOnUiThread {
|
||||||
handleDrawerData(drawerData, loadedFromCache = true)
|
handleDrawerData(drawerData, loadedFromCache = true)
|
||||||
drawerApiCalls(drawerData)
|
drawerApiCalls(drawerData)
|
||||||
@ -894,7 +874,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
|
|||||||
ItemCardAdapter(
|
ItemCardAdapter(
|
||||||
this,
|
this,
|
||||||
items,
|
items,
|
||||||
db,
|
|
||||||
customTabActivityHelper,
|
customTabActivityHelper,
|
||||||
internalBrowser,
|
internalBrowser,
|
||||||
articleViewer,
|
articleViewer,
|
||||||
@ -909,7 +888,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
|
|||||||
ItemListAdapter(
|
ItemListAdapter(
|
||||||
this,
|
this,
|
||||||
items,
|
items,
|
||||||
db,
|
|
||||||
customTabActivityHelper,
|
customTabActivityHelper,
|
||||||
internalBrowser,
|
internalBrowser,
|
||||||
articleViewer,
|
articleViewer,
|
||||||
@ -1106,26 +1084,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun handleOfflineActions() {
|
private fun handleOfflineActions() {
|
||||||
fun doAndReportOnFail(success: Boolean, action: ActionEntity) {
|
|
||||||
if (success) {
|
|
||||||
thread {
|
|
||||||
db.actionsDao().delete(action)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
CoroutineScope(Dispatchers.Main).launch {
|
|
||||||
val actions = db.actionsDao().actions()
|
|
||||||
|
|
||||||
actions.forEach { action ->
|
|
||||||
when {
|
|
||||||
action.read -> doAndReportOnFail(repository.markAsReadById(action.articleId.toInt()), action)
|
|
||||||
action.unread -> doAndReportOnFail(repository.unmarkAsReadById(action.articleId.toInt()), action)
|
|
||||||
action.starred -> doAndReportOnFail(repository.starrById(action.articleId.toInt()), action)
|
|
||||||
action.unstarred -> doAndReportOnFail(repository.unstarrById(action.articleId.toInt()), action)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -11,13 +11,14 @@ import android.widget.Toast
|
|||||||
import androidx.lifecycle.DefaultLifecycleObserver
|
import androidx.lifecycle.DefaultLifecycleObserver
|
||||||
import androidx.lifecycle.LifecycleOwner
|
import androidx.lifecycle.LifecycleOwner
|
||||||
import androidx.lifecycle.ProcessLifecycleOwner
|
import androidx.lifecycle.ProcessLifecycleOwner
|
||||||
import androidx.lifecycle.lifecycleScope
|
|
||||||
import androidx.multidex.MultiDexApplication
|
import androidx.multidex.MultiDexApplication
|
||||||
import androidx.preference.PreferenceManager
|
import androidx.preference.PreferenceManager
|
||||||
import bou.amine.apps.readerforselfossv2.DI.networkModule
|
import bou.amine.apps.readerforselfossv2.DI.networkModule
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.Config
|
import bou.amine.apps.readerforselfossv2.android.utils.Config
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.glide.loadMaybeBasicAuth
|
import bou.amine.apps.readerforselfossv2.android.utils.glide.loadMaybeBasicAuth
|
||||||
import bou.amine.apps.readerforselfossv2.android.viewmodel.AppViewModel
|
import bou.amine.apps.readerforselfossv2.android.viewmodel.AppViewModel
|
||||||
|
import bou.amine.apps.readerforselfossv2.dao.DriverFactory
|
||||||
|
import bou.amine.apps.readerforselfossv2.dao.ReaderForSelfossDB
|
||||||
import bou.amine.apps.readerforselfossv2.repository.Repository
|
import bou.amine.apps.readerforselfossv2.repository.Repository
|
||||||
import com.bumptech.glide.Glide
|
import com.bumptech.glide.Glide
|
||||||
import com.bumptech.glide.request.RequestOptions
|
import com.bumptech.glide.request.RequestOptions
|
||||||
@ -26,18 +27,20 @@ import com.github.ln_12.library.ConnectivityStatus
|
|||||||
import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
|
import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
|
||||||
import com.mikepenz.materialdrawer.util.DrawerImageLoader
|
import com.mikepenz.materialdrawer.util.DrawerImageLoader
|
||||||
import com.russhwolf.settings.Settings
|
import com.russhwolf.settings.Settings
|
||||||
|
import io.github.aakira.napier.DebugAntilog
|
||||||
|
import io.github.aakira.napier.Napier
|
||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import io.github.aakira.napier.DebugAntilog
|
|
||||||
import io.github.aakira.napier.Napier
|
|
||||||
import org.kodein.di.*
|
import org.kodein.di.*
|
||||||
|
|
||||||
class MyApp : MultiDexApplication(), DIAware {
|
class MyApp : MultiDexApplication(), DIAware {
|
||||||
|
|
||||||
override val di by DI.lazy {
|
override val di by DI.lazy {
|
||||||
import(networkModule)
|
import(networkModule)
|
||||||
bind<Repository>() with singleton { Repository(instance(), instance(), connectivityStatus) }
|
bind<DriverFactory>() with singleton { DriverFactory(applicationContext) }
|
||||||
|
bind<ReaderForSelfossDB>() with singleton { ReaderForSelfossDB(driverFactory.createDriver()) }
|
||||||
|
bind<Repository>() with singleton { Repository(instance(), instance(), connectivityStatus, instance()) }
|
||||||
bind<ConnectivityStatus>() with singleton { ConnectivityStatus(applicationContext) }
|
bind<ConnectivityStatus>() with singleton { ConnectivityStatus(applicationContext) }
|
||||||
bind<AppViewModel>() with singleton { AppViewModel(repository = instance()) }
|
bind<AppViewModel>() with singleton { AppViewModel(repository = instance()) }
|
||||||
}
|
}
|
||||||
@ -45,6 +48,7 @@ class MyApp : MultiDexApplication(), DIAware {
|
|||||||
private val repository: Repository by instance()
|
private val repository: Repository by instance()
|
||||||
private val viewModel: AppViewModel by instance()
|
private val viewModel: AppViewModel by instance()
|
||||||
private val connectivityStatus: ConnectivityStatus by instance()
|
private val connectivityStatus: ConnectivityStatus by instance()
|
||||||
|
private val driverFactory: DriverFactory by instance()
|
||||||
private lateinit var config: Config
|
private lateinit var config: Config
|
||||||
private lateinit var settings : Settings
|
private lateinit var settings : Settings
|
||||||
|
|
||||||
@ -65,7 +69,14 @@ class MyApp : MultiDexApplication(), DIAware {
|
|||||||
ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifeCycleObserver(connectivityStatus, repository))
|
ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifeCycleObserver(connectivityStatus, repository))
|
||||||
|
|
||||||
CoroutineScope(Dispatchers.Main).launch {
|
CoroutineScope(Dispatchers.Main).launch {
|
||||||
viewModel.toastMessageProvider.collect { toastMessage ->
|
viewModel.networkAvailableProvider.collect { networkAvailable ->
|
||||||
|
val toastMessage = if (networkAvailable) {
|
||||||
|
repository.handleDBActions()
|
||||||
|
R.string.network_connectivity_retrieved
|
||||||
|
} else {
|
||||||
|
R.string.network_connectivity_lost
|
||||||
|
}
|
||||||
|
|
||||||
Toast.makeText(
|
Toast.makeText(
|
||||||
applicationContext,
|
applicationContext,
|
||||||
toastMessage,
|
toastMessage,
|
||||||
@ -73,6 +84,7 @@ class MyApp : MultiDexApplication(), DIAware {
|
|||||||
).show()
|
).show()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun handleNotificationChannels() {
|
private fun handleNotificationChannels() {
|
||||||
|
|||||||
@ -8,20 +8,14 @@ import android.view.MenuItem
|
|||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
import androidx.fragment.app.FragmentActivity
|
import androidx.fragment.app.FragmentActivity
|
||||||
import androidx.room.Room
|
|
||||||
import androidx.viewpager2.adapter.FragmentStateAdapter
|
import androidx.viewpager2.adapter.FragmentStateAdapter
|
||||||
import androidx.viewpager2.widget.ViewPager2
|
import androidx.viewpager2.widget.ViewPager2
|
||||||
import bou.amine.apps.readerforselfossv2.android.databinding.ActivityReaderBinding
|
import bou.amine.apps.readerforselfossv2.android.databinding.ActivityReaderBinding
|
||||||
import bou.amine.apps.readerforselfossv2.android.fragments.ArticleFragment
|
import bou.amine.apps.readerforselfossv2.android.fragments.ArticleFragment
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.database.AppDatabase
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_1_2
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_2_3
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_3_4
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.themes.AppColors
|
import bou.amine.apps.readerforselfossv2.android.themes.AppColors
|
||||||
import bou.amine.apps.readerforselfossv2.android.themes.Toppings
|
import bou.amine.apps.readerforselfossv2.android.themes.Toppings
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.toggleStar
|
|
||||||
import bou.amine.apps.readerforselfossv2.repository.Repository
|
import bou.amine.apps.readerforselfossv2.repository.Repository
|
||||||
import bou.amine.apps.readerforselfossv2.rest.SelfossModel
|
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
||||||
import com.ftinc.scoop.Scoop
|
import com.ftinc.scoop.Scoop
|
||||||
import com.russhwolf.settings.Settings
|
import com.russhwolf.settings.Settings
|
||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
@ -39,7 +33,6 @@ class ReaderActivity : AppCompatActivity(), DIAware {
|
|||||||
|
|
||||||
private lateinit var toolbarMenu: Menu
|
private lateinit var toolbarMenu: Menu
|
||||||
|
|
||||||
private lateinit var db: AppDatabase
|
|
||||||
private lateinit var binding: ActivityReaderBinding
|
private lateinit var binding: ActivityReaderBinding
|
||||||
|
|
||||||
private var activeAlignment: Int = 1
|
private var activeAlignment: Int = 1
|
||||||
@ -75,11 +68,6 @@ class ReaderActivity : AppCompatActivity(), DIAware {
|
|||||||
|
|
||||||
setContentView(view)
|
setContentView(view)
|
||||||
|
|
||||||
db = Room.databaseBuilder(
|
|
||||||
applicationContext,
|
|
||||||
AppDatabase::class.java, "selfoss-database"
|
|
||||||
).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()
|
|
||||||
|
|
||||||
val scoop = Scoop.getInstance()
|
val scoop = Scoop.getInstance()
|
||||||
scoop.bind(this, Toppings.PRIMARY.value, binding.toolBar)
|
scoop.bind(this, Toppings.PRIMARY.value, binding.toolBar)
|
||||||
scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
|
scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
|
||||||
@ -128,19 +116,22 @@ class ReaderActivity : AppCompatActivity(), DIAware {
|
|||||||
|
|
||||||
override fun getItemCount(): Int = allItems.size
|
override fun getItemCount(): Int = allItems.size
|
||||||
|
|
||||||
override fun createFragment(position: Int): Fragment = ArticleFragment.newInstance(allItems[position])
|
override fun createFragment(position: Int): Fragment =
|
||||||
|
ArticleFragment.newInstance(allItems[position])
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
|
override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
|
||||||
return when (keyCode) {
|
return when (keyCode) {
|
||||||
KeyEvent.KEYCODE_VOLUME_DOWN -> {
|
KeyEvent.KEYCODE_VOLUME_DOWN -> {
|
||||||
val currentFragment = supportFragmentManager.findFragmentByTag("f" + binding.pager.currentItem) as ArticleFragment
|
val currentFragment =
|
||||||
|
supportFragmentManager.findFragmentByTag("f" + binding.pager.currentItem) as ArticleFragment
|
||||||
currentFragment.scrollDown()
|
currentFragment.scrollDown()
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
KeyEvent.KEYCODE_VOLUME_UP -> {
|
KeyEvent.KEYCODE_VOLUME_UP -> {
|
||||||
val currentFragment = supportFragmentManager.findFragmentByTag("f" + binding.pager.currentItem) as ArticleFragment
|
val currentFragment =
|
||||||
|
supportFragmentManager.findFragmentByTag("f" + binding.pager.currentItem) as ArticleFragment
|
||||||
currentFragment.scrollUp()
|
currentFragment.scrollUp()
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
|
|||||||
@ -11,7 +11,7 @@ import bou.amine.apps.readerforselfossv2.android.databinding.ActivitySourcesBind
|
|||||||
import bou.amine.apps.readerforselfossv2.android.themes.AppColors
|
import bou.amine.apps.readerforselfossv2.android.themes.AppColors
|
||||||
import bou.amine.apps.readerforselfossv2.android.themes.Toppings
|
import bou.amine.apps.readerforselfossv2.android.themes.Toppings
|
||||||
import bou.amine.apps.readerforselfossv2.repository.Repository
|
import bou.amine.apps.readerforselfossv2.repository.Repository
|
||||||
import bou.amine.apps.readerforselfossv2.rest.SelfossModel
|
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
||||||
import com.ftinc.scoop.Scoop
|
import com.ftinc.scoop.Scoop
|
||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
|||||||
@ -10,14 +10,16 @@ import androidx.recyclerview.widget.RecyclerView
|
|||||||
import bou.amine.apps.readerforselfossv2.android.R
|
import bou.amine.apps.readerforselfossv2.android.R
|
||||||
import bou.amine.apps.readerforselfossv2.android.databinding.CardItemBinding
|
import bou.amine.apps.readerforselfossv2.android.databinding.CardItemBinding
|
||||||
import bou.amine.apps.readerforselfossv2.android.model.*
|
import bou.amine.apps.readerforselfossv2.android.model.*
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.database.AppDatabase
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.themes.AppColors
|
import bou.amine.apps.readerforselfossv2.android.themes.AppColors
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.*
|
import bou.amine.apps.readerforselfossv2.android.utils.*
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
|
import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapCenterCrop
|
import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapCenterCrop
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
|
import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
|
||||||
import bou.amine.apps.readerforselfossv2.repository.Repository
|
import bou.amine.apps.readerforselfossv2.repository.Repository
|
||||||
import bou.amine.apps.readerforselfossv2.rest.SelfossModel
|
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
||||||
|
import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
|
||||||
|
import bou.amine.apps.readerforselfossv2.utils.getIcon
|
||||||
|
import bou.amine.apps.readerforselfossv2.utils.getThumbnail
|
||||||
import com.amulyakhare.textdrawable.TextDrawable
|
import com.amulyakhare.textdrawable.TextDrawable
|
||||||
import com.amulyakhare.textdrawable.util.ColorGenerator
|
import com.amulyakhare.textdrawable.util.ColorGenerator
|
||||||
import com.bumptech.glide.Glide
|
import com.bumptech.glide.Glide
|
||||||
@ -31,7 +33,6 @@ import org.kodein.di.instance
|
|||||||
class ItemCardAdapter(
|
class ItemCardAdapter(
|
||||||
override val app: Activity,
|
override val app: Activity,
|
||||||
override var items: ArrayList<SelfossModel.Item>,
|
override var items: ArrayList<SelfossModel.Item>,
|
||||||
override val db: AppDatabase,
|
|
||||||
private val helper: CustomTabActivityHelper,
|
private val helper: CustomTabActivityHelper,
|
||||||
private val internalBrowser: Boolean,
|
private val internalBrowser: Boolean,
|
||||||
private val articleViewer: Boolean,
|
private val articleViewer: Boolean,
|
||||||
@ -58,7 +59,7 @@ class ItemCardAdapter(
|
|||||||
val itm = items[position]
|
val itm = items[position]
|
||||||
|
|
||||||
binding.favButton.isSelected = itm.starred
|
binding.favButton.isSelected = itm.starred
|
||||||
binding.title.text = itm.getTitleDecoded()
|
binding.title.text = itm.title.getHtmlDecoded()
|
||||||
|
|
||||||
binding.title.setOnTouchListener(LinkOnTouchListener())
|
binding.title.setOnTouchListener(LinkOnTouchListener())
|
||||||
|
|
||||||
@ -81,13 +82,13 @@ class ItemCardAdapter(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (itm.getIcon(repository.baseUrl).isEmpty()) {
|
if (itm.getIcon(repository.baseUrl).isEmpty()) {
|
||||||
val color = generator.getColor(itm.getSourceTitle())
|
val color = generator.getColor(itm.title.getHtmlDecoded())
|
||||||
|
|
||||||
val drawable =
|
val drawable =
|
||||||
TextDrawable
|
TextDrawable
|
||||||
.builder()
|
.builder()
|
||||||
.round()
|
.round()
|
||||||
.build(itm.getSourceTitle().toTextDrawableString(c), color)
|
.build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
|
||||||
binding.sourceImage.setImageDrawable(drawable)
|
binding.sourceImage.setImageDrawable(drawable)
|
||||||
} else {
|
} else {
|
||||||
c.circularBitmapDrawable(config, itm.getIcon(repository.baseUrl), binding.sourceImage)
|
c.circularBitmapDrawable(config, itm.getIcon(repository.baseUrl), binding.sourceImage)
|
||||||
@ -128,7 +129,7 @@ class ItemCardAdapter(
|
|||||||
|
|
||||||
binding.shareBtn.setOnClickListener {
|
binding.shareBtn.setOnClickListener {
|
||||||
val item = items[bindingAdapterPosition]
|
val item = items[bindingAdapterPosition]
|
||||||
c.shareLink(item.getLinkDecoded(), item.getTitleDecoded())
|
c.shareLink(item.getLinkDecoded(), item.title.getHtmlDecoded())
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.browserBtn.setOnClickListener {
|
binding.browserBtn.setOnClickListener {
|
||||||
|
|||||||
@ -7,14 +7,16 @@ import android.view.ViewGroup
|
|||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import bou.amine.apps.readerforselfossv2.android.databinding.ListItemBinding
|
import bou.amine.apps.readerforselfossv2.android.databinding.ListItemBinding
|
||||||
import bou.amine.apps.readerforselfossv2.android.model.*
|
import bou.amine.apps.readerforselfossv2.android.model.*
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.database.AppDatabase
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.themes.AppColors
|
import bou.amine.apps.readerforselfossv2.android.themes.AppColors
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.*
|
import bou.amine.apps.readerforselfossv2.android.utils.*
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
|
import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapCenterCrop
|
import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapCenterCrop
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
|
import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
|
||||||
import bou.amine.apps.readerforselfossv2.repository.Repository
|
import bou.amine.apps.readerforselfossv2.repository.Repository
|
||||||
import bou.amine.apps.readerforselfossv2.rest.SelfossModel
|
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
||||||
|
import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
|
||||||
|
import bou.amine.apps.readerforselfossv2.utils.getIcon
|
||||||
|
import bou.amine.apps.readerforselfossv2.utils.getThumbnail
|
||||||
import com.amulyakhare.textdrawable.TextDrawable
|
import com.amulyakhare.textdrawable.TextDrawable
|
||||||
import com.amulyakhare.textdrawable.util.ColorGenerator
|
import com.amulyakhare.textdrawable.util.ColorGenerator
|
||||||
import org.kodein.di.DI
|
import org.kodein.di.DI
|
||||||
@ -24,7 +26,6 @@ import org.kodein.di.instance
|
|||||||
class ItemListAdapter(
|
class ItemListAdapter(
|
||||||
override val app: Activity,
|
override val app: Activity,
|
||||||
override var items: ArrayList<SelfossModel.Item>,
|
override var items: ArrayList<SelfossModel.Item>,
|
||||||
override val db: AppDatabase,
|
|
||||||
private val helper: CustomTabActivityHelper,
|
private val helper: CustomTabActivityHelper,
|
||||||
private val internalBrowser: Boolean,
|
private val internalBrowser: Boolean,
|
||||||
private val articleViewer: Boolean,
|
private val articleViewer: Boolean,
|
||||||
@ -47,7 +48,7 @@ class ItemListAdapter(
|
|||||||
with(holder) {
|
with(holder) {
|
||||||
val itm = items[position]
|
val itm = items[position]
|
||||||
|
|
||||||
binding.title.text = itm.getTitleDecoded()
|
binding.title.text = itm.title.getHtmlDecoded()
|
||||||
|
|
||||||
binding.title.setOnTouchListener(LinkOnTouchListener())
|
binding.title.setOnTouchListener(LinkOnTouchListener())
|
||||||
|
|
||||||
@ -58,13 +59,13 @@ class ItemListAdapter(
|
|||||||
if (itm.getThumbnail(repository.baseUrl).isEmpty()) {
|
if (itm.getThumbnail(repository.baseUrl).isEmpty()) {
|
||||||
|
|
||||||
if (itm.getIcon(repository.baseUrl).isEmpty()) {
|
if (itm.getIcon(repository.baseUrl).isEmpty()) {
|
||||||
val color = generator.getColor(itm.getSourceTitle())
|
val color = generator.getColor(itm.title.getHtmlDecoded())
|
||||||
|
|
||||||
val drawable =
|
val drawable =
|
||||||
TextDrawable
|
TextDrawable
|
||||||
.builder()
|
.builder()
|
||||||
.round()
|
.round()
|
||||||
.build(itm.getSourceTitle().toTextDrawableString(c), color)
|
.build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
|
||||||
|
|
||||||
binding.itemImage.setImageDrawable(drawable)
|
binding.itemImage.setImageDrawable(drawable)
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -5,11 +5,10 @@ import android.graphics.Color
|
|||||||
import android.widget.TextView
|
import android.widget.TextView
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import bou.amine.apps.readerforselfossv2.android.R
|
import bou.amine.apps.readerforselfossv2.android.R
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.database.AppDatabase
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.themes.AppColors
|
import bou.amine.apps.readerforselfossv2.android.themes.AppColors
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.Config
|
import bou.amine.apps.readerforselfossv2.android.utils.Config
|
||||||
import bou.amine.apps.readerforselfossv2.repository.Repository
|
import bou.amine.apps.readerforselfossv2.repository.Repository
|
||||||
import bou.amine.apps.readerforselfossv2.rest.SelfossModel
|
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
||||||
import bou.amine.apps.readerforselfossv2.utils.ItemType
|
import bou.amine.apps.readerforselfossv2.utils.ItemType
|
||||||
import com.google.android.material.snackbar.Snackbar
|
import com.google.android.material.snackbar.Snackbar
|
||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
@ -20,7 +19,6 @@ import org.kodein.di.DIAware
|
|||||||
abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapter<VH>(), DIAware {
|
abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapter<VH>(), DIAware {
|
||||||
abstract var items: ArrayList<SelfossModel.Item>
|
abstract var items: ArrayList<SelfossModel.Item>
|
||||||
abstract val repository: Repository
|
abstract val repository: Repository
|
||||||
abstract val db: AppDatabase
|
|
||||||
abstract val app: Activity
|
abstract val app: Activity
|
||||||
abstract val appColors: AppColors
|
abstract val appColors: AppColors
|
||||||
abstract val config: Config
|
abstract val config: Config
|
||||||
|
|||||||
@ -10,13 +10,13 @@ import androidx.constraintlayout.widget.ConstraintLayout
|
|||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import bou.amine.apps.readerforselfossv2.android.R
|
import bou.amine.apps.readerforselfossv2.android.R
|
||||||
import bou.amine.apps.readerforselfossv2.android.databinding.SourceListItemBinding
|
import bou.amine.apps.readerforselfossv2.android.databinding.SourceListItemBinding
|
||||||
import bou.amine.apps.readerforselfossv2.android.model.getIcon
|
import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString
|
||||||
import bou.amine.apps.readerforselfossv2.android.model.getTitleDecoded
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.Config
|
import bou.amine.apps.readerforselfossv2.android.utils.Config
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
|
import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.toTextDrawableString
|
|
||||||
import bou.amine.apps.readerforselfossv2.repository.Repository
|
import bou.amine.apps.readerforselfossv2.repository.Repository
|
||||||
import bou.amine.apps.readerforselfossv2.rest.SelfossModel
|
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
||||||
|
import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
|
||||||
|
import bou.amine.apps.readerforselfossv2.utils.getIcon
|
||||||
import com.amulyakhare.textdrawable.TextDrawable
|
import com.amulyakhare.textdrawable.TextDrawable
|
||||||
import com.amulyakhare.textdrawable.util.ColorGenerator
|
import com.amulyakhare.textdrawable.util.ColorGenerator
|
||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
@ -49,19 +49,19 @@ class SourcesListAdapter(
|
|||||||
config = Config()
|
config = Config()
|
||||||
|
|
||||||
if (itm.getIcon(repository.baseUrl).isEmpty()) {
|
if (itm.getIcon(repository.baseUrl).isEmpty()) {
|
||||||
val color = generator.getColor(itm.getTitleDecoded())
|
val color = generator.getColor(itm.title.getHtmlDecoded())
|
||||||
|
|
||||||
val drawable =
|
val drawable =
|
||||||
TextDrawable
|
TextDrawable
|
||||||
.builder()
|
.builder()
|
||||||
.round()
|
.round()
|
||||||
.build(itm.getTitleDecoded().toTextDrawableString(c), color)
|
.build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
|
||||||
binding.itemImage.setImageDrawable(drawable)
|
binding.itemImage.setImageDrawable(drawable)
|
||||||
} else {
|
} else {
|
||||||
c.circularBitmapDrawable(config, itm.getIcon(repository.baseUrl), binding.itemImage)
|
c.circularBitmapDrawable(config, itm.getIcon(repository.baseUrl), binding.itemImage)
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.sourceTitle.text = itm.getTitleDecoded()
|
binding.sourceTitle.text = itm.title.getHtmlDecoded()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getItemCount(): Int = items.size
|
override fun getItemCount(): Int = items.size
|
||||||
|
|||||||
@ -22,7 +22,7 @@ class MercuryApi() {
|
|||||||
val retrofit =
|
val retrofit =
|
||||||
Retrofit
|
Retrofit
|
||||||
.Builder()
|
.Builder()
|
||||||
.baseUrl("https://www.amine-bou.fr")
|
.baseUrl("https://www.amine-louveau.fr")
|
||||||
.client(client)
|
.client(client)
|
||||||
.addConverterFactory(GsonConverterFactory.create(gson))
|
.addConverterFactory(GsonConverterFactory.create(gson))
|
||||||
.build()
|
.build()
|
||||||
|
|||||||
@ -8,23 +8,17 @@ import android.os.Build
|
|||||||
import androidx.core.app.NotificationCompat
|
import androidx.core.app.NotificationCompat
|
||||||
import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
|
import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
|
||||||
import androidx.core.app.NotificationCompat.PRIORITY_LOW
|
import androidx.core.app.NotificationCompat.PRIORITY_LOW
|
||||||
import androidx.room.Room
|
|
||||||
import androidx.work.Worker
|
import androidx.work.Worker
|
||||||
import androidx.work.WorkerParameters
|
import androidx.work.WorkerParameters
|
||||||
import bou.amine.apps.readerforselfossv2.android.MainActivity
|
import bou.amine.apps.readerforselfossv2.android.MainActivity
|
||||||
import bou.amine.apps.readerforselfossv2.android.MyApp
|
import bou.amine.apps.readerforselfossv2.android.MyApp
|
||||||
import bou.amine.apps.readerforselfossv2.android.R
|
import bou.amine.apps.readerforselfossv2.android.R
|
||||||
import bou.amine.apps.readerforselfossv2.android.model.preloadImages
|
import bou.amine.apps.readerforselfossv2.android.model.preloadImages
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.database.AppDatabase
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.entities.ActionEntity
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_1_2
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_2_3
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_3_4
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.Config
|
import bou.amine.apps.readerforselfossv2.android.utils.Config
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAccessible
|
import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAccessible
|
||||||
|
import bou.amine.apps.readerforselfossv2.dao.ACTION
|
||||||
|
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.rest.SelfossModel
|
|
||||||
import bou.amine.apps.readerforselfossv2.utils.ItemType
|
|
||||||
import com.russhwolf.settings.Settings
|
import com.russhwolf.settings.Settings
|
||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
@ -36,7 +30,6 @@ import kotlin.concurrent.schedule
|
|||||||
import kotlin.concurrent.thread
|
import kotlin.concurrent.thread
|
||||||
|
|
||||||
class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(context, params), DIAware {
|
class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(context, params), DIAware {
|
||||||
lateinit var db: AppDatabase
|
|
||||||
|
|
||||||
override val di by lazy { (applicationContext as MyApp).di }
|
override val di by lazy { (applicationContext as MyApp).di }
|
||||||
private val repository : Repository by instance()
|
private val repository : Repository by instance()
|
||||||
@ -63,43 +56,10 @@ override fun doWork(): Result {
|
|||||||
|
|
||||||
val notifyNewItems = settings.getBoolean("notify_new_items", false)
|
val notifyNewItems = settings.getBoolean("notify_new_items", false)
|
||||||
|
|
||||||
db = Room.databaseBuilder(
|
repository.handleDBActions()
|
||||||
applicationContext,
|
|
||||||
AppDatabase::class.java, "selfoss-database"
|
|
||||||
).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3)
|
|
||||||
.addMigrations(MIGRATION_3_4).build()
|
|
||||||
|
|
||||||
val actions = db.actionsDao().actions()
|
|
||||||
|
|
||||||
actions.forEach { action ->
|
|
||||||
when {
|
|
||||||
action.read -> doAndReportOnFail(
|
|
||||||
repository.markAsReadById(action.articleId.toInt()),
|
|
||||||
action
|
|
||||||
)
|
|
||||||
action.unread -> doAndReportOnFail(
|
|
||||||
repository.unmarkAsReadById(action.articleId.toInt()),
|
|
||||||
action
|
|
||||||
)
|
|
||||||
action.starred -> doAndReportOnFail(
|
|
||||||
repository.starrById(action.articleId.toInt()),
|
|
||||||
action
|
|
||||||
)
|
|
||||||
action.unstarred -> doAndReportOnFail(
|
|
||||||
repository.unstarrById(action.articleId.toInt()),
|
|
||||||
action
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
launch {
|
launch {
|
||||||
try {
|
handleNewItemsNotification(repository.tryToCacheItemsAndGetNewOnes(), notifyNewItems, notificationManager)
|
||||||
val newItems = repository.allItems(ItemType.UNREAD)
|
|
||||||
handleNewItemsNotification(newItems, notifyNewItems, notificationManager)
|
|
||||||
val readItems = repository.allItems(ItemType.ALL)
|
|
||||||
val starredItems = repository.allItems(ItemType.STARRED)
|
|
||||||
// TODO: save all to DB
|
|
||||||
} catch (e: Throwable) {}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -153,13 +113,4 @@ override fun doWork(): Result {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun doAndReportOnFail(result: Boolean, action: ActionEntity) {
|
|
||||||
// TODO: Failures should be reported
|
|
||||||
if (result) {
|
|
||||||
thread {
|
|
||||||
db.actionsDao().delete(action)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@ -19,24 +19,22 @@ import androidx.browser.customtabs.CustomTabsIntent
|
|||||||
import androidx.core.content.res.ResourcesCompat
|
import androidx.core.content.res.ResourcesCompat
|
||||||
import androidx.core.widget.NestedScrollView
|
import androidx.core.widget.NestedScrollView
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
import androidx.room.Room
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.ImageActivity
|
import bou.amine.apps.readerforselfossv2.android.ImageActivity
|
||||||
import bou.amine.apps.readerforselfossv2.android.R
|
import bou.amine.apps.readerforselfossv2.android.R
|
||||||
import bou.amine.apps.readerforselfossv2.android.api.mercury.MercuryApi
|
import bou.amine.apps.readerforselfossv2.android.api.mercury.MercuryApi
|
||||||
import bou.amine.apps.readerforselfossv2.android.api.mercury.ParsedContent
|
import bou.amine.apps.readerforselfossv2.android.api.mercury.ParsedContent
|
||||||
import bou.amine.apps.readerforselfossv2.android.databinding.FragmentArticleBinding
|
import bou.amine.apps.readerforselfossv2.android.databinding.FragmentArticleBinding
|
||||||
import bou.amine.apps.readerforselfossv2.android.model.*
|
import bou.amine.apps.readerforselfossv2.android.model.*
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.database.AppDatabase
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_1_2
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_2_3
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_3_4
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.themes.AppColors
|
import bou.amine.apps.readerforselfossv2.android.themes.AppColors
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.*
|
import bou.amine.apps.readerforselfossv2.android.utils.*
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
|
import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
|
||||||
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.loadMaybeBasicAuth
|
import bou.amine.apps.readerforselfossv2.android.utils.glide.loadMaybeBasicAuth
|
||||||
import bou.amine.apps.readerforselfossv2.repository.Repository
|
import bou.amine.apps.readerforselfossv2.repository.Repository
|
||||||
import bou.amine.apps.readerforselfossv2.rest.SelfossModel
|
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
||||||
|
import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
|
||||||
|
import bou.amine.apps.readerforselfossv2.utils.getImages
|
||||||
|
import bou.amine.apps.readerforselfossv2.utils.getThumbnail
|
||||||
import bou.amine.apps.readerforselfossv2.utils.isEmptyOrNullOrNullString
|
import bou.amine.apps.readerforselfossv2.utils.isEmptyOrNullOrNullString
|
||||||
import com.bumptech.glide.Glide
|
import com.bumptech.glide.Glide
|
||||||
import com.bumptech.glide.load.engine.DiskCacheStrategy
|
import com.bumptech.glide.load.engine.DiskCacheStrategy
|
||||||
@ -71,7 +69,6 @@ class ArticleFragment : Fragment(), DIAware {
|
|||||||
private lateinit var allImages : ArrayList<String>
|
private lateinit var allImages : ArrayList<String>
|
||||||
private lateinit var fab: FloatingActionButton
|
private lateinit var fab: FloatingActionButton
|
||||||
private lateinit var appColors: AppColors
|
private lateinit var appColors: AppColors
|
||||||
private lateinit var db: AppDatabase
|
|
||||||
private lateinit var textAlignment: String
|
private lateinit var textAlignment: String
|
||||||
private lateinit var config: Config
|
private lateinit var config: Config
|
||||||
private var _binding: FragmentArticleBinding? = null
|
private var _binding: FragmentArticleBinding? = null
|
||||||
@ -103,11 +100,6 @@ class ArticleFragment : Fragment(), DIAware {
|
|||||||
val pi: ParecelableItem = requireArguments().getParcelable(ARG_ITEMS)!!
|
val pi: ParecelableItem = requireArguments().getParcelable(ARG_ITEMS)!!
|
||||||
|
|
||||||
item = pi.toModel()
|
item = pi.toModel()
|
||||||
|
|
||||||
db = Room.databaseBuilder(
|
|
||||||
requireContext(),
|
|
||||||
AppDatabase::class.java, "selfoss-database"
|
|
||||||
).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onCreateView(
|
override fun onCreateView(
|
||||||
@ -120,7 +112,7 @@ class ArticleFragment : Fragment(), DIAware {
|
|||||||
|
|
||||||
url = item.getLinkDecoded()
|
url = item.getLinkDecoded()
|
||||||
contentText = item.content
|
contentText = item.content
|
||||||
contentTitle = item.getTitleDecoded()
|
contentTitle = item.title.getHtmlDecoded()
|
||||||
contentImage = item.getThumbnail(repository.baseUrl)
|
contentImage = item.getThumbnail(repository.baseUrl)
|
||||||
contentSource = item.sourceAndDateText(repository.dateUtils)
|
contentSource = item.sourceAndDateText(repository.dateUtils)
|
||||||
allImages = item.getImages()
|
allImages = item.getImages()
|
||||||
@ -134,7 +126,6 @@ class ArticleFragment : Fragment(), DIAware {
|
|||||||
typeface = try {
|
typeface = try {
|
||||||
ResourcesCompat.getFont(requireContext(), resId)!!
|
ResourcesCompat.getFont(requireContext(), resId)!!
|
||||||
} catch (e: java.lang.Exception) {
|
} catch (e: java.lang.Exception) {
|
||||||
// ACRA.getErrorReporter().maybeHandleSilentException(Throwable("Font loading issue: ${e.message}"), requireContext())
|
|
||||||
// Just to be sure
|
// Just to be sure
|
||||||
null
|
null
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,43 +1,12 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.android.model
|
package bou.amine.apps.readerforselfossv2.android.model
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.net.Uri
|
|
||||||
import android.text.Html
|
|
||||||
import android.webkit.URLUtil
|
import android.webkit.URLUtil
|
||||||
import bou.amine.apps.readerforselfossv2.rest.SelfossModel
|
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
||||||
|
import bou.amine.apps.readerforselfossv2.utils.getImages
|
||||||
import com.bumptech.glide.Glide
|
import com.bumptech.glide.Glide
|
||||||
import com.bumptech.glide.load.engine.DiskCacheStrategy
|
import com.bumptech.glide.load.engine.DiskCacheStrategy
|
||||||
import com.bumptech.glide.request.RequestOptions
|
import com.bumptech.glide.request.RequestOptions
|
||||||
import org.jsoup.Jsoup
|
|
||||||
import java.util.*
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Items extension methods
|
|
||||||
*/
|
|
||||||
fun SelfossModel.Item.getIcon(baseUrl: String): String {
|
|
||||||
return constructUrl(baseUrl, "favicons", icon)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun SelfossModel.Item.getThumbnail(baseUrl: String): String {
|
|
||||||
return constructUrl(baseUrl, "thumbnails", thumbnail)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun SelfossModel.Item.getImages() : ArrayList<String> {
|
|
||||||
val allImages = ArrayList<String>()
|
|
||||||
|
|
||||||
for ( image in Jsoup.parse(content).getElementsByTag("img")) {
|
|
||||||
val url = image.attr("src")
|
|
||||||
if (url.lowercase(Locale.US).contains(".jpg") ||
|
|
||||||
url.lowercase(Locale.US).contains(".jpeg") ||
|
|
||||||
url.lowercase(Locale.US).contains(".png") ||
|
|
||||||
url.lowercase(Locale.US).contains(".webp"))
|
|
||||||
{
|
|
||||||
allImages.add(url)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return allImages
|
|
||||||
}
|
|
||||||
|
|
||||||
fun SelfossModel.Item.preloadImages(context: Context) : Boolean {
|
fun SelfossModel.Item.preloadImages(context: Context) : Boolean {
|
||||||
val imageUrls = this.getImages()
|
val imageUrls = this.getImages()
|
||||||
@ -60,66 +29,14 @@ fun SelfossModel.Item.preloadImages(context: Context) : Boolean {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
fun SelfossModel.Item.getTitleDecoded(): String {
|
fun String.toTextDrawableString(): String {
|
||||||
return Html.fromHtml(title).toString()
|
val textDrawable = StringBuilder()
|
||||||
}
|
for (s in this.split(" ".toRegex()).filter { it.isNotEmpty() }.toTypedArray()) {
|
||||||
|
try {
|
||||||
fun SelfossModel.Item.getSourceTitle(): String {
|
textDrawable.append(s[0])
|
||||||
return Html.fromHtml(sourcetitle).toString()
|
} catch (e: StringIndexOutOfBoundsException) {
|
||||||
}
|
// We do nothing
|
||||||
|
|
||||||
// TODO: maybe find a better way to handle these kind of urls
|
|
||||||
fun SelfossModel.Item.getLinkDecoded(): String {
|
|
||||||
var stringUrl: String
|
|
||||||
stringUrl =
|
|
||||||
if (link.startsWith("http://news.google.com/news/") || link.startsWith("https://news.google.com/news/")) {
|
|
||||||
if (link.contains("&url=")) {
|
|
||||||
link.substringAfter("&url=")
|
|
||||||
} else {
|
|
||||||
this.link.replace("&", "&")
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
this.link.replace("&", "&")
|
|
||||||
}
|
|
||||||
|
|
||||||
// handle :443 => https
|
|
||||||
if (stringUrl.contains(":443")) {
|
|
||||||
stringUrl = stringUrl.replace(":443", "").replace("http://", "https://")
|
|
||||||
}
|
|
||||||
|
|
||||||
// handle url not starting with http
|
|
||||||
if (stringUrl.startsWith("//")) {
|
|
||||||
stringUrl = "http:$stringUrl"
|
|
||||||
}
|
|
||||||
|
|
||||||
return stringUrl
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sources extension methods
|
|
||||||
*/
|
|
||||||
|
|
||||||
fun SelfossModel.Source.getIcon(baseUrl: String): String {
|
|
||||||
return constructUrl(baseUrl, "favicons", icon)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun SelfossModel.Source.getTitleDecoded(): String {
|
|
||||||
return Html.fromHtml(title).toString()
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Common methods
|
|
||||||
*/
|
|
||||||
private fun constructUrl(baseUrl: String, path: String, file: String?): String {
|
|
||||||
return if (file == null || file == "null" || file.isEmpty()) {
|
|
||||||
""
|
|
||||||
} else {
|
|
||||||
val baseUriBuilder = Uri.parse(baseUrl).buildUpon()
|
|
||||||
baseUriBuilder.appendPath(path).appendPath(file)
|
|
||||||
|
|
||||||
baseUriBuilder.toString()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return textDrawable.toString()
|
||||||
|
}
|
||||||
@ -1,10 +1,8 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.android.model
|
package bou.amine.apps.readerforselfossv2.android.model
|
||||||
|
|
||||||
import android.os.Build
|
|
||||||
import android.os.Parcel
|
import android.os.Parcel
|
||||||
import android.os.Parcelable
|
import android.os.Parcelable
|
||||||
import androidx.annotation.RequiresApi
|
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
||||||
import bou.amine.apps.readerforselfossv2.rest.SelfossModel
|
|
||||||
import com.google.gson.annotations.SerializedName
|
import com.google.gson.annotations.SerializedName
|
||||||
|
|
||||||
fun SelfossModel.Item.toParcelable() : ParecelableItem =
|
fun SelfossModel.Item.toParcelable() : ParecelableItem =
|
||||||
|
|||||||
@ -1,28 +0,0 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.android.persistence
|
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import androidx.room.Room
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.database.AppDatabase
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.entities.AndroidItemEntity
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_1_2
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_2_3
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.migrations.MIGRATION_3_4
|
|
||||||
import bou.amine.apps.readerforselfossv2.dao.DeviceDatabase
|
|
||||||
|
|
||||||
class AndroidDeviceDatabase(applicationContext: Context): DeviceDatabase<AndroidItemEntity> {
|
|
||||||
var db: AppDatabase = Room.databaseBuilder(
|
|
||||||
applicationContext,
|
|
||||||
AppDatabase::class.java, "selfoss-database"
|
|
||||||
).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()
|
|
||||||
|
|
||||||
|
|
||||||
override suspend fun items(): List<AndroidItemEntity> = db.itemsDao().items()
|
|
||||||
|
|
||||||
override suspend fun insertAllItems(vararg items: AndroidItemEntity) = db.itemsDao().insertAllItems(*items)
|
|
||||||
|
|
||||||
override suspend fun deleteAllItems() = db.itemsDao().deleteAllItems()
|
|
||||||
|
|
||||||
override suspend fun delete(item: AndroidItemEntity) = db.itemsDao().delete(item)
|
|
||||||
|
|
||||||
override suspend fun updateItem(item: AndroidItemEntity) = db.itemsDao().updateItem(item)
|
|
||||||
}
|
|
||||||
@ -1,40 +0,0 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.android.persistence
|
|
||||||
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.entities.AndroidItemEntity
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.persistence.toEntity
|
|
||||||
import bou.amine.apps.readerforselfossv2.rest.SelfossModel
|
|
||||||
import bou.amine.apps.readerforselfossv2.service.DeviceDataBaseService
|
|
||||||
import bou.amine.apps.readerforselfossv2.service.SearchService
|
|
||||||
|
|
||||||
class AndroidDeviceDatabaseService(db: AndroidDeviceDatabase, searchService: SearchService) :
|
|
||||||
DeviceDataBaseService<AndroidItemEntity>(db, searchService) {
|
|
||||||
override suspend fun updateDatabase() {
|
|
||||||
if (itemsCaching) {
|
|
||||||
if (items.isEmpty()) {
|
|
||||||
getFromDB()
|
|
||||||
}
|
|
||||||
db.deleteAllItems()
|
|
||||||
db.insertAllItems(*(items.map { it.toEntity() }).toTypedArray())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override suspend fun clearDBItems() {
|
|
||||||
db.deleteAllItems()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun appendNewItems(newItems: List<SelfossModel.Item>) {
|
|
||||||
var oldItems = items
|
|
||||||
if (oldItems != newItems) {
|
|
||||||
oldItems = oldItems.filter { item -> newItems.find { it.id == item.id } == null } as ArrayList<SelfossModel.Item>
|
|
||||||
oldItems.addAll(newItems)
|
|
||||||
items = oldItems
|
|
||||||
|
|
||||||
sortItems()
|
|
||||||
getFocusedItems()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun getFromDB() {
|
|
||||||
TODO("Not yet implemented")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.android.persistence.dao
|
|
||||||
|
|
||||||
import androidx.room.Dao
|
|
||||||
import androidx.room.Delete
|
|
||||||
import androidx.room.Insert
|
|
||||||
import androidx.room.OnConflictStrategy
|
|
||||||
import androidx.room.Query
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.entities.ActionEntity
|
|
||||||
|
|
||||||
@Dao
|
|
||||||
interface ActionsDao {
|
|
||||||
@Query("SELECT * FROM actions order by id asc")
|
|
||||||
suspend fun actions(): List<ActionEntity>
|
|
||||||
|
|
||||||
@Insert(onConflict = OnConflictStrategy.REPLACE)
|
|
||||||
fun insertAllActions(vararg actions: ActionEntity)
|
|
||||||
|
|
||||||
@Query("DELETE FROM actions WHERE articleid = :article_id AND read = 1")
|
|
||||||
fun deleteReadActionForArticle(article_id: String)
|
|
||||||
|
|
||||||
@Delete
|
|
||||||
fun delete(action: ActionEntity)
|
|
||||||
}
|
|
||||||
@ -1,36 +0,0 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.android.persistence.dao
|
|
||||||
|
|
||||||
import androidx.room.Delete
|
|
||||||
import androidx.room.Dao
|
|
||||||
import androidx.room.Insert
|
|
||||||
import androidx.room.OnConflictStrategy
|
|
||||||
import androidx.room.Query
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.entities.SourceEntity
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.entities.TagEntity
|
|
||||||
|
|
||||||
@Dao
|
|
||||||
interface DrawerDataDao {
|
|
||||||
@Query("SELECT * FROM tags")
|
|
||||||
fun tags(): List<TagEntity>
|
|
||||||
|
|
||||||
@Query("SELECT * FROM sources")
|
|
||||||
fun sources(): List<SourceEntity>
|
|
||||||
|
|
||||||
@Insert(onConflict = OnConflictStrategy.REPLACE)
|
|
||||||
fun insertAllTags(vararg tags: TagEntity)
|
|
||||||
|
|
||||||
@Insert(onConflict = OnConflictStrategy.REPLACE)
|
|
||||||
fun insertAllSources(vararg sources: SourceEntity)
|
|
||||||
|
|
||||||
@Query("DELETE FROM tags")
|
|
||||||
fun deleteAllTags()
|
|
||||||
|
|
||||||
@Query("DELETE FROM sources")
|
|
||||||
fun deleteAllSources()
|
|
||||||
|
|
||||||
@Delete
|
|
||||||
fun deleteTag(tag: TagEntity)
|
|
||||||
|
|
||||||
@Delete
|
|
||||||
fun deleteSource(source: SourceEntity)
|
|
||||||
}
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.android.persistence.dao
|
|
||||||
|
|
||||||
import androidx.room.Dao
|
|
||||||
import androidx.room.Delete
|
|
||||||
import androidx.room.Insert
|
|
||||||
import androidx.room.OnConflictStrategy
|
|
||||||
import androidx.room.Query
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.entities.AndroidItemEntity
|
|
||||||
import androidx.room.Update
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Dao
|
|
||||||
interface ItemsDao {
|
|
||||||
@Query("SELECT * FROM items order by id desc")
|
|
||||||
suspend fun items(): List<AndroidItemEntity>
|
|
||||||
|
|
||||||
@Insert(onConflict = OnConflictStrategy.REPLACE)
|
|
||||||
suspend fun insertAllItems(vararg items: AndroidItemEntity)
|
|
||||||
|
|
||||||
@Query("DELETE FROM items")
|
|
||||||
suspend fun deleteAllItems()
|
|
||||||
|
|
||||||
@Delete
|
|
||||||
suspend fun delete(item: AndroidItemEntity)
|
|
||||||
|
|
||||||
@Update
|
|
||||||
suspend fun updateItem(item: AndroidItemEntity)
|
|
||||||
}
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.android.persistence.database
|
|
||||||
|
|
||||||
import androidx.room.RoomDatabase
|
|
||||||
import androidx.room.Database
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.dao.ActionsDao
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.dao.DrawerDataDao
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.dao.ItemsDao
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.entities.ActionEntity
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.entities.AndroidItemEntity
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.entities.SourceEntity
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.entities.TagEntity
|
|
||||||
|
|
||||||
@Database(entities = [TagEntity::class, SourceEntity::class, AndroidItemEntity::class, ActionEntity::class], version = 4)
|
|
||||||
abstract class AppDatabase : RoomDatabase() {
|
|
||||||
abstract fun drawerDataDao(): DrawerDataDao
|
|
||||||
|
|
||||||
abstract fun itemsDao(): ItemsDao
|
|
||||||
|
|
||||||
abstract fun actionsDao(): ActionsDao
|
|
||||||
}
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.android.persistence.entities
|
|
||||||
|
|
||||||
import androidx.room.ColumnInfo
|
|
||||||
import androidx.room.Entity
|
|
||||||
import androidx.room.PrimaryKey
|
|
||||||
|
|
||||||
@Entity(tableName = "actions")
|
|
||||||
data class ActionEntity(
|
|
||||||
@ColumnInfo(name = "articleid")
|
|
||||||
val articleId: String,
|
|
||||||
@ColumnInfo(name = "read")
|
|
||||||
val read: Boolean,
|
|
||||||
@ColumnInfo(name = "unread")
|
|
||||||
val unread: Boolean,
|
|
||||||
@ColumnInfo(name = "starred")
|
|
||||||
var starred: Boolean,
|
|
||||||
@ColumnInfo(name = "unstarred")
|
|
||||||
var unstarred: Boolean
|
|
||||||
) {
|
|
||||||
@PrimaryKey(autoGenerate = true)
|
|
||||||
var id: Int = 0
|
|
||||||
}
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.android.persistence.entities
|
|
||||||
|
|
||||||
import androidx.room.ColumnInfo
|
|
||||||
import androidx.room.Entity
|
|
||||||
import androidx.room.PrimaryKey
|
|
||||||
import bou.amine.apps.readerforselfossv2.rest.SelfossModel
|
|
||||||
|
|
||||||
@Entity(tableName = "items")
|
|
||||||
data class AndroidItemEntity(
|
|
||||||
@PrimaryKey
|
|
||||||
@ColumnInfo(name = "id")
|
|
||||||
val id: String,
|
|
||||||
@ColumnInfo(name = "datetime")
|
|
||||||
val datetime: String,
|
|
||||||
@ColumnInfo(name = "title")
|
|
||||||
val title: String,
|
|
||||||
@ColumnInfo(name = "content")
|
|
||||||
val content: String,
|
|
||||||
@ColumnInfo(name = "unread")
|
|
||||||
val unread: Boolean,
|
|
||||||
@ColumnInfo(name = "starred")
|
|
||||||
var starred: Boolean,
|
|
||||||
@ColumnInfo(name = "thumbnail")
|
|
||||||
val thumbnail: String?,
|
|
||||||
@ColumnInfo(name = "icon")
|
|
||||||
val icon: String?,
|
|
||||||
@ColumnInfo(name = "link")
|
|
||||||
val link: String,
|
|
||||||
@ColumnInfo(name = "sourcetitle")
|
|
||||||
val sourcetitle: String,
|
|
||||||
@ColumnInfo(name = "tags")
|
|
||||||
val tags: String
|
|
||||||
)
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.android.persistence.entities
|
|
||||||
|
|
||||||
import androidx.room.ColumnInfo
|
|
||||||
import androidx.room.Entity
|
|
||||||
import androidx.room.PrimaryKey
|
|
||||||
|
|
||||||
@Entity(tableName = "tags")
|
|
||||||
data class TagEntity(
|
|
||||||
@PrimaryKey
|
|
||||||
@ColumnInfo(name = "tag")
|
|
||||||
val tag: String,
|
|
||||||
@ColumnInfo(name = "color")
|
|
||||||
val color: String,
|
|
||||||
@ColumnInfo(name = "unread")
|
|
||||||
val unread: Int
|
|
||||||
)
|
|
||||||
|
|
||||||
@Entity(tableName = "sources")
|
|
||||||
data class SourceEntity(
|
|
||||||
@PrimaryKey
|
|
||||||
@ColumnInfo(name = "id")
|
|
||||||
val id: String,
|
|
||||||
@ColumnInfo(name = "title")
|
|
||||||
val title: String,
|
|
||||||
@ColumnInfo(name = "tags")
|
|
||||||
val tags: String,
|
|
||||||
@ColumnInfo(name = "spout")
|
|
||||||
val spout: String,
|
|
||||||
@ColumnInfo(name = "error")
|
|
||||||
val error: String,
|
|
||||||
@ColumnInfo(name = "icon")
|
|
||||||
val icon: String
|
|
||||||
)
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.android.persistence.migrations
|
|
||||||
|
|
||||||
import androidx.sqlite.db.SupportSQLiteDatabase
|
|
||||||
import androidx.room.migration.Migration
|
|
||||||
|
|
||||||
val MIGRATION_1_2: Migration = object : Migration(1, 2) {
|
|
||||||
override fun migrate(database: SupportSQLiteDatabase) {
|
|
||||||
database.execSQL("CREATE TABLE IF NOT EXISTS `items` (`id` TEXT NOT NULL, `datetime` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `thumbnail` TEXT NOT NULL, `icon` TEXT NOT NULL, `link` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL, `tags` TEXT NOT NULL, PRIMARY KEY(`id`))")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val MIGRATION_2_3: Migration = object : Migration(2, 3) {
|
|
||||||
override fun migrate(database: SupportSQLiteDatabase) {
|
|
||||||
database.execSQL("CREATE TABLE IF NOT EXISTS `actions` (`id` INTEGER NOT NULL, `articleid` TEXT NOT NULL, `read` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `unstarred` INTEGER NOT NULL, PRIMARY KEY(`id`))")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val MIGRATION_3_4: Migration = object : Migration(3, 4) {
|
|
||||||
override fun migrate(database: SupportSQLiteDatabase) {
|
|
||||||
// @see https://stackoverflow.com/questions/57392015/how-to-migrate-not-null-table-column-into-null-in-android-room-database
|
|
||||||
// Create the new table
|
|
||||||
database.execSQL("CREATE TABLE IF NOT EXISTS `itemstmp` (`id` TEXT NOT NULL, `datetime` TEXT NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `unread` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `thumbnail` TEXT, `icon` TEXT, `link` TEXT NOT NULL, `sourcetitle` TEXT NOT NULL, `tags` TEXT NOT NULL, PRIMARY KEY(`id`))")
|
|
||||||
|
|
||||||
// Copy the data
|
|
||||||
database.execSQL(
|
|
||||||
"INSERT INTO itemstmp (`id`, `datetime`, `title`, `content`, `unread`, `starred`, `thumbnail`, `icon`, `link`, `sourcetitle`, `tags`) SELECT `id`, `datetime`, `title`, `content`, `unread`, `starred`, `thumbnail`, `icon`, `link`, `sourcetitle`, `tags` FROM items")
|
|
||||||
|
|
||||||
// Remove the old table
|
|
||||||
database.execSQL("DROP TABLE items")
|
|
||||||
|
|
||||||
// Change the table name to the correct one
|
|
||||||
database.execSQL("ALTER TABLE itemstmp RENAME TO items")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.android.utils
|
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.model.getSourceTitle
|
|
||||||
import bou.amine.apps.readerforselfossv2.rest.SelfossModel
|
|
||||||
import bou.amine.apps.readerforselfossv2.utils.DateUtils
|
|
||||||
import bou.amine.apps.readerforselfossv2.utils.parseRelativeDate
|
|
||||||
|
|
||||||
fun String.toTextDrawableString(c: Context): String {
|
|
||||||
val textDrawable = StringBuilder()
|
|
||||||
for (s in this.split(" ".toRegex()).filter { it.isNotEmpty() }.toTypedArray()) {
|
|
||||||
try {
|
|
||||||
textDrawable.append(s[0])
|
|
||||||
} catch (e: StringIndexOutOfBoundsException) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return textDrawable.toString()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun SelfossModel.Item.sourceAndDateText(dateUtils: DateUtils): String {
|
|
||||||
val formattedDate = parseRelativeDate(dateUtils)
|
|
||||||
|
|
||||||
return getSourceTitle() + formattedDate
|
|
||||||
}
|
|
||||||
|
|
||||||
fun SelfossModel.Item.toggleStar(): SelfossModel.Item {
|
|
||||||
this.starred = !this.starred
|
|
||||||
return this
|
|
||||||
}
|
|
||||||
@ -18,9 +18,8 @@ import android.widget.Toast
|
|||||||
import androidx.browser.customtabs.CustomTabsIntent
|
import androidx.browser.customtabs.CustomTabsIntent
|
||||||
import bou.amine.apps.readerforselfossv2.android.R
|
import bou.amine.apps.readerforselfossv2.android.R
|
||||||
import bou.amine.apps.readerforselfossv2.android.ReaderActivity
|
import bou.amine.apps.readerforselfossv2.android.ReaderActivity
|
||||||
import bou.amine.apps.readerforselfossv2.android.model.getLinkDecoded
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
|
import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
|
||||||
import bou.amine.apps.readerforselfossv2.rest.SelfossModel
|
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
||||||
import bou.amine.apps.readerforselfossv2.utils.toStringUriWithHttp
|
import bou.amine.apps.readerforselfossv2.utils.toStringUriWithHttp
|
||||||
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
|
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
|
||||||
|
|
||||||
|
|||||||
@ -1,9 +0,0 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.android.utils
|
|
||||||
|
|
||||||
import android.content.res.Resources
|
|
||||||
|
|
||||||
val Int.toPx: Int
|
|
||||||
get() = (this * Resources.getSystem().displayMetrics.density).toInt()
|
|
||||||
|
|
||||||
val Int.toDp: Int
|
|
||||||
get() = (this / Resources.getSystem().displayMetrics.density).toInt()
|
|
||||||
@ -1,72 +0,0 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.android.utils.persistence
|
|
||||||
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.model.getSourceTitle
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.model.getTitleDecoded
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.entities.AndroidItemEntity
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.entities.SourceEntity
|
|
||||||
import bou.amine.apps.readerforselfossv2.android.persistence.entities.TagEntity
|
|
||||||
import bou.amine.apps.readerforselfossv2.rest.SelfossModel
|
|
||||||
|
|
||||||
fun TagEntity.toView(): SelfossModel.Tag =
|
|
||||||
SelfossModel.Tag(
|
|
||||||
this.tag,
|
|
||||||
this.color,
|
|
||||||
this.unread
|
|
||||||
)
|
|
||||||
|
|
||||||
fun SourceEntity.toView(): SelfossModel.Source =
|
|
||||||
SelfossModel.Source(
|
|
||||||
this.id.toInt(),
|
|
||||||
this.title,
|
|
||||||
this.tags.split(","),
|
|
||||||
this.spout,
|
|
||||||
this.error,
|
|
||||||
this.icon
|
|
||||||
)
|
|
||||||
|
|
||||||
fun SelfossModel.Source.toEntity(): SourceEntity =
|
|
||||||
SourceEntity(
|
|
||||||
this.id.toString(),
|
|
||||||
this.getTitleDecoded(),
|
|
||||||
this.tags.joinToString(","),
|
|
||||||
this.spout,
|
|
||||||
this.error,
|
|
||||||
this.icon.orEmpty()
|
|
||||||
)
|
|
||||||
|
|
||||||
fun SelfossModel.Tag.toEntity(): TagEntity =
|
|
||||||
TagEntity(
|
|
||||||
this.tag,
|
|
||||||
this.color,
|
|
||||||
this.unread
|
|
||||||
)
|
|
||||||
|
|
||||||
fun AndroidItemEntity.toView(): SelfossModel.Item =
|
|
||||||
SelfossModel.Item(
|
|
||||||
this.id.toInt(),
|
|
||||||
this.datetime,
|
|
||||||
this.title,
|
|
||||||
this.content,
|
|
||||||
this.unread,
|
|
||||||
this.starred,
|
|
||||||
this.thumbnail,
|
|
||||||
this.icon,
|
|
||||||
this.link,
|
|
||||||
this.sourcetitle,
|
|
||||||
this.tags.split(",")
|
|
||||||
)
|
|
||||||
|
|
||||||
fun SelfossModel.Item.toEntity(): AndroidItemEntity =
|
|
||||||
AndroidItemEntity(
|
|
||||||
this.id.toString(),
|
|
||||||
this.datetime,
|
|
||||||
this.getTitleDecoded(),
|
|
||||||
this.content,
|
|
||||||
this.unread,
|
|
||||||
this.starred,
|
|
||||||
this.thumbnail,
|
|
||||||
this.icon,
|
|
||||||
this.link,
|
|
||||||
this.getSourceTitle(),
|
|
||||||
this.tags.joinToString(",")
|
|
||||||
)
|
|
||||||
@ -9,21 +9,23 @@ import kotlinx.coroutines.flow.asSharedFlow
|
|||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
|
|
||||||
class AppViewModel(private val repository: Repository) : ViewModel() {
|
class AppViewModel(private val repository: Repository) : ViewModel() {
|
||||||
private val _toastMessageProvider = MutableSharedFlow<Int>()
|
private val _networkAvailableProvider = MutableSharedFlow<Boolean>()
|
||||||
val toastMessageProvider = _toastMessageProvider.asSharedFlow()
|
val networkAvailableProvider = _networkAvailableProvider.asSharedFlow()
|
||||||
private var wasConnected = true
|
private var wasConnected = true
|
||||||
|
|
||||||
init {
|
init {
|
||||||
viewModelScope.launch {
|
viewModelScope.launch {
|
||||||
repository.isConnectionAvailable.collect { isConnected ->
|
repository.isConnectionAvailable.collect { isConnected ->
|
||||||
|
if (repository.connectionMonitored) {
|
||||||
if (isConnected && !wasConnected && repository.connectionMonitored) {
|
if (isConnected && !wasConnected && repository.connectionMonitored) {
|
||||||
_toastMessageProvider.emit(R.string.network_connectivity_retrieved)
|
_networkAvailableProvider.emit(true)
|
||||||
wasConnected = true
|
wasConnected = true
|
||||||
} else if (!isConnected && wasConnected && repository.connectionMonitored){
|
} else if (!isConnected && wasConnected && repository.connectionMonitored){
|
||||||
_toastMessageProvider.emit(R.string.network_connectivity_lost)
|
_networkAvailableProvider.emit(false)
|
||||||
wasConnected = false
|
wasConnected = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
@ -40,7 +40,8 @@
|
|||||||
<string name="addStringNoUrl">"Inicieu la sessió per afegir fonts."</string>
|
<string name="addStringNoUrl">"Inicieu la sessió per afegir fonts."</string>
|
||||||
<string name="cant_get_sources">"No es pot obtenir la llista de fonts."</string>
|
<string name="cant_get_sources">"No es pot obtenir la llista de fonts."</string>
|
||||||
<string name="cant_create_source">"No es pot crear la font."</string>
|
<string name="cant_create_source">"No es pot crear la font."</string>
|
||||||
<string name="cant_get_spouts">"No es pot obtenir la llista de canals."</string>
|
<string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
|
||||||
|
<string name="cant_get_spouts">"Can't get spouts list. There may ben an api issue."</string>
|
||||||
<string name="form_not_complete">"El formulari no està complet"</string>
|
<string name="form_not_complete">"El formulari no està complet"</string>
|
||||||
<string name="pref_header_links">"Enllaços"</string>
|
<string name="pref_header_links">"Enllaços"</string>
|
||||||
<string name="issue_tracker_link">"Detector de problemes"</string>
|
<string name="issue_tracker_link">"Detector de problemes"</string>
|
||||||
|
|||||||
@ -40,7 +40,8 @@
|
|||||||
<string name="addStringNoUrl">"Melde dich an um Quellen hinzuzufügen."</string>
|
<string name="addStringNoUrl">"Melde dich an um Quellen hinzuzufügen."</string>
|
||||||
<string name="cant_get_sources">"Quellen können nicht abgerufen werden."</string>
|
<string name="cant_get_sources">"Quellen können nicht abgerufen werden."</string>
|
||||||
<string name="cant_create_source">"Quelle kann nicht gespeichert werden."</string>
|
<string name="cant_create_source">"Quelle kann nicht gespeichert werden."</string>
|
||||||
<string name="cant_get_spouts">"Can't get spouts list."</string>
|
<string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
|
||||||
|
<string name="cant_get_spouts">"Can't get spouts list. There may ben an api issue."</string>
|
||||||
<string name="form_not_complete">"Das Formular ist nicht vollständig"</string>
|
<string name="form_not_complete">"Das Formular ist nicht vollständig"</string>
|
||||||
<string name="pref_header_links">"Links"</string>
|
<string name="pref_header_links">"Links"</string>
|
||||||
<string name="issue_tracker_link">"Issue Tracker"</string>
|
<string name="issue_tracker_link">"Issue Tracker"</string>
|
||||||
@ -142,8 +143,8 @@
|
|||||||
<string name="pref_switch_update_sources">Check for new sources and tags</string>
|
<string name="pref_switch_update_sources">Check for new sources and tags</string>
|
||||||
<string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
|
<string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
|
||||||
<string name="no_network_connectivity">Nicht verbunden !</string>
|
<string name="no_network_connectivity">Nicht verbunden !</string>
|
||||||
<string name="network_connectivity_lost">"Network connection lost"</string>
|
<string name="network_connectivity_lost">"Die Netzwerkverbindung wurde unterbrochen"</string>
|
||||||
<string name="network_connectivity_retrieved">"Network connection is now available"</string>
|
<string name="network_connectivity_retrieved">"Netzwerkverbindung ist jetzt verfügbar"</string>
|
||||||
<string name="pref_switch_periodic_refresh">Synchronisiere Artikel</string>
|
<string name="pref_switch_periodic_refresh">Synchronisiere Artikel</string>
|
||||||
<string name="pref_switch_periodic_refresh_off">Artikel werden nicht im Hintergrund synchronisiert</string>
|
<string name="pref_switch_periodic_refresh_off">Artikel werden nicht im Hintergrund synchronisiert</string>
|
||||||
<string name="pref_switch_periodic_refresh_on">Die Artikel werden regelmäßig synchronisiert</string>
|
<string name="pref_switch_periodic_refresh_on">Die Artikel werden regelmäßig synchronisiert</string>
|
||||||
|
|||||||
@ -40,7 +40,8 @@
|
|||||||
<string name="addStringNoUrl">"Iniciar sesión para añadir fuentes."</string>
|
<string name="addStringNoUrl">"Iniciar sesión para añadir fuentes."</string>
|
||||||
<string name="cant_get_sources">"No se puede obtener la lista de fuentes."</string>
|
<string name="cant_get_sources">"No se puede obtener la lista de fuentes."</string>
|
||||||
<string name="cant_create_source">"No se puede crear la fuente."</string>
|
<string name="cant_create_source">"No se puede crear la fuente."</string>
|
||||||
<string name="cant_get_spouts">"No se puede obtener la lista de fuentes."</string>
|
<string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
|
||||||
|
<string name="cant_get_spouts">"Can't get spouts list. There may ben an api issue."</string>
|
||||||
<string name="form_not_complete">"El formulario no está completo"</string>
|
<string name="form_not_complete">"El formulario no está completo"</string>
|
||||||
<string name="pref_header_links">"Enlaces"</string>
|
<string name="pref_header_links">"Enlaces"</string>
|
||||||
<string name="issue_tracker_link">"Rastreador de Incidencias"</string>
|
<string name="issue_tracker_link">"Rastreador de Incidencias"</string>
|
||||||
|
|||||||
@ -40,7 +40,8 @@
|
|||||||
<string name="addStringNoUrl">"Log in to add sources."</string>
|
<string name="addStringNoUrl">"Log in to add sources."</string>
|
||||||
<string name="cant_get_sources">"Can't get sources list."</string>
|
<string name="cant_get_sources">"Can't get sources list."</string>
|
||||||
<string name="cant_create_source">"Can't create source."</string>
|
<string name="cant_create_source">"Can't create source."</string>
|
||||||
<string name="cant_get_spouts">"Can't get spouts list."</string>
|
<string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
|
||||||
|
<string name="cant_get_spouts">"Can't get spouts list. There may ben an api issue."</string>
|
||||||
<string name="form_not_complete">"The form is not complete"</string>
|
<string name="form_not_complete">"The form is not complete"</string>
|
||||||
<string name="pref_header_links">"Links"</string>
|
<string name="pref_header_links">"Links"</string>
|
||||||
<string name="issue_tracker_link">"Issue Tracker"</string>
|
<string name="issue_tracker_link">"Issue Tracker"</string>
|
||||||
|
|||||||
@ -40,13 +40,14 @@
|
|||||||
<string name="addStringNoUrl">"Identifiez-vous pour ajouter une source."</string>
|
<string name="addStringNoUrl">"Identifiez-vous pour ajouter une source."</string>
|
||||||
<string name="cant_get_sources">"Impossible de récupérer la liste des sources"</string>
|
<string name="cant_get_sources">"Impossible de récupérer la liste des sources"</string>
|
||||||
<string name="cant_create_source">"Impossible de créer la source."</string>
|
<string name="cant_create_source">"Impossible de créer la source."</string>
|
||||||
<string name="cant_get_spouts">"Impossible de récupérer vos Spouts pour rajouter des sources"</string>
|
<string name="cant_get_spouts_no_network">"Impossible d'obtenir la liste des spouts en raison d'un problème de réseau."</string>
|
||||||
|
<string name="cant_get_spouts">"Impossible d'obtenir la liste des spouts. Cela pourrait venir de l'api."</string>
|
||||||
<string name="form_not_complete">"Il manque des données. Terminez le formulaire."</string>
|
<string name="form_not_complete">"Il manque des données. Terminez le formulaire."</string>
|
||||||
<string name="pref_header_links">"Liens utiles"</string>
|
<string name="pref_header_links">"Liens utiles"</string>
|
||||||
<string name="issue_tracker_link">"Suivi des problèmes"</string>
|
<string name="issue_tracker_link">"Suivi des problèmes"</string>
|
||||||
<string name="issue_tracker_summary">"Pour signaler un bug ou demander une nouvelle fonctionnalité"</string>
|
<string name="issue_tracker_summary">"Pour signaler un bug ou demander une nouvelle fonctionnalité"</string>
|
||||||
<string name="warning_wrong_url">"ATTENTION"</string>
|
<string name="warning_wrong_url">"ATTENTION"</string>
|
||||||
<string name="pref_switch_card_view_title">"Card View"</string>
|
<string name="pref_switch_card_view_title">"Vue en carte"</string>
|
||||||
<string name="cant_mark_favortie">"Impossible de marquer l'élément comme favoris"</string>
|
<string name="cant_mark_favortie">"Impossible de marquer l'élément comme favoris"</string>
|
||||||
<string name="cant_unmark_favortie">"Impossible de retirer l'élément des favoris"</string>
|
<string name="cant_unmark_favortie">"Impossible de retirer l'élément des favoris"</string>
|
||||||
<string name="share">"Partager"</string>
|
<string name="share">"Partager"</string>
|
||||||
|
|||||||
@ -40,7 +40,8 @@
|
|||||||
<string name="addStringNoUrl">"Accede pra engadir fontes."</string>
|
<string name="addStringNoUrl">"Accede pra engadir fontes."</string>
|
||||||
<string name="cant_get_sources">"Non se pode obter a lista de fontes."</string>
|
<string name="cant_get_sources">"Non se pode obter a lista de fontes."</string>
|
||||||
<string name="cant_create_source">"Non se pode crear unha fonte."</string>
|
<string name="cant_create_source">"Non se pode crear unha fonte."</string>
|
||||||
<string name="cant_get_spouts">"Non se pode obter a lista de fontes."</string>
|
<string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
|
||||||
|
<string name="cant_get_spouts">"Can't get spouts list. There may ben an api issue."</string>
|
||||||
<string name="form_not_complete">"O formulario non está completo"</string>
|
<string name="form_not_complete">"O formulario non está completo"</string>
|
||||||
<string name="pref_header_links">"Ligazóns"</string>
|
<string name="pref_header_links">"Ligazóns"</string>
|
||||||
<string name="issue_tracker_link">"Rastrexador de Incidencias"</string>
|
<string name="issue_tracker_link">"Rastrexador de Incidencias"</string>
|
||||||
@ -142,8 +143,8 @@
|
|||||||
<string name="pref_switch_update_sources">Comproba novas fontes e etiquetas</string>
|
<string name="pref_switch_update_sources">Comproba novas fontes e etiquetas</string>
|
||||||
<string name="pref_switch_update_sources_summary">Deshabilita isto se o teu servidor está recibindo demasiadas peticións de base de datos.</string>
|
<string name="pref_switch_update_sources_summary">Deshabilita isto se o teu servidor está recibindo demasiadas peticións de base de datos.</string>
|
||||||
<string name="no_network_connectivity">Non conectado!</string>
|
<string name="no_network_connectivity">Non conectado!</string>
|
||||||
<string name="network_connectivity_lost">"Network connection lost"</string>
|
<string name="network_connectivity_lost">"Perdeuse a conexión de rede"</string>
|
||||||
<string name="network_connectivity_retrieved">"Network connection is now available"</string>
|
<string name="network_connectivity_retrieved">"Conexión de rede xa dispoñíbel"</string>
|
||||||
<string name="pref_switch_periodic_refresh">Sincronizar artigos</string>
|
<string name="pref_switch_periodic_refresh">Sincronizar artigos</string>
|
||||||
<string name="pref_switch_periodic_refresh_off">Os artigos non se sincronizarán coa aplicación de fondo</string>
|
<string name="pref_switch_periodic_refresh_off">Os artigos non se sincronizarán coa aplicación de fondo</string>
|
||||||
<string name="pref_switch_periodic_refresh_on">Os artigos sincronizaranse periódicamente</string>
|
<string name="pref_switch_periodic_refresh_on">Os artigos sincronizaranse periódicamente</string>
|
||||||
|
|||||||
@ -40,7 +40,8 @@
|
|||||||
<string name="addStringNoUrl">"Masuk untuk menambah sumber."</string>
|
<string name="addStringNoUrl">"Masuk untuk menambah sumber."</string>
|
||||||
<string name="cant_get_sources">"Tidak bisa mendapatkan daftar sumber."</string>
|
<string name="cant_get_sources">"Tidak bisa mendapatkan daftar sumber."</string>
|
||||||
<string name="cant_create_source">"Tidak dapat membuat sumber."</string>
|
<string name="cant_create_source">"Tidak dapat membuat sumber."</string>
|
||||||
<string name="cant_get_spouts">"Tidak bisa masuk ke daftar Spouts."</string>
|
<string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
|
||||||
|
<string name="cant_get_spouts">"Can't get spouts list. There may ben an api issue."</string>
|
||||||
<string name="form_not_complete">"Formulirnya belum selesai"</string>
|
<string name="form_not_complete">"Formulirnya belum selesai"</string>
|
||||||
<string name="pref_header_links">"Tautan"</string>
|
<string name="pref_header_links">"Tautan"</string>
|
||||||
<string name="issue_tracker_link">"Pelacak Masalah"</string>
|
<string name="issue_tracker_link">"Pelacak Masalah"</string>
|
||||||
|
|||||||
@ -40,7 +40,8 @@
|
|||||||
<string name="addStringNoUrl">"Autenticati per aggiungere fonti."</string>
|
<string name="addStringNoUrl">"Autenticati per aggiungere fonti."</string>
|
||||||
<string name="cant_get_sources">"Can't get sources list."</string>
|
<string name="cant_get_sources">"Can't get sources list."</string>
|
||||||
<string name="cant_create_source">"Can't create source."</string>
|
<string name="cant_create_source">"Can't create source."</string>
|
||||||
<string name="cant_get_spouts">"Can't get spouts list."</string>
|
<string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
|
||||||
|
<string name="cant_get_spouts">"Can't get spouts list. There may ben an api issue."</string>
|
||||||
<string name="form_not_complete">"Il modulo non è completo"</string>
|
<string name="form_not_complete">"Il modulo non è completo"</string>
|
||||||
<string name="pref_header_links">"Links"</string>
|
<string name="pref_header_links">"Links"</string>
|
||||||
<string name="issue_tracker_link">"Traccia problemi"</string>
|
<string name="issue_tracker_link">"Traccia problemi"</string>
|
||||||
|
|||||||
@ -40,7 +40,8 @@
|
|||||||
<string name="addStringNoUrl">"로그인 소스를 추가 해야 합니다."</string>
|
<string name="addStringNoUrl">"로그인 소스를 추가 해야 합니다."</string>
|
||||||
<string name="cant_get_sources">"소스 리스트를 얻을 수 없습니다."</string>
|
<string name="cant_get_sources">"소스 리스트를 얻을 수 없습니다."</string>
|
||||||
<string name="cant_create_source">"소스를 만들 수 없습니다."</string>
|
<string name="cant_create_source">"소스를 만들 수 없습니다."</string>
|
||||||
<string name="cant_get_spouts">"Spouts 목록을 가져올 수 없습니다."</string>
|
<string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
|
||||||
|
<string name="cant_get_spouts">"Can't get spouts list. There may ben an api issue."</string>
|
||||||
<string name="form_not_complete">"양식이 완료되지 않았습니다."</string>
|
<string name="form_not_complete">"양식이 완료되지 않았습니다."</string>
|
||||||
<string name="pref_header_links">"링크"</string>
|
<string name="pref_header_links">"링크"</string>
|
||||||
<string name="issue_tracker_link">"이슈 트래커"</string>
|
<string name="issue_tracker_link">"이슈 트래커"</string>
|
||||||
|
|||||||
@ -40,7 +40,8 @@
|
|||||||
<string name="addStringNoUrl">"Login om bronnen toe te voegen"</string>
|
<string name="addStringNoUrl">"Login om bronnen toe te voegen"</string>
|
||||||
<string name="cant_get_sources">"Kan de lijst met bronnen niet ophalen"</string>
|
<string name="cant_get_sources">"Kan de lijst met bronnen niet ophalen"</string>
|
||||||
<string name="cant_create_source">"Kan bron niet creëeren"</string>
|
<string name="cant_create_source">"Kan bron niet creëeren"</string>
|
||||||
<string name="cant_get_spouts">"Ophalen spouts mislukt"</string>
|
<string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
|
||||||
|
<string name="cant_get_spouts">"Can't get spouts list. There may ben an api issue."</string>
|
||||||
<string name="form_not_complete">"Formulier is niet volledig ingevuld"</string>
|
<string name="form_not_complete">"Formulier is niet volledig ingevuld"</string>
|
||||||
<string name="pref_header_links">"Links"</string>
|
<string name="pref_header_links">"Links"</string>
|
||||||
<string name="issue_tracker_link">"Bug tracker"</string>
|
<string name="issue_tracker_link">"Bug tracker"</string>
|
||||||
|
|||||||
@ -40,7 +40,8 @@
|
|||||||
<string name="addStringNoUrl">"Faça login para adicionar fontes."</string>
|
<string name="addStringNoUrl">"Faça login para adicionar fontes."</string>
|
||||||
<string name="cant_get_sources">"Não é possível obter a lista de fontes."</string>
|
<string name="cant_get_sources">"Não é possível obter a lista de fontes."</string>
|
||||||
<string name="cant_create_source">"Não é possível criar fonte."</string>
|
<string name="cant_create_source">"Não é possível criar fonte."</string>
|
||||||
<string name="cant_get_spouts">"Não é possível obter a lista de spouts."</string>
|
<string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
|
||||||
|
<string name="cant_get_spouts">"Can't get spouts list. There may ben an api issue."</string>
|
||||||
<string name="form_not_complete">"O formulário não está completo"</string>
|
<string name="form_not_complete">"O formulário não está completo"</string>
|
||||||
<string name="pref_header_links">"Links"</string>
|
<string name="pref_header_links">"Links"</string>
|
||||||
<string name="issue_tracker_link">"Rastreador de problemas"</string>
|
<string name="issue_tracker_link">"Rastreador de problemas"</string>
|
||||||
|
|||||||
@ -40,7 +40,8 @@
|
|||||||
<string name="addStringNoUrl">"Logar para adicionar fontes."</string>
|
<string name="addStringNoUrl">"Logar para adicionar fontes."</string>
|
||||||
<string name="cant_get_sources">"Não é possível obter a lista de fontes."</string>
|
<string name="cant_get_sources">"Não é possível obter a lista de fontes."</string>
|
||||||
<string name="cant_create_source">"Não é possível criar a fonte."</string>
|
<string name="cant_create_source">"Não é possível criar a fonte."</string>
|
||||||
<string name="cant_get_spouts">"Não é possível obter a lista de bicos."</string>
|
<string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
|
||||||
|
<string name="cant_get_spouts">"Can't get spouts list. There may ben an api issue."</string>
|
||||||
<string name="form_not_complete">"O formulário não está completo"</string>
|
<string name="form_not_complete">"O formulário não está completo"</string>
|
||||||
<string name="pref_header_links">"Links"</string>
|
<string name="pref_header_links">"Links"</string>
|
||||||
<string name="issue_tracker_link">"Rastreador de problemas"</string>
|
<string name="issue_tracker_link">"Rastreador de problemas"</string>
|
||||||
|
|||||||
@ -40,7 +40,8 @@
|
|||||||
<string name="addStringNoUrl">"Log in to add sources."</string>
|
<string name="addStringNoUrl">"Log in to add sources."</string>
|
||||||
<string name="cant_get_sources">"Can't get sources list."</string>
|
<string name="cant_get_sources">"Can't get sources list."</string>
|
||||||
<string name="cant_create_source">"Can't create source."</string>
|
<string name="cant_create_source">"Can't create source."</string>
|
||||||
<string name="cant_get_spouts">"Can't get spouts list."</string>
|
<string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
|
||||||
|
<string name="cant_get_spouts">"Can't get spouts list. There may ben an api issue."</string>
|
||||||
<string name="form_not_complete">"The form is not complete"</string>
|
<string name="form_not_complete">"The form is not complete"</string>
|
||||||
<string name="pref_header_links">"Links"</string>
|
<string name="pref_header_links">"Links"</string>
|
||||||
<string name="issue_tracker_link">"Issue Tracker"</string>
|
<string name="issue_tracker_link">"Issue Tracker"</string>
|
||||||
|
|||||||
@ -40,7 +40,8 @@
|
|||||||
<string name="addStringNoUrl">"Kaynakları eklemek için giriş yapın."</string>
|
<string name="addStringNoUrl">"Kaynakları eklemek için giriş yapın."</string>
|
||||||
<string name="cant_get_sources">"Kaynakları listesi alınamıyor."</string>
|
<string name="cant_get_sources">"Kaynakları listesi alınamıyor."</string>
|
||||||
<string name="cant_create_source">"Kaynak oluşturulamıyor."</string>
|
<string name="cant_create_source">"Kaynak oluşturulamıyor."</string>
|
||||||
<string name="cant_get_spouts">"Spouts listesine girilemiyor."</string>
|
<string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
|
||||||
|
<string name="cant_get_spouts">"Can't get spouts list. There may ben an api issue."</string>
|
||||||
<string name="form_not_complete">"Form tamamlanamadı"</string>
|
<string name="form_not_complete">"Form tamamlanamadı"</string>
|
||||||
<string name="pref_header_links">"Bağlantılar"</string>
|
<string name="pref_header_links">"Bağlantılar"</string>
|
||||||
<string name="issue_tracker_link">"Sorun İzleyici"</string>
|
<string name="issue_tracker_link">"Sorun İzleyici"</string>
|
||||||
|
|||||||
@ -40,7 +40,8 @@
|
|||||||
<string name="addStringNoUrl">"登录以添加数据源。"</string>
|
<string name="addStringNoUrl">"登录以添加数据源。"</string>
|
||||||
<string name="cant_get_sources">"无法获取数据列表。"</string>
|
<string name="cant_get_sources">"无法获取数据列表。"</string>
|
||||||
<string name="cant_create_source">"无法创建源数据。"</string>
|
<string name="cant_create_source">"无法创建源数据。"</string>
|
||||||
<string name="cant_get_spouts">"无法获取数据列表"</string>
|
<string name="cant_get_spouts_no_network">"由于网络问题，无法获取 spouts 列表。"</string>
|
||||||
|
<string name="cant_get_spouts">"无法获取 spouts 列表。可能有一个 api 问题。"</string>
|
||||||
<string name="form_not_complete">"窗体未完成"</string>
|
<string name="form_not_complete">"窗体未完成"</string>
|
||||||
<string name="pref_header_links">"链接"</string>
|
<string name="pref_header_links">"链接"</string>
|
||||||
<string name="issue_tracker_link">"问题追踪器"</string>
|
<string name="issue_tracker_link">"问题追踪器"</string>
|
||||||
@ -142,8 +143,8 @@
|
|||||||
<string name="pref_switch_update_sources">检查新来源和标签</string>
|
<string name="pref_switch_update_sources">检查新来源和标签</string>
|
||||||
<string name="pref_switch_update_sources_summary">如果你的服务器接收过多的数据库查询，请禁用此功能。</string>
|
<string name="pref_switch_update_sources_summary">如果你的服务器接收过多的数据库查询，请禁用此功能。</string>
|
||||||
<string name="no_network_connectivity">未连接！</string>
|
<string name="no_network_connectivity">未连接！</string>
|
||||||
<string name="network_connectivity_lost">"Network connection lost"</string>
|
<string name="network_connectivity_lost">"网络连接丢失"</string>
|
||||||
<string name="network_connectivity_retrieved">"Network connection is now available"</string>
|
<string name="network_connectivity_retrieved">"网络连接现在可用"</string>
|
||||||
<string name="pref_switch_periodic_refresh">同步文章</string>
|
<string name="pref_switch_periodic_refresh">同步文章</string>
|
||||||
<string name="pref_switch_periodic_refresh_off">文章将不会在后台同步</string>
|
<string name="pref_switch_periodic_refresh_off">文章将不会在后台同步</string>
|
||||||
<string name="pref_switch_periodic_refresh_on">将定期同步文章</string>
|
<string name="pref_switch_periodic_refresh_on">将定期同步文章</string>
|
||||||
|
|||||||
@ -40,7 +40,8 @@
|
|||||||
<string name="addStringNoUrl">"登录以添加数据源。"</string>
|
<string name="addStringNoUrl">"登录以添加数据源。"</string>
|
||||||
<string name="cant_get_sources">"无法获取数据列表。"</string>
|
<string name="cant_get_sources">"无法获取数据列表。"</string>
|
||||||
<string name="cant_create_source">"无法创建源数据。"</string>
|
<string name="cant_create_source">"无法创建源数据。"</string>
|
||||||
<string name="cant_get_spouts">"无法获取数据列表"</string>
|
<string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
|
||||||
|
<string name="cant_get_spouts">"Can't get spouts list. There may ben an api issue."</string>
|
||||||
<string name="form_not_complete">"窗体未完成"</string>
|
<string name="form_not_complete">"窗体未完成"</string>
|
||||||
<string name="pref_header_links">"链接"</string>
|
<string name="pref_header_links">"链接"</string>
|
||||||
<string name="issue_tracker_link">"问题追踪器"</string>
|
<string name="issue_tracker_link">"问题追踪器"</string>
|
||||||
|
|||||||
@ -39,7 +39,8 @@
|
|||||||
<string name="addStringNoUrl">"Log in to add sources."</string>
|
<string name="addStringNoUrl">"Log in to add sources."</string>
|
||||||
<string name="cant_get_sources">"Can't get sources list."</string>
|
<string name="cant_get_sources">"Can't get sources list."</string>
|
||||||
<string name="cant_create_source">"Can't create source."</string>
|
<string name="cant_create_source">"Can't create source."</string>
|
||||||
<string name="cant_get_spouts">"Can't get spouts list."</string>
|
<string name="cant_get_spouts_no_network">"Can't get spouts list because of a network issue."</string>
|
||||||
|
<string name="cant_get_spouts">"Can't get spouts list. There may ben an api issue."</string>
|
||||||
<string name="form_not_complete">"The form is not complete"</string>
|
<string name="form_not_complete">"The form is not complete"</string>
|
||||||
<string name="pref_header_links">"Links"</string>
|
<string name="pref_header_links">"Links"</string>
|
||||||
<string name="issue_tracker_link">"Issue Tracker"</string>
|
<string name="issue_tracker_link">"Issue Tracker"</string>
|
||||||
|
|||||||
@ -6,10 +6,13 @@ buildscript {
|
|||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
|
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
|
||||||
classpath("com.android.tools.build:gradle:7.2.1")
|
classpath("com.android.tools.build:gradle:7.2.2")
|
||||||
|
|
||||||
// sonarquve
|
// sonarquve
|
||||||
classpath("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.4.0.2513")
|
classpath("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.4.0.2513")
|
||||||
|
|
||||||
|
// SqlDelight
|
||||||
|
classpath("com.squareup.sqldelight:gradle-plugin:1.5.3")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -19,4 +19,6 @@ android.useAndroidX=true
|
|||||||
android.enableJetifier=true
|
android.enableJetifier=true
|
||||||
kotlin.mpp.enableGranularSourceSetsMetadata=true
|
kotlin.mpp.enableGranularSourceSetsMetadata=true
|
||||||
org.gradle.parallel=true
|
org.gradle.parallel=true
|
||||||
|
org.gradle.caching=true
|
||||||
ignoreGitVersion=false
|
ignoreGitVersion=false
|
||||||
|
pushCache=true
|
||||||
|
|||||||
@ -1,3 +1,5 @@
|
|||||||
|
val pushCache: String by settings
|
||||||
|
|
||||||
pluginManagement {
|
pluginManagement {
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
@ -6,6 +8,16 @@ pluginManagement {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
buildCache {
|
||||||
|
remote<HttpBuildCache> {
|
||||||
|
url = uri("http://18.0.0.7:3071/cache/")
|
||||||
|
isAllowInsecureProtocol = true
|
||||||
|
isAllowUntrustedServer = true
|
||||||
|
isUseExpectContinue = true
|
||||||
|
isPush = (pushCache == "true")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
rootProject.name = "ReaderForSelfossV2"
|
rootProject.name = "ReaderForSelfossV2"
|
||||||
include(":androidApp")
|
include(":androidApp")
|
||||||
include(":shared")
|
include(":shared")
|
||||||
@ -1,6 +1,14 @@
|
|||||||
|
object SqlDelight {
|
||||||
|
const val runtime = "com.squareup.sqldelight:runtime:1.5.3"
|
||||||
|
const val android = "com.squareup.sqldelight:android-driver:1.5.3"
|
||||||
|
const val native = "com.squareup.sqldelight:native-driver:1.5.3"
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("multiplatform")
|
kotlin("multiplatform")
|
||||||
id("com.android.library")
|
id("com.android.library")
|
||||||
|
id("com.squareup.sqldelight")
|
||||||
kotlin("plugin.serialization") version "1.4.10"
|
kotlin("plugin.serialization") version "1.4.10"
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -39,6 +47,9 @@ kotlin {
|
|||||||
|
|
||||||
// Network information
|
// Network information
|
||||||
implementation("com.github.ln-12:multiplatform-connectivity-status:1.3.0")
|
implementation("com.github.ln-12:multiplatform-connectivity-status:1.3.0")
|
||||||
|
|
||||||
|
// Sql
|
||||||
|
implementation(SqlDelight.runtime)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
val commonTest by getting {
|
val commonTest by getting {
|
||||||
@ -50,6 +61,9 @@ kotlin {
|
|||||||
val androidMain by getting {
|
val androidMain by getting {
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation("io.ktor:ktor-client-android:2.0.1")
|
implementation("io.ktor:ktor-client-android:2.0.1")
|
||||||
|
|
||||||
|
// Sql
|
||||||
|
implementation(SqlDelight.android)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
val androidTest by getting {
|
val androidTest by getting {
|
||||||
@ -66,6 +80,11 @@ kotlin {
|
|||||||
iosX64Main.dependsOn(this)
|
iosX64Main.dependsOn(this)
|
||||||
iosArm64Main.dependsOn(this)
|
iosArm64Main.dependsOn(this)
|
||||||
//iosSimulatorArm64Main.dependsOn(this)
|
//iosSimulatorArm64Main.dependsOn(this)
|
||||||
|
|
||||||
|
// Sql
|
||||||
|
dependencies {
|
||||||
|
implementation(SqlDelight.native)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
val iosX64Test by getting
|
val iosX64Test by getting
|
||||||
val iosArm64Test by getting
|
val iosArm64Test by getting
|
||||||
@ -94,3 +113,11 @@ android {
|
|||||||
targetCompatibility = JavaVersion.VERSION_1_8
|
targetCompatibility = JavaVersion.VERSION_1_8
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sqldelight {
|
||||||
|
database("ReaderForSelfossDB") {
|
||||||
|
packageName = "bou.amine.apps.readerforselfossv2.dao"
|
||||||
|
sourceFolders = listOf("sqldelight")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,10 @@
|
|||||||
|
package bou.amine.apps.readerforselfossv2.dao
|
||||||
|
import android.content.Context
|
||||||
|
import com.squareup.sqldelight.android.AndroidSqliteDriver
|
||||||
|
import com.squareup.sqldelight.db.SqlDriver
|
||||||
|
|
||||||
|
actual class DriverFactory(private val context: Context) {
|
||||||
|
actual fun createDriver(): SqlDriver {
|
||||||
|
return AndroidSqliteDriver(ReaderForSelfossDB.Schema, context, "ReaderForSelfossV2-android.db")
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,6 +1,5 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.utils
|
package bou.amine.apps.readerforselfossv2.utils
|
||||||
|
|
||||||
import android.annotation.SuppressLint
|
|
||||||
import android.text.format.DateUtils
|
import android.text.format.DateUtils
|
||||||
import java.time.Instant
|
import java.time.Instant
|
||||||
import java.time.LocalDateTime
|
import java.time.LocalDateTime
|
||||||
|
|||||||
@ -0,0 +1,51 @@
|
|||||||
|
package bou.amine.apps.readerforselfossv2.utils
|
||||||
|
|
||||||
|
import android.net.Uri
|
||||||
|
import android.text.Html
|
||||||
|
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
||||||
|
import org.jsoup.Jsoup
|
||||||
|
import java.util.*
|
||||||
|
import kotlin.collections.ArrayList
|
||||||
|
|
||||||
|
actual fun String.getHtmlDecoded(): String {
|
||||||
|
return Html.fromHtml(this).toString()
|
||||||
|
}
|
||||||
|
|
||||||
|
actual fun SelfossModel.Item.getIcon(baseUrl: String): String {
|
||||||
|
return constructUrl(baseUrl, "favicons", icon)
|
||||||
|
}
|
||||||
|
|
||||||
|
actual fun SelfossModel.Item.getThumbnail(baseUrl: String): String {
|
||||||
|
return constructUrl(baseUrl, "thumbnails", thumbnail)
|
||||||
|
}
|
||||||
|
|
||||||
|
actual fun SelfossModel.Item.getImages(): ArrayList<String> {
|
||||||
|
val allImages = ArrayList<String>()
|
||||||
|
|
||||||
|
for ( image in Jsoup.parse(content).getElementsByTag("img")) {
|
||||||
|
val url = image.attr("src")
|
||||||
|
if (url.lowercase(Locale.US).contains(".jpg") ||
|
||||||
|
url.lowercase(Locale.US).contains(".jpeg") ||
|
||||||
|
url.lowercase(Locale.US).contains(".png") ||
|
||||||
|
url.lowercase(Locale.US).contains(".webp"))
|
||||||
|
{
|
||||||
|
allImages.add(url)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return allImages
|
||||||
|
}
|
||||||
|
|
||||||
|
actual fun SelfossModel.Source.getIcon(baseUrl: String): String {
|
||||||
|
return constructUrl(baseUrl, "favicons", icon)
|
||||||
|
}
|
||||||
|
|
||||||
|
actual fun constructUrl(baseUrl: String, path: String, file: String?): String {
|
||||||
|
return if (file == null || file == "null" || file.isEmpty()) {
|
||||||
|
""
|
||||||
|
} else {
|
||||||
|
val baseUriBuilder = Uri.parse(baseUrl).buildUpon()
|
||||||
|
baseUriBuilder.appendPath(path).appendPath(file)
|
||||||
|
|
||||||
|
baseUriBuilder.toString()
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,9 +1,7 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.dao
|
package bou.amine.apps.readerforselfossv2.dao
|
||||||
|
|
||||||
interface DeviceDatabase<ItemEntity> {
|
import com.squareup.sqldelight.db.SqlDriver
|
||||||
suspend fun items(): List<ItemEntity>
|
|
||||||
suspend fun insertAllItems(vararg items: ItemEntity)
|
expect class DriverFactory {
|
||||||
suspend fun deleteAllItems()
|
fun createDriver(): SqlDriver
|
||||||
suspend fun delete(item: ItemEntity)
|
|
||||||
suspend fun updateItem(item: ItemEntity)
|
|
||||||
}
|
}
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
package bou.amine.apps.readerforselfossv2.model
|
||||||
|
|
||||||
|
class NetworkUnavailableException : Exception()
|
||||||
@ -1,5 +1,7 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.rest
|
package bou.amine.apps.readerforselfossv2.model
|
||||||
|
|
||||||
|
import bou.amine.apps.readerforselfossv2.utils.DateUtils
|
||||||
|
import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
|
||||||
import kotlinx.serialization.Serializable
|
import kotlinx.serialization.Serializable
|
||||||
|
|
||||||
class SelfossModel {
|
class SelfossModel {
|
||||||
@ -9,11 +11,7 @@ class SelfossModel {
|
|||||||
val tag: String,
|
val tag: String,
|
||||||
val color: String,
|
val color: String,
|
||||||
val unread: Int
|
val unread: Int
|
||||||
) {
|
)
|
||||||
fun getTitleDecoded(): String {
|
|
||||||
return tag // TODO Html.fromHtml(tag).toString()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Serializable
|
@Serializable
|
||||||
class SuccessResponse(val success: Boolean) {
|
class SuccessResponse(val success: Boolean) {
|
||||||
@ -71,5 +69,40 @@ class SelfossModel {
|
|||||||
val link: String,
|
val link: String,
|
||||||
val sourcetitle: String,
|
val sourcetitle: String,
|
||||||
val tags: List<String>
|
val tags: List<String>
|
||||||
)
|
) {
|
||||||
|
// TODO: maybe find a better way to handle these kind of urls
|
||||||
|
fun getLinkDecoded(): String {
|
||||||
|
var stringUrl: String
|
||||||
|
stringUrl =
|
||||||
|
if (link.startsWith("http://news.google.com/news/") || link.startsWith("https://news.google.com/news/")) {
|
||||||
|
if (link.contains("&url=")) {
|
||||||
|
link.substringAfter("&url=")
|
||||||
|
} else {
|
||||||
|
this.link.replace("&", "&")
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
this.link.replace("&", "&")
|
||||||
|
}
|
||||||
|
|
||||||
|
// handle :443 => https
|
||||||
|
if (stringUrl.contains(":443")) {
|
||||||
|
stringUrl = stringUrl.replace(":443", "").replace("http://", "https://")
|
||||||
|
}
|
||||||
|
|
||||||
|
// handle url not starting with http
|
||||||
|
if (stringUrl.startsWith("//")) {
|
||||||
|
stringUrl = "http:$stringUrl"
|
||||||
|
}
|
||||||
|
|
||||||
|
return stringUrl
|
||||||
|
}
|
||||||
|
|
||||||
|
fun sourceAndDateText(dateUtils: DateUtils): String =
|
||||||
|
this.sourcetitle.getHtmlDecoded() + dateUtils.parseRelativeDate(this.datetime)
|
||||||
|
|
||||||
|
fun toggleStar(): Item {
|
||||||
|
this.starred = !this.starred
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -1,10 +1,11 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.repository
|
package bou.amine.apps.readerforselfossv2.repository
|
||||||
|
|
||||||
|
import bou.amine.apps.readerforselfossv2.dao.*
|
||||||
|
import bou.amine.apps.readerforselfossv2.model.NetworkUnavailableException
|
||||||
import bou.amine.apps.readerforselfossv2.rest.SelfossApi
|
import bou.amine.apps.readerforselfossv2.rest.SelfossApi
|
||||||
import bou.amine.apps.readerforselfossv2.rest.SelfossModel
|
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
||||||
import bou.amine.apps.readerforselfossv2.service.ApiDetailsService
|
import bou.amine.apps.readerforselfossv2.service.ApiDetailsService
|
||||||
import bou.amine.apps.readerforselfossv2.utils.DateUtils
|
import bou.amine.apps.readerforselfossv2.utils.*
|
||||||
import bou.amine.apps.readerforselfossv2.utils.ItemType
|
|
||||||
import com.github.ln_12.library.ConnectivityStatus
|
import com.github.ln_12.library.ConnectivityStatus
|
||||||
import com.russhwolf.settings.Settings
|
import com.russhwolf.settings.Settings
|
||||||
import io.github.aakira.napier.Napier
|
import io.github.aakira.napier.Napier
|
||||||
@ -12,7 +13,7 @@ import kotlinx.coroutines.CoroutineScope
|
|||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
|
|
||||||
class Repository(private val api: SelfossApi, private val apiDetails: ApiDetailsService, val connectivityStatus: ConnectivityStatus) {
|
class Repository(private val api: SelfossApi, private val apiDetails: ApiDetailsService, private val connectivityStatus: ConnectivityStatus, private val db: ReaderForSelfossDB) {
|
||||||
val settings = Settings()
|
val settings = Settings()
|
||||||
|
|
||||||
var items = ArrayList<SelfossModel.Item>()
|
var items = ArrayList<SelfossModel.Item>()
|
||||||
@ -62,11 +63,18 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
null
|
null
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
// TODO: Get items from the database
|
if (itemsCaching) {
|
||||||
|
fetchedItems = getDBItems().filter {
|
||||||
|
displayedItems == ItemType.ALL ||
|
||||||
|
(it.unread && displayedItems == ItemType.UNREAD) ||
|
||||||
|
(it.starred && displayedItems == ItemType.STARRED)
|
||||||
|
}.map { it.toView() }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fetchedItems != null) {
|
if (fetchedItems != null) {
|
||||||
items = ArrayList(fetchedItems)
|
items = ArrayList(fetchedItems)
|
||||||
|
sortItems()
|
||||||
}
|
}
|
||||||
return items
|
return items
|
||||||
}
|
}
|
||||||
@ -84,17 +92,16 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
searchFilter,
|
searchFilter,
|
||||||
null
|
null
|
||||||
)
|
)
|
||||||
} else {
|
} // When using the db cache, we load everything the first time, so there should be nothing more to load.
|
||||||
// TODO: Get items from the database
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fetchedItems != null) {
|
if (fetchedItems != null) {
|
||||||
appendItems(fetchedItems)
|
items.addAll(fetchedItems)
|
||||||
|
sortItems()
|
||||||
}
|
}
|
||||||
return items
|
return items
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun allItems(itemType: ItemType): List<SelfossModel.Item>? {
|
suspend fun getMaxItemsForBackground(itemType: ItemType): List<SelfossModel.Item>? {
|
||||||
return if (isNetworkAvailable()) {
|
return if (isNetworkAvailable()) {
|
||||||
api.getItems(
|
api.getItems(
|
||||||
itemType.type,
|
itemType.type,
|
||||||
@ -106,21 +113,11 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
null
|
null
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
// TODO: Provide an error message
|
emptyList()
|
||||||
null
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun appendItems(fetchedItems: List<SelfossModel.Item>) {
|
private fun sortItems() {
|
||||||
// TODO: Store in DB if enabled by user
|
|
||||||
val fetchedIDS = fetchedItems.map { it.id }
|
|
||||||
val tmpItems = ArrayList(items.filterNot { it.id in fetchedIDS })
|
|
||||||
tmpItems.addAll(fetchedItems)
|
|
||||||
sortItems(tmpItems)
|
|
||||||
items = tmpItems
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun sortItems(items: ArrayList<SelfossModel.Item>) {
|
|
||||||
items.sortByDescending { dateUtils.parseDate(it.datetime) }
|
items.sortByDescending { dateUtils.parseDate(it.datetime) }
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -135,38 +132,37 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
success = true
|
success = true
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// TODO: Compute badges from database
|
// TODO: do this differently, because it's not efficient
|
||||||
|
val dbItems = getDBItems()
|
||||||
|
badgeUnread = dbItems.filter { item -> item.unread }.size
|
||||||
|
badgeStarred = dbItems.filter { item -> item.starred }.size
|
||||||
|
badgeAll = items.size
|
||||||
}
|
}
|
||||||
return success
|
return success
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun getTags(): List<SelfossModel.Tag>? {
|
suspend fun getTags(): List<SelfossModel.Tag>? {
|
||||||
// TODO: Store in DB
|
|
||||||
return if (isNetworkAvailable()) {
|
return if (isNetworkAvailable()) {
|
||||||
api.tags()
|
api.tags()
|
||||||
} else {
|
} else {
|
||||||
// TODO: Compute from database
|
getDBTags().map { it.toView() }
|
||||||
null
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun getSpouts(): Map<String, SelfossModel.Spout>? {
|
suspend fun getSpouts(): Map<String, SelfossModel.Spout>? {
|
||||||
// TODO: Store in DB
|
|
||||||
return if (isNetworkAvailable()) {
|
return if (isNetworkAvailable()) {
|
||||||
api.spouts()
|
api.spouts()
|
||||||
} else {
|
} else {
|
||||||
// TODO: Compute from database
|
throw NetworkUnavailableException()
|
||||||
null
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun getSources(): ArrayList<SelfossModel.Source>? {
|
suspend fun getSources(): ArrayList<SelfossModel.Source>? {
|
||||||
// TODO: Store in DB
|
|
||||||
return if (isNetworkAvailable()) {
|
return if (isNetworkAvailable()) {
|
||||||
api.sources()
|
api.sources()
|
||||||
} else {
|
} else {
|
||||||
// TODO: Compute from database
|
ArrayList(getDBSources().map { it.toView() })
|
||||||
null
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -179,8 +175,14 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
return success
|
return success
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun markAsReadById(id: Int): Boolean =
|
suspend fun markAsReadById(id: Int): Boolean {
|
||||||
isNetworkAvailable() && api.markAsRead(id.toString())?.isSuccess == true
|
return if (isNetworkAvailable()) {
|
||||||
|
api.markAsRead(id.toString())?.isSuccess == true
|
||||||
|
} else {
|
||||||
|
insertDBAction(id.toString(), read = true)
|
||||||
|
true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
suspend fun unmarkAsRead(item: SelfossModel.Item): Boolean {
|
suspend fun unmarkAsRead(item: SelfossModel.Item): Boolean {
|
||||||
@ -192,8 +194,14 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
return success
|
return success
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun unmarkAsReadById(id: Int): Boolean =
|
suspend fun unmarkAsReadById(id: Int): Boolean {
|
||||||
isNetworkAvailable() && api.unmarkAsRead(id.toString())?.isSuccess == true
|
return if (isNetworkAvailable()) {
|
||||||
|
api.unmarkAsRead(id.toString())?.isSuccess == true
|
||||||
|
} else {
|
||||||
|
insertDBAction(id.toString(), unread = true)
|
||||||
|
true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
suspend fun starr(item: SelfossModel.Item): Boolean {
|
suspend fun starr(item: SelfossModel.Item): Boolean {
|
||||||
val success = starrById(item.id)
|
val success = starrById(item.id)
|
||||||
@ -204,8 +212,14 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
return success
|
return success
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun starrById(id: Int): Boolean =
|
suspend fun starrById(id: Int): Boolean {
|
||||||
isNetworkAvailable() && api.starr(id.toString())?.isSuccess == true
|
return if (isNetworkAvailable()) {
|
||||||
|
api.starr(id.toString())?.isSuccess == true
|
||||||
|
} else {
|
||||||
|
insertDBAction(id.toString(), starred = true)
|
||||||
|
true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
suspend fun unstarr(item: SelfossModel.Item): Boolean {
|
suspend fun unstarr(item: SelfossModel.Item): Boolean {
|
||||||
val success = unstarrById(item.id)
|
val success = unstarrById(item.id)
|
||||||
@ -216,9 +230,14 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
return success
|
return success
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun unstarrById(id: Int): Boolean =
|
suspend fun unstarrById(id: Int): Boolean {
|
||||||
isNetworkAvailable() && api.unstarr(id.toString())?.isSuccess == true
|
return if (isNetworkAvailable()) {
|
||||||
|
api.unstarr(id.toString())?.isSuccess == true
|
||||||
|
} else {
|
||||||
|
insertDBAction(id.toString(), starred = true)
|
||||||
|
true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
suspend fun markAllAsRead(items: ArrayList<SelfossModel.Item>): Boolean {
|
suspend fun markAllAsRead(items: ArrayList<SelfossModel.Item>): Boolean {
|
||||||
var success = false
|
var success = false
|
||||||
@ -233,35 +252,47 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun markAsReadLocally(item: SelfossModel.Item) {
|
private fun markAsReadLocally(item: SelfossModel.Item) {
|
||||||
// TODO: Mark also in the database
|
|
||||||
if (item.unread) {
|
if (item.unread) {
|
||||||
item.unread = false
|
item.unread = false
|
||||||
badgeUnread -= 1
|
badgeUnread -= 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CoroutineScope(Dispatchers.Main).launch {
|
||||||
|
updateDBItem(item)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun unmarkAsReadLocally(item: SelfossModel.Item) {
|
private fun unmarkAsReadLocally(item: SelfossModel.Item) {
|
||||||
// TODO: Mark also in the database
|
|
||||||
if (!item.unread) {
|
if (!item.unread) {
|
||||||
item.unread = true
|
item.unread = true
|
||||||
badgeUnread += 1
|
badgeUnread += 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CoroutineScope(Dispatchers.Main).launch {
|
||||||
|
updateDBItem(item)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun starrLocally(item: SelfossModel.Item) {
|
private fun starrLocally(item: SelfossModel.Item) {
|
||||||
// TODO: Mark also in the database
|
|
||||||
if (!item.starred) {
|
if (!item.starred) {
|
||||||
item.starred = true
|
item.starred = true
|
||||||
badgeStarred += 1
|
badgeStarred += 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CoroutineScope(Dispatchers.Main).launch {
|
||||||
|
updateDBItem(item)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun unstarrLocally(item: SelfossModel.Item) {
|
private fun unstarrLocally(item: SelfossModel.Item) {
|
||||||
// TODO: Mark also in the database
|
|
||||||
if (item.starred) {
|
if (item.starred) {
|
||||||
item.starred = false
|
item.starred = false
|
||||||
badgeStarred -= 1
|
badgeStarred -= 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CoroutineScope(Dispatchers.Main).launch {
|
||||||
|
updateDBItem(item)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun createSource(
|
suspend fun createSource(
|
||||||
@ -287,7 +318,6 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
}
|
}
|
||||||
|
|
||||||
suspend fun deleteSource(id: Int): Boolean {
|
suspend fun deleteSource(id: Int): Boolean {
|
||||||
// TODO: Store in DB
|
|
||||||
var success = false
|
var success = false
|
||||||
if (isNetworkAvailable()) {
|
if (isNetworkAvailable()) {
|
||||||
val response = api.deleteSource(id)
|
val response = api.deleteSource(id)
|
||||||
@ -299,8 +329,13 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
return success
|
return success
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun updateRemote(): Boolean =
|
suspend fun updateRemote(): Boolean {
|
||||||
isNetworkAvailable() && api.update()?.isSuccess == true
|
return if (isNetworkAvailable()) {
|
||||||
|
api.update()?.equals("finished") ?: false
|
||||||
|
} else {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
suspend fun login(): Boolean {
|
suspend fun login(): Boolean {
|
||||||
var result = false
|
var result = false
|
||||||
@ -342,5 +377,93 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails
|
|||||||
|
|
||||||
fun isNetworkAvailable() = isConnectionAvailable.value && !offlineOverride
|
fun isNetworkAvailable() = isConnectionAvailable.value && !offlineOverride
|
||||||
|
|
||||||
// TODO: Handle offline actions
|
fun getDBActions(): List<ACTION> =
|
||||||
|
db.actionsQueries.actions().executeAsList()
|
||||||
|
|
||||||
|
fun deleteDBAction(action: ACTION) =
|
||||||
|
db.actionsQueries.deleteAction(action.id)
|
||||||
|
|
||||||
|
fun getDBTags(): List<TAG> = db.tagsQueries.tags().executeAsList()
|
||||||
|
|
||||||
|
fun getDBSources(): List<SOURCE> = db.sourcesQueries.sources().executeAsList()
|
||||||
|
|
||||||
|
fun resetDBTagsWithData(tagEntities: List<SelfossModel.Tag>) {
|
||||||
|
db.tagsQueries.deleteAllTags()
|
||||||
|
|
||||||
|
db.tagsQueries.transaction {
|
||||||
|
tagEntities.forEach { tag ->
|
||||||
|
db.tagsQueries.insertTag(tag.toEntity())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun resetDBSourcesWithData(sources: List<SelfossModel.Source>) {
|
||||||
|
db.sourcesQueries.deleteAllSources()
|
||||||
|
|
||||||
|
db.sourcesQueries.transaction {
|
||||||
|
sources.forEach { source ->
|
||||||
|
db.sourcesQueries.insertSource(source.toEntity())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun insertDBItems(items: List<SelfossModel.Item>) {
|
||||||
|
db.itemsQueries.transaction {
|
||||||
|
items.forEach { item ->
|
||||||
|
db.itemsQueries.insertItem(item.toEntity())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun getDBItems(): List<ITEM> = db.itemsQueries.items().executeAsList()
|
||||||
|
|
||||||
|
private fun insertDBAction(articleid: String, read: Boolean = false, unread: Boolean = false, starred: Boolean = false, unstarred: Boolean = false) =
|
||||||
|
db.actionsQueries.insertAction(articleid, read, unread, starred, unstarred)
|
||||||
|
|
||||||
|
private fun updateDBItem(item: SelfossModel.Item) =
|
||||||
|
db.itemsQueries.updateItem(item.datetime, item.title.getHtmlDecoded(), item.content, item.unread, item.starred, item.thumbnail, item.icon, item.link, item.sourcetitle, item.tags.joinToString(","), item.id.toString())
|
||||||
|
|
||||||
|
|
||||||
|
suspend fun tryToCacheItemsAndGetNewOnes(): List<SelfossModel.Item>? {
|
||||||
|
try {
|
||||||
|
val newItems = getMaxItemsForBackground(ItemType.UNREAD)
|
||||||
|
val allItems = getMaxItemsForBackground(ItemType.ALL)
|
||||||
|
val starredItems = getMaxItemsForBackground(ItemType.STARRED)
|
||||||
|
insertDBItems(newItems.orEmpty() + allItems.orEmpty() + starredItems.orEmpty())
|
||||||
|
return newItems
|
||||||
|
} catch (e: Throwable) {}
|
||||||
|
return emptyList()
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun handleDBActions() {
|
||||||
|
|
||||||
|
val actions: List<ACTION> = getDBActions()
|
||||||
|
|
||||||
|
actions.forEach { action ->
|
||||||
|
when {
|
||||||
|
action.read -> doAndReportOnFail(
|
||||||
|
markAsReadById(action.articleid.toInt()),
|
||||||
|
action
|
||||||
|
)
|
||||||
|
action.unread -> doAndReportOnFail(
|
||||||
|
unmarkAsReadById(action.articleid.toInt()),
|
||||||
|
action
|
||||||
|
)
|
||||||
|
action.starred -> doAndReportOnFail(
|
||||||
|
starrById(action.articleid.toInt()),
|
||||||
|
action
|
||||||
|
)
|
||||||
|
action.unstarred -> doAndReportOnFail(
|
||||||
|
unstarrById(action.articleid.toInt()),
|
||||||
|
action
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun doAndReportOnFail(result: Boolean, action: ACTION) {
|
||||||
|
if (result) {
|
||||||
|
deleteDBAction(action)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -1,5 +1,6 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.rest
|
package bou.amine.apps.readerforselfossv2.rest
|
||||||
|
|
||||||
|
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
||||||
import bou.amine.apps.readerforselfossv2.service.ApiDetailsService
|
import bou.amine.apps.readerforselfossv2.service.ApiDetailsService
|
||||||
import io.ktor.client.*
|
import io.ktor.client.*
|
||||||
import io.ktor.client.call.*
|
import io.ktor.client.call.*
|
||||||
@ -99,7 +100,7 @@ class SelfossApi(private val apiDetailsService: ApiDetailsService) {
|
|||||||
parameter("password", apiDetailsService.getPassword())
|
parameter("password", apiDetailsService.getPassword())
|
||||||
}.body()
|
}.body()
|
||||||
|
|
||||||
suspend fun update(): SelfossModel.SuccessResponse? =
|
suspend fun update(): String? =
|
||||||
client.get(url("/update")) {
|
client.get(url("/update")) {
|
||||||
parameter("username", apiDetailsService.getUserName())
|
parameter("username", apiDetailsService.getUserName())
|
||||||
parameter("password", apiDetailsService.getPassword())
|
parameter("password", apiDetailsService.getPassword())
|
||||||
|
|||||||
@ -1,34 +0,0 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.service
|
|
||||||
|
|
||||||
import bou.amine.apps.readerforselfossv2.dao.DeviceDatabase
|
|
||||||
import bou.amine.apps.readerforselfossv2.utils.parseDate
|
|
||||||
import bou.amine.apps.readerforselfossv2.rest.SelfossModel
|
|
||||||
|
|
||||||
abstract class DeviceDataBaseService<ItemEntity>(val db: DeviceDatabase<ItemEntity>, private val searchService: SearchService) {
|
|
||||||
var itemsCaching = false
|
|
||||||
var items: ArrayList<SelfossModel.Item> = arrayListOf()
|
|
||||||
get() {
|
|
||||||
return ArrayList(field)
|
|
||||||
}
|
|
||||||
set(value) {
|
|
||||||
field = ArrayList(value)
|
|
||||||
}
|
|
||||||
|
|
||||||
abstract suspend fun updateDatabase()
|
|
||||||
abstract suspend fun clearDBItems()
|
|
||||||
abstract fun appendNewItems(items: List<SelfossModel.Item>)
|
|
||||||
abstract fun getFromDB()
|
|
||||||
|
|
||||||
fun sortItems() {
|
|
||||||
val tmpItems = ArrayList(items.sortedByDescending { it.parseDate(searchService.dateUtils) })
|
|
||||||
items = tmpItems
|
|
||||||
}
|
|
||||||
|
|
||||||
// This filtered items from items val. Do not use
|
|
||||||
fun getFocusedItems() {}
|
|
||||||
fun computeBadges() {
|
|
||||||
searchService.badgeUnread = items.filter { item -> item.unread }.size
|
|
||||||
searchService.badgeStarred = items.filter { item -> item.starred }.size
|
|
||||||
searchService.badgeAll = items.size
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,14 +1,11 @@
|
|||||||
package bou.amine.apps.readerforselfossv2.utils
|
package bou.amine.apps.readerforselfossv2.utils
|
||||||
|
|
||||||
import bou.amine.apps.readerforselfossv2.rest.SelfossModel
|
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
||||||
|
|
||||||
|
|
||||||
fun SelfossModel.Item.parseDate(dateUtils: DateUtils): Long =
|
fun SelfossModel.Item.parseDate(dateUtils: DateUtils): Long =
|
||||||
dateUtils.parseDate(this.datetime)
|
dateUtils.parseDate(this.datetime)
|
||||||
|
|
||||||
fun SelfossModel.Item.parseRelativeDate(dateUtils: DateUtils): String =
|
|
||||||
dateUtils.parseRelativeDate(this.datetime)
|
|
||||||
|
|
||||||
expect class DateUtils(apiMajorVersion: Int) {
|
expect class DateUtils(apiMajorVersion: Int) {
|
||||||
fun parseDate(dateString: String): Long
|
fun parseDate(dateString: String): Long
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,70 @@
|
|||||||
|
package bou.amine.apps.readerforselfossv2.utils
|
||||||
|
|
||||||
|
import bou.amine.apps.readerforselfossv2.dao.ITEM
|
||||||
|
import bou.amine.apps.readerforselfossv2.dao.SOURCE
|
||||||
|
import bou.amine.apps.readerforselfossv2.dao.TAG
|
||||||
|
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
||||||
|
|
||||||
|
fun TAG.toView(): SelfossModel.Tag =
|
||||||
|
SelfossModel.Tag(
|
||||||
|
this.name,
|
||||||
|
this.color,
|
||||||
|
this.unread.toInt()
|
||||||
|
)
|
||||||
|
|
||||||
|
fun SOURCE.toView(): SelfossModel.Source =
|
||||||
|
SelfossModel.Source(
|
||||||
|
this.id.toInt(),
|
||||||
|
this.title,
|
||||||
|
this.tags.split(","),
|
||||||
|
this.spout,
|
||||||
|
this.error,
|
||||||
|
this.icon
|
||||||
|
)
|
||||||
|
|
||||||
|
fun SelfossModel.Source.toEntity(): SOURCE =
|
||||||
|
SOURCE(
|
||||||
|
this.id.toString(),
|
||||||
|
this.title.getHtmlDecoded(),
|
||||||
|
this.tags.joinToString(","),
|
||||||
|
this.spout,
|
||||||
|
this.error,
|
||||||
|
this.icon.orEmpty()
|
||||||
|
)
|
||||||
|
|
||||||
|
fun SelfossModel.Tag.toEntity(): TAG =
|
||||||
|
TAG(
|
||||||
|
this.tag,
|
||||||
|
this.color,
|
||||||
|
this.unread.toLong()
|
||||||
|
)
|
||||||
|
|
||||||
|
fun ITEM.toView(): SelfossModel.Item =
|
||||||
|
SelfossModel.Item(
|
||||||
|
this.id.toInt(),
|
||||||
|
this.datetime,
|
||||||
|
this.title,
|
||||||
|
this.content,
|
||||||
|
this.unread,
|
||||||
|
this.starred,
|
||||||
|
this.thumbnail,
|
||||||
|
this.icon,
|
||||||
|
this.link,
|
||||||
|
this.sourcetitle,
|
||||||
|
this.tags.split(",")
|
||||||
|
)
|
||||||
|
|
||||||
|
fun SelfossModel.Item.toEntity(): ITEM =
|
||||||
|
ITEM(
|
||||||
|
this.id.toString(),
|
||||||
|
this.datetime,
|
||||||
|
this.title.getHtmlDecoded(),
|
||||||
|
this.content,
|
||||||
|
this.unread,
|
||||||
|
this.starred,
|
||||||
|
this.thumbnail,
|
||||||
|
this.icon,
|
||||||
|
this.link,
|
||||||
|
this.title.getHtmlDecoded(),
|
||||||
|
this.tags.joinToString(",")
|
||||||
|
)
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
package bou.amine.apps.readerforselfossv2.utils
|
||||||
|
|
||||||
|
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
||||||
|
|
||||||
|
expect fun String.getHtmlDecoded(): String
|
||||||
|
|
||||||
|
expect fun SelfossModel.Item.getIcon(baseUrl: String): String
|
||||||
|
|
||||||
|
expect fun SelfossModel.Item.getThumbnail(baseUrl: String): String
|
||||||
|
|
||||||
|
expect fun SelfossModel.Item.getImages(): ArrayList<String>
|
||||||
|
|
||||||
|
expect fun SelfossModel.Source.getIcon(baseUrl: String): String
|
||||||
|
|
||||||
|
expect fun constructUrl(baseUrl: String, path: String, file: String?): String
|
||||||
@ -0,0 +1,18 @@
|
|||||||
|
CREATE TABLE `ACTION` (
|
||||||
|
`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
|
||||||
|
`articleid` TEXT NOT NULL,
|
||||||
|
`read` INTEGER AS Boolean DEFAULT 0 NOT NULL,
|
||||||
|
`unread` INTEGER AS Boolean DEFAULT 0 NOT NULL,
|
||||||
|
`starred` INTEGER AS Boolean DEFAULT 0 NOT NULL,
|
||||||
|
`unstarred` INTEGER AS Boolean DEFAULT 0 NOT NULL
|
||||||
|
);
|
||||||
|
|
||||||
|
actions:
|
||||||
|
SELECT *
|
||||||
|
FROM `ACTION`;
|
||||||
|
|
||||||
|
insertAction:
|
||||||
|
INSERT OR REPLACE INTO `ACTION` (`articleid`, `read`, `unread`, `starred`, `unstarred`) VALUES (?, ?, ?, ?, ?);
|
||||||
|
|
||||||
|
deleteAction:
|
||||||
|
DELETE FROM `ACTION` WHERE id = ?;
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
CREATE TABLE ITEM (
|
||||||
|
`id` TEXT NOT NULL,
|
||||||
|
`datetime` TEXT NOT NULL,
|
||||||
|
`title` TEXT NOT NULL,
|
||||||
|
`content` TEXT NOT NULL,
|
||||||
|
`unread` INTEGER AS Boolean DEFAULT 0 NOT NULL,
|
||||||
|
`starred` INTEGER AS Boolean DEFAULT 0 NOT NULL,
|
||||||
|
`thumbnail` TEXT,
|
||||||
|
`icon` TEXT,
|
||||||
|
`link` TEXT NOT NULL,
|
||||||
|
`sourcetitle` TEXT NOT NULL,
|
||||||
|
`tags` TEXT NOT NULL,
|
||||||
|
PRIMARY KEY(`id`)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX item_title ON ITEM(`title`);
|
||||||
|
CREATE INDEX item_source ON ITEM(`sourcetitle`);
|
||||||
|
|
||||||
|
|
||||||
|
items:
|
||||||
|
SELECT * FROM ITEM ORDER BY `id` DESC;
|
||||||
|
|
||||||
|
insertItem:
|
||||||
|
INSERT OR REPLACE INTO ITEM VALUES ?;
|
||||||
|
|
||||||
|
deleteItem:
|
||||||
|
DELETE FROM ITEM WHERE `id` = ?;
|
||||||
|
|
||||||
|
updateItem:
|
||||||
|
UPDATE ITEM SET `datetime` = ?, `title` = ?, `content` = ?, `unread` = ?, `starred` = ?, `thumbnail` = ?, `icon` = ?, `link` = ?, `sourcetitle` = ?, `tags` = ? WHERE `id` = ?;
|
||||||
@ -0,0 +1,21 @@
|
|||||||
|
CREATE TABLE SOURCE (
|
||||||
|
`id` TEXT NOT NULL,
|
||||||
|
`title` TEXT NOT NULL,
|
||||||
|
`tags` TEXT NOT NULL,
|
||||||
|
`spout` TEXT NOT NULL,
|
||||||
|
`error` TEXT NOT NULL,
|
||||||
|
`icon` TEXT NOT NULL,
|
||||||
|
PRIMARY KEY(`id`)
|
||||||
|
);
|
||||||
|
|
||||||
|
sources:
|
||||||
|
SELECT * FROM SOURCE;
|
||||||
|
|
||||||
|
insertSource:
|
||||||
|
INSERT OR REPLACE INTO SOURCE VALUES ?;
|
||||||
|
|
||||||
|
deleteAllSources:
|
||||||
|
DELETE FROM SOURCE;
|
||||||
|
|
||||||
|
deleteSource:
|
||||||
|
DELETE FROM SOURCE WHERE `id` = ?;
|
||||||
@ -0,0 +1,20 @@
|
|||||||
|
CREATE TABLE TAG (
|
||||||
|
`name` TEXT NOT NULL,
|
||||||
|
`color` TEXT NOT NULL,
|
||||||
|
`unread` INTEGER NOT NULL,
|
||||||
|
PRIMARY KEY(`name`)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX tag_name ON TAG(`name`);
|
||||||
|
|
||||||
|
tags:
|
||||||
|
SELECT * FROM TAG;
|
||||||
|
|
||||||
|
insertTag:
|
||||||
|
INSERT OR REPLACE INTO TAG VALUES ?;
|
||||||
|
|
||||||
|
deleteAllTags:
|
||||||
|
DELETE FROM TAG;
|
||||||
|
|
||||||
|
deleteTag:
|
||||||
|
DELETE FROM TAG WHERE `name` = ? AND `color` = ?;
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
package bou.amine.apps.readerforselfossv2.dao
|
||||||
|
|
||||||
|
import com.squareup.sqldelight.db.SqlDriver
|
||||||
|
import com.squareup.sqldelight.drivers.native.NativeSqliteDriver
|
||||||
|
|
||||||
|
actual class DriverFactory {
|
||||||
|
actual fun createDriver(): SqlDriver {
|
||||||
|
return NativeSqliteDriver(ReaderForSelfossDB.Schema, "ReaderForSelfossV2-IOS.db")
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,12 @@
|
|||||||
|
package bou.amine.apps.readerforselfossv2.utils
|
||||||
|
|
||||||
|
actual class DateUtils actual constructor(apiMajorVersion: Int) {
|
||||||
|
actual fun parseDate(dateString: String): Long {
|
||||||
|
TODO("Not yet implemented")
|
||||||
|
}
|
||||||
|
|
||||||
|
actual fun parseRelativeDate(dateString: String): String {
|
||||||
|
TODO("Not yet implemented")
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,27 @@
|
|||||||
|
package bou.amine.apps.readerforselfossv2.utils
|
||||||
|
|
||||||
|
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
||||||
|
|
||||||
|
actual fun String.getHtmlDecoded(): String {
|
||||||
|
TODO("Not yet implemented")
|
||||||
|
}
|
||||||
|
|
||||||
|
actual fun SelfossModel.Item.getIcon(baseUrl: String): String {
|
||||||
|
TODO("Not yet implemented")
|
||||||
|
}
|
||||||
|
|
||||||
|
actual fun SelfossModel.Item.getThumbnail(baseUrl: String): String {
|
||||||
|
TODO("Not yet implemented")
|
||||||
|
}
|
||||||
|
|
||||||
|
actual fun SelfossModel.Item.getImages(): ArrayList<String> {
|
||||||
|
TODO("Not yet implemented")
|
||||||
|
}
|
||||||
|
|
||||||
|
actual fun SelfossModel.Source.getIcon(baseUrl: String): String {
|
||||||
|
TODO("Not yet implemented")
|
||||||
|
}
|
||||||
|
|
||||||
|
actual fun constructUrl(baseUrl: String, path: String, file: String?): String {
|
||||||
|
TODO("Not yet implemented")
|
||||||
|
}
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
package bou.amine.apps.readerforselfossv2.dao
|
||||||
|
|
||||||
|
import com.squareup.sqldelight.db.SqlDriver
|
||||||
|
import com.squareup.sqldelight.drivers.native.NativeSqliteDriver
|
||||||
|
|
||||||
|
actual class DriverFactory {
|
||||||
|
actual fun createDriver(): SqlDriver {
|
||||||
|
return NativeSqliteDriver(ReaderForSelfossDB.Schema, "ReaderForSelfossV2-IOS.db")
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,12 @@
|
|||||||
|
package bou.amine.apps.readerforselfossv2.utils
|
||||||
|
|
||||||
|
actual class DateUtils actual constructor(apiMajorVersion: Int) {
|
||||||
|
actual fun parseDate(dateString: String): Long {
|
||||||
|
TODO("Not yet implemented")
|
||||||
|
}
|
||||||
|
|
||||||
|
actual fun parseRelativeDate(dateString: String): String {
|
||||||
|
TODO("Not yet implemented")
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,27 @@
|
|||||||
|
package bou.amine.apps.readerforselfossv2.utils
|
||||||
|
|
||||||
|
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
||||||
|
|
||||||
|
actual fun String.getHtmlDecoded(): String {
|
||||||
|
TODO("Not yet implemented")
|
||||||
|
}
|
||||||
|
|
||||||
|
actual fun SelfossModel.Item.getIcon(baseUrl: String): String {
|
||||||
|
TODO("Not yet implemented")
|
||||||
|
}
|
||||||
|
|
||||||
|
actual fun SelfossModel.Item.getThumbnail(baseUrl: String): String {
|
||||||
|
TODO("Not yet implemented")
|
||||||
|
}
|
||||||
|
|
||||||
|
actual fun SelfossModel.Item.getImages(): ArrayList<String> {
|
||||||
|
TODO("Not yet implemented")
|
||||||
|
}
|
||||||
|
|
||||||
|
actual fun SelfossModel.Source.getIcon(baseUrl: String): String {
|
||||||
|
TODO("Not yet implemented")
|
||||||
|
}
|
||||||
|
|
||||||
|
actual fun constructUrl(baseUrl: String, path: String, file: String?): String {
|
||||||
|
TODO("Not yet implemented")
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user