Merge branch 'develop'

DonutWare · Dec 1, 2024 · 4668c3f · 4668c3f
2 parents 2e875a5 + f41c032
commit 4668c3f
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 21 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -30,7 +30,7 @@ jobs:
           VERSION_NAME=$(grep '^version:' pubspec.yaml | cut -d ':' -f2 | cut -d '+' -f1 | tr -d ' ')
           echo "version_name=${VERSION_NAME}" >> "$GITHUB_OUTPUT"
         shell: bash
-        
+
   build-android:
     needs: [fetch-info]
     runs-on: ubuntu-latest
@@ -78,7 +78,7 @@ jobs:
       - name: Build Android APK and AAB
         run: |
           flutter build apk --release --build-number=${{github.run_number}} --flavor production
-          flutter build appbundle --release --build-number=${{github.run_number}} --flavor production    
+          flutter build appbundle --release --build-number=${{github.run_number}} --flavor production
 
       - name: Rename APK and AAB
         run: |
@@ -90,11 +90,10 @@ jobs:
         uses: actions/[email protected]
         with:
           name: fladder-android
-          path: build/app/outputs/android_artifacts/            
+          path: build/app/outputs/android_artifacts/
 
   build-windows:
-    #Use windows-2019, latest(2022) causes MSVCP140.dll related crashes
-    runs-on: windows-2019
+    runs-on: windows-latest
     needs: [fetch-info]
 
     steps:
@@ -143,7 +142,7 @@ jobs:
         run: flutter pub get
 
       - name: Build iOS app
-        run: flutter build ipa --no-codesign --flavor production --build-number=${{ github.run_number }} 
+        run: flutter build ipa --no-codesign --flavor production --build-number=${{ github.run_number }}
 
       - name: Create unsigned IPA
         run: |
@@ -161,7 +160,7 @@ jobs:
   build-macos:
     runs-on: macos-latest
     needs: [fetch-info]
-    
+
     steps:
       - name: Checkout repository
         uses: actions/[email protected]
@@ -182,7 +181,7 @@ jobs:
         run: flutter build macos --flavor production --build-number=${{ github.run_number }}
 
       - name: Create DMG file
-        run:  hdiutil create -format UDZO -srcfolder build/macos/Build/Products/Release-production/fladder.app build/macos/Build/Products/Release-production/macOS.dmg
+        run: hdiutil create -format UDZO -srcfolder build/macos/Build/Products/Release-production/fladder.app build/macos/Build/Products/Release-production/macOS.dmg
 
       - name: Archive macOS artifact
         uses: actions/[email protected]
@@ -191,7 +190,7 @@ jobs:
           path: build/macos/Build/Products/Release-production/macOS.dmg
 
   build-linux:
-    runs-on: ubuntu-24.04  # bumped from 22.04 (latest) as it would otherwise use libmpv1
+    runs-on: ubuntu-24.04 # bumped from 22.04 (latest) as it would otherwise use libmpv1
     needs: [fetch-info]
 
     steps:
@@ -225,7 +224,7 @@ jobs:
             patchelf --set-rpath '$ORIGIN' "$lib"
           done
           patchelf --set-rpath '$ORIGIN/lib' "build/linux/x64/release/bundle/Fladder"
-          
+
       - name: Archive Linux artifact
         uses: actions/upload-artifact@v4
         with:
@@ -235,7 +234,7 @@ jobs:
   build-linux-flatpak:
     name: "Flatpak"
     runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/v')       
+    if: startsWith(github.ref, 'refs/tags/v')
     needs: [fetch-info, build-linux]
     container:
       image: bilelmoussaoui/flatpak-github-actions:gnome-46
@@ -306,11 +305,11 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Github pages web
-        if: startsWith(github.ref, 'refs/tags/v')        
+        if: startsWith(github.ref, 'refs/tags/v')
         run: flutter build web --base-href /${{ github.event.repository.name }}/ --release --build-number=$GITHUB_RUN_NUMBER
 
       - name: Deploy to GitHub Pages
-        if: startsWith(github.ref, 'refs/tags/v')        
+        if: startsWith(github.ref, 'refs/tags/v')
         uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }} # Automatically provided by GitHub Actions
@@ -328,7 +327,7 @@ jobs:
       - build-linux-flatpak
       - build-web
     runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/v')       
+    if: startsWith(github.ref, 'refs/tags/v')
     steps:
       - name: Download Artifacts Android
         uses: actions/download-artifact@v4
@@ -348,10 +347,10 @@ jobs:
           path: fladder-windows
 
       - name: Compress Windows
-        run:  |
+        run: |
           cd fladder-windows
           zip -r ../Fladder-Windows-${{needs.fetch-info.outputs.version_name}}.zip .
-      
+
       - name: Download Artifacts iOS
         uses: actions/download-artifact@v4
         with:
@@ -415,5 +414,3 @@ jobs:
             Fladder-Web-${{needs.fetch-info.outputs.version_name}}.zip
             Fladder-Linux-${{needs.fetch-info.outputs.version_name}}.zip
             Fladder-Linux-${{needs.fetch-info.outputs.version_name}}.flatpak
-
-  
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
@@ -5,6 +5,7 @@
 		<!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
 		<item name="android:windowBackground">@drawable/launch_background</item>
+		<item name="android:defaultFocusHighlightEnabled">false</item>
 	</style>
 	<!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
@@ -15,5 +16,6 @@
 	<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
 		<item name="android:windowBackground">?android:colorBackground</item>
 		<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+		<item name="android:defaultFocusHighlightEnabled">false</item>
 	</style>
 </resources>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
@@ -5,6 +5,7 @@
 		<!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
 		<item name="android:windowBackground">@drawable/launch_background</item>
+		<item name="android:defaultFocusHighlightEnabled">false</item>
 	</style>
 	<!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
@@ -15,5 +16,6 @@
 	<style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
 		<item name="android:windowBackground">?android:colorBackground</item>
 		<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+		<item name="android:defaultFocusHighlightEnabled">false</item>
 	</style>
 </resources>
diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
@@ -1186,5 +1186,17 @@
     "description": "To indicate a default value, default video player backend"
   },
   "noVideoPlayerOptions": "El backend seleccionado no tiene opciones",
-  "@noVideoPlayerOptions": {}
+  "@noVideoPlayerOptions": {},
+  "mediaSegmentRecap": "Resumen",
+  "@mediaSegmentRecap": {},
+  "mediaSegmentIntro": "Introducción",
+  "@mediaSegmentIntro": {},
+  "mediaSegmentUnknown": "Desconocido",
+  "@mediaSegmentUnknown": {},
+  "mediaSegmentCommercial": "Comercial",
+  "@mediaSegmentCommercial": {},
+  "mediaSegmentPreview": "Vista previa",
+  "@mediaSegmentPreview": {},
+  "mediaSegmentOutro": "Otro",
+  "@mediaSegmentOutro": {}
 }
diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb
@@ -1193,5 +1193,25 @@
   "playerSettingsBackendDesc": "Виберіть медіапрогравач, який вам подобається, для оптимального відтворення",
   "@playerSettingsBackendDesc": {},
   "noVideoPlayerOptions": "Обраний бекенд не має опцій",
-  "@noVideoPlayerOptions": {}
+  "@noVideoPlayerOptions": {},
+  "skipButtonLabel": "Пропустити {segment}",
+  "@skipButtonLabel": {
+    "placeholders": {
+      "segment": {
+        "type": "String"
+      }
+    }
+  },
+  "mediaSegmentPreview": "Попередній перегляд",
+  "@mediaSegmentPreview": {},
+  "mediaSegmentRecap": "Підсумок",
+  "@mediaSegmentRecap": {},
+  "mediaSegmentIntro": "Вступ",
+  "@mediaSegmentIntro": {},
+  "mediaSegmentOutro": "Завершення",
+  "@mediaSegmentOutro": {},
+  "mediaSegmentUnknown": "Невідомо",
+  "@mediaSegmentUnknown": {},
+  "mediaSegmentCommercial": "Реклама",
+  "@mediaSegmentCommercial": {}
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.5.0+1
+version: 0.5.1+1
 
 environment:
   sdk: ">=3.1.3 <4.0.0"