added prev and next buttons to player controls using custom layout (n…

…eeds work); added a lite flavour

app/build.gradle.kts

@@ -44,6 +44,22 @@ android {
     }
 
     testOptions.unitTests.isIncludeAndroidResources = true
+
+    flavorDimensions += "version"
+
+    productFlavors {
+
+        create("lite") {
+            dimension = "version"
+            applicationIdSuffix = ".lite"
+            versionNameSuffix = "-lite"
+        }
+
+        create("full") {
+            dimension = "version"
+        }
+
+    }
 }
 
 dependencies {
@@ -84,4 +100,6 @@ dependencies {
     implementation(libs.androidx.media3.ui)
     implementation(libs.androidx.media3.exoplayer)
     implementation(libs.androidx.media3.session)
+
+    // todo: if flavour = full, include AAP framework
 }

app/src/full/res/values/strings.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Recording Studio</string>
+    <string name="app_name_short">Rec Studio</string>
+</resources>

app/src/lite/res/values/strings.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Recording Studio Lite</string>
+    <string name="app_name_short">Rec Studio Lite</string>
+</resources>

app/src/main/java/io/github/leonidius20/recorder/ui/recordings_list/playback/PlaybackServiceLauncher.kt → app/src/main/java/io/github/leonidius20/recorder/data/playback/PlaybackServiceLauncher.kt

@@ -1,4 +1,4 @@
-package io.github.leonidius20.recorder.ui.recordings_list.playback
+package io.github.leonidius20.recorder.data.playback
 
 import android.content.ComponentName
 import android.content.Context

app/src/main/java/io/github/leonidius20/recorder/data/recorder/RecorderService.kt

@@ -118,6 +118,7 @@ class RecorderService : LifecycleService() {
             .setContentTitle("Recording in progress")
             .setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE)
             .setPriority(NotificationCompat.PRIORITY_LOW)
+            .setSilent(true)
             .build()
 
 

app/src/main/java/io/github/leonidius20/recorder/ui/recordings_list/RecordingsListFragment.kt

@@ -22,6 +22,7 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.media3.common.MediaItem
 import androidx.media3.common.MediaMetadata
+import androidx.media3.common.Player
 import androidx.media3.session.MediaController
 import androidx.media3.session.SessionToken
 import androidx.recyclerview.widget.DiffUtil
@@ -92,6 +93,8 @@ class RecordingsListFragment : Fragment() {
             adapter.setData(recordings)
             binding.recordingList.scrollToPosition(0)
 
+            // todo: use payloads to update file names
+
         }
 
         // this has to happen every time that we go to this fragment. However
@@ -331,4 +334,8 @@ class RecordingsListFragment : Fragment() {
         }
     }
 
+    fun attachPlayerToView(player: Player) {
+        binding.playerView.player = player
+    }
+
 }

app/src/main/java/io/github/leonidius20/recorder/ui/recordings_list/playback/PlaybackControls.kt

@@ -0,0 +1,55 @@
+package io.github.leonidius20.recorder.ui.recordings_list.playback
+
+import android.content.ComponentName
+import android.content.Context
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import androidx.media3.common.MediaItem
+import androidx.media3.common.MediaMetadata
+import androidx.media3.session.MediaController
+import androidx.media3.session.SessionToken
+import com.google.common.util.concurrent.ListenableFuture
+import com.google.common.util.concurrent.MoreExecutors
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.leonidius20.recorder.data.playback.PlaybackService
+import io.github.leonidius20.recorder.ui.recordings_list.RecordingsListFragment
+
+/*class PlaybackControls(
+    @ApplicationContext private val context: Context,
+): DefaultLifecycleObserver {
+
+    private var mediaController: MediaController? = null
+    private var controllerFuture: ListenableFuture<MediaController>? = null
+
+    override fun onStart(owner: LifecycleOwner) {
+        super.onStart(owner)
+        val sessionToken = SessionToken(context, ComponentName(context, PlaybackService::class.java))
+        val factory = MediaController.Builder(context, sessionToken).buildAsync()
+        controllerFuture = factory
+        factory.addListener( {
+            mediaController = factory?.let {
+                if (it.isDone)
+                    it.get()
+                else
+                    null
+            }
+
+            (owner as RecordingsListFragment).attachPlayerToView(mediaController!!)
+
+            viewModel.recordings.value!!.forEach { recording ->
+                mediaController?.addMediaItem(
+                    MediaItem.Builder().setUri(recording.uri).setMediaMetadata(
+                        MediaMetadata.Builder().setDisplayTitle(recording.name).build()
+                    ).build()
+                )
+            }
+
+            mediaController?.prepare()
+
+
+        }, MoreExecutors.directExecutor())
+    }
+
+
+}*/

app/src/main/res/layout/fragment_recordings_list.xml

@@ -47,6 +47,7 @@
             android:layout_width="match_parent"
             app:surface_type="none"
             app:hide_on_touch="false"
+            app:controller_layout_id="@layout/playback_controls"
             android:layout_height="64dp"/>
         <!-- todo change the height of the controls -->
     </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/playback_controls.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom"
+    android:layoutDirection="ltr"
+    android:background="@color/md_theme_secondaryContainer"
+    android:orientation="vertical"
+    tools:targetApi="28">
+
+    <!--
+        docs regarding the IDs used here:
+        https://github.com/google/ExoPlayer/blob/release-v2/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
+    -->
+
+    <LinearLayout
+
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingTop="4dp"
+        android:orientation="horizontal">
+
+        <ImageButton
+            android:id="@id/exo_prev"
+            style="@style/ExoMediaButton.Previous"/>
+
+        <ImageButton android:id="@id/exo_play_pause"
+            style="@style/ExoMediaButton.Play"/>
+
+        <ImageButton
+            android:id="@id/exo_next"
+            style="@style/ExoMediaButton.Next"/>
+
+        <!-- todo: slider for time -->
+
+
+
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@id/exo_position"/>
+
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@id/exo_progress_placeholder"/>
+
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@id/exo_duration"/>
+
+    </LinearLayout>
+
+</LinearLayout>

app/src/main/res/values/strings.xml

@@ -1,6 +1,5 @@
 <resources>
-    <string name="app_name">Recording Studio</string>
-    <string name="app_name_short">Rec Studio</string>
+
     <string name="nav_title_record">Record</string>
     <string name="nav_title_recordings">Recordings</string>
     <string name="nav_title_settings">Settings</string>