diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..1d1fe94 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +Dockerfile \ No newline at end of file diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml new file mode 100644 index 0000000..41a3e83 --- /dev/null +++ b/.github/workflows/android.yml @@ -0,0 +1,14 @@ +name: Android CI + +on: + push: + branches: [ master, develop ] + pull_request: + branches: [ master, develop ] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Validate Fastlane Supply Metadata + uses: ashutoshgngwr/validate-fastlane-supply-metadata@v1.1.1 diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..7a118b4 --- /dev/null +++ b/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "fastlane" diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..503e34b --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,178 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + atomos (0.1.3) + aws-eventstream (1.1.0) + aws-partitions (1.341.0) + aws-sdk-core (3.103.0) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.239.0) + aws-sigv4 (~> 1.1) + jmespath (~> 1.0) + aws-sdk-kms (1.36.0) + aws-sdk-core (~> 3, >= 3.99.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.74.0) + aws-sdk-core (~> 3, >= 3.102.1) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.2.1) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.3) + claide (1.0.3) + colored (1.2) + colored2 (3.1.2) + commander-fastlane (4.4.6) + highline (~> 1.7.2) + declarative (0.0.20) + declarative-option (0.1.0) + digest-crc (0.6.1) + rake (~> 13.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + dotenv (2.7.5) + emoji_regex (3.0.0) + excon (0.75.0) + faraday (1.0.1) + multipart-post (>= 1.2, < 3) + faraday-cookie_jar (0.0.6) + faraday (>= 0.7.4) + http-cookie (~> 1.0.0) + faraday_middleware (1.0.0) + faraday (~> 1.0) + fastimage (2.1.7) + fastlane (2.151.2) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.3, < 3.0.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored + commander-fastlane (>= 4.4.6, < 5.0.0) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (>= 0.17, < 2.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (>= 0.13.1, < 2.0) + fastimage (>= 2.1.0, < 3.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-api-client (>= 0.37.0, < 0.39.0) + google-cloud-storage (>= 1.15.0, < 2.0.0) + highline (>= 1.7.2, < 2.0.0) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (~> 2.0.0) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.3) + simctl (~> 1.6.3) + slack-notifier (>= 2.0.0, < 3.0.0) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (>= 1.4.5, < 2.0.0) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.3.0) + xcpretty-travis-formatter (>= 0.0.3) + gh_inspector (1.1.3) + google-api-client (0.38.0) + addressable (~> 2.5, >= 2.5.1) + googleauth (~> 0.9) + httpclient (>= 2.8.1, < 3.0) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.0) + signet (~> 0.12) + google-cloud-core (1.5.0) + google-cloud-env (~> 1.0) + google-cloud-errors (~> 1.0) + google-cloud-env (1.3.2) + faraday (>= 0.17.3, < 2.0) + google-cloud-errors (1.0.1) + google-cloud-storage (1.26.2) + addressable (~> 2.5) + digest-crc (~> 0.4) + google-api-client (~> 0.33) + google-cloud-core (~> 1.2) + googleauth (~> 0.9) + mini_mime (~> 1.0) + googleauth (0.13.0) + faraday (>= 0.17.3, < 2.0) + jwt (>= 1.4, < 3.0) + memoist (~> 0.16) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (~> 0.14) + highline (1.7.10) + http-cookie (1.0.3) + domain_name (~> 0.5) + httpclient (2.8.3) + jmespath (1.4.0) + json (2.3.1) + jwt (2.2.1) + memoist (0.16.2) + mini_magick (4.10.1) + mini_mime (1.0.2) + multi_json (1.14.1) + multipart-post (2.0.0) + nanaimo (0.2.6) + naturally (2.2.0) + os (1.1.0) + plist (3.5.0) + public_suffix (4.0.1) + rake (13.0.1) + representable (3.0.4) + declarative (< 0.1.0) + declarative-option (< 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rouge (2.0.7) + rubyzip (2.3.0) + security (0.1.3) + signet (0.14.0) + addressable (~> 2.3) + faraday (>= 0.17.3, < 2.0) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.8) + CFPropertyList + naturally + slack-notifier (2.3.2) + terminal-notifier (2.0.0) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + tty-cursor (0.7.0) + tty-screen (0.7.0) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.7) + unicode-display_width (1.6.0) + word_wrap (1.0.0) + xcodeproj (1.17.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.2.6) + xcpretty (0.3.0) + rouge (~> 2.0.7) + xcpretty-travis-formatter (1.0.0) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + ruby + +DEPENDENCIES + fastlane + +BUNDLED WITH + 2.0.2 diff --git a/README.md b/README.md index 9babb0d..df66918 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,9 @@

## Screenshots -[](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png) -[](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png) +[](fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png) +[](fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png) +[](fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png) ## Description PeerTube is a federated video streaming platform that is community-owned and ad-free, with no vendor lock-in. This client allows you to watch and browse videos on a server of your choice in the PeerTube network. diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 2daa4f9..5ad0ca0 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -314,7 +314,7 @@ ভিডিও প্লেব্যাক ভিডিও এর লিস্ট আকাউন্ট - সার্ভার পাছন্দ করুন + সার্ভার অনুসন্ধান করুন আপনি কি এই সার্ভার রিমুভ করতে চান সার্ভার বই থেকে\? সার্ভার রিমুভ করুন এড্রেস বই @@ -343,4 +343,10 @@ অ্যাপ্লিকেশান এর ভাষা ভিডিও চলার সময় ব্যাকগ্রাউন্ড প্লে পজ হবে ব্যাক বাটন প্রেস করলে। ব্যাক বাটন এ পজ + NSFW ইন্সটান্স + SettingsActivity2 + ভিডিওঃ %s, স্থানীয় ভিডিওঃ %s + Hello blank fragment + বিল্ড এর সময় + স্বয়ংক্রিয় \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index f78b5f3..91f4af2 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -318,4 +318,5 @@ Videowiedergabe Videoliste Videos: %s, Lokale Videos: %s + Wiedergabe stoppen \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f222277..0bbb895 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -35,7 +35,7 @@ Licence \nGNU Affero General Public License v3.0 -\n +\n \nLes autorisations de cette licence de copyleft la plus forte sont conditionnées à la mise à disposition d\'un code source complet des œuvres sous licence et des modifications, qui comprennent des œuvres plus grandes utilisant une œuvre sous licence, sous la même licence. Les avis de droit d\'auteur et de licence doivent être conservés. Les contributeurs accordent expressément des droits de brevet. Lorsqu\'une version modifiée est utilisée pour fournir un service sur un réseau, le code source complet de la version modifiée doit être mis à disposition. Version Rechercher sur PeerTube @@ -340,11 +340,12 @@ Continuer dans une fenêtre flottante Sélectionner le mode de fonctionnement de la lecture de vidéo lorsque l\'application est mise en arrière-plan Liste de vidéos - Sélectionner un serveur + Serveur de recherche Retirer un serveur Voulez-vous vraiment retirer ce serveur de votre carnet d\'adresses ? Automatique Instance avec du contenu adulte Bonjour ! Fragment vide Vidéos : %s, Vidéos locales : %s + Temps de construction \ No newline at end of file diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index b80e188..3c15655 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -124,4 +124,17 @@ Vietnamesisk 1,25× 0,75× + Ønsker du å slette all søkehistorikk for godt\? + Tøm søkehistorikk + Hvordan avspilling av video utføres når den sendes til bakgrunnen + Bilde-i-bilde -tilgang er mangler for dette programmet i Android-innstillingene + Android-versjonen støtter ikke flytende video + Oppsett av bakgrunnsavspilling + Fortsett video|avspilling i flytende vindu + Opphold i bakgrunnsavspilling når \"Tilbake\" trykkes under videoavspilling. + Sett på pause med \"Tilbake\"-knapp + Stopp all avspilling + Fortsett som lydstrøm i bakgrunnen + Velg språk for programgrensesnittet. Start programmet på ny for å utføre endringene. + Programspråk \ No newline at end of file diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index c9ffd35..6a6e7a0 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -328,7 +328,7 @@ Videolijst SettingsActivity2 Account - Server kiezen + Server zoeken Weet je zeker dat je deze server wilt verwijderen uit het adresboek\? Server verwijderen Bengaals (Bangladesh) @@ -339,4 +339,8 @@ Video afspelen in zwevend venster Afspelen stoppen Audio afspelen op achtergrond + Bouwtijd + Geautomatiseerd + Video\'s: %s - Lokale video\'s: %s + NSFW-instantie \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 8501511..98d4eeb 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -328,7 +328,7 @@ 影片清單 SettingsActivity2 帳號 - 選取伺服器 + 搜尋伺服器 您確定您想要從地址簿中移除此伺服器嗎? 移除伺服器 孟加拉語(孟加拉) @@ -341,4 +341,6 @@ 以背景音訊串流繼續 影片:%s,本地影片:%s NSFW 站臺 + 建構時間 + 自動 \ No newline at end of file diff --git a/fastlane/Appfile b/fastlane/Appfile new file mode 100644 index 0000000..7e91420 --- /dev/null +++ b/fastlane/Appfile @@ -0,0 +1,2 @@ +json_key_file("../api-7592231789318752674-817790-e2fecb9aaf18.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one +package_name("net.schueller.peertube") # e.g. com.krausefx.app diff --git a/fastlane/Fastfile b/fastlane/Fastfile new file mode 100644 index 0000000..f1bb16e --- /dev/null +++ b/fastlane/Fastfile @@ -0,0 +1,57 @@ +# This file contains the fastlane.tools configuration +# You can find the documentation at https://docs.fastlane.tools +# +# For a list of all available actions, check out +# +# https://docs.fastlane.tools/actions +# +# For a list of all available plugins, check out +# +# https://docs.fastlane.tools/plugins/available-plugins +# + +# Uncomment the line if you want fastlane to automatically update itself +update_fastlane + +opt_out_usage + +default_platform(:android) + +platform :android do + + desc "Builds the debug code" + lane :buildDebug do + gradle(task: "assembleDebug") + end + + desc "Builds the release code" + lane :buildRelease do + gradle(task: "assembleRelease") + end + + desc "Runs all the tests" + lane :test do + gradle(task: "test") + end + + desc "Submit a new Internal Build to Play Store" + lane :internal do + upload_to_play_store(track: 'internal', apk: 'app/build/outputs/apk/release/app-release.apk') + end + + desc "Promote Internal to Alpha" + lane :promote_internal_to_alpha do + upload_to_play_store(track: 'internal', track_promote_to: 'alpha') + end + + desc "Promote Alpha to Beta" + lane :promote_alpha_to_beta do + upload_to_play_store(track: 'alpha', track_promote_to: 'beta') + end + + desc "Promote Beta to Production" + lane :promote_beta_to_production do + upload_to_play_store(track: 'beta', track_promote_to: 'production') + end + +end diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt index bf2f133..53bbf08 100644 --- a/fastlane/metadata/android/en-US/full_description.txt +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -1,5 +1,33 @@ -PeerTube is a federated video streaming platform that is community-owned and ad-free, with no vendor lock-in. This client allows you to watch and browse videos on a server of your choice in the PeerTube network. +Thorium is a PeerTube client that can connect to any peertube server running version v1.1.0-alpha.2 or higher. + +PeerTube is a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser. For more information, please visit https://joinpeertube.org/ for more information and a list of servers. This client comes preconfigured with one PeerTube server managed by the application creator - not the PeerTube project itself, which lists more on http://instances.joinpeertube.org/ - to allow you to have a taste of what the client is capable of. Choose your server to tune your experience! -Please note this is app is in beta and is still missing a lot of features. +Current Features: +- Connect to any PeerTube server +- Torrent video or direct playback +- Search PeerTube +- Download / Share video +- Themes / Dark mode +- Background playback +- Fullscreen playback in landscape +- Playback speed +- Filter NSFW content +- Authentication / Login +- Like/dislike video + +Comming Soon: +- Comment videos +- Register +- User / Channel Overview Page +- Report Videos + +Permissions: +- Storage access, required for torrent download or video download. + +Licensed under GNU Affero General Public License v3.0 + +Permissions of this strongest copyleft license are conditioned on making available complete source code of licensed works and modifications, which include larger works using a licensed work, under the same license. Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. When a modified version is used to provide a service over a network, the complete source code of the modified version must be made available. + +Source Code at: https://github.com/sschueller/peertube-android/ \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png new file mode 100644 index 0000000..f7cd9db Binary files /dev/null and b/fastlane/metadata/android/en-US/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png new file mode 100644 index 0000000..17b90f6 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/icon.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png similarity index 100% rename from fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png rename to fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png new file mode 100644 index 0000000..be76fd2 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png similarity index 100% rename from fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png rename to fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png new file mode 100644 index 0000000..3d72586 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/5_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/5_en-US.png new file mode 100644 index 0000000..f5e8c59 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/5_en-US.png differ diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt index 9faf711..0654514 100644 --- a/fastlane/metadata/android/en-US/short_description.txt +++ b/fastlane/metadata/android/en-US/short_description.txt @@ -1 +1 @@ -A PeerTube player \ No newline at end of file +Thorium is an unofficial PeerTube Player \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt new file mode 100644 index 0000000..9284517 --- /dev/null +++ b/fastlane/metadata/android/en-US/title.txt @@ -0,0 +1 @@ +Thorium an unofficial PeerTube client \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/video.txt b/fastlane/metadata/android/en-US/video.txt new file mode 100644 index 0000000..e85c1c2 --- /dev/null +++ b/fastlane/metadata/android/en-US/video.txt @@ -0,0 +1 @@ +https://www.youtube.com/watch?v=PJIsiuSdpq8 \ No newline at end of file