diff --git a/README.md b/README.md
index 6d1bb99144..2c5146a543 100644
--- a/README.md
+++ b/README.md
@@ -5,14 +5,14 @@ Android app to help you keep track of your favorite TV shows and movies.
- Download •
- Support the dev •
+ Download •
+ Support the dev •
Contributing •
Announcements & Help
-
+
diff --git a/RELEASING.md b/RELEASING.md
index b83a2a5b01..9c1cfdaecf 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -1,12 +1,13 @@
# Release process
-- If stable, create `release-` branch. If beta, stay on `dev`.
-- Optional: Update translations.
-- Change version code and name in [`build.gradle.kts`](/build.gradle.kts).
-- Amend [`CHANGELOG.md`](/CHANGELOG.md).
-- Deploy to test device.
-- Push to GitHub and check build succeeds, tests are green and Lint file is OK.
-
+- If it does not exist, create a `release-` branch
+- Merge latest changes from `dev`
+- Optional: Update translations
+- Change version code and name in [`build.gradle.kts`](/build.gradle.kts)
+- Update [`CHANGELOG.md`](/CHANGELOG.md)
+- Push to GitHub
+- If it does not exist, create a merge request against `main`
+- Check build succeeds, tests are green and lint output is as expected
## Play Store (testing + production)
@@ -14,13 +15,14 @@
- Publish to alpha channel, test.
Published to beta channel:
+
- Tag like `v12.0.3`.
Published to production:
-- Download universal APK from Play Store and attach to GitHub tag.
+- Download universal APK from Play Store and attach to GitHub tag.
-## Amazon App Store (stable only)
+## Amazon App Store (production only)
-- `assembleAmazonRelease`
+- `bundleAmazonRelease`
- Test update on test device.
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
index 78f8caf668..1c26a31191 100644
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -11,6 +11,11 @@ val sgCompileSdk: Int by rootProject.extra
val sgMinSdk: Int by rootProject.extra
val sgTargetSdk: Int by rootProject.extra
+tasks.withType(JavaCompile::class.java).configureEach {
+ // Suppress JDK 21 warning about deprecated, but not yet removed, source and target value 8 support
+ options.compilerArgs.add("-Xlint:-options")
+}
+
android {
namespace = "com.battlelancer.seriesguide.api"
compileSdk = sgCompileSdk
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index fc68ea694a..2b19970b07 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
id("com.android.application")
kotlin("android")
kotlin("kapt")
+ alias(libs.plugins.compose.compiler)
}
if (project.file("google-services.json").exists()) {
@@ -21,6 +22,11 @@ val sgTargetSdk: Int by rootProject.extra
val sgVersionCode: Int by rootProject.extra
val sgVersionName: String by rootProject.extra
+tasks.withType(JavaCompile::class.java).configureEach {
+ // Suppress JDK 21 warning about deprecated, but not yet removed, source and target value 8 support
+ options.compilerArgs.add("-Xlint:-options")
+}
+
android {
namespace = "com.battlelancer.seriesguide"
compileSdk = sgCompileSdk
@@ -29,7 +35,7 @@ android {
buildFeatures {
buildConfig = true
- // https://developer.android.com/jetpack/compose/interop/adding
+ // https://developer.android.com/develop/ui/compose/setup
compose = true
// https://firebase.google.com/support/release-notes/android
viewBinding = true
@@ -39,6 +45,7 @@ android {
minSdk = sgMinSdk
targetSdk = sgTargetSdk
+ // Prevent plugin from generating PNGs, use compat loading instead https://developer.android.com/studio/write/vector-asset-studio#sloption
vectorDrawables.useSupportLibrary = true
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -65,16 +72,12 @@ android {
targetCompatibility = JavaVersion.VERSION_1_8
}
- composeOptions {
- // https://developer.android.com/jetpack/androidx/releases/compose-kotlin
- kotlinCompilerExtensionVersion = "1.5.14" // For Kotlin 1.9.24
- }
-
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
// Using experimental flatMapLatest for Paging 3
// Using experimental Material 3 compose APIs
- freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi,androidx.compose.material3.ExperimentalMaterial3Api"
+ freeCompilerArgs =
+ freeCompilerArgs + "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi,androidx.compose.material3.ExperimentalMaterial3Api"
}
lint {
@@ -95,7 +98,8 @@ android {
productFlavors {
create("pure") {
- isDefault = true // Make Studio select this by default, it often resets (after updates, randomly)
+ // Make Studio select this by default, it often resets (after updates, randomly)
+ isDefault = true
applicationId = "com.battlelancer.seriesguide"
versionCode = sgVersionCode
@@ -155,6 +159,9 @@ android {
// Based on https://docs.oracle.com/en/java/javase/17/docs/specs/jar/jar.html#jar-index
// only used by network applications like applets, so safe to exclude.
excludes += "/META-INF/INDEX.LIST"
+ // Exclude Coroutines debug file
+ // https://github.com/Kotlin/kotlinx.coroutines?tab=readme-ov-file#avoiding-including-the-debug-infrastructure-in-the-resulting-apk
+ excludes += "DebugProbesKt.bin"
}
}
}
@@ -164,7 +171,6 @@ kapt {
arguments {
arg("eventBusIndex", "com.battlelancer.seriesguide.SgEventBusIndex")
arg("room.schemaLocation", "$projectDir/schemas")
- arg("room.incremental", "true")
}
}
@@ -204,7 +210,7 @@ dependencies {
// Optional - Integration with activities
implementation(libs.androidx.activity.compose)
// Optional - Integration with ViewModels
- implementation( libs.androidx.lifecycle.compose)
+ implementation(libs.androidx.lifecycle.compose)
// ViewModel and LiveData
implementation(libs.androidx.lifecycle.livedata)
@@ -219,6 +225,8 @@ dependencies {
implementation(libs.androidx.room.ktx)
// Paging 3 Integration
implementation(libs.androidx.room.paging)
+ // KSP appears deprecated. KSP 2 is still under development.
+ //noinspection KaptUsageInsteadOfKsp
kapt(libs.androidx.room.compiler)
implementation(libs.dagger)
diff --git a/app/schemas/com.battlelancer.seriesguide.provider.SgRoomDatabase/54.json b/app/schemas/com.battlelancer.seriesguide.provider.SgRoomDatabase/54.json
new file mode 100644
index 0000000000..4bd82e33fc
--- /dev/null
+++ b/app/schemas/com.battlelancer.seriesguide.provider.SgRoomDatabase/54.json
@@ -0,0 +1,1653 @@
+{
+ "formatVersion": 1,
+ "database": {
+ "version": 54,
+ "identityHash": "37e698b27a2494936bc264752cbf9943",
+ "entities": [
+ {
+ "tableName": "series",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER NOT NULL, `series_slug` TEXT, `seriestitle` TEXT NOT NULL, `series_title_noarticle` TEXT, `overview` TEXT, `airstime` INTEGER, `airsdayofweek` INTEGER, `series_airtime` TEXT, `series_timezone` TEXT, `firstaired` TEXT, `genres` TEXT, `network` TEXT, `rating` REAL, `series_rating_votes` INTEGER, `series_rating_user` INTEGER, `runtime` TEXT, `status` TEXT, `contentrating` TEXT, `next` TEXT, `poster` TEXT, `series_poster_small` TEXT, `series_nextairdate` INTEGER, `nexttext` TEXT, `imdbid` TEXT, `series_trakt_id` INTEGER, `series_favorite` INTEGER NOT NULL, `series_syncenabled` INTEGER NOT NULL, `series_hidden` INTEGER NOT NULL, `series_lastupdate` INTEGER NOT NULL, `series_lastedit` INTEGER NOT NULL, `series_lastwatchedid` INTEGER NOT NULL, `series_lastwatched_ms` INTEGER NOT NULL, `series_language` TEXT, `series_unwatched_count` INTEGER NOT NULL, `series_notify` INTEGER NOT NULL, PRIMARY KEY(`_id`))",
+ "fields": [
+ {
+ "fieldPath": "tvdbId",
+ "columnName": "_id",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "slug",
+ "columnName": "series_slug",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "title",
+ "columnName": "seriestitle",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "titleNoArticle",
+ "columnName": "series_title_noarticle",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "overview",
+ "columnName": "overview",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "releaseTime",
+ "columnName": "airstime",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "releaseWeekDay",
+ "columnName": "airsdayofweek",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "releaseCountry",
+ "columnName": "series_airtime",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "releaseTimeZone",
+ "columnName": "series_timezone",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "firstRelease",
+ "columnName": "firstaired",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "genres",
+ "columnName": "genres",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "network",
+ "columnName": "network",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "ratingGlobal",
+ "columnName": "rating",
+ "affinity": "REAL",
+ "notNull": false
+ },
+ {
+ "fieldPath": "ratingVotes",
+ "columnName": "series_rating_votes",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "ratingUser",
+ "columnName": "series_rating_user",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "runtime",
+ "columnName": "runtime",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "status",
+ "columnName": "status",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "contentRating",
+ "columnName": "contentrating",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "nextEpisode",
+ "columnName": "next",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "poster",
+ "columnName": "poster",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "posterSmall",
+ "columnName": "series_poster_small",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "nextAirdateMs",
+ "columnName": "series_nextairdate",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "nextText",
+ "columnName": "nexttext",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "imdbId",
+ "columnName": "imdbid",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "traktId",
+ "columnName": "series_trakt_id",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "favorite",
+ "columnName": "series_favorite",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "hexagonMergeComplete",
+ "columnName": "series_syncenabled",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "hidden",
+ "columnName": "series_hidden",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "lastUpdatedMs",
+ "columnName": "series_lastupdate",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "lastEditedSec",
+ "columnName": "series_lastedit",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "lastWatchedEpisodeId",
+ "columnName": "series_lastwatchedid",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "lastWatchedMs",
+ "columnName": "series_lastwatched_ms",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "language",
+ "columnName": "series_language",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "unwatchedCount",
+ "columnName": "series_unwatched_count",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "notify",
+ "columnName": "series_notify",
+ "affinity": "INTEGER",
+ "notNull": true
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": false,
+ "columnNames": [
+ "_id"
+ ]
+ },
+ "indices": [],
+ "foreignKeys": []
+ },
+ {
+ "tableName": "seasons",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER, `combinednr` INTEGER, `series_id` TEXT, `watchcount` INTEGER, `willaircount` INTEGER, `noairdatecount` INTEGER, `seasonposter` TEXT, `season_totalcount` INTEGER, PRIMARY KEY(`_id`), FOREIGN KEY(`series_id`) REFERENCES `series`(`_id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+ "fields": [
+ {
+ "fieldPath": "tvdbId",
+ "columnName": "_id",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "number",
+ "columnName": "combinednr",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "showTvdbId",
+ "columnName": "series_id",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "watchCount",
+ "columnName": "watchcount",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "notReleasedCount",
+ "columnName": "willaircount",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "noReleaseDateCount",
+ "columnName": "noairdatecount",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "tags",
+ "columnName": "seasonposter",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "totalCount",
+ "columnName": "season_totalcount",
+ "affinity": "INTEGER",
+ "notNull": false
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": false,
+ "columnNames": [
+ "_id"
+ ]
+ },
+ "indices": [
+ {
+ "name": "index_seasons_series_id",
+ "unique": false,
+ "columnNames": [
+ "series_id"
+ ],
+ "orders": [],
+ "createSql": "CREATE INDEX IF NOT EXISTS `index_seasons_series_id` ON `${TABLE_NAME}` (`series_id`)"
+ }
+ ],
+ "foreignKeys": [
+ {
+ "table": "series",
+ "onDelete": "NO ACTION",
+ "onUpdate": "NO ACTION",
+ "columns": [
+ "series_id"
+ ],
+ "referencedColumns": [
+ "_id"
+ ]
+ }
+ ]
+ },
+ {
+ "tableName": "episodes",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER NOT NULL, `episodetitle` TEXT NOT NULL, `episodedescription` TEXT, `episodenumber` INTEGER NOT NULL, `season` INTEGER NOT NULL, `dvdnumber` REAL, `season_id` INTEGER NOT NULL, `series_id` INTEGER NOT NULL, `watched` INTEGER NOT NULL, `plays` INTEGER, `directors` TEXT, `gueststars` TEXT, `writers` TEXT, `episodeimage` TEXT, `episode_firstairedms` INTEGER NOT NULL, `episode_collected` INTEGER NOT NULL, `rating` REAL, `episode_rating_votes` INTEGER, `episode_rating_user` INTEGER, `episode_imdbid` TEXT, `episode_lastedit` INTEGER NOT NULL, `absolute_number` INTEGER, `episode_lastupdate` INTEGER NOT NULL, PRIMARY KEY(`_id`), FOREIGN KEY(`season_id`) REFERENCES `seasons`(`_id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`series_id`) REFERENCES `series`(`_id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+ "fields": [
+ {
+ "fieldPath": "tvdbId",
+ "columnName": "_id",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "title",
+ "columnName": "episodetitle",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "overview",
+ "columnName": "episodedescription",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "number",
+ "columnName": "episodenumber",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "season",
+ "columnName": "season",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "dvdNumber",
+ "columnName": "dvdnumber",
+ "affinity": "REAL",
+ "notNull": false
+ },
+ {
+ "fieldPath": "seasonTvdbId",
+ "columnName": "season_id",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "showTvdbId",
+ "columnName": "series_id",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "watched",
+ "columnName": "watched",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "plays",
+ "columnName": "plays",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "directors",
+ "columnName": "directors",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "guestStars",
+ "columnName": "gueststars",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "writers",
+ "columnName": "writers",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "image",
+ "columnName": "episodeimage",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "firstReleasedMs",
+ "columnName": "episode_firstairedms",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "collected",
+ "columnName": "episode_collected",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "ratingGlobal",
+ "columnName": "rating",
+ "affinity": "REAL",
+ "notNull": false
+ },
+ {
+ "fieldPath": "ratingVotes",
+ "columnName": "episode_rating_votes",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "ratingUser",
+ "columnName": "episode_rating_user",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "imdbId",
+ "columnName": "episode_imdbid",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "lastEditedSec",
+ "columnName": "episode_lastedit",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "absoluteNumber",
+ "columnName": "absolute_number",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "lastUpdatedSec",
+ "columnName": "episode_lastupdate",
+ "affinity": "INTEGER",
+ "notNull": true
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": false,
+ "columnNames": [
+ "_id"
+ ]
+ },
+ "indices": [
+ {
+ "name": "index_episodes_season_id",
+ "unique": false,
+ "columnNames": [
+ "season_id"
+ ],
+ "orders": [],
+ "createSql": "CREATE INDEX IF NOT EXISTS `index_episodes_season_id` ON `${TABLE_NAME}` (`season_id`)"
+ },
+ {
+ "name": "index_episodes_series_id",
+ "unique": false,
+ "columnNames": [
+ "series_id"
+ ],
+ "orders": [],
+ "createSql": "CREATE INDEX IF NOT EXISTS `index_episodes_series_id` ON `${TABLE_NAME}` (`series_id`)"
+ }
+ ],
+ "foreignKeys": [
+ {
+ "table": "seasons",
+ "onDelete": "NO ACTION",
+ "onUpdate": "NO ACTION",
+ "columns": [
+ "season_id"
+ ],
+ "referencedColumns": [
+ "_id"
+ ]
+ },
+ {
+ "table": "series",
+ "onDelete": "NO ACTION",
+ "onUpdate": "NO ACTION",
+ "columns": [
+ "series_id"
+ ],
+ "referencedColumns": [
+ "_id"
+ ]
+ }
+ ]
+ },
+ {
+ "tableName": "sg_show",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `series_tmdb_id` INTEGER, `series_tvdb_id` INTEGER, `series_slug` TEXT, `series_trakt_id` INTEGER, `series_title` TEXT NOT NULL, `series_title_noarticle` TEXT, `series_overview` TEXT, `series_airstime` INTEGER, `series_airsdayofweek` INTEGER, `series_country` TEXT, `series_timezone` TEXT, `series_firstaired` TEXT, `series_genres` TEXT, `series_network` TEXT, `series_imdbid` TEXT, `series_rating_tmdb` REAL, `series_rating_tmdb_votes` INTEGER, `series_rating` REAL, `series_rating_votes` INTEGER, `series_rating_user` INTEGER, `series_runtime` INTEGER, `series_status` INTEGER, `series_contentrating` TEXT, `series_next` TEXT, `series_poster` TEXT, `series_poster_small` TEXT, `series_nextairdate` INTEGER, `series_nexttext` TEXT, `series_lastupdate` INTEGER NOT NULL, `series_lastedit` INTEGER NOT NULL, `series_lastwatchedid` INTEGER NOT NULL, `series_lastwatched_ms` INTEGER NOT NULL, `series_language` TEXT, `series_unwatched_count` INTEGER NOT NULL, `series_favorite` INTEGER NOT NULL, `series_hidden` INTEGER NOT NULL, `series_notify` INTEGER NOT NULL, `series_syncenabled` INTEGER NOT NULL, `series_custom_release_time` INTEGER, `series_custom_day_offset` INTEGER, `series_custom_timezone` TEXT, `series_user_note` TEXT, `series_user_note_trakt_id` INTEGER)",
+ "fields": [
+ {
+ "fieldPath": "id",
+ "columnName": "_id",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "tmdbId",
+ "columnName": "series_tmdb_id",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "tvdbId",
+ "columnName": "series_tvdb_id",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "slug",
+ "columnName": "series_slug",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "traktId",
+ "columnName": "series_trakt_id",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "title",
+ "columnName": "series_title",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "titleNoArticle",
+ "columnName": "series_title_noarticle",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "overview",
+ "columnName": "series_overview",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "releaseTime",
+ "columnName": "series_airstime",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "releaseWeekDay",
+ "columnName": "series_airsdayofweek",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "releaseCountry",
+ "columnName": "series_country",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "releaseTimeZone",
+ "columnName": "series_timezone",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "firstRelease",
+ "columnName": "series_firstaired",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "genres",
+ "columnName": "series_genres",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "network",
+ "columnName": "series_network",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "imdbId",
+ "columnName": "series_imdbid",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "ratingTmdb",
+ "columnName": "series_rating_tmdb",
+ "affinity": "REAL",
+ "notNull": false
+ },
+ {
+ "fieldPath": "ratingTmdbVotes",
+ "columnName": "series_rating_tmdb_votes",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "ratingTrakt",
+ "columnName": "series_rating",
+ "affinity": "REAL",
+ "notNull": false
+ },
+ {
+ "fieldPath": "ratingTraktVotes",
+ "columnName": "series_rating_votes",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "ratingUser",
+ "columnName": "series_rating_user",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "runtime",
+ "columnName": "series_runtime",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "status",
+ "columnName": "series_status",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "contentRating",
+ "columnName": "series_contentrating",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "nextEpisode",
+ "columnName": "series_next",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "poster",
+ "columnName": "series_poster",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "posterSmall",
+ "columnName": "series_poster_small",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "nextAirdateMs",
+ "columnName": "series_nextairdate",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "nextText",
+ "columnName": "series_nexttext",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "lastUpdatedMs",
+ "columnName": "series_lastupdate",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "lastEditedSec",
+ "columnName": "series_lastedit",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "lastWatchedEpisodeId",
+ "columnName": "series_lastwatchedid",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "lastWatchedMs",
+ "columnName": "series_lastwatched_ms",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "language",
+ "columnName": "series_language",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "unwatchedCount",
+ "columnName": "series_unwatched_count",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "favorite",
+ "columnName": "series_favorite",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "hidden",
+ "columnName": "series_hidden",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "notify",
+ "columnName": "series_notify",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "hexagonMergeComplete",
+ "columnName": "series_syncenabled",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "customReleaseTime",
+ "columnName": "series_custom_release_time",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "customReleaseDayOffset",
+ "columnName": "series_custom_day_offset",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "customReleaseTimeZone",
+ "columnName": "series_custom_timezone",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "userNote",
+ "columnName": "series_user_note",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "userNoteTraktId",
+ "columnName": "series_user_note_trakt_id",
+ "affinity": "INTEGER",
+ "notNull": false
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": true,
+ "columnNames": [
+ "_id"
+ ]
+ },
+ "indices": [
+ {
+ "name": "index_sg_show_series_tmdb_id",
+ "unique": false,
+ "columnNames": [
+ "series_tmdb_id"
+ ],
+ "orders": [],
+ "createSql": "CREATE INDEX IF NOT EXISTS `index_sg_show_series_tmdb_id` ON `${TABLE_NAME}` (`series_tmdb_id`)"
+ },
+ {
+ "name": "index_sg_show_series_tvdb_id",
+ "unique": false,
+ "columnNames": [
+ "series_tvdb_id"
+ ],
+ "orders": [],
+ "createSql": "CREATE INDEX IF NOT EXISTS `index_sg_show_series_tvdb_id` ON `${TABLE_NAME}` (`series_tvdb_id`)"
+ }
+ ],
+ "foreignKeys": []
+ },
+ {
+ "tableName": "sg_season",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `series_id` INTEGER NOT NULL, `season_tmdb_id` TEXT, `season_tvdb_id` INTEGER, `season_number` INTEGER, `season_name` TEXT, `season_order` INTEGER NOT NULL, `season_watchcount` INTEGER, `season_willaircount` INTEGER, `season_noairdatecount` INTEGER, `season_totalcount` INTEGER, `season_tags` TEXT, FOREIGN KEY(`series_id`) REFERENCES `sg_show`(`_id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+ "fields": [
+ {
+ "fieldPath": "id",
+ "columnName": "_id",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "showId",
+ "columnName": "series_id",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "tmdbId",
+ "columnName": "season_tmdb_id",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "tvdbId",
+ "columnName": "season_tvdb_id",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "numberOrNull",
+ "columnName": "season_number",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "name",
+ "columnName": "season_name",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "order",
+ "columnName": "season_order",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "notWatchedReleasedOrNull",
+ "columnName": "season_watchcount",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "notWatchedToBeReleasedOrNull",
+ "columnName": "season_willaircount",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "notWatchedNoReleaseOrNull",
+ "columnName": "season_noairdatecount",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "totalOrNull",
+ "columnName": "season_totalcount",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "tags",
+ "columnName": "season_tags",
+ "affinity": "TEXT",
+ "notNull": false
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": true,
+ "columnNames": [
+ "_id"
+ ]
+ },
+ "indices": [
+ {
+ "name": "index_sg_season_series_id",
+ "unique": false,
+ "columnNames": [
+ "series_id"
+ ],
+ "orders": [],
+ "createSql": "CREATE INDEX IF NOT EXISTS `index_sg_season_series_id` ON `${TABLE_NAME}` (`series_id`)"
+ }
+ ],
+ "foreignKeys": [
+ {
+ "table": "sg_show",
+ "onDelete": "NO ACTION",
+ "onUpdate": "NO ACTION",
+ "columns": [
+ "series_id"
+ ],
+ "referencedColumns": [
+ "_id"
+ ]
+ }
+ ]
+ },
+ {
+ "tableName": "sg_episode",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `season_id` INTEGER NOT NULL, `series_id` INTEGER NOT NULL, `episode_tmdb_id` INTEGER, `episode_tvdb_id` INTEGER, `episode_title` TEXT, `episode_description` TEXT, `episode_number` INTEGER NOT NULL, `episode_absolute_number` INTEGER, `episode_season_number` INTEGER NOT NULL, `episode_order` INTEGER NOT NULL, `episode_dvd_number` REAL, `episode_watched` INTEGER NOT NULL, `episode_plays` INTEGER, `episode_collected` INTEGER NOT NULL, `episode_directors` TEXT, `episode_gueststars` TEXT, `episode_writers` TEXT, `episode_image` TEXT, `episode_firstairedms` INTEGER NOT NULL, `episode_rating_tmdb` REAL, `episode_rating_tmdb_votes` INTEGER, `episode_rating` REAL, `episode_rating_votes` INTEGER, `episode_rating_user` INTEGER, `episode_imdbid` TEXT, `episode_lastedit` INTEGER NOT NULL, `episode_lastupdate` INTEGER NOT NULL, FOREIGN KEY(`series_id`) REFERENCES `sg_show`(`_id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+ "fields": [
+ {
+ "fieldPath": "id",
+ "columnName": "_id",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "seasonId",
+ "columnName": "season_id",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "showId",
+ "columnName": "series_id",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "tmdbId",
+ "columnName": "episode_tmdb_id",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "tvdbId",
+ "columnName": "episode_tvdb_id",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "title",
+ "columnName": "episode_title",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "overview",
+ "columnName": "episode_description",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "number",
+ "columnName": "episode_number",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "absoluteNumber",
+ "columnName": "episode_absolute_number",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "season",
+ "columnName": "episode_season_number",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "order",
+ "columnName": "episode_order",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "dvdNumber",
+ "columnName": "episode_dvd_number",
+ "affinity": "REAL",
+ "notNull": false
+ },
+ {
+ "fieldPath": "watched",
+ "columnName": "episode_watched",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "plays",
+ "columnName": "episode_plays",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "collected",
+ "columnName": "episode_collected",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "directors",
+ "columnName": "episode_directors",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "guestStars",
+ "columnName": "episode_gueststars",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "writers",
+ "columnName": "episode_writers",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "image",
+ "columnName": "episode_image",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "firstReleasedMs",
+ "columnName": "episode_firstairedms",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "ratingTmdb",
+ "columnName": "episode_rating_tmdb",
+ "affinity": "REAL",
+ "notNull": false
+ },
+ {
+ "fieldPath": "ratingTmdbVotes",
+ "columnName": "episode_rating_tmdb_votes",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "ratingTrakt",
+ "columnName": "episode_rating",
+ "affinity": "REAL",
+ "notNull": false
+ },
+ {
+ "fieldPath": "ratingTraktVotes",
+ "columnName": "episode_rating_votes",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "ratingUser",
+ "columnName": "episode_rating_user",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "imdbId",
+ "columnName": "episode_imdbid",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "lastEditedSec",
+ "columnName": "episode_lastedit",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "lastUpdatedSec",
+ "columnName": "episode_lastupdate",
+ "affinity": "INTEGER",
+ "notNull": true
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": true,
+ "columnNames": [
+ "_id"
+ ]
+ },
+ "indices": [
+ {
+ "name": "index_sg_episode_season_id",
+ "unique": false,
+ "columnNames": [
+ "season_id"
+ ],
+ "orders": [],
+ "createSql": "CREATE INDEX IF NOT EXISTS `index_sg_episode_season_id` ON `${TABLE_NAME}` (`season_id`)"
+ },
+ {
+ "name": "index_sg_episode_series_id",
+ "unique": false,
+ "columnNames": [
+ "series_id"
+ ],
+ "orders": [],
+ "createSql": "CREATE INDEX IF NOT EXISTS `index_sg_episode_series_id` ON `${TABLE_NAME}` (`series_id`)"
+ }
+ ],
+ "foreignKeys": [
+ {
+ "table": "sg_show",
+ "onDelete": "NO ACTION",
+ "onUpdate": "NO ACTION",
+ "columns": [
+ "series_id"
+ ],
+ "referencedColumns": [
+ "_id"
+ ]
+ }
+ ]
+ },
+ {
+ "tableName": "lists",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `list_id` TEXT NOT NULL, `list_name` TEXT NOT NULL, `list_order` INTEGER)",
+ "fields": [
+ {
+ "fieldPath": "id",
+ "columnName": "_id",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "listId",
+ "columnName": "list_id",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "name",
+ "columnName": "list_name",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "order",
+ "columnName": "list_order",
+ "affinity": "INTEGER",
+ "notNull": false
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": true,
+ "columnNames": [
+ "_id"
+ ]
+ },
+ "indices": [
+ {
+ "name": "index_lists_list_id",
+ "unique": true,
+ "columnNames": [
+ "list_id"
+ ],
+ "orders": [],
+ "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_lists_list_id` ON `${TABLE_NAME}` (`list_id`)"
+ }
+ ],
+ "foreignKeys": []
+ },
+ {
+ "tableName": "listitems",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `list_item_id` TEXT NOT NULL, `item_ref_id` TEXT NOT NULL, `item_type` INTEGER NOT NULL, `list_id` TEXT, FOREIGN KEY(`list_id`) REFERENCES `lists`(`list_id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+ "fields": [
+ {
+ "fieldPath": "id",
+ "columnName": "_id",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "listItemId",
+ "columnName": "list_item_id",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "itemRefId",
+ "columnName": "item_ref_id",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "type",
+ "columnName": "item_type",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "listId",
+ "columnName": "list_id",
+ "affinity": "TEXT",
+ "notNull": false
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": true,
+ "columnNames": [
+ "_id"
+ ]
+ },
+ "indices": [
+ {
+ "name": "index_listitems_list_item_id",
+ "unique": true,
+ "columnNames": [
+ "list_item_id"
+ ],
+ "orders": [],
+ "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_listitems_list_item_id` ON `${TABLE_NAME}` (`list_item_id`)"
+ },
+ {
+ "name": "index_listitems_list_id",
+ "unique": false,
+ "columnNames": [
+ "list_id"
+ ],
+ "orders": [],
+ "createSql": "CREATE INDEX IF NOT EXISTS `index_listitems_list_id` ON `${TABLE_NAME}` (`list_id`)"
+ }
+ ],
+ "foreignKeys": [
+ {
+ "table": "lists",
+ "onDelete": "NO ACTION",
+ "onUpdate": "NO ACTION",
+ "columns": [
+ "list_id"
+ ],
+ "referencedColumns": [
+ "list_id"
+ ]
+ }
+ ]
+ },
+ {
+ "tableName": "movies",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `movies_tmdbid` INTEGER NOT NULL, `movies_imdbid` TEXT, `movies_title` TEXT, `movies_title_noarticle` TEXT, `movies_poster` TEXT, `movies_genres` TEXT, `movies_overview` TEXT, `movies_released` INTEGER, `movies_runtime` INTEGER, `movies_trailer` TEXT, `movies_certification` TEXT, `movies_incollection` INTEGER, `movies_inwatchlist` INTEGER, `movies_plays` INTEGER, `movies_watched` INTEGER, `movies_rating_tmdb` REAL, `movies_rating_votes_tmdb` INTEGER, `movies_rating_trakt` INTEGER, `movies_rating_votes_trakt` INTEGER, `movies_rating_user` INTEGER, `movies_last_updated` INTEGER)",
+ "fields": [
+ {
+ "fieldPath": "id",
+ "columnName": "_id",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "tmdbId",
+ "columnName": "movies_tmdbid",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "imdbId",
+ "columnName": "movies_imdbid",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "title",
+ "columnName": "movies_title",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "titleNoArticle",
+ "columnName": "movies_title_noarticle",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "poster",
+ "columnName": "movies_poster",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "genres",
+ "columnName": "movies_genres",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "overview",
+ "columnName": "movies_overview",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "releasedMs",
+ "columnName": "movies_released",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "runtimeMin",
+ "columnName": "movies_runtime",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "trailer",
+ "columnName": "movies_trailer",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "certification",
+ "columnName": "movies_certification",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "inCollection",
+ "columnName": "movies_incollection",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "inWatchlist",
+ "columnName": "movies_inwatchlist",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "plays",
+ "columnName": "movies_plays",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "watched",
+ "columnName": "movies_watched",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "ratingTmdb",
+ "columnName": "movies_rating_tmdb",
+ "affinity": "REAL",
+ "notNull": false
+ },
+ {
+ "fieldPath": "ratingVotesTmdb",
+ "columnName": "movies_rating_votes_tmdb",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "ratingTrakt",
+ "columnName": "movies_rating_trakt",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "ratingVotesTrakt",
+ "columnName": "movies_rating_votes_trakt",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "ratingUser",
+ "columnName": "movies_rating_user",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "lastUpdated",
+ "columnName": "movies_last_updated",
+ "affinity": "INTEGER",
+ "notNull": false
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": true,
+ "columnNames": [
+ "_id"
+ ]
+ },
+ "indices": [
+ {
+ "name": "index_movies_movies_tmdbid",
+ "unique": true,
+ "columnNames": [
+ "movies_tmdbid"
+ ],
+ "orders": [],
+ "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_movies_movies_tmdbid` ON `${TABLE_NAME}` (`movies_tmdbid`)"
+ }
+ ],
+ "foreignKeys": []
+ },
+ {
+ "tableName": "activity",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `activity_episode` TEXT NOT NULL, `activity_show` TEXT NOT NULL, `activity_time` INTEGER NOT NULL, `activity_type` INTEGER NOT NULL)",
+ "fields": [
+ {
+ "fieldPath": "id",
+ "columnName": "_id",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "episodeTvdbOrTmdbId",
+ "columnName": "activity_episode",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "showTvdbOrTmdbId",
+ "columnName": "activity_show",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "timestampMs",
+ "columnName": "activity_time",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "activity_type",
+ "columnName": "activity_type",
+ "affinity": "INTEGER",
+ "notNull": true
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": true,
+ "columnNames": [
+ "_id"
+ ]
+ },
+ "indices": [
+ {
+ "name": "index_activity_activity_episode_activity_type",
+ "unique": true,
+ "columnNames": [
+ "activity_episode",
+ "activity_type"
+ ],
+ "orders": [],
+ "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_activity_activity_episode_activity_type` ON `${TABLE_NAME}` (`activity_episode`, `activity_type`)"
+ }
+ ],
+ "foreignKeys": []
+ },
+ {
+ "tableName": "jobs",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT, `job_created_at` INTEGER, `job_type` INTEGER, `job_extras` BLOB)",
+ "fields": [
+ {
+ "fieldPath": "id",
+ "columnName": "_id",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "createdMs",
+ "columnName": "job_created_at",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "type",
+ "columnName": "job_type",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "extras",
+ "columnName": "job_extras",
+ "affinity": "BLOB",
+ "notNull": false
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": true,
+ "columnNames": [
+ "_id"
+ ]
+ },
+ "indices": [
+ {
+ "name": "index_jobs_job_created_at",
+ "unique": true,
+ "columnNames": [
+ "job_created_at"
+ ],
+ "orders": [],
+ "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_jobs_job_created_at` ON `${TABLE_NAME}` (`job_created_at`)"
+ }
+ ],
+ "foreignKeys": []
+ },
+ {
+ "tableName": "sg_watch_provider",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `provider_id` INTEGER NOT NULL, `provider_name` TEXT NOT NULL, `display_priority` INTEGER NOT NULL, `logo_path` TEXT NOT NULL, `type` INTEGER NOT NULL, `enabled` INTEGER NOT NULL, `filter_local` INTEGER NOT NULL DEFAULT false)",
+ "fields": [
+ {
+ "fieldPath": "_id",
+ "columnName": "_id",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "provider_id",
+ "columnName": "provider_id",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "provider_name",
+ "columnName": "provider_name",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "display_priority",
+ "columnName": "display_priority",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "logo_path",
+ "columnName": "logo_path",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "type",
+ "columnName": "type",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "enabled",
+ "columnName": "enabled",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "filter_local",
+ "columnName": "filter_local",
+ "affinity": "INTEGER",
+ "notNull": true,
+ "defaultValue": "false"
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": true,
+ "columnNames": [
+ "_id"
+ ]
+ },
+ "indices": [
+ {
+ "name": "index_sg_watch_provider_provider_id_type",
+ "unique": true,
+ "columnNames": [
+ "provider_id",
+ "type"
+ ],
+ "orders": [],
+ "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_sg_watch_provider_provider_id_type` ON `${TABLE_NAME}` (`provider_id`, `type`)"
+ },
+ {
+ "name": "index_sg_watch_provider_provider_name",
+ "unique": false,
+ "columnNames": [
+ "provider_name"
+ ],
+ "orders": [],
+ "createSql": "CREATE INDEX IF NOT EXISTS `index_sg_watch_provider_provider_name` ON `${TABLE_NAME}` (`provider_name`)"
+ },
+ {
+ "name": "index_sg_watch_provider_display_priority",
+ "unique": false,
+ "columnNames": [
+ "display_priority"
+ ],
+ "orders": [],
+ "createSql": "CREATE INDEX IF NOT EXISTS `index_sg_watch_provider_display_priority` ON `${TABLE_NAME}` (`display_priority`)"
+ },
+ {
+ "name": "index_sg_watch_provider_enabled",
+ "unique": false,
+ "columnNames": [
+ "enabled"
+ ],
+ "orders": [],
+ "createSql": "CREATE INDEX IF NOT EXISTS `index_sg_watch_provider_enabled` ON `${TABLE_NAME}` (`enabled`)"
+ },
+ {
+ "name": "index_sg_watch_provider_type",
+ "unique": false,
+ "columnNames": [
+ "type"
+ ],
+ "orders": [],
+ "createSql": "CREATE INDEX IF NOT EXISTS `index_sg_watch_provider_type` ON `${TABLE_NAME}` (`type`)"
+ }
+ ],
+ "foreignKeys": []
+ },
+ {
+ "tableName": "sg_watch_provider_show_mappings",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`provider_id` INTEGER NOT NULL, `show_id` INTEGER NOT NULL, PRIMARY KEY(`provider_id`, `show_id`))",
+ "fields": [
+ {
+ "fieldPath": "provider_id",
+ "columnName": "provider_id",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "show_id",
+ "columnName": "show_id",
+ "affinity": "INTEGER",
+ "notNull": true
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": false,
+ "columnNames": [
+ "provider_id",
+ "show_id"
+ ]
+ },
+ "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, '37e698b27a2494936bc264752cbf9943')"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/battlelancer/seriesguide/provider/DefaultValuesTest.java b/app/src/androidTest/java/com/battlelancer/seriesguide/provider/DefaultValuesTest.java
index c010e8e281..49254919c5 100644
--- a/app/src/androidTest/java/com/battlelancer/seriesguide/provider/DefaultValuesTest.java
+++ b/app/src/androidTest/java/com/battlelancer/seriesguide/provider/DefaultValuesTest.java
@@ -128,6 +128,8 @@ public void showDefaultValuesImport() {
assertThat(show.getCustomReleaseTime()).isNull();
assertThat(show.getCustomReleaseDayOffset()).isNull();
assertThat(show.getCustomReleaseTimeZone()).isNull();
+ assertThat(show.getUserNote()).isNull();
+ assertThat(show.getUserNoteTraktId()).isNull();
}
@Test
diff --git a/app/src/androidTest/java/com/battlelancer/seriesguide/shows/tools/ShowTestHelper.kt b/app/src/androidTest/java/com/battlelancer/seriesguide/shows/tools/ShowTestHelper.kt
index 41ae184c77..1b0c1494d0 100644
--- a/app/src/androidTest/java/com/battlelancer/seriesguide/shows/tools/ShowTestHelper.kt
+++ b/app/src/androidTest/java/com/battlelancer/seriesguide/shows/tools/ShowTestHelper.kt
@@ -41,7 +41,9 @@ object ShowTestHelper {
posterSmall = "poster.jpg",
// set desired language, might not be the content language if fallback used above.
language = LanguageTools.LANGUAGE_EN,
- lastUpdatedMs = System.currentTimeMillis() // now
+ lastUpdatedMs = System.currentTimeMillis(), // now
+ userNote = null,
+ userNoteTraktId = null
)
}
diff --git a/app/src/androidTest/java/com/battlelancer/seriesguide/ui/ShowsActivityTest.java b/app/src/androidTest/java/com/battlelancer/seriesguide/ui/ShowsActivityTest.java
index a16a712ab8..a729833974 100644
--- a/app/src/androidTest/java/com/battlelancer/seriesguide/ui/ShowsActivityTest.java
+++ b/app/src/androidTest/java/com/battlelancer/seriesguide/ui/ShowsActivityTest.java
@@ -64,7 +64,7 @@ public void testAddShowAndSetWatchedThenReturn() {
// Open discover screen
ViewInteraction floatingActionButton = onView(
- allOf(withId(R.id.buttonShowsAdd), isDisplayed()));
+ allOf(withId(R.id.buttonShowsFloating), isDisplayed()));
floatingActionButton.perform(click());
// Added a sleep statement to match the app's execution delay.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3266a7186b..798b53ddeb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -41,13 +41,12 @@
-
seasons;
}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/history/UserEpisodeStreamFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/history/UserEpisodeStreamFragment.kt
index 27276d64c4..9ef3456159 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/history/UserEpisodeStreamFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/history/UserEpisodeStreamFragment.kt
@@ -1,18 +1,17 @@
-// Copyright 2023 Uwe Trottmann
// SPDX-License-Identifier: Apache-2.0
+// Copyright 2014-2024 Uwe Trottmann
package com.battlelancer.seriesguide.history
import android.os.Bundle
import android.view.View
-import androidx.core.app.ActivityCompat
-import androidx.core.app.ActivityOptionsCompat
import androidx.lifecycle.lifecycleScope
import androidx.loader.app.LoaderManager
import androidx.loader.content.Loader
import com.battlelancer.seriesguide.provider.SgRoomDatabase
import com.battlelancer.seriesguide.shows.episodes.EpisodesActivity
import com.battlelancer.seriesguide.shows.search.discover.AddShowDialogFragment
+import com.battlelancer.seriesguide.util.startActivityWithAnimation
import com.uwetrottmann.trakt5.entities.HistoryEntry
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
@@ -73,12 +72,7 @@ class UserEpisodeStreamFragment : StreamFragment() {
// Is in database, show details.
val intent =
EpisodesActivity.intentEpisode(episodeIdOrNull, requireContext())
- ActivityCompat.startActivity(
- requireActivity(), intent,
- ActivityOptionsCompat
- .makeScaleUpAnimation(view, 0, 0, view.width, view.height)
- .toBundle()
- )
+ requireActivity().startActivityWithAnimation(intent, view)
} else {
// Offer to add the show if not in database.
AddShowDialogFragment.show(
diff --git a/app/src/main/java/com/battlelancer/seriesguide/history/UserMovieStreamFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/history/UserMovieStreamFragment.kt
index f11b9950e4..1fa360287d 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/history/UserMovieStreamFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/history/UserMovieStreamFragment.kt
@@ -1,15 +1,14 @@
-// Copyright 2023 Uwe Trottmann
// SPDX-License-Identifier: Apache-2.0
+// Copyright 2014-2024 Uwe Trottmann
package com.battlelancer.seriesguide.history
import android.os.Bundle
import android.view.View
-import androidx.core.app.ActivityCompat
-import androidx.core.app.ActivityOptionsCompat
import androidx.loader.app.LoaderManager
import androidx.loader.content.Loader
import com.battlelancer.seriesguide.movies.details.MovieDetailsActivity
+import com.battlelancer.seriesguide.util.startActivityWithAnimation
import com.uwetrottmann.trakt5.entities.HistoryEntry
/**
@@ -46,11 +45,7 @@ class UserMovieStreamFragment : StreamFragment() {
// display movie details
val tmdb = item.movie?.ids?.tmdb ?: return
val i = MovieDetailsActivity.intentMovie(requireContext(), tmdb)
- ActivityCompat.startActivity(
- requireContext(), i, ActivityOptionsCompat
- .makeScaleUpAnimation(view, 0, 0, view.width, view.height)
- .toBundle()
- )
+ requireContext().startActivityWithAnimation(i, view)
}
}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/jobs/TraktEpisodeJob.kt b/app/src/main/java/com/battlelancer/seriesguide/jobs/TraktEpisodeJob.kt
index a0dabc4482..622c444852 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/jobs/TraktEpisodeJob.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/jobs/TraktEpisodeJob.kt
@@ -227,8 +227,7 @@ class TraktEpisodeJob(
}
WatchedEpisode(number, season)
}
- val pageCount = response.headers()["x-pagination-page-count"]?.toIntOrNull()
- ?: 1
+ val pageCount = TraktV2.getPageCount(response) ?: 1
Ok(HistoryPage(episodes, pageCount))
}
}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/lists/AddListDialogFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/lists/AddListDialogFragment.kt
index 16b24eb6d2..7739081503 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/lists/AddListDialogFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/lists/AddListDialogFragment.kt
@@ -1,5 +1,5 @@
-// Copyright 2023 Uwe Trottmann
// SPDX-License-Identifier: Apache-2.0
+// Copyright 2012-2024 Uwe Trottmann
package com.battlelancer.seriesguide.lists
@@ -12,7 +12,7 @@ import android.widget.TextView
import androidx.appcompat.app.AppCompatDialogFragment
import androidx.fragment.app.FragmentManager
import com.battlelancer.seriesguide.R
-import com.battlelancer.seriesguide.databinding.DialogListManageBinding
+import com.battlelancer.seriesguide.databinding.DialogAddListBinding
import com.battlelancer.seriesguide.provider.SeriesGuideContract
import com.battlelancer.seriesguide.util.safeShow
import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -23,10 +23,10 @@ import com.google.android.material.textfield.TextInputLayout
*/
class AddListDialogFragment : AppCompatDialogFragment() {
- private var binding: DialogListManageBinding? = null
+ private var binding: DialogAddListBinding? = null
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
- val binding = DialogListManageBinding.inflate(layoutInflater)
+ val binding = DialogAddListBinding.inflate(layoutInflater)
this.binding = binding
// title
diff --git a/app/src/main/java/com/battlelancer/seriesguide/lists/DeleteListDialogFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/lists/DeleteListDialogFragment.kt
new file mode 100644
index 0000000000..be178ad110
--- /dev/null
+++ b/app/src/main/java/com/battlelancer/seriesguide/lists/DeleteListDialogFragment.kt
@@ -0,0 +1,58 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2024 Uwe Trottmann
+
+package com.battlelancer.seriesguide.lists
+
+import android.app.Dialog
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatDialogFragment
+import androidx.core.os.bundleOf
+import com.battlelancer.seriesguide.R
+import com.battlelancer.seriesguide.provider.SgRoomDatabase
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+
+/**
+ * Dialog to confirm deletion of a list and its items.
+ */
+class DeleteListDialogFragment : AppCompatDialogFragment() {
+
+ private lateinit var listId: String
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+
+ listId = requireArguments().getString(ARG_LIST_ID)
+ ?: throw IllegalArgumentException("$ARG_LIST_ID must be supplied")
+ }
+
+ override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+ val listTitle = SgRoomDatabase.getInstance(requireContext()).sgListHelper()
+ .getList(listId)
+ ?.name ?: getString(R.string.unknown)
+
+ // Explicitly make negative button cancel (non-destructive action) as the delete list button
+ // is the negative action in the originating dialog; so accidentally pressing again in the
+ // same region does not do the destructive action.
+ return MaterialAlertDialogBuilder(requireContext())
+ .setTitle(requireContext().getString(R.string.confirm_delete, listTitle))
+ .setNegativeButton(android.R.string.cancel) { _, _ ->
+ // just dismiss
+ }
+ .setPositiveButton(R.string.list_remove) { _, _ ->
+ ListsTools.deleteList(requireContext(), listId)
+ }
+ .create()
+ }
+
+ companion object {
+
+ private const val ARG_LIST_ID = "list_id"
+
+ fun create(listId: String): DeleteListDialogFragment {
+ return DeleteListDialogFragment().apply {
+ arguments = bundleOf(ARG_LIST_ID to listId)
+ }
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/battlelancer/seriesguide/lists/ListManageDialogFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/lists/ListManageDialogFragment.kt
index 7080c749a2..5b940e47b1 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/lists/ListManageDialogFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/lists/ListManageDialogFragment.kt
@@ -1,5 +1,5 @@
-// Copyright 2023 Uwe Trottmann
// SPDX-License-Identifier: Apache-2.0
+// Copyright 2012-2024 Uwe Trottmann
package com.battlelancer.seriesguide.lists
@@ -12,7 +12,7 @@ import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import com.battlelancer.seriesguide.R
import com.battlelancer.seriesguide.databinding.DialogListManageBinding
-import com.battlelancer.seriesguide.provider.SeriesGuideContract
+import com.battlelancer.seriesguide.provider.SgRoomDatabase
import com.battlelancer.seriesguide.util.safeShow
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import kotlinx.coroutines.launch
@@ -39,23 +39,29 @@ class ListManageDialogFragment : AppCompatDialogFragment() {
this.binding = binding
// buttons
- binding.buttonNegative.isEnabled = false
- binding.buttonNegative.setText(R.string.list_remove)
- binding.buttonNegative.setOnClickListener {
- // remove list and items
- ListsTools.removeList(requireContext(), listId)
- dismiss()
+ binding.buttonListManageDelete.apply {
+ isEnabled = false
+ setText(R.string.list_remove)
+ setOnClickListener {
+ // ask about removing list
+ DeleteListDialogFragment.create(listId)
+ .safeShow(parentFragmentManager, "confirm-delete-list")
+ dismiss()
+ }
}
- binding.buttonPositive.setText(android.R.string.ok)
- binding.buttonPositive.setOnClickListener {
- val editText = this.binding?.textInputLayoutListManageListName?.editText
- ?: return@setOnClickListener
-
- // update title
- val listName = editText.text.toString().trim()
- ListsTools.renameList(requireContext(), listId, listName)
-
- dismiss()
+ binding.buttonListManageConfirm.apply {
+ setText(R.string.action_save)
+ setOnClickListener {
+ val editText =
+ this@ListManageDialogFragment.binding?.textInputLayoutListManageListName?.editText
+ ?: return@setOnClickListener
+
+ // update title
+ val listName = editText.text.toString().trim()
+ ListsTools.renameList(requireContext(), listId, listName)
+
+ dismiss()
+ }
}
// Delay loading data for views to after this function
@@ -71,26 +77,16 @@ class ListManageDialogFragment : AppCompatDialogFragment() {
}
private fun configureViews() {
+ // Querying on main thread as the queries are very small
+ val listHelper = SgRoomDatabase.getInstance(requireContext()).sgListHelper()
// pre-populate list title
- val list = requireContext().contentResolver
- .query(
- SeriesGuideContract.Lists.buildListUri(listId), arrayOf(
- SeriesGuideContract.Lists.NAME
- ), null, null, null
- )
+ val list = listHelper.getList(listId)
if (list == null) {
// list might have been removed, or query failed
dismiss()
return
}
- if (!list.moveToFirst()) {
- // list not found
- list.close()
- dismiss()
- return
- }
- val listName = list.getString(0)
- list.close()
+ val listName = list.name
val binding = this@ListManageDialogFragment.binding
if (binding == null) {
@@ -104,21 +100,14 @@ class ListManageDialogFragment : AppCompatDialogFragment() {
editTextName.addTextChangedListener(
AddListDialogFragment.ListNameTextWatcher(
requireContext(), textInputLayoutName,
- binding.buttonPositive, listName
+ binding.buttonListManageConfirm, listName
)
)
// do only allow removing if this is NOT the last list
- val lists = requireContext().contentResolver.query(
- SeriesGuideContract.Lists.CONTENT_URI, arrayOf(
- SeriesGuideContract.Lists._ID
- ), null, null, null
- )
- if (lists != null) {
- if (lists.count > 1) {
- binding.buttonNegative.isEnabled = true
- }
- lists.close()
+ val listsCount = listHelper.getListsCount()
+ if (listsCount > 1) {
+ binding.buttonListManageDelete.isEnabled = true
}
}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/lists/ListsReorderDialogFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/lists/ListsReorderDialogFragment.kt
index 5635c053ff..a457ea45a6 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/lists/ListsReorderDialogFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/lists/ListsReorderDialogFragment.kt
@@ -1,8 +1,9 @@
-// Copyright 2023 Uwe Trottmann
// SPDX-License-Identifier: Apache-2.0
+// Copyright 2015-2024 Uwe Trottmann
package com.battlelancer.seriesguide.lists
+import android.annotation.SuppressLint
import android.app.Dialog
import android.content.DialogInterface
import android.os.Bundle
@@ -24,6 +25,8 @@ class ListsReorderDialogFragment : AppCompatDialogFragment() {
private var binding: DialogListsReorderBinding? = null
private lateinit var adapter: ListsAdapter
+ // ClickableViewAccessibility: there is nothing to click
+ @SuppressLint("ClickableViewAccessibility")
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val binding = DialogListsReorderBinding.inflate(layoutInflater)
this.binding = binding
diff --git a/app/src/main/java/com/battlelancer/seriesguide/lists/ListsTools.java b/app/src/main/java/com/battlelancer/seriesguide/lists/ListsTools.java
index 996d874036..39ff5d9004 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/lists/ListsTools.java
+++ b/app/src/main/java/com/battlelancer/seriesguide/lists/ListsTools.java
@@ -13,7 +13,7 @@
import com.battlelancer.seriesguide.util.tasks.AddListTask;
import com.battlelancer.seriesguide.util.tasks.ChangeListItemListsTask;
import com.battlelancer.seriesguide.util.tasks.RemoveListItemTask;
-import com.battlelancer.seriesguide.util.tasks.RemoveListTask;
+import com.battlelancer.seriesguide.util.tasks.DeleteListTask;
import com.battlelancer.seriesguide.util.tasks.RenameListTask;
import com.battlelancer.seriesguide.util.tasks.ReorderListsTask;
import com.uwetrottmann.seriesguide.backend.lists.model.SgListItem;
@@ -60,8 +60,8 @@ static void renameList(@NonNull Context context, @NonNull String listId,
AsyncTask.THREAD_POOL_EXECUTOR);
}
- static void removeList(@NonNull Context context, @NonNull String listId) {
- new RemoveListTask(context, listId).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+ static void deleteList(@NonNull Context context, @NonNull String listId) {
+ new DeleteListTask(context, listId).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
static void reorderLists(@NonNull Context context,
diff --git a/app/src/main/java/com/battlelancer/seriesguide/lists/SgListFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/lists/SgListFragment.kt
index 4255e0cf04..4de9345f49 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/lists/SgListFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/lists/SgListFragment.kt
@@ -25,8 +25,8 @@ import com.battlelancer.seriesguide.shows.tools.ShowSync
import com.battlelancer.seriesguide.ui.AutoGridLayoutManager
import com.battlelancer.seriesguide.ui.OverviewActivity
import com.battlelancer.seriesguide.ui.widgets.SgFastScroller
-import com.battlelancer.seriesguide.util.Utils
import com.battlelancer.seriesguide.util.ViewTools
+import com.battlelancer.seriesguide.util.startActivityWithAnimation
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -112,8 +112,7 @@ class SgListFragment : Fragment() {
private val itemClickListener: SgListItemViewHolder.ItemClickListener =
object : SgListItemViewHolder.ItemClickListener {
override fun onItemClick(anchor: View, item: SgListItemWithDetails) {
- Utils.startActivityWithAnimation(
- requireActivity(),
+ requireActivity().startActivityWithAnimation(
OverviewActivity.intentShow(requireActivity(), item.showId),
anchor
)
diff --git a/app/src/main/java/com/battlelancer/seriesguide/lists/database/SgListHelper.kt b/app/src/main/java/com/battlelancer/seriesguide/lists/database/SgListHelper.kt
index f1e3027bcb..dc8e5c02e4 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/lists/database/SgListHelper.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/lists/database/SgListHelper.kt
@@ -23,12 +23,24 @@ import com.battlelancer.seriesguide.shows.tools.ShowStatus
@Dao
interface SgListHelper {
+ /**
+ * Is null on error or if it does not exist.
+ */
+ @Query("SELECT * FROM lists WHERE list_id = :id")
+ fun getList(id: String): SgList?
+
@Query("SELECT * FROM lists ORDER BY ${Lists.SORT_ORDER_THEN_NAME}")
fun getListsForDisplay(): LiveData>
@Query("SELECT * FROM lists ORDER BY ${Lists.SORT_ORDER_THEN_NAME}")
fun getListsForExport(): List
+ /**
+ * Is 0 on error.
+ */
+ @Query("SELECT COUNT(_id) FROM lists")
+ fun getListsCount(): Int
+
@Query("SELECT * FROM listitems WHERE item_ref_id = :tmdbId AND item_type = ${ListItemTypes.TMDB_SHOW}")
fun getListItemsWithTmdbId(tmdbId: Int): List
diff --git a/app/src/main/java/com/battlelancer/seriesguide/movies/MovieClickListenerImpl.kt b/app/src/main/java/com/battlelancer/seriesguide/movies/MovieClickListenerImpl.kt
index d063a9c236..c2081b0f13 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/movies/MovieClickListenerImpl.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/movies/MovieClickListenerImpl.kt
@@ -13,6 +13,7 @@ import com.battlelancer.seriesguide.movies.details.MovieDetailsActivity
import com.battlelancer.seriesguide.movies.tools.MovieTools
import com.battlelancer.seriesguide.provider.SgRoomDatabase
import com.battlelancer.seriesguide.util.Utils
+import com.battlelancer.seriesguide.util.startActivityWithAnimation
open class MovieClickListenerImpl(val context: Context) : MovieClickListener {
@@ -21,7 +22,7 @@ open class MovieClickListenerImpl(val context: Context) : MovieClickListener {
// launch details activity
val intent = MovieDetailsActivity.intentMovie(context, movieTmdbId)
- Utils.startActivityWithAnimation(context, intent, posterView)
+ context.startActivityWithAnimation(intent, posterView)
}
override fun onMoreOptionsClick(movieTmdbId: Int, anchor: View) {
diff --git a/app/src/main/java/com/battlelancer/seriesguide/movies/MoviesDiscoverFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/movies/MoviesDiscoverFragment.kt
index 2f5e62ba83..f086adbfcd 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/movies/MoviesDiscoverFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/movies/MoviesDiscoverFragment.kt
@@ -25,8 +25,8 @@ import com.battlelancer.seriesguide.movies.MovieLocalizationDialogFragment.Local
import com.battlelancer.seriesguide.movies.MoviesActivityViewModel.ScrollTabToTopEvent
import com.battlelancer.seriesguide.movies.search.MoviesSearchActivity
import com.battlelancer.seriesguide.ui.AutoGridLayoutManager
-import com.battlelancer.seriesguide.util.Utils
import com.battlelancer.seriesguide.util.ViewTools
+import com.battlelancer.seriesguide.util.startActivityWithAnimation
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -144,7 +144,7 @@ class MoviesDiscoverFragment : Fragment() {
MoviesDiscoverAdapter.ItemClickListener {
override fun onLinkClick(link: MoviesDiscoverLink, anchor: View) {
MoviesSearchActivity.intentLink(context, link)
- .let { Utils.startActivityWithAnimation(context, it, anchor) }
+ .let { context.startActivityWithAnimation(it, anchor) }
}
}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/movies/MoviesHistoryFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/movies/MoviesHistoryFragment.kt
index 94f3b2bf20..d1c1710dbd 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/movies/MoviesHistoryFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/movies/MoviesHistoryFragment.kt
@@ -29,8 +29,8 @@ import com.battlelancer.seriesguide.shows.history.ShowsHistoryAdapter
import com.battlelancer.seriesguide.shows.history.ShowsHistoryAdapter.Item
import com.battlelancer.seriesguide.shows.history.TraktRecentEpisodeHistoryLoader
import com.battlelancer.seriesguide.traktapi.TraktCredentials
-import com.battlelancer.seriesguide.util.Utils
import com.battlelancer.seriesguide.util.ViewTools
+import com.battlelancer.seriesguide.util.startActivityWithAnimation
/**
* From Trakt, displays recently watched movies of the user and Trakt friends.
@@ -254,9 +254,8 @@ class MoviesHistoryFragment : Fragment() {
// display movie details
val i = MovieDetailsActivity.intentMovie(requireContext(), movieTmdbId)
-
// simple scale up animation as there are no images
- Utils.startActivityWithAnimation(activity, i, view)
+ requireActivity().startActivityWithAnimation(i, view)
}
}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/movies/details/MovieDetailsFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/movies/details/MovieDetailsFragment.kt
index 285649397c..f62fa44e16 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/movies/details/MovieDetailsFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/movies/details/MovieDetailsFragment.kt
@@ -70,6 +70,7 @@ import com.battlelancer.seriesguide.util.Utils
import com.battlelancer.seriesguide.util.ViewTools
import com.battlelancer.seriesguide.util.WebTools
import com.battlelancer.seriesguide.util.copyTextToClipboardOnLongClick
+import com.battlelancer.seriesguide.util.startActivityWithAnimation
import com.squareup.picasso.Callback
import com.squareup.picasso.Picasso
import com.uwetrottmann.androidutils.AndroidUtils
@@ -135,6 +136,13 @@ class MovieDetailsFragment : Fragment(), MovieActionsContract {
}
isEnabled = false
}
+ // release dates button
+ buttonMovieReleaseDates.setOnClickListener {
+ WebTools.openInCustomTab(
+ requireContext(),
+ TmdbTools.buildMovieReleaseDatesUrl(tmdbId)
+ )
+ }
// similar movies button
buttonMovieSimilar.setOnClickListener {
movieDetails?.tmdbMovie()
@@ -469,7 +477,7 @@ class MovieDetailsFragment : Fragment(), MovieActionsContract {
val tmdbId = tmdbId
if (tmdbId > 0) {
val i = TraktCommentsActivity.intentMovie(requireContext(), movieTitle, tmdbId)
- Utils.startActivityWithAnimation(activity, i, v)
+ requireActivity().startActivityWithAnimation(i, v)
}
}
}
@@ -600,7 +608,7 @@ class MovieDetailsFragment : Fragment(), MovieActionsContract {
smallImageUrl,
largeImageUrl
)
- Utils.startActivityWithAnimation(activity, intent, view)
+ requireActivity().startActivityWithAnimation(intent, view)
}
}
}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/people/PeopleListHelper.kt b/app/src/main/java/com/battlelancer/seriesguide/people/PeopleListHelper.kt
index 8e6358e5b1..0497bfb083 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/people/PeopleListHelper.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/people/PeopleListHelper.kt
@@ -16,7 +16,7 @@ import com.battlelancer.seriesguide.tmdbapi.TmdbTools
import com.battlelancer.seriesguide.util.CircleTransformation
import com.battlelancer.seriesguide.util.ImageTools
import com.battlelancer.seriesguide.util.ThemeUtils
-import com.battlelancer.seriesguide.util.Utils
+import com.battlelancer.seriesguide.util.startActivityWithAnimation
import timber.log.Timber
/**
@@ -230,7 +230,7 @@ class PeopleListHelper {
// showing a specific person
i.putExtra(PersonFragment.ARG_PERSON_TMDB_ID, personTmdbId)
}
- Utils.startActivityWithAnimation(context, i, v)
+ context.startActivityWithAnimation(i, v)
}
}
}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/preferences/NotificationThresholdDialogFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/preferences/NotificationThresholdDialogFragment.kt
index 82fef8dc33..0048e85651 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/preferences/NotificationThresholdDialogFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/preferences/NotificationThresholdDialogFragment.kt
@@ -1,8 +1,9 @@
-// Copyright 2023 Uwe Trottmann
// SPDX-License-Identifier: Apache-2.0
+// Copyright 2017-2024 Uwe Trottmann
package com.battlelancer.seriesguide.preferences
+import android.annotation.SuppressLint
import android.app.Dialog
import android.content.DialogInterface
import android.content.res.Resources
@@ -29,6 +30,7 @@ class NotificationThresholdDialogFragment : AppCompatDialogFragment() {
private var binding: DialogNotificationThresholdBinding? = null
private var value = 0
+ @SuppressLint("SetTextI18n")
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val binding = DialogNotificationThresholdBinding.inflate(layoutInflater)
this.binding = binding
@@ -52,6 +54,8 @@ class NotificationThresholdDialogFragment : AppCompatDialogFragment() {
value = minutes
binding.radioGroupThreshold.check(R.id.radioButtonThresholdMinutes)
}
+ // Suppress SetTextI18n: to accept Arabic numbers, would need to add custom text parsing
+ // and remove the inputType number restriction.
binding.editTextThresholdValue.setText(value.toString())
// radio buttons are updated by text watcher
diff --git a/app/src/main/java/com/battlelancer/seriesguide/preferences/TimeOffsetDialogFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/preferences/TimeOffsetDialogFragment.kt
index e3e20c5283..7c4bb188f5 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/preferences/TimeOffsetDialogFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/preferences/TimeOffsetDialogFragment.kt
@@ -33,6 +33,7 @@ class TimeOffsetDialogFragment : AppCompatDialogFragment() {
private var hours = 0
+ @SuppressLint("SetTextI18n")
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val binding = DialogTimeOffsetBinding.inflate(layoutInflater)
this.binding = binding
@@ -42,6 +43,8 @@ class TimeOffsetDialogFragment : AppCompatDialogFragment() {
binding.editTextOffsetValue.addTextChangedListener(textWatcher)
val hours = getShowsTimeOffset(requireContext())
+ // Suppress SetTextI18n: to accept Arabic numbers, would need to add custom text parsing
+ // and remove the inputType numberSigned restriction.
binding.editTextOffsetValue.setText(hours.toString())
// text views are updated by text watcher
diff --git a/app/src/main/java/com/battlelancer/seriesguide/provider/SeriesGuideContract.java b/app/src/main/java/com/battlelancer/seriesguide/provider/SeriesGuideContract.java
index 4dfeaf1013..0eb54f97d1 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/provider/SeriesGuideContract.java
+++ b/app/src/main/java/com/battlelancer/seriesguide/provider/SeriesGuideContract.java
@@ -721,6 +721,16 @@ public interface SgShow2Columns extends BaseColumns {
*/
String UNWATCHED_COUNT = "series_unwatched_count";
+ /**
+ * See {@link SgShow2#getUserNote()}.
+ */
+ String USER_NOTE = "series_user_note";
+
+ /**
+ * See {@link SgShow2#getUserNoteTraktId()}.
+ */
+ String USER_NOTE_TRAKT_ID = "series_user_note_trakt_id";
+
String SELECTION_FAVORITES = FAVORITE + "=1";
String SELECTION_NOT_FAVORITES = FAVORITE + "=0";
String SELECTION_HIDDEN = HIDDEN + "=1";
diff --git a/app/src/main/java/com/battlelancer/seriesguide/provider/SgRoomDatabase.kt b/app/src/main/java/com/battlelancer/seriesguide/provider/SgRoomDatabase.kt
index ecffd9a3dc..8b3cd8b033 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/provider/SgRoomDatabase.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/provider/SgRoomDatabase.kt
@@ -67,6 +67,10 @@ import timber.log.Timber
AutoMigration(
from = SgRoomDatabase.VERSION_52_WATCH_PROVIDER_FILTERS,
to = SgRoomDatabase.VERSION_53_SHOW_TMDB_RATINGS
+ ),
+ AutoMigration(
+ from = SgRoomDatabase.VERSION_53_SHOW_TMDB_RATINGS,
+ to = SgRoomDatabase.VERSION_54_SHOW_NOTES
)
]
)
@@ -139,7 +143,13 @@ abstract class SgRoomDatabase : RoomDatabase() {
* - Add [SgEpisode2.ratingTmdb] and [SgEpisode2.ratingTmdbVotes].
*/
const val VERSION_53_SHOW_TMDB_RATINGS = 53
- const val VERSION = VERSION_53_SHOW_TMDB_RATINGS
+
+ /**
+ * - Add [SgShow2.userNote] and [SgShow2.userNoteTraktId].
+ */
+ const val VERSION_54_SHOW_NOTES = 54
+
+ const val VERSION = VERSION_54_SHOW_NOTES
@Volatile
private var instance: SgRoomDatabase? = null
diff --git a/app/src/main/java/com/battlelancer/seriesguide/settings/TmdbSettings.kt b/app/src/main/java/com/battlelancer/seriesguide/settings/TmdbSettings.kt
index 8af3c9741b..7766a4defb 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/settings/TmdbSettings.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/settings/TmdbSettings.kt
@@ -21,7 +21,21 @@ object TmdbSettings {
private const val KEY_TMDB_BASE_URL = "com.battlelancer.seriesguide.tmdb.baseurl"
const val POSTER_SIZE_SPEC_W154 = "w154"
const val POSTER_SIZE_SPEC_W342 = "w342"
- private const val STILL_SIZE_SPEC_W300 = "w300"
+
+ /**
+ * As of 2024-11:
+ *
+ * - w300 (300 × 169 px) JPEG is around 9-16 kB
+ * - w780 (780 × 439 px) JPEG is around 30-70 kB
+ * - w1280 (1280 × 720 px) JPEG is around 60-140 KB
+ *
+ * Samples:
+ *
+ * - https://image.tmdb.org/t/p/original/8Tvnx22rzhwArofFPhmcfaBvgjN.jpg (smallest)
+ * - https://image.tmdb.org/t/p/original/j4WEC9Jh4AyXF8ynpX3pz633tse.jpg
+ * - https://image.tmdb.org/t/p/original/5Bh7EE3p6OOS0NzH22AE0N7DYO8.jpg (largest)
+ */
+ const val BACKDROP_SMALL_SIZE_SPEC = "w780"
private const val IMAGE_SIZE_SPEC_ORIGINAL = "original"
const val DEFAULT_BASE_URL = "https://image.tmdb.org/t/p/"
@@ -69,7 +83,7 @@ object TmdbSettings {
}
}
- fun getStillUrl(context: Context, path: String): String {
- return getImageBaseUrl(context) + STILL_SIZE_SPEC_W300 + path
+ fun buildBackdropUrl(context: Context, path: String): String {
+ return "${getImageBaseUrl(context)}$BACKDROP_SMALL_SIZE_SPEC$path"
}
}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/ShowsActivityImpl.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/ShowsActivityImpl.kt
index 4520f96a7b..8fa2395518 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/ShowsActivityImpl.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/ShowsActivityImpl.kt
@@ -5,7 +5,6 @@ package com.battlelancer.seriesguide.shows
import android.content.Intent
import android.os.Bundle
-import android.view.KeyEvent
import android.view.View
import androidx.activity.viewModels
import androidx.lifecycle.ViewModelProvider
@@ -188,9 +187,9 @@ open class ShowsActivityImpl : BaseTopActivity() {
}
private fun setupViews() {
- // setup floating action button for adding shows
- val buttonAddShow = findViewById(R.id.buttonShowsAdd)
- buttonAddShow.setOnClickListener {
+ // setup floating action button
+ val floatingActionButton = findViewById(R.id.buttonShowsFloating)
+ floatingActionButton.setOnClickListener {
startActivity(ShowsDiscoverPagingActivity.intentSearch(this))
}
@@ -205,7 +204,7 @@ open class ShowsActivityImpl : BaseTopActivity() {
tabs.setOnPageChangeListener(
ShowsPageChangeListener(
findViewById(R.id.sgAppBarLayout),
- buttonAddShow,
+ floatingActionButton,
viewModel
)
)
@@ -326,11 +325,6 @@ open class ShowsActivityImpl : BaseTopActivity() {
ShowsSettings.saveLastShowsTabPosition(this, viewPager.currentItem)
}
- override fun onKeyLongPress(keyCode: Int, event: KeyEvent): Boolean {
- // prevent navigating to top activity as this is the top activity
- return keyCode == KeyEvent.KEYCODE_BACK
- }
-
override val snackbarParentView: View
get() = findViewById(R.id.coordinatorLayoutShows)
@@ -363,7 +357,6 @@ open class ShowsActivityImpl : BaseTopActivity() {
}
appBarLayout.liftOnScrollTargetViewId = liftOnScrollTarget
- // only display add show button on Shows tab
if (position == Tab.DISCOVER.index) {
floatingActionButton.show()
} else {
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/ShowsDistillationFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/ShowsDistillationFragment.kt
index 771deb5760..bad923775c 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/ShowsDistillationFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/ShowsDistillationFragment.kt
@@ -33,7 +33,6 @@ import com.google.android.material.tabs.TabLayout.OnTabSelectedListener
class ShowsDistillationFragment : AppCompatDialogFragment() {
private val model: ShowsDistillationViewModel by viewModels()
- private var binding: DialogShowsDistillationBinding? = null
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -178,11 +177,6 @@ class ShowsDistillationFragment : AppCompatDialogFragment() {
}
- override fun onDestroyView() {
- super.onDestroyView()
- binding = null
- }
-
companion object {
private const val TAG = "shows-distillation-dialog"
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/ShowsFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/ShowsFragment.kt
index 93c786619f..c09623edd8 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/ShowsFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/ShowsFragment.kt
@@ -20,8 +20,6 @@ import android.view.ViewGroup
import android.widget.Button
import androidx.activity.result.contract.ActivityResultContracts
import androidx.appcompat.widget.PopupMenu
-import androidx.core.app.ActivityCompat
-import androidx.core.app.ActivityOptionsCompat
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.lifecycle.Lifecycle
@@ -48,6 +46,7 @@ import com.battlelancer.seriesguide.ui.SearchActivity
import com.battlelancer.seriesguide.ui.menus.ManualSyncMenu
import com.battlelancer.seriesguide.ui.widgets.SgFastScroller
import com.battlelancer.seriesguide.util.ViewTools
+import com.battlelancer.seriesguide.util.startActivityWithAnimation
import com.google.android.material.snackbar.Snackbar
import com.uwetrottmann.androidutils.AndroidUtils
import kotlinx.coroutines.Job
@@ -254,13 +253,7 @@ class ShowsFragment : Fragment() {
override fun onItemClick(anchor: View, showRowId: Long) {
// display overview for this show
val intent = intentShow(requireContext(), showRowId)
- ActivityCompat.startActivity(
- requireContext(), intent,
- ActivityOptionsCompat.makeScaleUpAnimation(
- anchor, 0, 0, anchor.width,
- anchor.height
- ).toBundle()
- )
+ requireContext().startActivityWithAnimation(intent, anchor)
}
override fun onMoreOptionsClick(anchor: View, show: ShowItem) {
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/WatchProviderFilterView.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/WatchProviderFilterView.kt
index 5fb0fd2f55..dca96a2ca0 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/WatchProviderFilterView.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/WatchProviderFilterView.kt
@@ -4,6 +4,7 @@
package com.battlelancer.seriesguide.shows
import android.content.res.Configuration
+import androidx.annotation.StringRes
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
@@ -21,6 +22,7 @@ import androidx.compose.material3.Checkbox
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
+import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.PlainTooltip
import androidx.compose.material3.Surface
@@ -29,6 +31,7 @@ import androidx.compose.material3.TooltipBox
import androidx.compose.material3.TooltipDefaults
import androidx.compose.material3.rememberTooltipState
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
@@ -84,16 +87,25 @@ fun WatchProviderList(
}
HorizontalDivider()
Row {
+ // Disabling makes it easier to see if any of the shown provider filters is enabled,
+ // however, it prevents re-setting not shown providers. Which should not matter as
+ // only shown ones are considered for filtering (see
+ // SgWatchProviderHelper.filterLocalWatchProviders).
+ val isResetEnabled = watchProviders.find { it.filter_local } != null
Row(
modifier = Modifier
.weight(1f)
.clickable(
+ enabled = isResetEnabled,
role = Role.Button,
onClick = onProviderIncludeAny
)
.padding(16.dp)
) {
- Text(stringResource(id = R.string.action_reset))
+ TextWithDisabledState(
+ id = R.string.action_reset,
+ enabled = isResetEnabled
+ )
}
val descriptionStreamSettingsButton =
stringResource(id = R.string.action_stream_settings)
@@ -117,6 +129,23 @@ fun WatchProviderList(
}
}
+@Composable
+fun TextWithDisabledState(@StringRes id: Int, enabled: Boolean) {
+ // https://developer.android.com/develop/ui/compose/designsystems/material2-material3#emphasis-and
+ // https://developer.android.com/develop/ui/compose/designsystems/material3#emphasis
+ CompositionLocalProvider(
+ LocalContentColor.provides(
+ if (enabled) {
+ MaterialTheme.colorScheme.onSurface
+ } else {
+ MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f)
+ }
+ )
+ ) {
+ Text(stringResource(id = id))
+ }
+}
+
@Composable
fun WatchProviderFilterItem(
item: SgWatchProvider,
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/calendar/CalendarFragment2.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/calendar/CalendarFragment2.kt
index 11d5a25402..e59cde6fbf 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/calendar/CalendarFragment2.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/calendar/CalendarFragment2.kt
@@ -37,7 +37,7 @@ import com.battlelancer.seriesguide.ui.AutoGridLayoutManager
import com.battlelancer.seriesguide.ui.SearchActivity
import com.battlelancer.seriesguide.ui.menus.ManualSyncMenu
import com.battlelancer.seriesguide.ui.widgets.SgFastScroller
-import com.battlelancer.seriesguide.util.Utils
+import com.battlelancer.seriesguide.util.startActivityWithAnimation
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.conflate
@@ -231,7 +231,7 @@ abstract class CalendarFragment2 : Fragment() {
CalendarAdapter2.ItemClickListener {
override fun onItemClick(episodeId: Long) {
val intent = EpisodesActivity.intentEpisode(episodeId, requireContext())
- Utils.startActivityWithAnimation(activity, intent, view)
+ requireActivity().startActivityWithAnimation(intent, view!!)
}
override fun onMoreOptionsClick(anchor: View, episode: SgEpisode2WithShow) {
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/database/SgShow2.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/database/SgShow2.kt
index f39bda2695..49cf02860f 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/database/SgShow2.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/database/SgShow2.kt
@@ -49,8 +49,11 @@ import com.battlelancer.seriesguide.provider.SeriesGuideContract.SgShow2Columns.
import com.battlelancer.seriesguide.provider.SeriesGuideContract.SgShow2Columns.TRAKT_ID
import com.battlelancer.seriesguide.provider.SeriesGuideContract.SgShow2Columns.TVDB_ID
import com.battlelancer.seriesguide.provider.SeriesGuideContract.SgShow2Columns.UNWATCHED_COUNT
+import com.battlelancer.seriesguide.provider.SeriesGuideContract.SgShow2Columns.USER_NOTE
+import com.battlelancer.seriesguide.provider.SeriesGuideContract.SgShow2Columns.USER_NOTE_TRAKT_ID
import com.battlelancer.seriesguide.provider.SeriesGuideContract.SgShow2Columns._ID
import com.battlelancer.seriesguide.provider.SgRoomDatabase
+import com.battlelancer.seriesguide.shows.database.SgShow2.Companion.MAX_USER_NOTE_LENGTH
import com.battlelancer.seriesguide.shows.tools.NextEpisodeUpdater
import com.battlelancer.seriesguide.shows.tools.ShowStatus
import com.battlelancer.seriesguide.util.TimeTools
@@ -163,6 +166,22 @@ data class SgShow2(
@ColumnInfo(name = CUSTOM_RELEASE_TIME) var customReleaseTime: Int?,
@ColumnInfo(name = CUSTOM_RELEASE_DAY_OFFSET) var customReleaseDayOffset: Int?,
@ColumnInfo(name = CUSTOM_RELEASE_TIME_ZONE) var customReleaseTimeZone: String?,
+ /**
+ * A user editable text note for this show.
+ *
+ * Default `null`. Should be at most [MAX_USER_NOTE_LENGTH].
+ *
+ * Added with [SgRoomDatabase.VERSION_54_SHOW_NOTES].
+ */
+ @ColumnInfo(name = USER_NOTE) var userNote: String?,
+ /**
+ * Trakt ID for [userNote].
+ *
+ * Default `null`.
+ *
+ * Added with [SgRoomDatabase.VERSION_54_SHOW_NOTES].
+ */
+ @ColumnInfo(name = USER_NOTE_TRAKT_ID) val userNoteTraktId: Long?
) {
val releaseTimeOrDefault: Int
get() = releaseTime ?: -1
@@ -179,6 +198,12 @@ data class SgShow2(
val statusOrUnknown: Int
get() = status ?: ShowStatus.UNKNOWN
+ /**
+ * Maps blank or null to empty string.
+ */
+ val userNoteOrEmpty: String
+ get() = userNote?.ifBlank { "" } ?: ""
+
companion object {
/**
* Used if the number of remaining episodes to watch for a show is not (yet) known.
@@ -197,5 +222,11 @@ data class SgShow2(
* Maximum absolute (so positive or negative) value of the [customReleaseDayOffset].
*/
const val MAX_CUSTOM_DAY_OFFSET = 28
+
+ /**
+ * Max note length to support Trakt and Hexagon
+ * (Trakt supports up to 500 characters, Hexagon up to 2000).
+ */
+ const val MAX_USER_NOTE_LENGTH = 500
}
}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/database/SgShow2Helper.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/database/SgShow2Helper.kt
index bd03618c24..50ccebd596 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/database/SgShow2Helper.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/database/SgShow2Helper.kt
@@ -145,6 +145,24 @@ interface SgShow2Helper {
@Query("UPDATE sg_show SET series_tmdb_id = :tmdbId WHERE _id = :id")
fun updateTmdbId(id: Long, tmdbId: Int): Int
+ @Query("SELECT _id FROM sg_show WHERE series_user_note IS NOT NULL AND series_user_note != ''")
+ fun getShowIdsWithNotes(): MutableList
+
+ @Query("SELECT _id, series_tmdb_id, series_user_note, series_user_note_trakt_id FROM sg_show WHERE _id = :id")
+ fun getShowWithNote(id: Long): SgShow2WithNote?
+
+ @Query("UPDATE sg_show SET series_user_note = :note, series_user_note_trakt_id = :traktId WHERE _id = :id")
+ fun updateUserNote(id: Long, note: String, traktId: Long?)
+
+ data class NoteUpdate(val text: String, val traktId: Long?)
+
+ @Transaction
+ fun updateUserNotes(notesById: Map) {
+ for (entry in notesById) {
+ updateUserNote(entry.key, entry.value.text, entry.value.traktId)
+ }
+ }
+
@Query("DELETE FROM sg_show")
fun deleteAllShows()
@@ -163,10 +181,10 @@ interface SgShow2Helper {
@Query("UPDATE sg_show SET series_syncenabled = 1 WHERE _id = :id")
fun setHexagonMergeCompleted(id: Long)
- @Query("SELECT _id, series_tmdb_id, series_language, series_favorite, series_hidden, series_notify, series_custom_release_time, series_custom_day_offset, series_custom_timezone, series_lastupdate FROM sg_show WHERE _id = :id")
+ @Query("SELECT _id, series_tmdb_id, series_language, series_favorite, series_hidden, series_notify, series_custom_release_time, series_custom_day_offset, series_custom_timezone, series_lastupdate, series_user_note FROM sg_show WHERE _id = :id")
fun getForCloudUpdate(id: Long): SgShow2CloudUpdate?
- @Query("SELECT _id, series_tmdb_id, series_language, series_favorite, series_hidden, series_notify, series_custom_release_time, series_custom_day_offset, series_custom_timezone, series_lastupdate FROM sg_show")
+ @Query("SELECT _id, series_tmdb_id, series_language, series_favorite, series_hidden, series_notify, series_custom_release_time, series_custom_day_offset, series_custom_timezone, series_lastupdate, series_user_note FROM sg_show")
fun getForCloudUpdate(): List
@Update(entity = SgShow2::class)
@@ -365,7 +383,8 @@ data class SgShow2CloudUpdate(
@ColumnInfo(name = SgShow2Columns.CUSTOM_RELEASE_TIME) var customReleaseTime: Int?,
@ColumnInfo(name = SgShow2Columns.CUSTOM_RELEASE_DAY_OFFSET) var customReleaseDayOffset: Int?,
@ColumnInfo(name = SgShow2Columns.CUSTOM_RELEASE_TIME_ZONE) var customReleaseTimeZone: String?,
- @ColumnInfo(name = SgShow2Columns.LASTUPDATED) var lastUpdatedMs: Long
+ @ColumnInfo(name = SgShow2Columns.LASTUPDATED) var lastUpdatedMs: Long,
+ @ColumnInfo(name = SgShow2Columns.USER_NOTE) var userNote: String?,
)
data class ShowLastWatchedInfo(
@@ -373,3 +392,10 @@ data class ShowLastWatchedInfo(
val episodeSeason: Int,
val episodeNumber: Int
)
+
+data class SgShow2WithNote(
+ @ColumnInfo(name = SgShow2Columns._ID) val id: Long,
+ @ColumnInfo(name = SgShow2Columns.TMDB_ID) val tmdbId: Int?,
+ @ColumnInfo(name = SgShow2Columns.USER_NOTE) var userNote: String?,
+ @ColumnInfo(name = SgShow2Columns.USER_NOTE_TRAKT_ID) val userNoteTraktId: Long?
+)
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/episodes/EpisodeDetailsFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/episodes/EpisodeDetailsFragment.kt
index c90acb61c9..171f98b77f 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/episodes/EpisodeDetailsFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/episodes/EpisodeDetailsFragment.kt
@@ -52,7 +52,6 @@ import com.battlelancer.seriesguide.ui.BaseMessageActivity.ServiceActiveEvent
import com.battlelancer.seriesguide.ui.BaseMessageActivity.ServiceCompletedEvent
import com.battlelancer.seriesguide.ui.FullscreenImageActivity.Companion.intent
import com.battlelancer.seriesguide.util.ImageTools
-import com.battlelancer.seriesguide.util.ImageTools.tmdbOrTvdbStillUrl
import com.battlelancer.seriesguide.util.LanguageTools
import com.battlelancer.seriesguide.util.RatingsTools.initialize
import com.battlelancer.seriesguide.util.RatingsTools.setLink
@@ -66,6 +65,7 @@ import com.battlelancer.seriesguide.util.Utils
import com.battlelancer.seriesguide.util.ViewTools
import com.battlelancer.seriesguide.util.copyTextToClipboardOnLongClick
import com.battlelancer.seriesguide.util.safeShow
+import com.battlelancer.seriesguide.util.startActivityWithAnimation
import com.squareup.picasso.Callback
import com.squareup.picasso.Picasso
import kotlinx.coroutines.Job
@@ -448,13 +448,13 @@ class EpisodeDetailsFragment : Fragment(), EpisodeActionsContract {
// episode image
val imagePath = episode.image
- binding.containerImage.setOnClickListener { v: View? ->
+ binding.containerImage.setOnClickListener { v: View ->
val intent = intent(
requireContext(),
- tmdbOrTvdbStillUrl(imagePath, requireContext(), false),
- tmdbOrTvdbStillUrl(imagePath, requireContext(), true)
+ ImageTools.buildEpisodeImageUrl(imagePath, requireContext()),
+ ImageTools.buildEpisodeImageUrl(imagePath, requireContext(), originalSize = true)
)
- Utils.startActivityWithAnimation(requireActivity(), intent, v)
+ requireActivity().startActivityWithAnimation(intent, v)
}
loadImage(imagePath, hideDetails)
@@ -595,12 +595,12 @@ class EpisodeDetailsFragment : Fragment(), EpisodeActionsContract {
}
// Trakt comments
- bindingButtons.buttonEpisodeComments.setOnClickListener { v: View? ->
+ bindingButtons.buttonEpisodeComments.setOnClickListener { v: View ->
val episodeId = episodeId
if (episodeId > 0) {
val intent =
TraktCommentsActivity.intentEpisode(requireContext(), episodeTitle, episodeId)
- Utils.startActivityWithAnimation(requireActivity(), intent, v)
+ requireActivity().startActivityWithAnimation(intent, v)
}
}
}
@@ -685,7 +685,7 @@ class EpisodeDetailsFragment : Fragment(), EpisodeActionsContract {
binding.containerImage.visibility = View.VISIBLE
ImageTools.loadWithPicasso(
requireContext(),
- tmdbOrTvdbStillUrl(imagePath, requireContext(), false)
+ ImageTools.buildEpisodeImageUrl(imagePath, requireContext())
)
.error(R.drawable.ic_photo_gray_24dp)
.into(
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/episodes/EpisodesFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/episodes/EpisodesFragment.kt
index 01ec71a92b..1a84a182d0 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/episodes/EpisodesFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/episodes/EpisodesFragment.kt
@@ -318,7 +318,7 @@ class EpisodesFragment : Fragment() {
R.array.epsortingData,
EpisodesSettings.getEpisodeSortOrder(requireActivity()).index(),
EpisodesSettings.KEY_EPISODE_SORT_ORDER,
- R.string.pref_episodesorting,
+ R.string.sort,
"episodeSortOrderDialog"
)
}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/history/ShowsHistoryFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/history/ShowsHistoryFragment.kt
index 0a0cce89a4..5f4e967488 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/history/ShowsHistoryFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/history/ShowsHistoryFragment.kt
@@ -12,8 +12,6 @@ import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
import android.view.animation.AnimationUtils
-import androidx.core.app.ActivityCompat
-import androidx.core.app.ActivityOptionsCompat
import androidx.core.view.MenuProvider
import androidx.fragment.app.Fragment
import androidx.lifecycle.Lifecycle
@@ -36,6 +34,7 @@ import com.battlelancer.seriesguide.traktapi.TraktCredentials
import com.battlelancer.seriesguide.ui.BaseMessageActivity.ServiceCompletedEvent
import com.battlelancer.seriesguide.ui.SearchActivity
import com.battlelancer.seriesguide.util.ViewTools
+import com.battlelancer.seriesguide.util.startActivityWithAnimation
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import org.greenrobot.eventbus.EventBus
@@ -266,13 +265,7 @@ class ShowsHistoryFragment : Fragment() {
*/
private fun showDetails(view: View, episodeId: Long) {
val intent = EpisodesActivity.intentEpisode(episodeId, requireContext())
-
- ActivityCompat.startActivity(
- requireContext(), intent,
- ActivityOptionsCompat
- .makeScaleUpAnimation(view, 0, 0, view.width, view.height)
- .toBundle()
- )
+ requireContext().startActivityWithAnimation(intent, view)
}
private fun showError(errorText: String?) {
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/overview/EditNoteDialog.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/overview/EditNoteDialog.kt
new file mode 100644
index 0000000000..ce5a93e6f9
--- /dev/null
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/overview/EditNoteDialog.kt
@@ -0,0 +1,123 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2024 Uwe Trottmann
+
+package com.battlelancer.seriesguide.shows.overview
+
+import android.app.Dialog
+import android.os.Bundle
+import android.text.Editable
+import androidx.appcompat.app.AppCompatDialogFragment
+import androidx.core.os.bundleOf
+import androidx.core.widget.doAfterTextChanged
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.battlelancer.seriesguide.R
+import com.battlelancer.seriesguide.databinding.DialogEditNoteBinding
+import com.battlelancer.seriesguide.shows.database.SgShow2
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+/**
+ * Edits a note of a show, enforcing a maximum length, allows to save or discard changes.
+ */
+class EditNoteDialog() : AppCompatDialogFragment() {
+
+ constructor(showId: Long) : this() {
+ arguments = bundleOf(
+ ARG_SHOW_ID to showId
+ )
+ }
+
+ private var binding: DialogEditNoteBinding? = null
+ private val model: EditNoteDialogViewModel by viewModels(
+ extrasProducer = {
+ EditNoteDialogViewModel.creationExtras(
+ defaultViewModelCreationExtras,
+ requireArguments().getLong(ARG_SHOW_ID)
+ )
+ },
+ factoryProducer = { EditNoteDialogViewModel.Factory }
+ )
+
+ override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+ val binding = DialogEditNoteBinding.inflate(layoutInflater)
+ .also { this.binding = it }
+
+ // Text field
+ binding.textFieldEditNote.counterMaxLength = SgShow2.MAX_USER_NOTE_LENGTH
+ val editText = binding.textFieldEditNote.editText!!
+ // Disable save button if text is too long to save
+ editText.doAfterTextChanged { text ->
+ setSaveEnabled(model.uiState.value.isEditingEnabled, text.textHasNoError())
+ }
+
+ // Buttons
+ // Can not use dialog buttons as they dismiss the dialog right away,
+ // but need to keep it visible if saving fails.
+ binding.buttonPositive.apply {
+ setText(R.string.action_save)
+ setOnClickListener {
+ model.updateNote(editText.text?.toString())
+ model.saveNote()
+ }
+ }
+ binding.buttonNegative.apply {
+ setText(android.R.string.cancel)
+ setOnClickListener { dismiss() }
+ }
+
+ // UI state
+ lifecycleScope.launch {
+ repeatOnLifecycle(Lifecycle.State.STARTED) {
+ model.uiState.collect { state ->
+ Timber.d("Display note")
+ editText.setText(state.noteText)
+ setViewsEnabled(state.isEditingEnabled, editText.text.textHasNoError())
+ if (state.isNoteSaved) {
+ dismiss()
+ }
+ }
+ }
+ }
+
+ return MaterialAlertDialogBuilder(requireContext())
+ .setTitle(R.string.action_edit_note)
+ .setView(binding.root)
+ .create()
+ }
+
+ private fun setViewsEnabled(isEditingEnabled: Boolean, hasNoError: Boolean) {
+ binding?.apply {
+ textFieldEditNote.isEnabled = isEditingEnabled
+ setSaveEnabled(isEditingEnabled, hasNoError)
+ }
+ }
+
+ private fun Editable?.textHasNoError(): Boolean {
+ val textLength = this?.length ?: 0
+ return textLength <= SgShow2.MAX_USER_NOTE_LENGTH
+ }
+
+ private fun setSaveEnabled(isEditingEnabled: Boolean, hasNoError: Boolean) {
+ binding?.buttonPositive?.isEnabled = isEditingEnabled && hasNoError
+ }
+
+ override fun onPause() {
+ super.onPause()
+ // Note: can not update using TextWatcher due to infinite loop
+ model.updateNote(binding?.textFieldEditNote?.editText?.text?.toString())
+ }
+
+ override fun onDestroyView() {
+ super.onDestroyView()
+ binding = null
+ }
+
+ companion object {
+ private const val ARG_SHOW_ID = "showId"
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/overview/EditNoteDialogViewModel.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/overview/EditNoteDialogViewModel.kt
new file mode 100644
index 0000000000..4aa07d306d
--- /dev/null
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/overview/EditNoteDialogViewModel.kt
@@ -0,0 +1,107 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2024 Uwe Trottmann
+
+package com.battlelancer.seriesguide.shows.overview
+
+import android.app.Application
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory.Companion.APPLICATION_KEY
+import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.viewmodel.CreationExtras
+import androidx.lifecycle.viewmodel.MutableCreationExtras
+import androidx.lifecycle.viewmodel.initializer
+import androidx.lifecycle.viewmodel.viewModelFactory
+import com.battlelancer.seriesguide.SgApp
+import com.battlelancer.seriesguide.provider.SgRoomDatabase
+import com.battlelancer.seriesguide.shows.tools.ShowTools2
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+
+class EditNoteDialogViewModel(application: Application, private val showId: Long) :
+ AndroidViewModel(application) {
+
+ data class EditNoteDialogUiState(
+ val noteText: String = "",
+ val noteTraktId: Long? = null,
+ val isEditingEnabled: Boolean = false,
+ val isNoteSaved: Boolean = false
+ )
+
+ val uiState = MutableStateFlow(EditNoteDialogUiState())
+
+ init {
+ viewModelScope.launch(Dispatchers.IO) {
+ val show = SgRoomDatabase.getInstance(application)
+ .sgShow2Helper()
+ .getShow(showId)
+ if (show != null) {
+ uiState.update {
+ it.copy(
+ noteText = show.userNoteOrEmpty,
+ noteTraktId = show.userNoteTraktId,
+ isEditingEnabled = true
+ )
+ }
+ }
+ }
+ }
+
+ fun updateNote(text: String?) {
+ uiState.update {
+ it.copy(noteText = text ?: "")
+ }
+ }
+
+ /**
+ * Tries to save the note, see [ShowTools2.storeUserNote].
+ *
+ * Updates UI state depending on success.
+ */
+ fun saveNote() {
+ uiState.update {
+ it.copy(isEditingEnabled = false)
+ }
+ val noteDraft = uiState.value.noteText
+ val noteTraktId = uiState.value.noteTraktId
+ viewModelScope.launch {
+ val result = SgApp.getServicesComponent(getApplication()).showTools()
+ .storeUserNote(showId, noteDraft, noteTraktId)
+ uiState.update {
+ if (result != null) {
+ it.copy(
+ noteText = result.text,
+ noteTraktId = result.traktId,
+ isEditingEnabled = true,
+ isNoteSaved = true
+ )
+ } else {
+ // Failed, re-enable buttons
+ it.copy(
+ isEditingEnabled = true
+ )
+ }
+ }
+ }
+ }
+
+ companion object {
+
+ private val KEY_SHOW_ID = object : CreationExtras.Key {}
+
+ val Factory = viewModelFactory {
+ initializer {
+ val application = this[APPLICATION_KEY]!!
+ val showId = this[KEY_SHOW_ID]!!
+ EditNoteDialogViewModel(application, showId)
+ }
+ }
+
+ fun creationExtras(defaultExtras: CreationExtras, showId: Long) =
+ MutableCreationExtras(defaultExtras).apply {
+ set(KEY_SHOW_ID, showId)
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/overview/OverviewFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/overview/OverviewFragment.kt
index 91245b6a6e..361582d073 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/overview/OverviewFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/overview/OverviewFragment.kt
@@ -60,7 +60,6 @@ import com.battlelancer.seriesguide.traktapi.TraktTools
import com.battlelancer.seriesguide.ui.BaseMessageActivity.ServiceActiveEvent
import com.battlelancer.seriesguide.ui.BaseMessageActivity.ServiceCompletedEvent
import com.battlelancer.seriesguide.util.ImageTools
-import com.battlelancer.seriesguide.util.ImageTools.tmdbOrTvdbStillUrl
import com.battlelancer.seriesguide.util.LanguageTools
import com.battlelancer.seriesguide.util.RatingsTools.initialize
import com.battlelancer.seriesguide.util.RatingsTools.setLink
@@ -75,6 +74,7 @@ import com.battlelancer.seriesguide.util.ViewTools
import com.battlelancer.seriesguide.util.WebTools
import com.battlelancer.seriesguide.util.copyTextToClipboardOnLongClick
import com.battlelancer.seriesguide.util.safeShow
+import com.battlelancer.seriesguide.util.startActivityWithAnimation
import com.squareup.picasso.Callback
import com.squareup.picasso.Picasso
import kotlinx.coroutines.Job
@@ -82,6 +82,7 @@ import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
import timber.log.Timber
+import java.text.NumberFormat
/**
* Displays general information about a show and, if there is one, the next episode to watch.
@@ -146,11 +147,11 @@ class OverviewFragment() : Fragment(), EpisodeActionsContract {
}
buttonOverviewFavoriteShow.setOnClickListener { onButtonFavoriteClick() }
- containerOverviewEpisodeCard.setOnClickListener { v: View? ->
+ containerOverviewEpisodeCard.setOnClickListener { v: View ->
runIfHasEpisode { episode ->
// display episode details
val intent = EpisodesActivity.intentEpisode(episode.id, requireContext())
- Utils.startActivityWithAnimation(activity, intent, v)
+ requireActivity().startActivityWithAnimation(intent, v)
}
}
@@ -341,10 +342,10 @@ class OverviewFragment() : Fragment(), EpisodeActionsContract {
}
}
- private fun onButtonCommentsClick(v: View?) {
+ private fun onButtonCommentsClick(v: View) {
runIfHasEpisode { episode ->
val i = TraktCommentsActivity.intentEpisode(requireContext(), episode.title, episode.id)
- Utils.startActivityWithAnimation(activity, i, v)
+ requireActivity().startActivityWithAnimation(i, v)
}
}
@@ -470,7 +471,9 @@ class OverviewFragment() : Fragment(), EpisodeActionsContract {
val episodeAbsoluteNumber = episode.absoluteNumber
if (episodeAbsoluteNumber != null
&& episodeAbsoluteNumber > 0 && episodeAbsoluteNumber != number) {
- infoText.append(" (").append(episodeAbsoluteNumber).append(")")
+ infoText.append(" (")
+ .append(NumberFormat.getIntegerInstance().format(episodeAbsoluteNumber.toLong()))
+ .append(")")
}
// release date
@@ -624,7 +627,11 @@ class OverviewFragment() : Fragment(), EpisodeActionsContract {
)
}
- private fun loadEpisodeImage(imageView: ImageView, detailsHiddenView: View, imagePath: String?) {
+ private fun loadEpisodeImage(
+ imageView: ImageView,
+ detailsHiddenView: View,
+ imagePath: String?
+ ) {
if (imagePath.isNullOrEmpty()) {
imageView.setImageDrawable(null)
detailsHiddenView.isGone = true
@@ -643,7 +650,7 @@ class OverviewFragment() : Fragment(), EpisodeActionsContract {
// Try loading image
ImageTools.loadWithPicasso(
requireContext(),
- tmdbOrTvdbStillUrl(imagePath, requireContext(), false)
+ ImageTools.buildEpisodeImageUrl(imagePath, requireContext())
)
.error(R.drawable.ic_photo_gray_24dp)
.into(imageView,
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/overview/SeasonsFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/overview/SeasonsFragment.kt
index 055bf76ea2..c7507e4123 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/overview/SeasonsFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/overview/SeasonsFragment.kt
@@ -13,8 +13,6 @@ import android.view.View
import android.view.ViewGroup
import androidx.appcompat.widget.PopupMenu
import androidx.appcompat.widget.TooltipCompat
-import androidx.core.app.ActivityCompat
-import androidx.core.app.ActivityOptionsCompat
import androidx.core.os.bundleOf
import androidx.core.view.MenuProvider
import androidx.fragment.app.Fragment
@@ -32,6 +30,7 @@ import com.battlelancer.seriesguide.shows.episodes.EpisodesActivity
import com.battlelancer.seriesguide.ui.BaseMessageActivity
import com.battlelancer.seriesguide.ui.dialogs.SingleChoiceDialogFragment
import com.battlelancer.seriesguide.util.ThemeUtils
+import com.battlelancer.seriesguide.util.startActivityWithAnimation
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.launch
import org.greenrobot.eventbus.EventBus
@@ -167,12 +166,7 @@ class SeasonsFragment() : Fragment() {
private val listOnItemClickListener = object : SeasonsAdapter.ItemClickListener {
override fun onItemClick(v: View, seasonRowId: Long) {
val intent = EpisodesActivity.intentSeason(seasonRowId, requireActivity())
- ActivityCompat.startActivity(
- requireActivity(), intent,
- ActivityOptionsCompat
- .makeScaleUpAnimation(v, 0, 0, v.width, v.height)
- .toBundle()
- )
+ requireActivity().startActivityWithAnimation(intent, v)
}
override fun onMoreOptionsClick(v: View, seasonRowId: Long) {
@@ -383,7 +377,7 @@ class SeasonsFragment() : Fragment() {
parentFragmentManager,
R.array.sesorting,
R.array.sesortingData, sortOrder.index,
- SeasonsSettings.KEY_SEASON_SORT_ORDER, R.string.pref_seasonsorting,
+ SeasonsSettings.KEY_SEASON_SORT_ORDER, R.string.sort,
"seasonSortOrderDialog"
)
}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/overview/ShowFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/overview/ShowFragment.kt
index b9fa5879c3..30a9433908 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/overview/ShowFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/overview/ShowFragment.kt
@@ -17,6 +17,7 @@ import android.widget.TextView
import androidx.activity.result.contract.ActivityResultContracts
import androidx.appcompat.widget.TooltipCompat
import androidx.core.os.bundleOf
+import androidx.core.view.isGone
import androidx.core.widget.NestedScrollView
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
@@ -51,6 +52,7 @@ import com.battlelancer.seriesguide.util.Utils
import com.battlelancer.seriesguide.util.ViewTools
import com.battlelancer.seriesguide.util.copyTextToClipboardOnLongClick
import com.battlelancer.seriesguide.util.safeShow
+import com.battlelancer.seriesguide.util.startActivityWithAnimation
import com.google.android.material.button.MaterialButton
import com.google.android.material.snackbar.Snackbar
import com.uwetrottmann.androidutils.AndroidUtils
@@ -111,6 +113,8 @@ class ShowFragment() : Fragment() {
val buttonWebSearch: Button
val buttonComments: Button
val buttonShare: Button
+ val buttonEditNote: Button
+ val textViewNote: TextView
val castLabel: TextView
val castContainer: LinearLayout
val crewLabel: TextView
@@ -147,6 +151,8 @@ class ShowFragment() : Fragment() {
buttonWebSearch = view.findViewById(R.id.buttonShowWebSearch)
buttonComments = view.findViewById(R.id.buttonShowComments)
buttonShare = view.findViewById(R.id.buttonShowShare)
+ buttonEditNote = view.findViewById(R.id.buttonShowNote)
+ textViewNote = view.findViewById(R.id.textViewShowNote)
castLabel = view.findViewById(R.id.labelCast)
castContainer = view.findViewById(R.id.containerCast)
crewLabel = view.findViewById(R.id.labelCrew)
@@ -184,6 +190,11 @@ class ShowFragment() : Fragment() {
}
}
+ // Edit note button
+ binding.buttonEditNote.setOnClickListener {
+ EditNoteDialog(showId).safeShow(parentFragmentManager, "edit-note")
+ }
+
// language button
val buttonLanguage = binding.buttonLanguage
buttonLanguage.setOnClickListener { displayLanguageSettings() }
@@ -382,6 +393,12 @@ class ShowFragment() : Fragment() {
}
}
+ // note
+ binding.textViewNote.apply {
+ text = showForUi.userNote
+ isGone = showForUi.userNote.isEmpty()
+ }
+
// overview
// Source text requires styling, so needs UI context
binding.textViewOverview.text =
@@ -461,7 +478,7 @@ class ShowFragment() : Fragment() {
val showId = showId
if (showId > 0) {
val i = TraktCommentsActivity.intentShow(requireContext(), show.title, showId)
- Utils.startActivityWithAnimation(activity, i, v)
+ requireActivity().startActivityWithAnimation(i, v)
}
}
@@ -485,7 +502,7 @@ class ShowFragment() : Fragment() {
originalSize = true
)
)
- Utils.startActivityWithAnimation(activity, intent, v)
+ requireActivity().startActivityWithAnimation(intent, v)
}
}
}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/overview/ShowViewModel.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/overview/ShowViewModel.kt
index 7f9e4f168d..fbe6fe27cd 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/overview/ShowViewModel.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/overview/ShowViewModel.kt
@@ -38,6 +38,7 @@ class ShowViewModel(application: Application) : AndroidViewModel(application) {
val show: SgShow2,
val releaseTime: String?,
val baseInfo: String,
+ val userNote: String,
val overview: String?,
val languageData: LanguageTools.LanguageData?,
val country: String,
@@ -97,6 +98,7 @@ class ShowViewModel(application: Application) : AndroidViewModel(application) {
show,
timeOrNull,
baseInfo,
+ show.userNoteOrEmpty,
overview,
languageData,
country,
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/search/EpisodeSearchFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/search/EpisodeSearchFragment.kt
index 36f5d43011..f6f53cfb4b 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/search/EpisodeSearchFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/search/EpisodeSearchFragment.kt
@@ -15,7 +15,7 @@ import com.battlelancer.seriesguide.databinding.FragmentSearchBinding
import com.battlelancer.seriesguide.shows.episodes.EpisodesActivity
import com.battlelancer.seriesguide.shows.search.EpisodeSearchFragment.Companion.ARG_SHOW_TITLE
import com.battlelancer.seriesguide.util.TabClickEvent
-import com.battlelancer.seriesguide.util.Utils
+import com.battlelancer.seriesguide.util.startActivityWithAnimation
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -96,7 +96,7 @@ class EpisodeSearchFragment : BaseSearchFragment() {
private val onItemClickListener = object : EpisodeSearchAdapter.OnItemClickListener {
override fun onItemClick(anchor: View, episodeId: Long) {
EpisodesActivity.intentEpisode(episodeId, requireContext())
- .also { Utils.startActivityWithAnimation(activity, it, anchor) }
+ .also { requireActivity().startActivityWithAnimation(it, anchor) }
}
}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/search/ShowSearchFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/search/ShowSearchFragment.kt
index 39bd6841e1..bc6ba03e1a 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/search/ShowSearchFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/search/ShowSearchFragment.kt
@@ -13,8 +13,6 @@ import android.view.View
import android.view.ViewGroup
import android.widget.GridView
import androidx.appcompat.widget.PopupMenu
-import androidx.core.app.ActivityCompat
-import androidx.core.app.ActivityOptionsCompat
import androidx.core.view.MenuProvider
import androidx.fragment.app.viewModels
import androidx.lifecycle.Lifecycle
@@ -27,6 +25,7 @@ import com.battlelancer.seriesguide.shows.search.discover.ShowsDiscoverPagingAct
import com.battlelancer.seriesguide.ui.OverviewActivity
import com.battlelancer.seriesguide.ui.widgets.EmptyView
import com.battlelancer.seriesguide.util.TabClickEvent
+import com.battlelancer.seriesguide.util.startActivityWithAnimation
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -132,13 +131,7 @@ class ShowSearchFragment : BaseSearchFragment() {
override fun onItemClick(anchor: View, showId: Long) {
OverviewActivity.intentShow(requireContext(), showId).let {
- ActivityCompat.startActivity(
- requireActivity(), it,
- ActivityOptionsCompat.makeScaleUpAnimation(
- anchor, 0, 0,
- anchor.width, anchor.height
- ).toBundle()
- )
+ requireActivity().startActivityWithAnimation(it, anchor)
}
}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/ShowsDiscoverAdapter.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/ShowsDiscoverAdapter.kt
index e30ba89d40..bbc112f8b1 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/ShowsDiscoverAdapter.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/ShowsDiscoverAdapter.kt
@@ -215,7 +215,7 @@ class ShowsDiscoverAdapter(
}
binding.buttonDiscoverHeader.apply {
setIconResource(R.drawable.ic_filter_white_24dp)
- contentDescription = context.getString(R.string.action_shows_filter)
+ contentDescription = context.getString(R.string.action_filter)
TooltipCompat.setTooltipText(this, contentDescription)
setOnClickListener { view ->
itemClickListener.onHeaderButtonClick(view)
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/ShowsDiscoverFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/ShowsDiscoverFragment.kt
index d5b04fb11c..bd7827f227 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/ShowsDiscoverFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/ShowsDiscoverFragment.kt
@@ -28,10 +28,10 @@ import com.battlelancer.seriesguide.traktapi.TraktCredentials
import com.battlelancer.seriesguide.ui.dialogs.L10nDialogFragment
import com.battlelancer.seriesguide.ui.dialogs.LanguagePickerDialogFragment
import com.battlelancer.seriesguide.ui.dialogs.YearPickerDialogFragment
-import com.battlelancer.seriesguide.util.Utils
import com.battlelancer.seriesguide.util.ViewTools
import com.battlelancer.seriesguide.util.findDialog
import com.battlelancer.seriesguide.util.safeShow
+import com.battlelancer.seriesguide.util.startActivityWithAnimation
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.launch
import org.greenrobot.eventbus.Subscribe
@@ -137,7 +137,7 @@ class ShowsDiscoverFragment : BaseAddShowsFragment() {
}
}
- Utils.startActivityWithAnimation(activity, intent, anchor)
+ requireActivity().startActivityWithAnimation(intent, anchor)
}
override fun onHeaderButtonClick(anchor: View) {
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/tools/AddUpdateShowTools.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/tools/AddUpdateShowTools.kt
index 005a38f82a..777af61612 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/tools/AddUpdateShowTools.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/tools/AddUpdateShowTools.kt
@@ -131,6 +131,9 @@ class AddUpdateShowTools @Inject constructor(
if (hexagonShow.customReleaseTimeZone != null) {
show.customReleaseTimeZone = hexagonShow.customReleaseTimeZone
}
+ if (hexagonShow.note != null) {
+ show.userNote = hexagonShow.note
+ }
}
}
@@ -679,6 +682,7 @@ class AddUpdateShowTools @Inject constructor(
it.customReleaseTime = show.customReleaseTime
it.customReleaseDayOffset = show.customReleaseDayOffset
it.customReleaseTimeZone = show.customReleaseTimeZone
+ it.note = show.userNote
it.isRemoved = false
}))
if (!uploadSuccess) return@andThen Err(UpdateResult.ApiErrorStop(HEXAGON))
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/tools/GetShowTools.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/tools/GetShowTools.kt
index f6ae38cccd..4ce0b6d80a 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/tools/GetShowTools.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/tools/GetShowTools.kt
@@ -205,7 +205,9 @@ class GetShowTools @Inject constructor(
posterSmall = poster,
// set desired language, might not be the content language if fallback used above.
language = desiredLanguage,
- lastUpdatedMs = System.currentTimeMillis() // now
+ lastUpdatedMs = System.currentTimeMillis(), // now
+ userNote = null, // If at all, added later via Hexagon or Trakt (VIP only)
+ userNoteTraktId = null // If at all, added later via Trakt
),
seasons = tmdbSeasons
)
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/tools/ShowTools2.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/tools/ShowTools2.kt
index 37b2d0f205..2614125f96 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/tools/ShowTools2.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/tools/ShowTools2.kt
@@ -15,7 +15,13 @@ import com.battlelancer.seriesguide.notifications.NotificationService
import com.battlelancer.seriesguide.provider.SeriesGuideContract
import com.battlelancer.seriesguide.provider.SeriesGuideDatabase
import com.battlelancer.seriesguide.provider.SgRoomDatabase
+import com.battlelancer.seriesguide.shows.database.SgShow2
import com.battlelancer.seriesguide.sync.HexagonShowSync
+import com.battlelancer.seriesguide.traktapi.TraktCredentials
+import com.battlelancer.seriesguide.traktapi.TraktTools2
+import com.battlelancer.seriesguide.traktapi.TraktTools2.TraktErrorResponse
+import com.battlelancer.seriesguide.traktapi.TraktTools2.TraktNonNullResponse
+import com.battlelancer.seriesguide.traktapi.TraktTools2.TraktResponse
import com.uwetrottmann.androidutils.AndroidUtils
import com.uwetrottmann.seriesguide.backend.shows.model.SgCloudShow
import dagger.Lazy
@@ -23,6 +29,7 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.greenrobot.eventbus.EventBus
+import timber.log.Timber
import javax.inject.Inject
import kotlin.collections.set
import com.battlelancer.seriesguide.enums.Result as SgResult
@@ -451,6 +458,131 @@ class ShowTools2 @Inject constructor(
notifyAboutSyncing()
}
+ data class StoreUserNoteResult(val text: String, val traktId: Long?)
+
+ /**
+ * Uploads to Hexagon and Trakt and on success saves to local database,
+ * on failure returns `null`.
+ *
+ * Fails if [noteDraft] exceeds [SgShow2.MAX_USER_NOTE_LENGTH] characters.
+ *
+ * A blank string is treated as an empty string.
+ *
+ * If the final string is empty, an existing note will be deleted at Trakt.
+ *
+ * Returns the stored text (as Trakt may modify it) and optional assigned Trakt ID.
+ */
+ suspend fun storeUserNote(
+ showId: Long,
+ noteDraft: String,
+ noteTraktId: Long?
+ ): StoreUserNoteResult? {
+ val noteText = noteDraft
+ .ifBlank { "" } // Avoid storing useless data, but also Trakt does not allow a blank text
+
+ // Fail if string is too long
+ if (noteText.length > SgShow2.MAX_USER_NOTE_LENGTH) return null
+
+ // Send to Cloud first, Trakt may fail if user is not VIP
+ val isSendToCloudSuccess: Boolean = if (HexagonSettings.isEnabled(context)) {
+ withContext(Dispatchers.Default) {
+ if (isNotConnected(context)) {
+ return@withContext false
+ }
+
+ val showTmdbId = withContext(Dispatchers.IO) {
+ SgRoomDatabase.getInstance(context).sgShow2Helper().getShowTmdbId(showId)
+ }
+ if (showTmdbId == 0) return@withContext false
+
+ val show = SgCloudShow()
+ show.tmdbId = showTmdbId
+ // Must be empty to remove, Cloud ignores null values
+ show.note = noteText
+ return@withContext uploadShowToCloud(show)
+ }
+ } else {
+ true // Not sending to Cloud
+ }
+
+ // If sending to Cloud failed, do not even try Trakt or save to database
+ if (!isSendToCloudSuccess) return null
+
+ var result: StoreUserNoteResult? = StoreUserNoteResult(text = noteText, traktId = null)
+
+ val sendToTrakt = TraktCredentials.get(context).hasCredentials()
+ if (sendToTrakt) {
+ result = withContext(Dispatchers.Default) {
+ if (isNotConnected(context)) {
+ return@withContext null
+ }
+
+ val showTmdbId = withContext(Dispatchers.IO) {
+ SgRoomDatabase.getInstance(context).sgShow2Helper().getShowTmdbId(showId)
+ }
+ if (showTmdbId == 0) return@withContext null
+
+ val trakt = SgApp.getServicesComponent(context).trakt()
+ if (noteText.isEmpty()) {
+ // Delete note
+ if (noteTraktId == null) return@withContext null
+ val response = TraktTools2.deleteNote(trakt, noteTraktId)
+ return@withContext when (response) {
+ is TraktResponse.Success -> {
+ StoreUserNoteResult("", null) // Remove text and Trakt ID
+ }
+
+ is TraktErrorResponse.IsUnauthorized -> {
+ TraktCredentials.get(context).setCredentialsInvalid()
+ null // Abort
+ }
+
+ is TraktErrorResponse.IsNotVip -> {
+ Timber.d("storeUserNote: user is not Trakt VIP, can not delete at Trakt")
+ result // Store as is
+ }
+
+ is TraktErrorResponse.Other -> null // Abort
+ }
+ } else {
+ // Add or update note
+ val response = TraktTools2.saveNoteForShow(trakt.notes(), showTmdbId, noteText)
+ return@withContext when (response) {
+ is TraktNonNullResponse.Success -> {
+ // Store ID and note text from Trakt
+ // (which may shorten or otherwise modify it).
+ val storedText = response.data.notes ?: ""
+ StoreUserNoteResult(storedText, response.data.id)
+ }
+
+ is TraktErrorResponse.IsUnauthorized -> {
+ TraktCredentials.get(context).setCredentialsInvalid()
+ null
+ }
+
+ is TraktErrorResponse.IsNotVip -> {
+ Timber.d("storeUserNote: user is not Trakt VIP, can not upload to Trakt")
+ result // Store as is
+ }
+
+ is TraktErrorResponse.Other -> null // Abort
+ }
+ }
+ }
+ }
+
+ // Do not save to local database if sending to Trakt has failed,
+ // but not if user is just not VIP.
+ if (result == null) return null
+
+ // Save to local database
+ withContext(Dispatchers.IO) {
+ SgRoomDatabase.getInstance(context).sgShow2Helper()
+ .updateUserNote(showId, result.text, result.traktId)
+ }
+ return result
+ }
+
private suspend fun notifyAboutSyncing() {
withContext(Dispatchers.Main) {
// show immediate feedback, also if offline and sync won't go through
@@ -475,6 +607,9 @@ class ShowTools2 @Inject constructor(
return !isConnected
}
+ /**
+ * Calls [HexagonShowSync.upload].
+ */
private suspend fun uploadShowToCloud(show: SgCloudShow): Boolean {
return hexagonShowSync.get().upload(show)
}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/streaming/SgWatchProviderHelper.kt b/app/src/main/java/com/battlelancer/seriesguide/streaming/SgWatchProviderHelper.kt
index 4f13d18519..231f458d6c 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/streaming/SgWatchProviderHelper.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/streaming/SgWatchProviderHelper.kt
@@ -55,8 +55,8 @@ interface SgWatchProviderHelper {
@Query("SELECT sg_watch_provider.* FROM sg_watch_provider JOIN sg_watch_provider_show_mappings ON sg_watch_provider.provider_id=sg_watch_provider_show_mappings.provider_id WHERE type=:type GROUP BY _id ORDER BY provider_name COLLATE UNICODE ASC")
fun usedWatchProvidersFlow(type: Int): Flow>
- /* Note: never just get those with filter_local=1 as once a show does not longer use a provider
- it is not longer shown in the filter UI, so it can not be disabled. */
+ /* Note: never just get those with filter_local=1 as once a show does no longer use a provider
+ it is no longer shown in the filter UI, so it can not be disabled. */
@Query("SELECT sg_watch_provider.* FROM sg_watch_provider JOIN sg_watch_provider_show_mappings ON sg_watch_provider.provider_id=sg_watch_provider_show_mappings.provider_id WHERE type=:type AND filter_local=1 GROUP BY _id")
fun filterLocalWatchProviders(type: Int): Flow>
diff --git a/app/src/main/java/com/battlelancer/seriesguide/streaming/WatchProviderFilterDialogFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/streaming/WatchProviderFilterDialogFragment.kt
index 988d0156fa..0299f0b42c 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/streaming/WatchProviderFilterDialogFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/streaming/WatchProviderFilterDialogFragment.kt
@@ -49,12 +49,6 @@ class WatchProviderFilterDialogFragment : AppCompatDialogFragment() {
val binding = DialogWatchProviderFilterBinding.inflate(layoutInflater)
.also { binding = it }
- val titleRes = when (type) {
- Type.SHOWS -> R.string.action_shows_filter
- Type.MOVIES -> R.string.action_movies_filter
- }
- binding.textViewTitle.setText(titleRes)
-
// watch region button
binding.buttonWatchRegion.apply {
text = StreamingSearch.getCurrentRegionOrSelectString(requireContext())
@@ -80,6 +74,7 @@ class WatchProviderFilterDialogFragment : AppCompatDialogFragment() {
}
return MaterialAlertDialogBuilder(requireContext())
+ .setTitle(R.string.action_stream)
.setView(binding.root)
.setPositiveButton(R.string.dismiss, null)
.setNegativeButton(R.string.action_reset) { _, _ ->
diff --git a/app/src/main/java/com/battlelancer/seriesguide/sync/HexagonShowSync.kt b/app/src/main/java/com/battlelancer/seriesguide/sync/HexagonShowSync.kt
index fcf97891cd..ef29d26ce9 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/sync/HexagonShowSync.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/sync/HexagonShowSync.kt
@@ -135,7 +135,7 @@ class HexagonShowSync @Inject constructor(
logAndReportHexagon("get shows", e)
return false
}
- if (shows == null || shows.isEmpty()) {
+ if (shows.isNullOrEmpty()) {
// nothing to do here
break
}
@@ -324,6 +324,14 @@ class HexagonShowSync @Inject constructor(
hasUpdates = true
}
}
+ if (show.note != null) {
+ // When merging, only overwrite if note on server is not empty:
+ // this might cause a previously deleted note to get uploaded later, but
+ // that's less bad than deleting a note that only exists on this device.
+ if (!mergeValues || show.note.isNotEmpty()) {
+ update.userNote = show.note
+ }
+ }
// If below properties have changed (new value != old value), should
// trigger a sync for this show.
var scheduleShowUpdate = false
@@ -381,6 +389,8 @@ class HexagonShowSync @Inject constructor(
val tmdbId = localShow.tmdbId ?: continue
val cloudShow = SgCloudShow()
cloudShow.tmdbId = tmdbId
+ // It's fine if some of these are null (and would be ignored by Cloud) as existing shows
+ // on Cloud were downloaded before this.
cloudShow.isFavorite = localShow.favorite
cloudShow.notify = localShow.favorite
cloudShow.isHidden = localShow.hidden
@@ -388,6 +398,7 @@ class HexagonShowSync @Inject constructor(
cloudShow.customReleaseTime = localShow.customReleaseTime
cloudShow.customReleaseDayOffset = localShow.customReleaseDayOffset
cloudShow.customReleaseTimeZone = localShow.customReleaseTimeZone
+ cloudShow.note = localShow.userNote
shows.add(cloudShow)
}
if (shows.size == 0) {
@@ -399,7 +410,7 @@ class HexagonShowSync @Inject constructor(
}
/**
- * Uploads the given list of shows to Hexagon.
+ * Uploads the given list of shows to Hexagon. Returns `true` if upload succeeded.
*/
fun upload(shows: List): Boolean {
if (shows.isEmpty()) {
@@ -430,6 +441,9 @@ class HexagonShowSync @Inject constructor(
return true
}
+ /**
+ * Calls [upload] on the IO dispatcher. Returns `true` if upload succeeded.
+ */
suspend fun upload(show: SgCloudShow): Boolean {
return withContext(Dispatchers.IO) {
upload(listOf(show))
diff --git a/app/src/main/java/com/battlelancer/seriesguide/sync/SgSyncAdapter.kt b/app/src/main/java/com/battlelancer/seriesguide/sync/SgSyncAdapter.kt
index c5641008ac..23642947cb 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/sync/SgSyncAdapter.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/sync/SgSyncAdapter.kt
@@ -26,12 +26,13 @@ import com.battlelancer.seriesguide.notifications.NotificationService
import com.battlelancer.seriesguide.provider.SeriesGuideDatabase
import com.battlelancer.seriesguide.settings.UpdateSettings
import com.battlelancer.seriesguide.shows.tools.ShowSync
+import com.battlelancer.seriesguide.shows.tools.ShowTools2
import com.battlelancer.seriesguide.sync.SyncOptions.SyncType
+import com.battlelancer.seriesguide.traktapi.SgTrakt
import com.battlelancer.seriesguide.traktapi.TraktCredentials
import com.battlelancer.seriesguide.util.TaskManager
import com.uwetrottmann.androidutils.AndroidUtils
import com.uwetrottmann.tmdb2.services.ConfigurationService
-import com.uwetrottmann.trakt5.services.Sync
import dagger.Lazy
import timber.log.Timber
import javax.inject.Inject
@@ -52,7 +53,10 @@ class SgSyncAdapter(context: Context) : AbstractThreadedSyncAdapter(context, tru
lateinit var hexagonTools: Lazy
@Inject
- lateinit var traktSync: Lazy
+ lateinit var trakt: Lazy
+
+ @Inject
+ lateinit var showTools2: Lazy
@Inject
lateinit var movieTools: Lazy
@@ -189,9 +193,12 @@ class SgSyncAdapter(context: Context) : AbstractThreadedSyncAdapter(context, tru
// sync with trakt (only ratings if hexagon is enabled)
if (TraktCredentials.get(context).hasCredentials()) {
val resultTraktSync = TraktSync(
- context, movieTools.get(),
- traktSync.get(), progress
- ).sync(currentTime, isHexagonEnabled)
+ context,
+ showTools2.get(),
+ movieTools.get(),
+ trakt.get(),
+ progress
+ ).sync(isHexagonEnabled)
// don't overwrite failure
if (resultCode == UpdateResult.SUCCESS) {
resultCode = resultTraktSync
diff --git a/app/src/main/java/com/battlelancer/seriesguide/sync/SyncProgress.java b/app/src/main/java/com/battlelancer/seriesguide/sync/SyncProgress.java
index a87654f99d..bd24a4433d 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/sync/SyncProgress.java
+++ b/app/src/main/java/com/battlelancer/seriesguide/sync/SyncProgress.java
@@ -23,6 +23,7 @@ public enum Step {
TRAKT(R.string.trakt, 0),
TRAKT_EPISODES(R.string.trakt, R.string.episodes),
TRAKT_RATINGS(R.string.trakt, R.string.ratings),
+ TRAKT_NOTES(R.string.trakt, R.string.title_notes),
TRAKT_MOVIES(R.string.trakt, R.string.movies);
public final int serviceRes;
diff --git a/app/src/main/java/com/battlelancer/seriesguide/sync/TraktEpisodeSync.kt b/app/src/main/java/com/battlelancer/seriesguide/sync/TraktEpisodeSync.kt
index ed30ea5309..6c3a4fc3dc 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/sync/TraktEpisodeSync.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/sync/TraktEpisodeSync.kt
@@ -1,5 +1,5 @@
-// Copyright 2023 Uwe Trottmann
// SPDX-License-Identifier: Apache-2.0
+// Copyright 2017-2024 Uwe Trottmann
package com.battlelancer.seriesguide.sync
@@ -49,7 +49,7 @@ class TraktEpisodeSync(
showRowId: Long,
flag: Flag
): Boolean {
- if (tmdbIdsToTraktShow == null || tmdbIdsToTraktShow.isEmpty()) {
+ if (tmdbIdsToTraktShow.isNullOrEmpty()) {
return true // no watched/collected shows on Trakt, done.
}
val traktShow = tmdbIdsToTraktShow[showTmdbId]
@@ -219,7 +219,9 @@ class TraktEpisodeSync(
if (isInitialSync) {
// upload all watched/collected episodes of the show
// do in between processing to stretch uploads over longer time periods
- uploadShow(traktSync!!, showId, showTraktId, flag)
+ if (!uploadShow(traktSync!!, showId, showTraktId, flag)) {
+ return false // uploading failed, stop and try again later
+ }
uploadedShowsCount++
} else {
// Set all watched/collected episodes of show not watched/collected,
@@ -470,6 +472,8 @@ class TraktEpisodeSync(
/**
* Uploads all watched/collected episodes for the given show to Trakt.
+ *
+ * Returns true if the upload was successful or there was nothing to upload.
*/
private fun uploadShow(
traktSync: TraktSync,
@@ -492,6 +496,8 @@ class TraktEpisodeSync(
/**
* Uploads all the given watched/collected episodes of the given show to Trakt.
+ *
+ * Returns true if the upload was successful.
*/
private fun upload(
traktSync: TraktSync,
@@ -538,6 +544,7 @@ class TraktEpisodeSync(
Flag.WATCHED -> {
helper.getWatchedEpisodesForTraktSync(seasonId)
}
+
Flag.COLLECTED -> {
helper.getCollectedEpisodesForTraktSync(seasonId)
}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/sync/TraktMovieSync.kt b/app/src/main/java/com/battlelancer/seriesguide/sync/TraktMovieSync.kt
index 1da83f1d36..d1032c499a 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/sync/TraktMovieSync.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/sync/TraktMovieSync.kt
@@ -1,20 +1,17 @@
-// Copyright 2023 Uwe Trottmann
// SPDX-License-Identifier: Apache-2.0
+// Copyright 2017-2024 Uwe Trottmann
package com.battlelancer.seriesguide.sync
import android.content.ContentProviderOperation
import android.content.OperationApplicationException
-import androidx.preference.PreferenceManager
import com.battlelancer.seriesguide.movies.database.SgMovieFlags
import com.battlelancer.seriesguide.provider.SeriesGuideContract.Movies
import com.battlelancer.seriesguide.provider.SgRoomDatabase
import com.battlelancer.seriesguide.traktapi.SgTrakt
-import com.battlelancer.seriesguide.traktapi.TraktCredentials
import com.battlelancer.seriesguide.traktapi.TraktSettings
import com.battlelancer.seriesguide.util.DBUtils
import com.battlelancer.seriesguide.util.Errors
-import com.uwetrottmann.androidutils.AndroidUtils
import com.uwetrottmann.trakt5.entities.BaseMovie
import com.uwetrottmann.trakt5.entities.LastActivityMore
import com.uwetrottmann.trakt5.entities.MovieIds
@@ -47,31 +44,29 @@ class TraktMovieSync(
* thread.
*/
fun syncLists(activity: LastActivityMore): Boolean {
- if (activity.collected_at == null) {
+ val collectedAt = activity.collected_at
+ if (collectedAt == null) {
Timber.e("syncLists: null collected_at")
return false
}
- if (activity.watchlisted_at == null) {
+ val watchlistedAt = activity.watchlisted_at
+ if (watchlistedAt == null) {
Timber.e("syncLists: null watchlisted_at")
return false
}
- if (activity.watched_at == null) {
+ val watchedAt = activity.watched_at
+ if (watchedAt == null) {
Timber.e("syncLists: null watched_at")
return false
}
- val merging = !TraktSettings.hasMergedMovies(context)
- if (!merging && !TraktSettings.isMovieListsChanged(
- context, activity.collected_at, activity.watchlisted_at, activity.watched_at
- )) {
+ val isInitialSync = TraktSettings.isInitialSyncMovies(context)
+ if (!isInitialSync
+ && !TraktSettings.isMovieListsChanged(context, collectedAt, watchlistedAt, watchedAt)) {
Timber.d("syncLists: no changes")
return true
}
- if (!TraktCredentials.get(context).hasCredentials()) {
- return false
- }
-
// Download Trakt state.
val collection = downloadCollection() ?: return false
val watchlist = downloadWatchlist() ?: return false
@@ -97,7 +92,7 @@ class TraktMovieSync(
val playsOnTrakt = watchedWithPlays.remove(tmdbId)
val isWatchedOnTrakt = playsOnTrakt != null
- if (merging) {
+ if (isInitialSync) {
// Mark movie for upload if missing from Trakt collection or watchlist
// or if not watched on Trakt.
// Note: If watches were removed on Trakt in the meanwhile, this would re-add them.
@@ -177,7 +172,7 @@ class TraktMovieSync(
batch.clear() // release for gc
// merge on first run
- if (merging) {
+ if (isInitialSync) {
// Upload movies not in Trakt collection, watchlist or watched history.
if (uploadFlagsNotOnTrakt(
toCollectOnTrakt,
@@ -185,10 +180,7 @@ class TraktMovieSync(
toSetWatchedOnTrakt
)) {
// set merge successful
- PreferenceManager.getDefaultSharedPreferences(context)
- .edit()
- .putBoolean(TraktSettings.KEY_HAS_MERGED_MOVIES, true)
- .apply()
+ TraktSettings.setInitialSyncMoviesCompleted(context)
} else {
return false
}
@@ -202,9 +194,9 @@ class TraktMovieSync(
// store last activity timestamps
TraktSettings.storeLastMoviesChangedAt(
context,
- activity.collected_at,
- activity.watchlisted_at,
- activity.watched_at
+ collectedAt,
+ watchlistedAt,
+ watchedAt
)
// if movies were added, ensure ratings for them are downloaded next
if (collection.isNotEmpty() || watchlist.isNotEmpty() || watchedWithPlays.isNotEmpty()) {
@@ -321,10 +313,6 @@ class TraktMovieSync(
return true
}
- if (!AndroidUtils.isNetworkConnected(context)) {
- return false // Fail, no connection is available.
- }
-
// Upload.
var action = ""
val items = SyncItems()
diff --git a/app/src/main/java/com/battlelancer/seriesguide/sync/TraktNotesSync.kt b/app/src/main/java/com/battlelancer/seriesguide/sync/TraktNotesSync.kt
new file mode 100644
index 0000000000..b2c1e0b027
--- /dev/null
+++ b/app/src/main/java/com/battlelancer/seriesguide/sync/TraktNotesSync.kt
@@ -0,0 +1,216 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2024 Uwe Trottmann
+
+package com.battlelancer.seriesguide.sync
+
+import com.battlelancer.seriesguide.provider.SgRoomDatabase
+import com.battlelancer.seriesguide.shows.database.SgShow2Helper
+import com.battlelancer.seriesguide.traktapi.SgTrakt
+import com.battlelancer.seriesguide.traktapi.TraktSettings
+import com.battlelancer.seriesguide.traktapi.TraktTools2
+import com.battlelancer.seriesguide.traktapi.TraktTools2.TraktErrorResponse
+import com.battlelancer.seriesguide.traktapi.TraktTools2.TraktNonNullResponse
+import com.battlelancer.seriesguide.util.Errors
+import com.battlelancer.seriesguide.util.TimeTools
+import com.uwetrottmann.trakt5.TraktV2
+import com.uwetrottmann.trakt5.entities.NoteResponse
+import com.uwetrottmann.trakt5.entities.UserSlug
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
+import org.threeten.bp.OffsetDateTime
+import timber.log.Timber
+
+/**
+ * Syncs notes, currently only for shows, with Trakt.
+ *
+ * This will do nothing if the user is not a Trakt VIP.
+ */
+class TraktNotesSync(
+ private val traktSync: TraktSync
+) {
+ private val context = traktSync.context
+ private val showHelper = SgRoomDatabase.getInstance(context).sgShow2Helper()
+
+ /**
+ * When a note is new or different at Trakt, updates the local show (if it is added).
+ * So if the local show has a note, it is overwritten (server is source of truth).
+ * When a note is removed (or rather does not exist) at Trakt, will either on the initial sync
+ * upload the note or for consecutive syncs remove the note on the local show.
+ */
+ fun syncForShows(updatedAt: OffsetDateTime?): Boolean {
+ if (updatedAt == null) {
+ Timber.e("syncForShows: null updatedAt")
+ return false
+ }
+
+ val isInitialSync = TraktSettings.isInitialSyncShowNotes(context)
+
+ // Do not sync if notes have not changed, or is not initial sync
+ val lastUpdatedAt = TraktSettings.getLastNotesUpdatedAt(context)
+ if (!isInitialSync && !TimeTools.isAfterMillis(updatedAt, lastUpdatedAt)) {
+ Timber.d("syncForShows: no changes since %tF %tT", lastUpdatedAt, lastUpdatedAt)
+ return true
+ }
+
+ // As this runs only if a note changes, optimize for memory, not for CPU
+ val tmdbIdsToLocalShowIds = traktSync.showTools2.getTmdbIdsToShowIds()
+ val showIdsWithNotesToUploadOrRemove = showHelper.getShowIdsWithNotes()
+
+ val action = "get notes"
+ var page = 1
+ var pageCount: Int
+ do {
+ try {
+ val response = traktSync.users
+ .notes(UserSlug.ME, "shows", page, null, null)
+ .execute()
+
+ if (!response.isSuccessful) {
+ if (TraktV2.isNotVip(response)) {
+ // Do not error; also do not set initial sync complete or last updated in
+ // case the user gets VIP later, or loses VIP and gets it again.
+ Timber.d("syncForShows: user is not VIP, giving up")
+ return true
+ }
+ if (SgTrakt.isUnauthorized(context, response)) {
+ return false
+ }
+ Errors.logAndReport(action, response)
+ return false
+ }
+
+ val noteResponses = response.body()
+ if (noteResponses == null) {
+ Errors.logAndReport(action, response, "body is null")
+ return false
+ }
+
+ processShowNotes(
+ noteResponses,
+ tmdbIdsToLocalShowIds,
+ showIdsWithNotesToUploadOrRemove
+ )
+
+ pageCount = TraktV2.getPageCount(response) ?: 1
+ page++
+ } catch (e: Exception) {
+ Errors.logAndReport(action, e)
+ return false
+ }
+ } while (page <= pageCount)
+
+ if (isInitialSync) {
+ if (!uploadNotesForShows(showIdsWithNotesToUploadOrRemove)) return false
+ } else {
+ // Remove notes from shows that are not on Trakt, meaning their note got removed
+ Timber.d(
+ "syncForShows: remove notes no longer on Trakt for %s shows",
+ showIdsWithNotesToUploadOrRemove.size
+ )
+ showHelper.updateUserNotes(showIdsWithNotesToUploadOrRemove
+ .associateWith { SgShow2Helper.NoteUpdate("", null) })
+ }
+
+ if (isInitialSync) {
+ TraktSettings.setInitialSyncShowNotesCompleted(context)
+ }
+ TraktSettings.storeLastNotesUpdatedAt(context, updatedAt)
+
+ return true
+ }
+
+ private fun processShowNotes(
+ response: List,
+ tmdbIdsToLocalShowIds: Map,
+ showIdsWithNotesToUploadOrRemove: MutableList
+ ) {
+ if (response.isEmpty()) {
+ Timber.d("processShowNotes: nothing to process")
+ return
+ }
+
+ val noteUpdates = mutableMapOf()
+
+ for (note in response) {
+ val showTmdbId = note.show?.ids?.tmdb
+ ?: continue // Need a TMDB ID
+ val noteText = note.note?.notes
+ ?: continue // Need a note
+ val noteTraktId = note.note?.id
+ ?: continue // Need its Trakt ID
+
+ val localShowId = tmdbIdsToLocalShowIds[showTmdbId]
+ ?: continue // Show not in database
+ showIdsWithNotesToUploadOrRemove.remove(localShowId)
+ val localShow = showHelper.getShowWithNote(localShowId)
+ ?: continue // Show was removed in the meantime
+
+ // Not sure how it could happen, but also update when the Trakt ID has changed to
+ // always have the correct one.
+ if (localShow.userNote != noteText || localShow.userNoteTraktId != noteTraktId) {
+ noteUpdates[localShowId] = SgShow2Helper.NoteUpdate(noteText, noteTraktId)
+ }
+ }
+
+ Timber.d("processShowNotes: updating note text or ID for %s shows", noteUpdates.size)
+ showHelper.updateUserNotes(noteUpdates)
+ }
+
+ /**
+ * Adds the notes at Trakt and updates the local show with the saved text (Trakt may modify it)
+ * and note ID.
+ *
+ * Returns whether all notes were successfully uploaded.
+ */
+ private fun uploadNotesForShows(showIdsWithNotesToUpload: MutableList): Boolean {
+ Timber.d("uploadNotesForShows: uploading for %s shows", showIdsWithNotesToUpload.size)
+
+ // Cache service
+ val traktNotes = traktSync.trakt.notes()
+
+ val noteUpdates = mutableMapOf()
+ try {
+ for (showId in showIdsWithNotesToUpload) {
+ val show = showHelper.getShowWithNote(showId)
+ ?: continue // Show was removed in the meantime
+ val showTmdbId = show.tmdbId
+ ?: continue // Need a TMDB ID to upload
+ val noteText = show.userNote
+ ?.ifBlank { null } // Trakt does not allow blank text
+ ?: continue // Note got removed in the meantime
+
+ // If this thread is interrupted throws InterruptedException
+ val storedNote = runBlocking(Dispatchers.Default) {
+ val response = TraktTools2
+ .saveNoteForShow(traktNotes, showTmdbId, noteText)
+ when (response) {
+ is TraktNonNullResponse.Success -> response.data
+ is TraktErrorResponse.IsNotVip -> {
+ // Note: if failing due to not VIP, downloaded notes before, which would
+ // have required VIP; so assume it expired when getting until this point.
+ Timber.e("uploadNotesForShows: user is no longer VIP")
+ null
+ }
+
+ else -> null
+ }
+ }
+
+ if (storedNote == null) {
+ return false // Stop uploading
+ }
+
+ val storedText = storedNote.notes ?: ""
+ val noteTraktId = storedNote.id
+ noteUpdates[showId] = SgShow2Helper.NoteUpdate(storedText, noteTraktId)
+ }
+ } finally {
+ Timber.d("uploadNotesForShows: uploaded for %s shows", noteUpdates.size)
+ // In any case, save updates to any already sent notes
+ showHelper.updateUserNotes(noteUpdates)
+ }
+
+ return true
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/battlelancer/seriesguide/sync/TraktRatingsSync.kt b/app/src/main/java/com/battlelancer/seriesguide/sync/TraktRatingsSync.kt
index 5b56519383..12ddbf7d07 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/sync/TraktRatingsSync.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/sync/TraktRatingsSync.kt
@@ -10,7 +10,6 @@ import androidx.preference.PreferenceManager
import com.battlelancer.seriesguide.provider.SeriesGuideContract.Movies
import com.battlelancer.seriesguide.provider.SgRoomDatabase
import com.battlelancer.seriesguide.traktapi.SgTrakt
-import com.battlelancer.seriesguide.traktapi.TraktCredentials
import com.battlelancer.seriesguide.traktapi.TraktSettings
import com.battlelancer.seriesguide.util.DBUtils
import com.battlelancer.seriesguide.util.Errors
@@ -48,10 +47,6 @@ class TraktRatingsSync(
return true
}
- if (!TraktCredentials.get(context).hasCredentials()) {
- return false
- }
-
// download rated shows
val ratedShows: List?
try {
@@ -133,10 +128,6 @@ class TraktRatingsSync(
return true
}
- if (!TraktCredentials.get(context).hasCredentials()) {
- return false
- }
-
// download rated episodes
val ratedEpisodes: List?
try {
@@ -217,10 +208,6 @@ class TraktRatingsSync(
return true
}
- if (!TraktCredentials.get(context).hasCredentials()) {
- return false
- }
-
// download rated shows
val ratedMovies: List?
try {
diff --git a/app/src/main/java/com/battlelancer/seriesguide/sync/TraktSync.kt b/app/src/main/java/com/battlelancer/seriesguide/sync/TraktSync.kt
index 099c5fc91c..45071926ba 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/sync/TraktSync.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/sync/TraktSync.kt
@@ -1,22 +1,20 @@
-// Copyright 2023 Uwe Trottmann
// SPDX-License-Identifier: Apache-2.0
+// Copyright 2017-2024 Uwe Trottmann
package com.battlelancer.seriesguide.sync
import android.content.Context
-import androidx.preference.PreferenceManager
import com.battlelancer.seriesguide.R
import com.battlelancer.seriesguide.SgApp
import com.battlelancer.seriesguide.movies.tools.MovieTools
+import com.battlelancer.seriesguide.shows.tools.ShowTools2
import com.battlelancer.seriesguide.traktapi.SgTrakt
-import com.battlelancer.seriesguide.traktapi.TraktCredentials
import com.battlelancer.seriesguide.traktapi.TraktSettings
import com.battlelancer.seriesguide.traktapi.TraktTools2
import com.battlelancer.seriesguide.util.Errors
import com.github.michaelbull.result.getOrElse
import com.uwetrottmann.androidutils.AndroidUtils
import com.uwetrottmann.trakt5.entities.LastActivityMore
-import com.uwetrottmann.trakt5.services.Sync
import retrofit2.Response
import timber.log.Timber
@@ -27,20 +25,36 @@ import timber.log.Timber
*/
class TraktSync(
val context: Context,
+ val showTools2: ShowTools2,
val movieTools: MovieTools,
- val sync: Sync,
+ val trakt: SgTrakt,
val progress: SyncProgress
) {
+
+ // Cache services
+ val sync = trakt.sync()
+ val users = trakt.users()
+
+ private fun noConnection(): Boolean {
+ return if (AndroidUtils.isNetworkConnected(context)) {
+ false
+ } else {
+ progress.recordError()
+ true
+ }
+ }
+
/**
* To not conflict with Hexagon sync, can turn on [onlyRatings] so only
* ratings are synced.
*/
- fun sync(currentTime: Long, onlyRatings: Boolean): SgSyncAdapter.UpdateResult {
+ fun sync(onlyRatings: Boolean): SgSyncAdapter.UpdateResult {
progress.publish(SyncProgress.Step.TRAKT)
- if (!AndroidUtils.isNetworkConnected(context)) {
- progress.recordError()
- return SgSyncAdapter.UpdateResult.INCOMPLETE
- }
+ // While responses might get returned from the disk cache,
+ // this is not desirable when syncing, so frequently check for a network connection.
+ // Note: looked into creating a separate HTTP client without cache, but it makes sense
+ // to keep one as some of the responses are re-used in other parts of the app.
+ if (noConnection()) return SgSyncAdapter.UpdateResult.INCOMPLETE
// Get last activity timestamps.
val lastActivity = TraktTools2.getLastActivity(context)
@@ -60,21 +74,15 @@ class TraktSync(
if (!onlyRatings) {
// Download and upload episode watched and collected flags.
progress.publish(SyncProgress.Step.TRAKT_EPISODES)
- if (!AndroidUtils.isNetworkConnected(context)) {
- progress.recordError()
- return SgSyncAdapter.UpdateResult.INCOMPLETE
- }
- if (!syncEpisodes(tmdbIdsToShowIds, lastActivity.episodes, currentTime)) {
+ if (noConnection()) return SgSyncAdapter.UpdateResult.INCOMPLETE
+ if (!syncEpisodes(tmdbIdsToShowIds, lastActivity.episodes)) {
progress.recordError()
return SgSyncAdapter.UpdateResult.INCOMPLETE
}
}
// Download episode ratings.
progress.publish(SyncProgress.Step.TRAKT_RATINGS)
- if (!AndroidUtils.isNetworkConnected(context)) {
- progress.recordError()
- return SgSyncAdapter.UpdateResult.INCOMPLETE
- }
+ if (noConnection()) return SgSyncAdapter.UpdateResult.INCOMPLETE
if (!ratingsSync.downloadForEpisodes(lastActivity.episodes.rated_at)) {
progress.recordError()
return SgSyncAdapter.UpdateResult.INCOMPLETE
@@ -82,24 +90,27 @@ class TraktSync(
// SHOWS
// Download show ratings.
- if (!AndroidUtils.isNetworkConnected(context)) {
- progress.recordError()
- return SgSyncAdapter.UpdateResult.INCOMPLETE
- }
+ if (noConnection()) return SgSyncAdapter.UpdateResult.INCOMPLETE
if (!ratingsSync.downloadForShows(lastActivity.shows.rated_at)) {
progress.recordError()
return SgSyncAdapter.UpdateResult.INCOMPLETE
}
+ // Download notes
+ if (!onlyRatings) {
+ progress.publish(SyncProgress.Step.TRAKT_NOTES)
+ if (noConnection()) return SgSyncAdapter.UpdateResult.INCOMPLETE
+ if (!TraktNotesSync(this).syncForShows(lastActivity.notes.updated_at)) {
+ progress.recordError()
+ return SgSyncAdapter.UpdateResult.INCOMPLETE
+ }
+ }
}
// MOVIES
progress.publish(SyncProgress.Step.TRAKT_MOVIES)
// Sync watchlist, collection and watched movies.
if (!onlyRatings) {
- if (!AndroidUtils.isNetworkConnected(context)) {
- progress.recordError()
- return SgSyncAdapter.UpdateResult.INCOMPLETE
- }
+ if (noConnection()) return SgSyncAdapter.UpdateResult.INCOMPLETE
if (!TraktMovieSync(this).syncLists(lastActivity.movies)) {
progress.recordError()
return SgSyncAdapter.UpdateResult.INCOMPLETE
@@ -109,10 +120,7 @@ class TraktSync(
}
// Download movie ratings.
progress.publish(SyncProgress.Step.TRAKT_RATINGS)
- if (!AndroidUtils.isNetworkConnected(context)) {
- progress.recordError()
- return SgSyncAdapter.UpdateResult.INCOMPLETE
- }
+ if (noConnection()) return SgSyncAdapter.UpdateResult.INCOMPLETE
if (!ratingsSync.downloadForMovies(lastActivity.movies.rated_at)) {
progress.recordError()
return SgSyncAdapter.UpdateResult.INCOMPLETE
@@ -128,17 +136,12 @@ class TraktSync(
*/
private fun syncEpisodes(
tmdbIdsToShowIds: Map,
- lastActivity: LastActivityMore,
- currentTime: Long
+ lastActivity: LastActivityMore
): Boolean {
- if (!TraktCredentials.get(context).hasCredentials()) {
- return false // Auth was removed.
- }
-
// Download flags.
// If initial sync, upload any flags missing on Trakt
// otherwise clear all local flags not on Trakt.
- val isInitialSync = !TraktSettings.hasMergedEpisodes(context)
+ val isInitialSync = TraktSettings.isInitialSyncEpisodes(context)
// Watched episodes.
val episodeSync = TraktEpisodeSync(this)
@@ -153,14 +156,10 @@ class TraktSync(
return false
}
- val editor = PreferenceManager.getDefaultSharedPreferences(context).edit()
if (isInitialSync) {
// Success, set initial sync as complete.
- editor.putBoolean(TraktSettings.KEY_HAS_MERGED_EPISODES, true)
+ TraktSettings.setInitialSyncEpisodesCompleted(context)
}
- // Success, set last sync time to now.
- editor.putLong(TraktSettings.KEY_LAST_FULL_EPISODE_SYNC, currentTime)
- editor.apply()
return true
}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/tmdbapi/TmdbTools.kt b/app/src/main/java/com/battlelancer/seriesguide/tmdbapi/TmdbTools.kt
index cb11e0ddf9..0b910ff403 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/tmdbapi/TmdbTools.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/tmdbapi/TmdbTools.kt
@@ -22,28 +22,32 @@ object TmdbTools {
}
}
- private const val BASE_URL = "https://www.themoviedb.org/"
- private const val PATH_TV = "tv/"
- private const val PATH_MOVIES = "movie/"
- private const val PATH_PERSON = "person/"
+ private const val BASE_URL = "https://www.themoviedb.org"
+ private const val PATH_TV = "tv"
+ private const val PATH_MOVIES = "movie"
+ private const val PATH_PERSON = "person"
@JvmStatic
fun buildEpisodeUrl(showTmdbId: Int, season: Int, episode: Int): String {
- return "$BASE_URL$PATH_TV$showTmdbId/season/$season/episode/$episode"
+ return "$BASE_URL/$PATH_TV/$showTmdbId/season/$season/episode/$episode"
}
@JvmStatic
fun buildShowUrl(showTmdbId: Int): String {
- return BASE_URL + PATH_TV + showTmdbId
+ return "$BASE_URL/$PATH_TV/$showTmdbId"
}
@JvmStatic
fun buildMovieUrl(movieTmdbId: Int): String {
- return BASE_URL + PATH_MOVIES + movieTmdbId
+ return "$BASE_URL/$PATH_MOVIES/$movieTmdbId"
}
fun buildPersonUrl(personTmdbId: Int): String {
- return BASE_URL + PATH_PERSON + personTmdbId
+ return "$BASE_URL/$PATH_PERSON/$personTmdbId"
+ }
+
+ fun buildMovieReleaseDatesUrl(movieTmdbId: Int): String {
+ return "${buildMovieUrl(movieTmdbId)}/releases"
}
/**
diff --git a/app/src/main/java/com/battlelancer/seriesguide/traktapi/SgTrakt.kt b/app/src/main/java/com/battlelancer/seriesguide/traktapi/SgTrakt.kt
index 54d5d245a9..f46a4030fd 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/traktapi/SgTrakt.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/traktapi/SgTrakt.kt
@@ -41,15 +41,6 @@ class SgTrakt(
}
companion object {
- /**
- * Check if the request was unauthorized.
- *
- * @see isUnauthorized accepting context
- */
- @JvmStatic
- fun isUnauthorized(response: Response<*>): Boolean {
- return response.code() == 401
- }
/**
* Returns if the request was not authorized. If it was, also calls
@@ -57,7 +48,7 @@ class SgTrakt(
*/
@JvmStatic
fun isUnauthorized(context: Context, response: Response<*>): Boolean {
- if (response.code() == 401) {
+ if (isUnauthorized(response)) {
// current access token is invalid, remove it and notify user to re-connect
TraktCredentials.get(context).setCredentialsInvalid()
return true
@@ -66,13 +57,6 @@ class SgTrakt(
}
}
- /**
- * Check if the associated [Trakt account is locked](https://trakt.docs.apiary.io/#introduction/locked-user-account).
- */
- fun isAccountLocked(response: Response<*>): Boolean {
- return response.code() == 423
- }
-
fun checkForTraktError(trakt: TraktV2, response: Response<*>): String? {
val error = trakt.checkForTraktError(response)
return if (error?.message != null) {
diff --git a/app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktAuthActivityModel.kt b/app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktAuthActivityModel.kt
index 84f0d1455b..9f786f4dac 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktAuthActivityModel.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktAuthActivityModel.kt
@@ -1,18 +1,17 @@
-// Copyright 2023 Uwe Trottmann
// SPDX-License-Identifier: Apache-2.0
+// Copyright 2021-2024 Uwe Trottmann
package com.battlelancer.seriesguide.traktapi
import android.app.Application
-import androidx.core.content.edit
import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.viewModelScope
-import androidx.preference.PreferenceManager
import com.battlelancer.seriesguide.SgApp
import com.battlelancer.seriesguide.jobs.NetworkJobProcessor
import com.battlelancer.seriesguide.util.Errors
import com.uwetrottmann.androidutils.AndroidUtils
+import com.uwetrottmann.trakt5.TraktV2
import com.uwetrottmann.trakt5.entities.AccessToken
import com.uwetrottmann.trakt5.entities.Settings
import kotlinx.coroutines.Dispatchers
@@ -97,23 +96,8 @@ class TraktAuthActivityModel(application: Application) : AndroidViewModel(applic
}
// reset sync state before hasCredentials may return true
- NetworkJobProcessor(getApplication())
- .removeObsoleteJobs(false)
- PreferenceManager.getDefaultSharedPreferences(getApplication()).edit {
- // make next sync merge local watched and collected episodes with those on trakt
- putBoolean(TraktSettings.KEY_HAS_MERGED_EPISODES, false)
- // make next sync merge local movies with those on trakt
- putBoolean(TraktSettings.KEY_HAS_MERGED_MOVIES, false)
-
- // make sure the next sync will run a full episode sync
- putLong(TraktSettings.KEY_LAST_FULL_EPISODE_SYNC, 0)
- // make sure the next sync will download all watched movies
- putLong(TraktSettings.KEY_LAST_MOVIES_WATCHED_AT, 0)
- // make sure the next sync will download all ratings
- putLong(TraktSettings.KEY_LAST_SHOWS_RATED_AT, 0)
- putLong(TraktSettings.KEY_LAST_EPISODES_RATED_AT, 0)
- putLong(TraktSettings.KEY_LAST_MOVIES_RATED_AT, 0)
- }
+ NetworkJobProcessor(getApplication()).removeObsoleteJobs(false)
+ TraktSettings.resetToInitialSync(getApplication())
// store the access token, refresh token and expiry time
TraktCredentials.get(getApplication()).storeAccessToken(accessToken)
@@ -147,12 +131,12 @@ class TraktAuthActivityModel(application: Application) : AndroidViewModel(applic
SgTrakt.checkForTraktError(trakt, response)
)
return@withContext when {
- SgTrakt.isUnauthorized(response) -> {
+ TraktV2.isUnauthorized(response) -> {
// access token already is invalid, remove it :(
TraktCredentials.get(getApplication()).removeCredentials()
ConnectResult(TraktResult.AUTH_ERROR)
}
- SgTrakt.isAccountLocked(response) -> {
+ TraktV2.isAccountLocked(response) -> {
ConnectResult(TraktResult.ACCOUNT_LOCKED)
}
else -> {
diff --git a/app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktComments.kt b/app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktComments.kt
index 106cbf046c..b33bd678ab 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktComments.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktComments.kt
@@ -109,7 +109,7 @@ class TraktComments(
errorMessageOrNull = context.getString(R.string.error_delete_comment)
} else if (response.code() == 404) {
errorMessageOrNull = context.getString(R.string.trakt_error_not_exists)
- } else if (SgTrakt.isUnauthorized(response)) {
+ } else if (TraktV2.isUnauthorized(response)) {
// for users banned from posting comments requests also return 401
// so do not sign out if an error header does not indicate the token is invalid
val authHeader = response.headers()["WWW-Authenticate"]
diff --git a/app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktCredentials.kt b/app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktCredentials.kt
index 01b11acd0a..68c404e7c6 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktCredentials.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktCredentials.kt
@@ -201,7 +201,7 @@ class TraktCredentials private constructor(context: Context) {
refreshToken = token.refresh_token
expiresIn = token.expires_in?.toLong() ?: 0
} else {
- if (!SgTrakt.isUnauthorized(response)) {
+ if (!TraktV2.isUnauthorized(response)) {
Errors.logAndReport("refresh access token", response)
}
}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktSettings.java b/app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktSettings.java
deleted file mode 100644
index ef56a48e5b..0000000000
--- a/app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktSettings.java
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright 2023 Uwe Trottmann
-// SPDX-License-Identifier: Apache-2.0
-
-package com.battlelancer.seriesguide.traktapi;
-
-import android.content.Context;
-import android.text.format.DateUtils;
-import androidx.preference.PreferenceManager;
-import com.battlelancer.seriesguide.util.TimeTools;
-import org.threeten.bp.OffsetDateTime;
-
-/**
- * Settings related to trakt.tv integration.
- */
-public class TraktSettings {
-
- public static final String KEY_LAST_ACTIVITY_DOWNLOAD
- = "com.battlelancer.seriesguide.lasttraktupdate";
-
- public static final String KEY_LAST_SHOWS_RATED_AT
- = "trakt.last_activity.shows.rated";
-
- public static final String KEY_LAST_EPISODES_WATCHED_AT
- = "trakt.last_activity.episodes.watched";
-
- public static final String KEY_LAST_EPISODES_COLLECTED_AT
- = "trakt.last_activity.episodes.collected";
-
- public static final String KEY_LAST_EPISODES_RATED_AT
- = "trakt.last_activity.episodes.rated";
-
- public static final String KEY_LAST_MOVIES_WATCHLISTED_AT
- = "trakt.last_activity.movies.watchlisted";
-
- public static final String KEY_LAST_MOVIES_COLLECTED_AT
- = "trakt.last_activity.movies.collected";
-
- public static final String KEY_LAST_MOVIES_RATED_AT
- = "trakt.last_activity.movies.rated";
-
- public static final String KEY_LAST_MOVIES_WATCHED_AT
- = "trakt.last_activity.movies.watched";
-
- public static final String KEY_LAST_FULL_EPISODE_SYNC
- = "com.battlelancer.seriesguide.trakt.lastfullsync";
-
- public static final String KEY_AUTO_ADD_TRAKT_SHOWS
- = "com.battlelancer.seriesguide.autoaddtraktshows";
-
- public static final String KEY_HAS_MERGED_EPISODES =
- "com.battlelancer.seriesguide.trakt.mergedepisodes";
-
- public static final String KEY_HAS_MERGED_MOVIES
- = "com.battlelancer.seriesguide.trakt.mergedmovies";
-
- public static final String KEY_QUICK_CHECKIN
- = "com.battlelancer.seriesguide.trakt.quickcheckin";
-
- private static final long FULL_SYNC_INTERVAL_MILLIS = 24 * DateUtils.HOUR_IN_MILLIS;
-
- /**
- * The last time trakt episode activity was successfully downloaded.
- */
- public static long getLastActivityDownloadTime(Context context) {
- return PreferenceManager.getDefaultSharedPreferences(context)
- .getLong(KEY_LAST_ACTIVITY_DOWNLOAD, System.currentTimeMillis());
- }
-
- /**
- * The last time show ratings have changed or 0 if no value exists.
- */
- public static long getLastShowsRatedAt(Context context) {
- return PreferenceManager.getDefaultSharedPreferences(context)
- .getLong(KEY_LAST_SHOWS_RATED_AT, 0);
- }
-
- /**
- * The last time watched flags for episodes have changed.
- */
- public static long getLastEpisodesWatchedAt(Context context) {
- return PreferenceManager.getDefaultSharedPreferences(context)
- .getLong(KEY_LAST_EPISODES_WATCHED_AT, 0);
- }
-
- /**
- * The last time collected flags for episodes have changed.
- */
- public static long getLastEpisodesCollectedAt(Context context) {
- return PreferenceManager.getDefaultSharedPreferences(context)
- .getLong(KEY_LAST_EPISODES_COLLECTED_AT, 0);
- }
-
- /**
- * The last time episode ratings have changed or 0 if no value exists.
- */
- public static long getLastEpisodesRatedAt(Context context) {
- return PreferenceManager.getDefaultSharedPreferences(context)
- .getLong(KEY_LAST_EPISODES_RATED_AT, 0);
- }
-
- /**
- * The last time watched flags for movies have changed.
- */
- public static long getLastMoviesWatchlistedAt(Context context) {
- return PreferenceManager.getDefaultSharedPreferences(context)
- .getLong(KEY_LAST_MOVIES_WATCHLISTED_AT, 0);
- }
-
- /**
- * The last time collected flags for movies have changed.
- */
- public static long getLastMoviesCollectedAt(Context context) {
- return PreferenceManager.getDefaultSharedPreferences(context)
- .getLong(KEY_LAST_MOVIES_COLLECTED_AT, 0);
- }
-
- /**
- * The last time movie ratings have changed or 0 if no value exists.
- */
- public static long getLastMoviesRatedAt(Context context) {
- return PreferenceManager.getDefaultSharedPreferences(context)
- .getLong(KEY_LAST_MOVIES_RATED_AT, 0);
- }
-
- /**
- * The last time movie watched flags have changed or 0 if no value exists.
- */
- public static long getLastMoviesWatchedAt(Context context) {
- return PreferenceManager.getDefaultSharedPreferences(context)
- .getLong(KEY_LAST_MOVIES_WATCHED_AT, 0);
- }
-
- /**
- * If either collection, watchlist or watched list have changes newer than last stored.
- */
- public static boolean isMovieListsChanged(
- Context context,
- OffsetDateTime collectedAt,
- OffsetDateTime watchlistedAt,
- OffsetDateTime watchedAt
- ) {
- return TimeTools.isAfterMillis(collectedAt, getLastMoviesCollectedAt(context))
- || TimeTools.isAfterMillis(watchlistedAt, getLastMoviesWatchlistedAt(context))
- || TimeTools.isAfterMillis(watchedAt, getLastMoviesWatchedAt(context));
- }
-
- /**
- * Store last collected, watchlisted and watched timestamps.
- */
- public static void storeLastMoviesChangedAt(
- Context context,
- OffsetDateTime collectedAt,
- OffsetDateTime watchlistedAt,
- OffsetDateTime watchedAt
- ) {
- PreferenceManager.getDefaultSharedPreferences(context)
- .edit()
- .putLong(TraktSettings.KEY_LAST_MOVIES_COLLECTED_AT,
- collectedAt.toInstant().toEpochMilli())
- .putLong(TraktSettings.KEY_LAST_MOVIES_WATCHLISTED_AT,
- watchlistedAt.toInstant().toEpochMilli())
- .putLong(TraktSettings.KEY_LAST_MOVIES_WATCHED_AT,
- watchedAt.toInstant().toEpochMilli())
- .apply();
- }
-
- /**
- * Reset {@link #KEY_LAST_MOVIES_RATED_AT} to 0 so all movie ratings will be downloaded the next
- * time a sync runs.
- */
- public static boolean resetMoviesLastRatedAt(Context context) {
- return PreferenceManager.getDefaultSharedPreferences(context)
- .edit()
- .putLong(TraktSettings.KEY_LAST_MOVIES_RATED_AT, 0)
- .commit();
- }
-
- /**
- * Remove {@link #KEY_LAST_MOVIES_WATCHED_AT} so all watched movies will be downloaded the
- * next time a sync runs.
- */
- public static boolean resetMoviesLastWatchedAt(Context context) {
- return PreferenceManager.getDefaultSharedPreferences(context)
- .edit()
- .remove(KEY_LAST_MOVIES_WATCHED_AT)
- .commit();
- }
-
- public static boolean isAutoAddingShows(Context context) {
- return PreferenceManager.getDefaultSharedPreferences(context)
- .getBoolean(KEY_AUTO_ADD_TRAKT_SHOWS, true);
- }
-
- /**
- * Whether watched and collected episodes were merged with the users trakt profile since she
- * connected to trakt.
- */
- public static boolean hasMergedEpisodes(Context context) {
- return PreferenceManager.getDefaultSharedPreferences(context)
- .getBoolean(KEY_HAS_MERGED_EPISODES, true);
- }
-
- /**
- * Whether the list of movies was merged with the users trakt profile since she connected to
- * trakt.
- */
- public static boolean hasMergedMovies(Context context) {
- return PreferenceManager.getDefaultSharedPreferences(context)
- .getBoolean(KEY_HAS_MERGED_MOVIES, false);
- }
-
- /**
- * Determines if enough time has passed since the last full trakt episode sync.
- */
- public static boolean isTimeForFullEpisodeSync(Context context, long currentTime) {
- long previousUpdateTime = PreferenceManager.getDefaultSharedPreferences(context)
- .getLong(KEY_LAST_FULL_EPISODE_SYNC, currentTime);
- return (currentTime - previousUpdateTime) > FULL_SYNC_INTERVAL_MILLIS;
- }
-
- /**
- * Whether the check-in dialog should not wait for the user to enter a message, but immediately
- * start the check-in.
- */
- public static boolean useQuickCheckin(Context context) {
- return PreferenceManager.getDefaultSharedPreferences(context)
- .getBoolean(KEY_QUICK_CHECKIN, false);
- }
-}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktSettings.kt b/app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktSettings.kt
new file mode 100644
index 0000000000..2076ccad75
--- /dev/null
+++ b/app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktSettings.kt
@@ -0,0 +1,290 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2013-2024 Uwe Trottmann
+
+package com.battlelancer.seriesguide.traktapi
+
+import android.content.Context
+import androidx.core.content.edit
+import androidx.preference.PreferenceManager
+import com.battlelancer.seriesguide.util.TimeTools
+import org.threeten.bp.OffsetDateTime
+
+/**
+ * Settings related to Trakt integration.
+ */
+object TraktSettings {
+
+ /**
+ * Unused, but kept for reference.
+ *
+ * Replaced by type specific last activity timestamps.
+ */
+ private const val KEY_LAST_ACTIVITY_DOWNLOAD
+ : String = "com.battlelancer.seriesguide.lasttraktupdate"
+
+ const val KEY_LAST_SHOWS_RATED_AT
+ : String = "trakt.last_activity.shows.rated"
+
+ const val KEY_LAST_EPISODES_WATCHED_AT
+ : String = "trakt.last_activity.episodes.watched"
+
+ const val KEY_LAST_EPISODES_COLLECTED_AT
+ : String = "trakt.last_activity.episodes.collected"
+
+ const val KEY_LAST_EPISODES_RATED_AT
+ : String = "trakt.last_activity.episodes.rated"
+
+ private const val KEY_LAST_MOVIES_WATCHLISTED_AT
+ : String = "trakt.last_activity.movies.watchlisted"
+
+ private const val KEY_LAST_MOVIES_COLLECTED_AT
+ : String = "trakt.last_activity.movies.collected"
+
+ const val KEY_LAST_MOVIES_RATED_AT
+ : String = "trakt.last_activity.movies.rated"
+
+ private const val KEY_LAST_MOVIES_WATCHED_AT
+ : String = "trakt.last_activity.movies.watched"
+
+ private const val KEY_LAST_NOTES_UPDATED_AT
+ : String = "trakt.last_activity.notes.updated"
+
+ /**
+ * Unused, but kept for reference.
+ *
+ * Replaced by [KEY_LAST_EPISODES_WATCHED_AT] and [KEY_LAST_EPISODES_COLLECTED_AT].
+ */
+ private const val KEY_LAST_FULL_EPISODE_SYNC
+ : String = "com.battlelancer.seriesguide.trakt.lastfullsync"
+
+ /**
+ * Unused, but kept for reference.
+ */
+ private const val KEY_AUTO_ADD_TRAKT_SHOWS
+ : String = "com.battlelancer.seriesguide.autoaddtraktshows"
+
+ private const val KEY_HAS_MERGED_EPISODES
+ : String = "com.battlelancer.seriesguide.trakt.mergedepisodes"
+
+ private const val KEY_HAS_MERGED_MOVIES
+ : String = "com.battlelancer.seriesguide.trakt.mergedmovies"
+
+ private const val KEY_HAS_MERGED_SHOW_NOTES
+ : String = "trakt.notes.shows.merged"
+
+ /**
+ * Used in settings_basic.xml.
+ */
+ private const val KEY_QUICK_CHECKIN
+ : String = "com.battlelancer.seriesguide.trakt.quickcheckin"
+
+ /**
+ * The last time show ratings have changed or 0 if no value exists.
+ */
+ fun getLastShowsRatedAt(context: Context): Long {
+ return PreferenceManager.getDefaultSharedPreferences(context)
+ .getLong(KEY_LAST_SHOWS_RATED_AT, 0)
+ }
+
+ /**
+ * The last time watched flags for episodes have changed.
+ */
+ fun getLastEpisodesWatchedAt(context: Context): Long {
+ return PreferenceManager.getDefaultSharedPreferences(context)
+ .getLong(KEY_LAST_EPISODES_WATCHED_AT, 0)
+ }
+
+ /**
+ * The last time collected flags for episodes have changed.
+ */
+ fun getLastEpisodesCollectedAt(context: Context): Long {
+ return PreferenceManager.getDefaultSharedPreferences(context)
+ .getLong(KEY_LAST_EPISODES_COLLECTED_AT, 0)
+ }
+
+ /**
+ * The last time episode ratings have changed or 0 if no value exists.
+ */
+ fun getLastEpisodesRatedAt(context: Context): Long {
+ return PreferenceManager.getDefaultSharedPreferences(context)
+ .getLong(KEY_LAST_EPISODES_RATED_AT, 0)
+ }
+
+ /**
+ * The last time watched flags for movies have changed.
+ */
+ fun getLastMoviesWatchlistedAt(context: Context): Long {
+ return PreferenceManager.getDefaultSharedPreferences(context)
+ .getLong(KEY_LAST_MOVIES_WATCHLISTED_AT, 0)
+ }
+
+ /**
+ * The last time collected flags for movies have changed.
+ */
+ fun getLastMoviesCollectedAt(context: Context): Long {
+ return PreferenceManager.getDefaultSharedPreferences(context)
+ .getLong(KEY_LAST_MOVIES_COLLECTED_AT, 0)
+ }
+
+ /**
+ * The last time movie ratings have changed or 0 if no value exists.
+ */
+ fun getLastMoviesRatedAt(context: Context): Long {
+ return PreferenceManager.getDefaultSharedPreferences(context)
+ .getLong(KEY_LAST_MOVIES_RATED_AT, 0)
+ }
+
+ /**
+ * The last time movie watched flags have changed or 0 if no value exists.
+ */
+ fun getLastMoviesWatchedAt(context: Context): Long {
+ return PreferenceManager.getDefaultSharedPreferences(context)
+ .getLong(KEY_LAST_MOVIES_WATCHED_AT, 0)
+ }
+
+ /**
+ * The last time notes were updated or 0 if no value exists.
+ */
+ fun getLastNotesUpdatedAt(context: Context): Long {
+ return PreferenceManager.getDefaultSharedPreferences(context)
+ .getLong(KEY_LAST_NOTES_UPDATED_AT, 0)
+ }
+
+ fun storeLastNotesUpdatedAt(context: Context, updatedAt: OffsetDateTime) {
+ PreferenceManager.getDefaultSharedPreferences(context).edit {
+ putLong(KEY_LAST_NOTES_UPDATED_AT, updatedAt.toInstant().toEpochMilli())
+ }
+ }
+
+ /**
+ * If either collection, watchlist or watched list have changes newer than last stored.
+ */
+ fun isMovieListsChanged(
+ context: Context,
+ collectedAt: OffsetDateTime,
+ watchlistedAt: OffsetDateTime,
+ watchedAt: OffsetDateTime
+ ): Boolean {
+ return (TimeTools.isAfterMillis(collectedAt, getLastMoviesCollectedAt(context))
+ || TimeTools.isAfterMillis(watchlistedAt, getLastMoviesWatchlistedAt(context))
+ || TimeTools.isAfterMillis(watchedAt, getLastMoviesWatchedAt(context)))
+ }
+
+ /**
+ * Store last collected, watchlisted and watched timestamps.
+ */
+ fun storeLastMoviesChangedAt(
+ context: Context,
+ collectedAt: OffsetDateTime,
+ watchlistedAt: OffsetDateTime,
+ watchedAt: OffsetDateTime
+ ) {
+ PreferenceManager.getDefaultSharedPreferences(context)
+ .edit()
+ .putLong(
+ KEY_LAST_MOVIES_COLLECTED_AT,
+ collectedAt.toInstant().toEpochMilli()
+ )
+ .putLong(
+ KEY_LAST_MOVIES_WATCHLISTED_AT,
+ watchlistedAt.toInstant().toEpochMilli()
+ )
+ .putLong(
+ KEY_LAST_MOVIES_WATCHED_AT,
+ watchedAt.toInstant().toEpochMilli()
+ )
+ .apply()
+ }
+
+ /**
+ * Reset [KEY_LAST_MOVIES_RATED_AT] to 0 so all movie ratings will be downloaded the next
+ * time a sync runs.
+ */
+ @JvmStatic
+ fun resetMoviesLastRatedAt(context: Context): Boolean {
+ return PreferenceManager.getDefaultSharedPreferences(context)
+ .edit()
+ .putLong(KEY_LAST_MOVIES_RATED_AT, 0)
+ .commit()
+ }
+
+ /**
+ * Remove [KEY_LAST_MOVIES_WATCHED_AT] so all watched movies will be downloaded the
+ * next time a sync runs.
+ */
+ fun resetMoviesLastWatchedAt(context: Context): Boolean {
+ return PreferenceManager.getDefaultSharedPreferences(context)
+ .edit()
+ .remove(KEY_LAST_MOVIES_WATCHED_AT)
+ .commit()
+ }
+
+ /**
+ * Returns if episodes have not been synced with the current Trakt account.
+ */
+ fun isInitialSyncEpisodes(context: Context): Boolean {
+ return !PreferenceManager.getDefaultSharedPreferences(context)
+ .getBoolean(KEY_HAS_MERGED_EPISODES, false)
+ }
+
+ fun setInitialSyncEpisodesCompleted(context: Context) {
+ PreferenceManager.getDefaultSharedPreferences(context).edit {
+ putBoolean(KEY_HAS_MERGED_EPISODES, true)
+ }
+ }
+
+ /**
+ * Returns if movies have not been synced with the current Trakt account.
+ */
+ fun isInitialSyncMovies(context: Context): Boolean {
+ return !PreferenceManager.getDefaultSharedPreferences(context)
+ .getBoolean(KEY_HAS_MERGED_MOVIES, false)
+ }
+
+ fun setInitialSyncMoviesCompleted(context: Context) {
+ PreferenceManager.getDefaultSharedPreferences(context).edit {
+ putBoolean(KEY_HAS_MERGED_MOVIES, true)
+ }
+ }
+
+ /**
+ * Returns if show notes have not been synced with the current Trakt account.
+ */
+ fun isInitialSyncShowNotes(context: Context): Boolean {
+ return !PreferenceManager.getDefaultSharedPreferences(context)
+ .getBoolean(KEY_HAS_MERGED_SHOW_NOTES, false)
+ }
+
+ fun setInitialSyncShowNotesCompleted(context: Context) {
+ PreferenceManager.getDefaultSharedPreferences(context).edit {
+ putBoolean(KEY_HAS_MERGED_SHOW_NOTES, true)
+ }
+ }
+
+
+ fun resetToInitialSync(context: Context) {
+ PreferenceManager.getDefaultSharedPreferences(context).edit {
+ putBoolean(KEY_HAS_MERGED_EPISODES, false)
+ putBoolean(KEY_HAS_MERGED_MOVIES, false)
+ putBoolean(KEY_HAS_MERGED_SHOW_NOTES, false)
+ // Not actually necessary, but also reset timestamps for episodes and movies
+ putLong(KEY_LAST_EPISODES_WATCHED_AT, 0)
+ putLong(KEY_LAST_EPISODES_COLLECTED_AT, 0)
+ putLong(KEY_LAST_MOVIES_WATCHED_AT, 0)
+
+ // Reset timestamps for ratings so they are downloaded immediately
+ putLong(KEY_LAST_SHOWS_RATED_AT, 0)
+ putLong(KEY_LAST_EPISODES_RATED_AT, 0)
+ putLong(KEY_LAST_MOVIES_RATED_AT, 0)
+ }
+ }
+
+ /**
+ * Whether the check-in dialog should not wait for the user to enter a message, but immediately
+ * start the check-in.
+ */
+ fun useQuickCheckin(context: Context): Boolean {
+ return PreferenceManager.getDefaultSharedPreferences(context)
+ .getBoolean(KEY_QUICK_CHECKIN, false)
+ }
+}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktTools2.kt b/app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktTools2.kt
index f2bfd1b731..17a7a27412 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktTools2.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/traktapi/TraktTools2.kt
@@ -1,11 +1,10 @@
-// Copyright 2023 Uwe Trottmann
// SPDX-License-Identifier: Apache-2.0
+// Copyright 2021-2024 Uwe Trottmann
package com.battlelancer.seriesguide.traktapi
import android.content.Context
import com.battlelancer.seriesguide.SgApp
-import com.battlelancer.seriesguide.shows.tools.AddUpdateShowTools.ShowResult
import com.battlelancer.seriesguide.util.Errors
import com.battlelancer.seriesguide.util.isRetryError
import com.github.michaelbull.result.Err
@@ -14,20 +13,126 @@ import com.github.michaelbull.result.Result
import com.github.michaelbull.result.andThen
import com.github.michaelbull.result.mapError
import com.github.michaelbull.result.runCatching
+import com.uwetrottmann.trakt5.TraktV2
+import com.uwetrottmann.trakt5.entities.AddNoteRequest
import com.uwetrottmann.trakt5.entities.BaseShow
-import com.uwetrottmann.trakt5.entities.LastActivities
import com.uwetrottmann.trakt5.entities.LastActivity
import com.uwetrottmann.trakt5.entities.LastActivityMore
+import com.uwetrottmann.trakt5.entities.LastActivityUpdated
+import com.uwetrottmann.trakt5.entities.Note
import com.uwetrottmann.trakt5.entities.Ratings
import com.uwetrottmann.trakt5.entities.Show
+import com.uwetrottmann.trakt5.entities.ShowIds
import com.uwetrottmann.trakt5.enums.Extended
import com.uwetrottmann.trakt5.enums.IdType
import com.uwetrottmann.trakt5.enums.Type
+import com.uwetrottmann.trakt5.services.Notes
+import retrofit2.Call
import retrofit2.Response
+import retrofit2.awaitResponse
object TraktTools2 {
- data class SearchResult(val result: ShowResult, val show: Show?)
+ sealed interface TraktResponse {
+ data class Success(
+ /**
+ * If T is [Void] this is always `null`.
+ */
+ val data: T?
+ ) : TraktResponse
+ }
+
+ sealed interface TraktNonNullResponse {
+ data class Success(val data: T) : TraktNonNullResponse
+ }
+
+ sealed interface TraktErrorResponse {
+ class IsNotVip : TraktResponse, TraktNonNullResponse
+ class IsUnauthorized : TraktResponse, TraktNonNullResponse
+ class Other : TraktResponse, TraktNonNullResponse
+ }
+
+ /**
+ * Adds or updates the note for the given show.
+ */
+ suspend fun saveNoteForShow(
+ traktNotes: Notes,
+ showTmdbId: Int,
+ noteText: String
+ ): TraktNonNullResponse {
+ // Note: calling the add endpoint for an existing note will update it
+ return awaitTraktCallNonNull(
+ traktNotes.addNote(
+ AddNoteRequest(
+ Show().apply {
+ ids = ShowIds.tmdb(showTmdbId)
+ },
+ noteText
+ )
+ ), "update note"
+ )
+ }
+
+ suspend fun deleteNote(
+ trakt: SgTrakt,
+ noteId: Long
+ ): TraktResponse {
+ return awaitTraktCall(trakt.notes().deleteNote(noteId), "delete note")
+ }
+
+ private suspend fun awaitTraktCall(
+ call: Call,
+ action: String,
+ logErrorOnNullBody: Boolean = false
+ ): TraktResponse {
+ val response = try {
+ call.awaitResponse()
+ } catch (e: Exception) {
+ Errors.logAndReport(action, e)
+ return TraktErrorResponse.Other()
+ }
+
+ if (!response.isSuccessful) {
+ return when {
+ TraktV2.isNotVip(response) -> TraktErrorResponse.IsNotVip()
+ TraktV2.isUnauthorized(response) -> TraktErrorResponse.IsUnauthorized()
+ else -> {
+ Errors.logAndReport(action, response)
+ TraktErrorResponse.Other()
+ }
+ }
+ }
+
+ val body = response.body()
+
+ if (logErrorOnNullBody && body == null) {
+ Errors.logAndReport(action, response, "body is null")
+ }
+
+ return TraktResponse.Success(body)
+ }
+
+ /**
+ * Like [awaitTraktCall], but ensures the response data is not null.
+ */
+ private suspend fun awaitTraktCallNonNull(
+ call: Call,
+ action: String
+ ): TraktNonNullResponse {
+ return when (val response = awaitTraktCall(call, action, logErrorOnNullBody = true)) {
+ is TraktErrorResponse.Other -> response
+ is TraktErrorResponse.IsNotVip -> response
+ is TraktErrorResponse.IsUnauthorized -> response
+ is TraktResponse.Success -> {
+ val data = response.data
+ if (data == null) {
+ TraktErrorResponse.Other()
+ } else {
+ TraktNonNullResponse.Success(data)
+ }
+ }
+ }
+ }
/**
* Look up a show by its TMDB ID, may return `null` if not found.
@@ -140,6 +245,7 @@ object TraktTools2 {
val episodes: LastActivityMore,
val shows: LastActivity,
val movies: LastActivityMore,
+ val notes: LastActivityUpdated,
)
fun getLastActivity(context: Context): Result {
@@ -157,12 +263,14 @@ object TraktTools2 {
val episodes = lastActivities?.episodes
val shows = lastActivities?.shows
val movies = lastActivities?.movies
- if (episodes != null && shows != null && movies != null) {
+ val notes = lastActivities?.notes
+ if (episodes != null && shows != null && movies != null && notes != null) {
return@andThen Ok(
LastActivities(
episodes = episodes,
shows = shows,
- movies = movies
+ movies = movies,
+ notes = notes
)
)
} else {
diff --git a/app/src/main/java/com/battlelancer/seriesguide/ui/BaseThemeActivity.kt b/app/src/main/java/com/battlelancer/seriesguide/ui/BaseThemeActivity.kt
index ca4321b2bd..088290809d 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/ui/BaseThemeActivity.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/ui/BaseThemeActivity.kt
@@ -51,7 +51,7 @@ abstract class BaseThemeActivity : AppCompatActivity() {
android.R.id.home -> {
val upIntent = NavUtils.getParentActivityIntent(this)
if (upIntent != null) {
- if (NavUtils.shouldUpRecreateTask(this, upIntent)) {
+ if (shouldUpRecreateTask(upIntent)) {
// This activity is NOT part of this app's task, so create a new task
// when navigating up, with a synthesized back stack.
TaskStackBuilder.create(this)
@@ -62,7 +62,7 @@ abstract class BaseThemeActivity : AppCompatActivity() {
} else {
// This activity is part of this app's task, so simply
// navigate up to the logical parent activity.
- NavUtils.navigateUpTo(this, upIntent)
+ navigateUpTo(upIntent)
}
} else {
// No parent activity defined in AndroidManifest, let back press handle up
diff --git a/app/src/main/java/com/battlelancer/seriesguide/util/ActivityTools.kt b/app/src/main/java/com/battlelancer/seriesguide/util/ActivityTools.kt
index 9ee77b1d35..3a3b625c21 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/util/ActivityTools.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/util/ActivityTools.kt
@@ -1,10 +1,13 @@
-// Copyright 2023 Uwe Trottmann
// SPDX-License-Identifier: Apache-2.0
+// Copyright 2014-2024 Uwe Trottmann
package com.battlelancer.seriesguide.util
+import android.app.ActivityOptions
import android.content.ActivityNotFoundException
import android.content.Context
+import android.content.Intent
+import android.view.View
import android.widget.Toast
import androidx.activity.result.ActivityResultLauncher
import com.battlelancer.seriesguide.R
@@ -19,4 +22,16 @@ fun ActivityResultLauncher.tryLaunch(input: I, context: Context) {
} catch (e: ActivityNotFoundException) {
Toast.makeText(context, R.string.app_not_available, Toast.LENGTH_LONG).show()
}
+}
+
+/**
+ * Uses [ActivityOptions.makeScaleUpAnimation] on the [sourceView].
+ */
+fun Context.startActivityWithAnimation(intent: Intent, sourceView: View) {
+ startActivity(
+ intent,
+ ActivityOptions
+ .makeScaleUpAnimation(sourceView, 0, 0, sourceView.width, sourceView.height)
+ .toBundle()
+ )
}
\ No newline at end of file
diff --git a/app/src/main/java/com/battlelancer/seriesguide/util/ImageTools.kt b/app/src/main/java/com/battlelancer/seriesguide/util/ImageTools.kt
index 72780f0ff6..00adfbdfd5 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/util/ImageTools.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/util/ImageTools.kt
@@ -1,5 +1,5 @@
-// Copyright 2023 Uwe Trottmann
// SPDX-License-Identifier: Apache-2.0
+// Copyright 2021-2024 Uwe Trottmann
package com.battlelancer.seriesguide.util
@@ -71,45 +71,24 @@ object ImageTools {
return tmdbOrTvdbPosterUrl(imagePath, context)
}
+ /**
+ * Calls [buildTmdbOrTvdbImageCacheUrl] with small image and demo URLs for show posters.
+ */
@JvmStatic
fun tmdbOrTvdbPosterUrl(
imagePath: String?,
context: Context,
originalSize: Boolean = false
): String? {
- return if (imagePath.isNullOrEmpty()) {
- null
- } else {
- if (AppSettings.isDemoModeEnabled(context)) {
- return pickDemoPosterUrl(imagePath)
+ return buildTmdbOrTvdbImageCacheUrl(
+ imagePath, context, originalSize,
+ demoUrl = { nonNullImagePath ->
+ pickDemoPosterUrl(nonNullImagePath)
+ },
+ tmdbSmallImageUrl = { nonNullImagePath ->
+ "${TmdbSettings.getPosterBaseUrl(context)}$nonNullImagePath"
}
-
- // If the path contains the legacy TVDB cache prefix, use the www subdomain as it has
- // a redirect to the new thumbnail URL set up (artworks subdomain + file name postfix).
- // E.g. https://www.thetvdb.com/banners/_cache/posters/example.jpg redirects to
- // https://artworks.thetvdb.com/banners/posters/example_t.jpg
- // Using the artworks subdomain with the legacy cache prefix is not supported.
- val imageUrl = when {
- imagePath.contains(TVDB_LEGACY_CACHE_PREFIX, false) -> {
- "${TVDB_LEGACY_MIRROR_BANNERS}$imagePath"
- }
-
- imagePath.startsWith("/") -> {
- // TMDB images have no path at all, but always start with /.
- // Use small size based on density, or original size (as large as possible).
- if (originalSize) {
- TmdbSettings.getImageOriginalUrl(context, imagePath)
- } else {
- "${TmdbSettings.getPosterBaseUrl(context)}$imagePath"
- }
- }
-
- else -> {
- "${TVDB_MIRROR_BANNERS}$imagePath"
- }
- }
- buildImageCacheUrl(imageUrl)
- }
+ )
}
private val demoPosterUrls = listOf(
@@ -123,24 +102,50 @@ object ImageTools {
"https://seriesgui.de/demo/sitcom.jpg",
)
- private val demoStillUrl = "https://seriesgui.de/demo/episode-anime.jpg"
+ private val demoEpisodeImageUrl = "https://seriesgui.de/demo/episode-anime.jpg"
private fun pickDemoPosterUrl(imagePath: String): String {
// Map an image path always to the same image
return demoPosterUrls[imagePath.hashCode().mod(demoPosterUrls.size)]
}
- @JvmStatic
- fun tmdbOrTvdbStillUrl(
+ /**
+ * Calls [buildTmdbOrTvdbImageCacheUrl] with small image and demo URLs for episode images.
+ */
+ fun buildEpisodeImageUrl(
imagePath: String?,
context: Context,
originalSize: Boolean = false
+ ): String? {
+ return buildTmdbOrTvdbImageCacheUrl(
+ imagePath, context, originalSize,
+ demoUrl = { demoEpisodeImageUrl },
+ tmdbSmallImageUrl = { nonNullImagePath ->
+ TmdbSettings.buildBackdropUrl(context, nonNullImagePath)
+ }
+ )
+ }
+
+ /**
+ * Builds an image cache URL, or returns null if [imagePath] is null or empty.
+ *
+ * Returns [demoUrl] if [AppSettings.isDemoModeEnabled] is enabled.
+ *
+ * If [imagePath] starts with `/` builds a TMDB episode image path with resolution depending on
+ * [originalSize]. Otherwise a legacy TVDB URL.
+ */
+ private fun buildTmdbOrTvdbImageCacheUrl(
+ imagePath: String?,
+ context: Context,
+ originalSize: Boolean = false,
+ demoUrl: (String) -> String,
+ tmdbSmallImageUrl: (String) -> String
): String? {
return if (imagePath.isNullOrEmpty()) {
null
} else {
if (AppSettings.isDemoModeEnabled(context)) {
- return demoStillUrl
+ return demoUrl(imagePath)
}
// If the path contains the legacy TVDB cache prefix, use the www subdomain as it has
@@ -159,7 +164,7 @@ object ImageTools {
if (originalSize) {
TmdbSettings.getImageOriginalUrl(context, imagePath)
} else {
- TmdbSettings.getStillUrl(context, imagePath)
+ tmdbSmallImageUrl(imagePath)
}
}
@@ -174,7 +179,7 @@ object ImageTools {
/**
* [posterUrl] must not be empty.
*/
- fun buildImageCacheUrl(posterUrl: String): String? {
+ private fun buildImageCacheUrl(posterUrl: String): String? {
@Suppress("SENSELESS_COMPARISON")
if (BuildConfig.IMAGE_CACHE_URL == null) {
return posterUrl // no cache
diff --git a/app/src/main/java/com/battlelancer/seriesguide/util/PackageTools.kt b/app/src/main/java/com/battlelancer/seriesguide/util/PackageTools.kt
index 32557bbdf4..43f04547bd 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/util/PackageTools.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/util/PackageTools.kt
@@ -1,5 +1,5 @@
-// Copyright 2023 Uwe Trottmann
// SPDX-License-Identifier: Apache-2.0
+// Copyright 2023-2024 Uwe Trottmann
package com.battlelancer.seriesguide.util
@@ -26,11 +26,12 @@ object PackageTools {
* Get version name from this apps package.
*/
fun getVersion(context: Context): String {
- return try {
+ val version = try {
getAppPackage(context).versionName
} catch (e: PackageManager.NameNotFoundException) {
- "UnknownVersion"
+ null
}
+ return version ?: "UnknownVersion"
}
/**
@@ -72,7 +73,8 @@ object PackageTools {
)
val sgSignatures = appInfoSeriesGuide.signatures
val xSignatures = appInfoSeriesGuideX.signatures
- if (sgSignatures.size == xSignatures.size) {
+ if (sgSignatures != null && xSignatures != null
+ && sgSignatures.size == xSignatures.size) {
for (i in sgSignatures.indices) {
if (sgSignatures[i].toCharsString() != xSignatures[i].toCharsString()) {
return false // a signature does not match
diff --git a/app/src/main/java/com/battlelancer/seriesguide/util/ThemeUtils.kt b/app/src/main/java/com/battlelancer/seriesguide/util/ThemeUtils.kt
index 565eff9a76..9fdc532018 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/util/ThemeUtils.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/util/ThemeUtils.kt
@@ -1,5 +1,5 @@
-// Copyright 2023 Uwe Trottmann
// SPDX-License-Identifier: Apache-2.0
+// Copyright 2015-2024 Uwe Trottmann
package com.battlelancer.seriesguide.util
@@ -167,7 +167,7 @@ object ThemeUtils {
return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
// A light status bar is only supported on M+.
// Use a translucent black status bar instead.
- val opaqueStatusBarColor: Int =
+ @Suppress("DEPRECATION") val opaqueStatusBarColor: Int =
MaterialColors.getColor(context, android.R.attr.statusBarColor, Color.BLACK)
ColorUtils.setAlphaComponent(opaqueStatusBarColor, EDGE_TO_EDGE_BAR_ALPHA)
} else {
@@ -179,7 +179,7 @@ object ThemeUtils {
return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O_MR1) {
// A light navigation bar is only supported on O_MR1+.
// Use a translucent black navigation bar instead.
- val opaqueNavBarColor =
+ @Suppress("DEPRECATION") val opaqueNavBarColor =
MaterialColors.getColor(context, android.R.attr.navigationBarColor, Color.BLACK)
ColorUtils.setAlphaComponent(opaqueNavBarColor, EDGE_TO_EDGE_BAR_ALPHA)
} else {
diff --git a/app/src/main/java/com/battlelancer/seriesguide/util/TimeTools.kt b/app/src/main/java/com/battlelancer/seriesguide/util/TimeTools.kt
index c3c79ae20c..12f813f3a5 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/util/TimeTools.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/util/TimeTools.kt
@@ -64,7 +64,6 @@ object TimeTools {
return dateTime.toInstant().isBefore(Instant.ofEpochMilli(millis))
}
- @JvmStatic
fun isAfterMillis(dateTime: OffsetDateTime, millis: Long): Boolean {
return dateTime.toInstant().isAfter(Instant.ofEpochMilli(millis))
}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/util/Utils.java b/app/src/main/java/com/battlelancer/seriesguide/util/Utils.java
index e9bbcaf18e..f64edd6576 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/util/Utils.java
+++ b/app/src/main/java/com/battlelancer/seriesguide/util/Utils.java
@@ -1,5 +1,5 @@
-// Copyright 2023 Uwe Trottmann
// SPDX-License-Identifier: Apache-2.0
+// Copyright 2011-2024 Uwe Trottmann
package com.battlelancer.seriesguide.util;
@@ -8,11 +8,8 @@
import android.content.Context;
import android.content.Intent;
import android.util.Log;
-import android.view.View;
import android.widget.Toast;
import androidx.annotation.NonNull;
-import androidx.core.app.ActivityCompat;
-import androidx.core.app.ActivityOptionsCompat;
import androidx.fragment.app.Fragment;
import com.battlelancer.seriesguide.BuildConfig;
import com.battlelancer.seriesguide.R;
@@ -62,8 +59,8 @@ public static boolean hasXpass(Context context) {
}
/**
- * Launches {@link com.battlelancer.seriesguide.billing.amazon.AmazonBillingActivity} or {@link
- * BillingActivity} and notifies that something is only available with the subscription.
+ * Launches {@link com.battlelancer.seriesguide.billing.amazon.AmazonBillingActivity} or
+ * {@link BillingActivity} and notifies that something is only available with the subscription.
*/
public static void advertiseSubscription(Context context) {
Toast.makeText(context, R.string.onlyx, Toast.LENGTH_SHORT).show();
@@ -81,15 +78,15 @@ public static boolean isAmazonVersion() {
@NonNull
public static Intent getBillingActivityIntent(Context context) {
if (Utils.isAmazonVersion()) {
- return new Intent(context, AmazonBillingActivity.class);
+ return new Intent(context, AmazonBillingActivity.class);
} else {
return new Intent(context, BillingActivity.class);
}
}
/**
- * Returns false if there is an active, but metered connection and
- * the user did not approve it for large data downloads (e.g. images).
+ * Returns false if there is an active, but metered connection and the user did not approve it
+ * for large data downloads (e.g. images).
*/
static boolean isAllowedLargeDataConnection(Context context) {
boolean isConnected;
@@ -174,14 +171,6 @@ public static void tryStartActivityForResult(Fragment fragment, Intent intent,
}
}
- public static void startActivityWithAnimation(Context context, Intent intent, View view) {
- ActivityCompat.startActivity(context, intent,
- ActivityOptionsCompat
- .makeScaleUpAnimation(view, 0, 0, view.getWidth(), view.getHeight())
- .toBundle()
- );
- }
-
/**
* Tries to start the given intent as a new document (e.g. opening a website, other app) so it
* appears as a new entry in the task switcher using {@link #tryStartActivity}.
@@ -191,5 +180,4 @@ public static boolean openNewDocument(@NonNull Context context, @NonNull Intent
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
return Utils.tryStartActivity(context, intent, true);
}
-
}
diff --git a/app/src/main/java/com/battlelancer/seriesguide/util/ViewTools.kt b/app/src/main/java/com/battlelancer/seriesguide/util/ViewTools.kt
index 6ad4a7c12f..8898410032 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/util/ViewTools.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/util/ViewTools.kt
@@ -19,6 +19,7 @@ import androidx.core.view.WindowCompat
import androidx.core.view.WindowInsetsCompat
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import com.battlelancer.seriesguide.R
+import java.text.NumberFormat
object ViewTools {
@@ -86,7 +87,7 @@ object ViewTools {
return if (value != null && value > 0.0) {
label.visibility = View.VISIBLE
text.visibility = View.VISIBLE
- text.text = value.toString()
+ text.text = NumberFormat.getNumberInstance().format(value)
true
} else {
label.visibility = View.GONE
diff --git a/app/src/main/java/com/battlelancer/seriesguide/util/WebTools.kt b/app/src/main/java/com/battlelancer/seriesguide/util/WebTools.kt
index 8656fbd57a..af8900495c 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/util/WebTools.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/util/WebTools.kt
@@ -1,5 +1,5 @@
-// Copyright 2023 Uwe Trottmann
// SPDX-License-Identifier: Apache-2.0
+// Copyright 2023-2024 Uwe Trottmann
package com.battlelancer.seriesguide.util
@@ -22,7 +22,6 @@ object WebTools {
*
* See also [openInApp].
*/
- @JvmStatic
fun openInCustomTab(context: Context, url: String): Boolean {
val darkParams = CustomTabColorSchemeParams.Builder()
.setToolbarColor(
diff --git a/app/src/main/java/com/battlelancer/seriesguide/util/tasks/RemoveListTask.java b/app/src/main/java/com/battlelancer/seriesguide/util/tasks/DeleteListTask.java
similarity index 93%
rename from app/src/main/java/com/battlelancer/seriesguide/util/tasks/RemoveListTask.java
rename to app/src/main/java/com/battlelancer/seriesguide/util/tasks/DeleteListTask.java
index 54298e78da..3e06e24d1d 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/util/tasks/RemoveListTask.java
+++ b/app/src/main/java/com/battlelancer/seriesguide/util/tasks/DeleteListTask.java
@@ -14,13 +14,13 @@
import java.io.IOException;
/**
- * Task to remove a list.
+ * Task to delete a list and its items.
*/
-public class RemoveListTask extends BaseActionTask {
+public class DeleteListTask extends BaseActionTask {
@NonNull protected final String listId;
- public RemoveListTask(@NonNull Context context, @NonNull String listId) {
+ public DeleteListTask(@NonNull Context context, @NonNull String listId) {
super(context);
this.listId = listId;
}
diff --git a/app/src/main/res/drawable/ic_calendar_month_control_24dp.xml b/app/src/main/res/drawable/ic_calendar_month_control_24dp.xml
new file mode 100644
index 0000000000..a68f64c89c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_calendar_month_control_24dp.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_edit_note_control_24dp.xml b/app/src/main/res/drawable/ic_edit_note_control_24dp.xml
new file mode 100644
index 0000000000..7299f4ee80
--- /dev/null
+++ b/app/src/main/res/drawable/ic_edit_note_control_24dp.xml
@@ -0,0 +1,13 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_event_control_24dp.xml b/app/src/main/res/drawable/ic_event_control_24dp.xml
new file mode 100644
index 0000000000..8cf9596eca
--- /dev/null
+++ b/app/src/main/res/drawable/ic_event_control_24dp.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_event_white_24dp.xml b/app/src/main/res/drawable/ic_event_white_24dp.xml
deleted file mode 100644
index e5d971795a..0000000000
--- a/app/src/main/res/drawable/ic_event_white_24dp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_shows.xml b/app/src/main/res/layout/activity_shows.xml
index fac7843cd4..cc27d80e6b 100644
--- a/app/src/main/res/layout/activity_shows.xml
+++ b/app/src/main/res/layout/activity_shows.xml
@@ -21,7 +21,7 @@
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
diff --git a/app/src/main/res/layout/buttons_episode.xml b/app/src/main/res/layout/buttons_episode.xml
index 994a179ed6..0e96689451 100644
--- a/app/src/main/res/layout/buttons_episode.xml
+++ b/app/src/main/res/layout/buttons_episode.xml
@@ -107,7 +107,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/addtocalendar"
- app:icon="@drawable/ic_event_white_24dp"
+ app:icon="@drawable/ic_event_control_24dp"
app:iconGravity="start" />