From c49569fbb9e5daf771cedbe96f4923cfb7fec736 Mon Sep 17 00:00:00 2001 From: Maxwell Mapako Date: Sat, 27 Jan 2024 18:10:25 +0200 Subject: [PATCH] chore: reduce per paging limit (#635) * chore: reduce default per paging limit * chore: reduce pager items and revert back to serial threadpool --- .github/workflows/version-updater.yml | 12 ++++++------ .idea/deploymentTargetDropDown.xml | 17 +++++------------ .idea/gradle.xml | 5 ++--- .idea/migrations.xml | 10 ++++++++++ app/.meta/version.json | 4 ++-- app/src/main/assets/changelog.md | 2 +- .../base/custom/viewmodel/ViewModelBase.kt | 2 +- .../java/com/mxt/anitrend/util/KeyUtil.java | 2 +- .../buildsrc/components/PropertiesComponents.kt | 2 +- gradle/release.properties | 2 -- gradle/version.properties | 4 ++-- 11 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 .idea/migrations.xml delete mode 100644 gradle/release.properties diff --git a/.github/workflows/version-updater.yml b/.github/workflows/version-updater.yml index 40fb9bcb9..4b16ef1f7 100644 --- a/.github/workflows/version-updater.yml +++ b/.github/workflows/version-updater.yml @@ -22,18 +22,18 @@ jobs: MINOR=$((VER[1] * 10000)) PATCH=${VER[2]} CODE=$((MAJOR + MINOR + PATCH)) - echo "version=$(cat VERSION)" > gradle/release.properties - echo "code=$CODE" >> gradle/release.properties - echo "name=v$(cat VERSION)" >> gradle/release.properties + echo "version=$(cat VERSION)" > gradle/version.properties + echo "code=$CODE" >> gradle/version.properties + echo "name=v$(cat VERSION)" >> gradle/version.properties - name: Show release info - run: cat gradle/release.properties + run: cat gradle/version.properties - - name: Commit release.properties + - name: Commit version.properties run: | git config --local user.email "action@github.com" git config --local user.name "GitHub Action" - git add gradle/release.properties + git add gradle/version.properties git commit -m "Bump version to $(cat VERSION)" - name: Push changes diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 713f56a78..0c0c33838 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -1,17 +1,10 @@ - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 20ad4d656..b1a76b4b4 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,10 +4,8 @@ diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 000000000..f8051a6f9 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/.meta/version.json b/app/.meta/version.json index 0a74e7645..4a17027e2 100644 --- a/app/.meta/version.json +++ b/app/.meta/version.json @@ -1,8 +1,8 @@ { - "code": 1011000000, + "code": 1011000001, "migration": false, "minSdk": 21, "releaseNotes": "", - "version": "1.11.0", + "version": "1.11.1", "appId": "com.mxt.anitrend" } \ No newline at end of file diff --git a/app/src/main/assets/changelog.md b/app/src/main/assets/changelog.md index 14850c18e..7ebb79cd6 100644 --- a/app/src/main/assets/changelog.md +++ b/app/src/main/assets/changelog.md @@ -6,7 +6,7 @@ Read the **FAQ** for issues regarding NSFW and notifications. Goto **Options** - ## What's Changed ### Enhancements -- New application icon +- Reduce the number of items loaded per page, hopefully will result in less request timeouts ### Current Issues - Gifs may show artifacts if more than one is playing at a given moment (with experimental markdown support in settings) diff --git a/app/src/main/java/com/mxt/anitrend/base/custom/viewmodel/ViewModelBase.kt b/app/src/main/java/com/mxt/anitrend/base/custom/viewmodel/ViewModelBase.kt index 9da0c2af9..19cd4d00d 100644 --- a/app/src/main/java/com/mxt/anitrend/base/custom/viewmodel/ViewModelBase.kt +++ b/app/src/main/java/com/mxt/anitrend/base/custom/viewmodel/ViewModelBase.kt @@ -48,7 +48,7 @@ class ViewModelBase: ViewModel(), RetroCallback { */ fun requestData(@KeyUtil.RequestType request_type: Int, context: Context) { mLoader = RequestHandler(params, this, request_type) - mLoader?.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, context) + mLoader?.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR, context) } /** diff --git a/app/src/main/java/com/mxt/anitrend/util/KeyUtil.java b/app/src/main/java/com/mxt/anitrend/util/KeyUtil.java index ec00a49ac..e851e2187 100644 --- a/app/src/main/java/com/mxt/anitrend/util/KeyUtil.java +++ b/app/src/main/java/com/mxt/anitrend/util/KeyUtil.java @@ -15,7 +15,7 @@ public interface KeyUtil { float AspectRatio = 1.37f; float WideAspectRatio = 0.95f; float PEEK_HEIGHT = 200f; - int PAGING_LIMIT = 42, GLIDE_REQUEST_TIMEOUT = 10000, SINGLE_ITEM_LIMIT = 1; + int PAGING_LIMIT = 21, GLIDE_REQUEST_TIMEOUT = 10000, SINGLE_ITEM_LIMIT = 1; /** Notification Actions */ String NOTIFICATION_ID = "anitrend_notification_id"; diff --git a/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/components/PropertiesComponents.kt b/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/components/PropertiesComponents.kt index c926bab07..f9dbe60ec 100644 --- a/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/components/PropertiesComponents.kt +++ b/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/components/PropertiesComponents.kt @@ -14,7 +14,7 @@ class PropertiesReader(project: Project) { private val properties = Properties(2) init { - val releaseFile = File(project.rootDir, "gradle/release.properties") + val releaseFile = File(project.rootDir, "gradle/version.properties") if (!releaseFile.exists()) { project.logger.error("Release file cannot be found in path: $releaseFile") } diff --git a/gradle/release.properties b/gradle/release.properties deleted file mode 100644 index 2b4ea3630..000000000 --- a/gradle/release.properties +++ /dev/null @@ -1,2 +0,0 @@ -version=1.11.0 -code=1011000000 \ No newline at end of file diff --git a/gradle/version.properties b/gradle/version.properties index 2b4ea3630..7b9527f91 100644 --- a/gradle/version.properties +++ b/gradle/version.properties @@ -1,2 +1,2 @@ -version=1.11.0 -code=1011000000 \ No newline at end of file +version=1.11.1 +code=1011000001 \ No newline at end of file