Skip to content

Commit

Permalink
Merge branch 'develop' into feature/android-tv-settings
Browse files Browse the repository at this point in the history
  • Loading branch information
cemrich committed Dec 22, 2023
2 parents 6f7781a + 06295b0 commit d3f0eeb
Show file tree
Hide file tree
Showing 26 changed files with 141 additions and 7 deletions.
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,7 @@ indent_size = 4

[*.md]
trim_trailing_whitespace = false

[*.yml]
indent_style = space
indent_size = 2
14 changes: 8 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion app/src/main/res/values-en/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<string name="activity_main_tab_live">Live</string>
<string name="activity_main_tab_mediathek">Media Center</string>
<string name="activity_main_tab_downloads">Downloads</string>
<string name="activity_main_tab_bookmarks">Bookmarks</string>
<string name="activity_main_tab_continue_watching">Continue Watching</string>
<string name="activity_main_tab_bookmarks">Bookmarks</string>
<string name="activity_main_tab_personal">My Shows</string>

<string name="about_summary">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.</string>
Expand Down Expand Up @@ -176,4 +176,5 @@
<string name="notification_download_downloading_size">%1$s / %2$s</string>
<string name="notification_download_complete">Download complete</string>
<string name="notification_download_failed">Download failed</string>

</resources>
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -176,4 +176,5 @@
<string name="notification_download_downloading_size">%1$s / %2$s</string>
<string name="notification_download_complete">Download abgeschlossen</string>
<string name="notification_download_failed">Download fehlgeschlagen</string>

</resources>
1 change: 1 addition & 0 deletions fastlane/metadata/android/en/changelogs/52.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Fixed downloads not working
5 changes: 5 additions & 0 deletions fastlane/metadata/android/en/changelogs/53.txt
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions fastlane/metadata/android/en/changelogs/54.txt
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions fastlane/metadata/android/en/changelogs/55.txt
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions fastlane/metadata/android/en/changelogs/56.txt
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions fastlane/metadata/android/en/changelogs/57.txt
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions fastlane/metadata/android/en/changelogs/58.txt
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions fastlane/metadata/android/en/changelogs/59.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Zapp made visible again for non-Android TV devices
2 changes: 2 additions & 0 deletions fastlane/metadata/android/en/changelogs/60.txt
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions fastlane/metadata/android/en/changelogs/61.txt
Original file line number Diff line number Diff line change
@@ -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
13 changes: 13 additions & 0 deletions fastlane/metadata/android/en/changelogs/62.txt
Original file line number Diff line number Diff line change
@@ -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
13 changes: 13 additions & 0 deletions fastlane/metadata/android/en/changelogs/63.txt
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions fastlane/metadata/android/en/changelogs/64.txt
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions fastlane/metadata/android/en/changelogs/65.txt
Original file line number Diff line number Diff line change
@@ -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!
5 changes: 5 additions & 0 deletions fastlane/metadata/android/en/changelogs/66.txt
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions fastlane/metadata/android/en/changelogs/67.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Fixed crash caused by changed channel order
2 changes: 2 additions & 0 deletions fastlane/metadata/android/en/changelogs/68.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
* Fixed download notifications not opening the show
* Fixed wrong tab displayed after device rotation
8 changes: 8 additions & 0 deletions fastlane/metadata/android/en/changelogs/69.txt
Original file line number Diff line number Diff line change
@@ -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
16 changes: 16 additions & 0 deletions fastlane/metadata/android/en/full_description.txt
Original file line number Diff line number Diff line change
@@ -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.

<b>Features:</b>
* 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

<b>Please note:</b> If you use Zapp outside Germany some channels – like ZDF – may be geoblocked.
1 change: 1 addition & 0 deletions fastlane/metadata/android/en/short_description.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Collection of German public broadcasting live streams
1 change: 1 addition & 0 deletions fastlane/metadata/android/en/title.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Zapp
27 changes: 27 additions & 0 deletions transifex.yml
Original file line number Diff line number Diff line change
@@ -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-<lang>/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-<lang>"
# 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/<lang>"

settings:
language_mapping:
en_US: en-US

0 comments on commit d3f0eeb

Please sign in to comment.