diff --git a/.editorconfig b/.editorconfig index 1fc9eedc..f3dfd2b0 100644 --- a/.editorconfig +++ b/.editorconfig @@ -14,3 +14,7 @@ indent_size = 4 [*.md] trim_trailing_whitespace = false + +[*.yml] +indent_style = space +indent_size = 2 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 43955c8e..41fa288e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,31 +1,33 @@ name: Build and test + on: [push, pull_request] jobs: build: + if: ${{ github.actor != 'transifex-integration[bot]' }} + runs-on: ubuntu-latest - + steps: - uses: actions/checkout@v2 - + - name: Validate Gradle wrapper uses: gradle/wrapper-validation-action@v1 - + - name: Set up JDK 11 uses: actions/setup-java@v2 with: distribution: 'temurin' java-version: 17 cache: 'gradle' - + - name: Build and test with Gradle run: ./gradlew build test -Pci - + - name: Cleanup Gradle Cache # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions. # Restoring these files from a GitHub Actions cache might cause problems for future builds. run: | rm -f ~/.gradle/caches/modules-2/modules-2.lock rm -f ~/.gradle/caches/modules-2/gc.properties - \ No newline at end of file diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 1c0e6ace..d7f0dc64 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -5,8 +5,8 @@ Live Media Center Downloads - Bookmarks Continue Watching + Bookmarks My Shows Zapp is part of MediathekView and gives you easy access to a large number of German public broadcasting live streams. Watch ARD, ZDF and other channels live. @@ -176,4 +176,5 @@ %1$s / %2$s Download complete Download failed + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e1762453..805ed0e5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -176,4 +176,5 @@ %1$s / %2$s Download abgeschlossen Download fehlgeschlagen + diff --git a/fastlane/metadata/android/en/changelogs/52.txt b/fastlane/metadata/android/en/changelogs/52.txt new file mode 100644 index 00000000..233301e5 --- /dev/null +++ b/fastlane/metadata/android/en/changelogs/52.txt @@ -0,0 +1 @@ +* Fixed downloads not working \ No newline at end of file diff --git a/fastlane/metadata/android/en/changelogs/53.txt b/fastlane/metadata/android/en/changelogs/53.txt new file mode 100644 index 00000000..791ce80c --- /dev/null +++ b/fastlane/metadata/android/en/changelogs/53.txt @@ -0,0 +1,5 @@ +* extended mediathek search: filtern by channel and show duration +* removed search suggestions +* display channel logo in playback notifications +* use highest available quality when sharing mediathek shows +* add faq entry regarding chromecast support \ No newline at end of file diff --git a/fastlane/metadata/android/en/changelogs/54.txt b/fastlane/metadata/android/en/changelogs/54.txt new file mode 100644 index 00000000..cdd4df77 --- /dev/null +++ b/fastlane/metadata/android/en/changelogs/54.txt @@ -0,0 +1,3 @@ +* Fixed crash after editing channel list +* Fixed crash when starting Tagessschau24 on Android 6 +* Fixed jumping progress bar in channel list on Android 6 \ No newline at end of file diff --git a/fastlane/metadata/android/en/changelogs/55.txt b/fastlane/metadata/android/en/changelogs/55.txt new file mode 100644 index 00000000..55970ddc --- /dev/null +++ b/fastlane/metadata/android/en/changelogs/55.txt @@ -0,0 +1,5 @@ +* Video player interface is hidden automatically faster +* Fixed playback errors for some mediathek shows +* Fixed deactivated download button for some mediathek shows +* Fixed app crash in mediathek list +* Fixed background playback not killed by the system after a few minutes diff --git a/fastlane/metadata/android/en/changelogs/56.txt b/fastlane/metadata/android/en/changelogs/56.txt new file mode 100644 index 00000000..af54ae43 --- /dev/null +++ b/fastlane/metadata/android/en/changelogs/56.txt @@ -0,0 +1,3 @@ +* Failed downloads can be removed from download list +* Repaired video quality selection in metered networks +* Number of results is displayed inside mediathek filter diff --git a/fastlane/metadata/android/en/changelogs/57.txt b/fastlane/metadata/android/en/changelogs/57.txt new file mode 100644 index 00000000..dddefe20 --- /dev/null +++ b/fastlane/metadata/android/en/changelogs/57.txt @@ -0,0 +1,5 @@ +* Official support for Android TV! +* New Material 3 design +* Support for Android backups for preferences and database entries +* Category icons are now visible in light theme +* Improved fullscreen mode for videos diff --git a/fastlane/metadata/android/en/changelogs/58.txt b/fastlane/metadata/android/en/changelogs/58.txt new file mode 100644 index 00000000..eef73798 --- /dev/null +++ b/fastlane/metadata/android/en/changelogs/58.txt @@ -0,0 +1,3 @@ +* Player UI hides correctly automatically when coming out of background playback +* Fixed crashes on startup on older Android TV devices +* Click on download finished notification works again on Android 12 diff --git a/fastlane/metadata/android/en/changelogs/59.txt b/fastlane/metadata/android/en/changelogs/59.txt new file mode 100644 index 00000000..37d576b5 --- /dev/null +++ b/fastlane/metadata/android/en/changelogs/59.txt @@ -0,0 +1 @@ +* Zapp made visible again for non-Android TV devices diff --git a/fastlane/metadata/android/en/changelogs/60.txt b/fastlane/metadata/android/en/changelogs/60.txt new file mode 100644 index 00000000..766f49b9 --- /dev/null +++ b/fastlane/metadata/android/en/changelogs/60.txt @@ -0,0 +1,2 @@ +* Standby mode on Android TV devices no longer activates during video playback +* Standby mode is no longer activated when returning from background playback diff --git a/fastlane/metadata/android/en/changelogs/61.txt b/fastlane/metadata/android/en/changelogs/61.txt new file mode 100644 index 00000000..8875d0cc --- /dev/null +++ b/fastlane/metadata/android/en/changelogs/61.txt @@ -0,0 +1,3 @@ +* Channel list layout on tablets smoothed out +* Fixed hanging status bar in full screen mode on some devices +* Volume and brightness controls improved \ No newline at end of file diff --git a/fastlane/metadata/android/en/changelogs/62.txt b/fastlane/metadata/android/en/changelogs/62.txt new file mode 100644 index 00000000..f14c4c7c --- /dev/null +++ b/fastlane/metadata/android/en/changelogs/62.txt @@ -0,0 +1,13 @@ +* Support for Android 13 (monochrome icon, per-app language preference) +* Language selection in app settings +* Cancelled support for Android 7 +* Fixed null values in search result count +* Android TV receives up to date stream addresses +* Fixed jumping of the mediathek list during scrolling +* Overhauled download functionality +* Failed downloads will be resumed automatically +* Searchable download list +* Searchable "continue watching" list +* Searchable bookmarks +* Modern network stack for video playback +* Better error messages during video playback \ No newline at end of file diff --git a/fastlane/metadata/android/en/changelogs/63.txt b/fastlane/metadata/android/en/changelogs/63.txt new file mode 100644 index 00000000..f14c4c7c --- /dev/null +++ b/fastlane/metadata/android/en/changelogs/63.txt @@ -0,0 +1,13 @@ +* Support for Android 13 (monochrome icon, per-app language preference) +* Language selection in app settings +* Cancelled support for Android 7 +* Fixed null values in search result count +* Android TV receives up to date stream addresses +* Fixed jumping of the mediathek list during scrolling +* Overhauled download functionality +* Failed downloads will be resumed automatically +* Searchable download list +* Searchable "continue watching" list +* Searchable bookmarks +* Modern network stack for video playback +* Better error messages during video playback \ No newline at end of file diff --git a/fastlane/metadata/android/en/changelogs/64.txt b/fastlane/metadata/android/en/changelogs/64.txt new file mode 100644 index 00000000..5c80beb1 --- /dev/null +++ b/fastlane/metadata/android/en/changelogs/64.txt @@ -0,0 +1,4 @@ +* Fixed videos sometimes not loading when started from within picture in picture mode +* Video progress is saved periodically during playback +* Resume playback in background when screen gets turned off +* Preference for automatically switching to picture in picture mode \ No newline at end of file diff --git a/fastlane/metadata/android/en/changelogs/65.txt b/fastlane/metadata/android/en/changelogs/65.txt new file mode 100644 index 00000000..29313a0a --- /dev/null +++ b/fastlane/metadata/android/en/changelogs/65.txt @@ -0,0 +1,4 @@ +* Support for dynamic device colors +* Fixed crash in mediathek list +* Fixed dsiplay error in mediathek list on Android TV +* Switching between live streams is possible again! \ No newline at end of file diff --git a/fastlane/metadata/android/en/changelogs/66.txt b/fastlane/metadata/android/en/changelogs/66.txt new file mode 100644 index 00000000..a62509b2 --- /dev/null +++ b/fastlane/metadata/android/en/changelogs/66.txt @@ -0,0 +1,5 @@ +* Settings in material design (thanks to Bnyro) +* Sleep timer (thanks to Bnyro) +* Exo player update - should fix playback problems on some devices +* Possibility to set start tab in settings (thanks to Bnyro) +* Videos use subtitle style from Android system settings \ No newline at end of file diff --git a/fastlane/metadata/android/en/changelogs/67.txt b/fastlane/metadata/android/en/changelogs/67.txt new file mode 100644 index 00000000..f8c120fc --- /dev/null +++ b/fastlane/metadata/android/en/changelogs/67.txt @@ -0,0 +1 @@ +* Fixed crash caused by changed channel order \ No newline at end of file diff --git a/fastlane/metadata/android/en/changelogs/68.txt b/fastlane/metadata/android/en/changelogs/68.txt new file mode 100644 index 00000000..77c46b21 --- /dev/null +++ b/fastlane/metadata/android/en/changelogs/68.txt @@ -0,0 +1,2 @@ +* Fixed download notifications not opening the show +* Fixed wrong tab displayed after device rotation \ No newline at end of file diff --git a/fastlane/metadata/android/en/changelogs/69.txt b/fastlane/metadata/android/en/changelogs/69.txt new file mode 100644 index 00000000..ddae180e --- /dev/null +++ b/fastlane/metadata/android/en/changelogs/69.txt @@ -0,0 +1,8 @@ +* Switched from exoplayer to new media 3 library +* Fixed crash on app start if an sd card with downloaded shows had been removed +* Prepared Zapp for Android 14 +* Translated FAQ and changelog to English (thanks to eUgEntOptIc) +* Program information can be accessed via the channel list's context menus +* Updated channel logos +* Added Funk.net to mediathek +* Added SR to mediathek \ No newline at end of file diff --git a/fastlane/metadata/android/en/full_description.txt b/fastlane/metadata/android/en/full_description.txt new file mode 100644 index 00000000..f09a6202 --- /dev/null +++ b/fastlane/metadata/android/en/full_description.txt @@ -0,0 +1,16 @@ +Zapp is a part of MediathekView and gives you easy access to many German public broadcasting stations. Watch ARD, ZDF and other channels live or from their media centre. + +Features: +* Android client for MediathekView +* Live streams of over 30 channels +* Adaptive streaming +* Quick channel transition +* Up to date program information +* Channel shortcuts for new versions of Android +* Shows from over 20 media centers to stream +* Easy search for shows inside the media center +* Subtitles for some shows +* Share function for live and media center shows +* Background playback + +Please note: If you use Zapp outside Germany some channels – like ZDF – may be geoblocked. \ No newline at end of file diff --git a/fastlane/metadata/android/en/short_description.txt b/fastlane/metadata/android/en/short_description.txt new file mode 100644 index 00000000..d0c4c727 --- /dev/null +++ b/fastlane/metadata/android/en/short_description.txt @@ -0,0 +1 @@ +Collection of German public broadcasting live streams \ No newline at end of file diff --git a/fastlane/metadata/android/en/title.txt b/fastlane/metadata/android/en/title.txt new file mode 100644 index 00000000..f0301825 --- /dev/null +++ b/fastlane/metadata/android/en/title.txt @@ -0,0 +1 @@ +Zapp \ No newline at end of file diff --git a/transifex.yml b/transifex.yml new file mode 100644 index 00000000..99bee9b8 --- /dev/null +++ b/transifex.yml @@ -0,0 +1,27 @@ +git: + filters: + # main strings.xml + - filter_type: file + file_format: ANDROID + source_file: app/src/main/res/values/strings.xml + source_language: de + translation_files_expression: "app/src/main/res/values-/strings.xml" + # FAQ & changelog + - filter_type: dir + file_format: GITHUBMARKDOWN + source_file_dir: app/src/main/res/raw + source_file_extension: md + source_language: de + translation_files_expression: "app/src/main/res/raw-" + # Fastlane metadata + - filter_type: dir + file_format: GITHUBMARKDOWN + source_file_dir: fastlane/metadata/android/de + source_file_extension: txt + source_language: de + translation_files_expression: "fastlane/metadata/android/" + + settings: + language_mapping: + en_US: en-US +