Merge pull request #148 from tobexyz/fix/issue146

issue #146 fixed landscape layout of av transport player
tobexyz · Jan 11, 2025 · 27bac23 · 27bac23
2 parents 2887678 + 4491b3a
commit 27bac23
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 17 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -41,8 +41,8 @@ jobs:
       - name: Upload APK Debug
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.date_today }} - YAACC - APK(s) debug generated
-          path: ./yaacc/build/outputs/apk/debug/
+          name: YAACC - APK debug generated
+          path: ./yaacc/build/outputs/apk/debug/yaacc-debug.apk
 
       # build pages
       - name: Setup Pages

diff --git a/yaacc/src/main/res/layout-land/activity_avtransport_player.xml b/yaacc/src/main/res/layout-land/activity_avtransport_player.xml
@@ -206,14 +206,6 @@
                 android:paddingRight="16dp">
 
 
-                <ImageButton
-                    android:id="@+id/avtransportPlayerActivityControlPrev"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:layout_marginStart="2dp"
-                    android:contentDescription="@string/previous"
-                    app:srcCompat="@drawable/ic_baseline_skip_previous_32" />
-
                 <ImageButton
                     android:id="@+id/avtransportPlayerActivityControlPlay"
                     android:layout_width="48dp"
@@ -238,13 +230,6 @@
                     android:contentDescription="@string/stop"
                     app:srcCompat="@drawable/ic_baseline_stop_32" />
 
-                <ImageButton
-                    android:id="@+id/avtransportPlayerActivityControlNext"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:layout_marginStart="2dp"
-                    android:contentDescription="@string/next"
-                    app:srcCompat="@drawable/ic_baseline_skip_next_32" />
 
                 <ImageButton
                     android:id="@+id/avtransportPlayerActivityControlPlaylist"
@@ -264,6 +249,46 @@
                     app:srcCompat="@drawable/ic_baseline_cancel_32" />
             </LinearLayout>
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp">
+
+                <ImageButton
+                    android:id="@+id/avtransportPlayerActivityControlPrev"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:layout_marginStart="2dp"
+                    android:contentDescription="@string/previous"
+                    app:srcCompat="@drawable/ic_baseline_skip_previous_32" />
+
+                <ImageButton
+                    android:id="@+id/avtransportPlayerActivityControlFastRewind"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:layout_marginStart="2dp"
+                    android:contentDescription="@string/fast_rewind"
+                    app:srcCompat="@drawable/ic_baseline_fast_rewind_32" />
+
+                <ImageButton
+                    android:id="@+id/avtransportPlayerActivityControlFastForward"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:layout_marginStart="2dp"
+                    android:contentDescription="@string/fast_forward"
+                    app:srcCompat="@drawable/ic_baseline_fast_forward_32" />
+
+                <ImageButton
+                    android:id="@+id/avtransportPlayerActivityControlNext"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:layout_marginStart="2dp"
+                    android:contentDescription="@string/next"
+                    app:srcCompat="@drawable/ic_baseline_skip_next_32" />
+            </LinearLayout>
         </LinearLayout>
     </RelativeLayout>
 </LinearLayout>