Set up Compose rules check

.editorconfig

@@ -13,6 +13,7 @@ ij_kotlin_allow_trailing_comma = true
 ij_kotlin_allow_trailing_comma_on_call_site = true
 ktlint_code_style = intellij_idea
 ktlint_function_naming_ignore_when_annotated_with = Composable
+ktlint_standard_function-expression-body = disabled
 
 [*.md]
 trim_trailing_whitespace = false

app/src/main/java/com/google/android/samples/socialite/repository/ChatRepository.kt

@@ -62,8 +62,7 @@ class ChatRepository @Inject internal constructor(
 ) {
     private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "settings")
     private val enableChatbotKey = booleanPreferencesKey("enable_chatbot")
-    val isBotEnabled = appContext.dataStore.data.map {
-            preference ->
+    val isBotEnabled = appContext.dataStore.data.map { preference ->
         preference[enableChatbotKey] ?: false
     }
 

app/src/main/java/com/google/android/samples/socialite/ui/Bubble.kt

@@ -22,19 +22,22 @@ import androidx.compose.ui.Modifier
 import com.google.android.samples.socialite.ui.chat.ChatScreen
 
 @Composable
-fun Bubble(chatId: Long) {
+fun Bubble(
+    chatId: Long,
+    modifier: Modifier = Modifier,
+) {
     SocialTheme {
         ChatScreen(
             chatId = chatId,
             foreground = false,
-            onBackPressed = null,
+            onBackPress = null,
             // TODO (donovanfm): Hook up camera button in the Bubble composable
             onCameraClick = {},
             // TODO (jolandaverhoef): Hook up play video button in the Bubble composable
             onVideoClick = {},
             // TODO (mayurikhin): Hook up camera button in the Bubble composable
             onPhotoPickerClick = {},
-            modifier = Modifier.fillMaxSize(),
+            modifier = modifier.fillMaxSize(),
         )
     }
 }

app/src/main/java/com/google/android/samples/socialite/ui/Main.kt

@@ -53,17 +53,20 @@ import com.google.android.samples.socialite.ui.videoedit.VideoEditScreen
 @Composable
 fun Main(
     shortcutParams: ShortcutParams?,
+    modifier: Modifier = Modifier,
 ) {
-    val modifier = Modifier.fillMaxSize()
     SocialTheme {
-        MainNavigation(modifier, shortcutParams)
+        MainNavigation(
+            shortcutParams = shortcutParams,
+            modifier = modifier.fillMaxSize(),
+        )
     }
 }
 
 @Composable
 fun MainNavigation(
-    modifier: Modifier,
     shortcutParams: ShortcutParams?,
+    modifier: Modifier = Modifier,
 ) {
     val activity = LocalContext.current as Activity
     val navController = rememberNavController()
@@ -95,7 +98,7 @@ fun MainNavigation(
         ) {
             Home(
                 modifier = Modifier.fillMaxSize(),
-                onChatClicked = { chatId -> navController.navigate("chat/$chatId") },
+                onChatClick = { chatId -> navController.navigate("chat/$chatId") },
             )
         }
         composable(
@@ -116,7 +119,7 @@ fun MainNavigation(
             ChatScreen(
                 chatId = chatId,
                 foreground = true,
-                onBackPressed = { navController.popBackStack() },
+                onBackPress = { navController.popBackStack() },
                 onCameraClick = { navController.navigate("chat/$chatId/camera") },
                 onPhotoPickerClick = { navController.navigateToPhotoPicker(chatId) },
                 onVideoClick = { uri -> navController.navigate("videoPlayer?uri=$uri") },
@@ -132,7 +135,7 @@ fun MainNavigation(
         ) { backStackEntry ->
             val chatId = backStackEntry.arguments?.getLong("chatId") ?: 0L
             Camera(
-                onMediaCaptured = { capturedMedia: Media? ->
+                onMediaCapture = { capturedMedia: Media? ->
                     when (capturedMedia?.mediaType) {
                         MediaType.PHOTO -> {
                             navController.popBackStack()
@@ -155,7 +158,7 @@ fun MainNavigation(
 
         // Invoke PhotoPicker to select photo or video from device gallery
         photoPickerScreen(
-            onPhotoPicked = navController::popBackStack,
+            onPhotoPick = navController::popBackStack,
         )
 
         composable(
@@ -170,7 +173,7 @@ fun MainNavigation(
             VideoEditScreen(
                 chatId = chatId,
                 uri = videoUri,
-                onCloseButtonClicked = { navController.popBackStack() },
+                onCloseButtonClick = { navController.popBackStack() },
                 navController = navController,
             )
         }
@@ -183,7 +186,7 @@ fun MainNavigation(
             val videoUri = backStackEntry.arguments?.getString("videoUri") ?: ""
             VideoPlayerScreen(
                 uri = videoUri,
-                onCloseButtonClicked = { navController.popBackStack() },
+                onCloseButtonClick = { navController.popBackStack() },
             )
         }
     }

app/src/main/java/com/google/android/samples/socialite/ui/camera/Camera.kt

@@ -72,7 +72,7 @@ import kotlinx.coroutines.asExecutor
 @Composable
 fun Camera(
     chatId: Long,
-    onMediaCaptured: (Media?) -> Unit,
+    onMediaCapture: (Media?) -> Unit,
     modifier: Modifier = Modifier,
     viewModel: CameraViewModel = hiltViewModel(),
 ) {
@@ -165,7 +165,7 @@ fun Camera(
     @SuppressLint("MissingPermission")
     fun onVideoRecordingStart() {
         captureMode = CaptureMode.VIDEO_RECORDING
-        viewModel.startVideoCapture(onMediaCaptured)
+        viewModel.startVideoCapture(onMediaCapture)
     }
 
     fun onVideoRecordingFinish() {
@@ -184,7 +184,7 @@ fun Camera(
                         .height(50.dp),
                 ) {
                     IconButton(onClick = {
-                        onMediaCaptured(null)
+                        onMediaCapture(null)
                     }) {
                         Icon(
                             imageVector = Icons.Default.ArrowBack,
@@ -227,7 +227,7 @@ fun Camera(
                                 ) {
                                     ShutterButton(
                                         captureMode,
-                                        { viewModel.capturePhoto(onMediaCaptured) },
+                                        { viewModel.capturePhoto(onMediaCapture) },
                                         { onVideoRecordingStart() },
                                         { onVideoRecordingFinish() },
                                     )
@@ -248,9 +248,9 @@ fun Camera(
                                 horizontalAlignment = Alignment.CenterHorizontally,
                             ) {
                                 ViewFinder(
-                                    viewFinderState.cameraState,
-                                    onPreviewSurfaceProviderReady,
-                                    viewModel::setZoomScale,
+                                    cameraState = viewFinderState.cameraState,
+                                    onSurfaceProviderReady = onPreviewSurfaceProviderReady,
+                                    onZoomChange = viewModel::setZoomScale,
                                 )
                             }
                         }
@@ -261,9 +261,9 @@ fun Camera(
                                 .weight(1f),
                         ) {
                             ViewFinder(
-                                viewFinderState.cameraState,
-                                onPreviewSurfaceProviderReady,
-                                viewModel::setZoomScale,
+                                cameraState = viewFinderState.cameraState,
+                                onSurfaceProviderReady = onPreviewSurfaceProviderReady,
+                                onZoomChange = viewModel::setZoomScale,
                             )
                         }
                         Row(
@@ -293,7 +293,7 @@ fun Camera(
                             Spacer(modifier = Modifier.size(50.dp))
                             ShutterButton(
                                 captureMode,
-                                { viewModel.capturePhoto(onMediaCaptured) },
+                                { viewModel.capturePhoto(onMediaCapture) },
                                 { onVideoRecordingStart() },
                                 { onVideoRecordingFinish() },
                             )
@@ -305,13 +305,18 @@ fun Camera(
         }
     } else {
         CameraAndRecordAudioPermission(cameraAndRecordAudioPermissionState) {
-            onMediaCaptured(null)
+            onMediaCapture(null)
         }
     }
 }
 
 @Composable
-fun CameraControls(captureMode: CaptureMode, onPhotoButtonClick: () -> Unit, onVideoButtonClick: () -> Unit) {
+fun CameraControls(
+    captureMode: CaptureMode,
+    onPhotoButtonClick: () -> Unit,
+    onVideoButtonClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
     val activeButtonColor =
         ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.primary)
     val inactiveButtonColor =
@@ -335,8 +340,14 @@ fun CameraControls(captureMode: CaptureMode, onPhotoButtonClick: () -> Unit, onV
 }
 
 @Composable
-fun ShutterButton(captureMode: CaptureMode, onPhotoCapture: () -> Unit, onVideoRecordingStart: () -> Unit, onVideoRecordingFinish: () -> Unit) {
-    Box(modifier = Modifier.padding(25.dp, 0.dp)) {
+fun ShutterButton(
+    captureMode: CaptureMode,
+    onPhotoCapture: () -> Unit,
+    onVideoRecordingStart: () -> Unit,
+    onVideoRecordingFinish: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Box(modifier = modifier.padding(25.dp, 0.dp)) {
         if (captureMode == CaptureMode.PHOTO) {
             Button(
                 onClick = onPhotoCapture,
@@ -370,15 +381,23 @@ fun ShutterButton(captureMode: CaptureMode, onPhotoCapture: () -> Unit, onVideoR
 }
 
 @Composable
-fun CameraSwitcher(captureMode: CaptureMode, cameraSelector: CameraSelector, setCameraSelector: KFunction1<CameraSelector, Unit>) {
+fun CameraSwitcher(
+    captureMode: CaptureMode,
+    cameraSelector: CameraSelector,
+    setCameraSelector: KFunction1<CameraSelector, Unit>,
+    modifier: Modifier = Modifier,
+) {
     if (captureMode != CaptureMode.VIDEO_RECORDING) {
-        IconButton(onClick = {
-            if (cameraSelector == CameraSelector.DEFAULT_BACK_CAMERA) {
-                setCameraSelector(CameraSelector.DEFAULT_FRONT_CAMERA)
-            } else {
-                setCameraSelector(CameraSelector.DEFAULT_BACK_CAMERA)
-            }
-        }) {
+        IconButton(
+            onClick = {
+                if (cameraSelector == CameraSelector.DEFAULT_BACK_CAMERA) {
+                    setCameraSelector(CameraSelector.DEFAULT_FRONT_CAMERA)
+                } else {
+                    setCameraSelector(CameraSelector.DEFAULT_BACK_CAMERA)
+                }
+            },
+            modifier = modifier,
+        ) {
             Icon(
                 imageVector = Icons.Default.Autorenew,
                 contentDescription = null,

app/src/main/java/com/google/android/samples/socialite/ui/camera/CameraAndRecordAudioPermission.kt

@@ -49,10 +49,10 @@ import com.google.android.samples.socialite.R
 fun CameraAndRecordAudioPermission(
     permissionsState: MultiplePermissionsState,
     modifier: Modifier = Modifier,
-    onBackClicked: () -> Unit,
+    onBackClick: () -> Unit,
 ) {
     var alreadyRequestedCameraPermissions by remember { mutableStateOf(false) }
-    fun onRequestPermissionsClicked() {
+    fun onRequestPermissionsClick() {
         permissionsState.launchMultiplePermissionRequest()
         alreadyRequestedCameraPermissions = true
     }
@@ -92,7 +92,7 @@ fun CameraAndRecordAudioPermission(
             } else {
                 if (permissionsState.shouldShowRationale) {
                     Row {
-                        Button(onClick = { onRequestPermissionsClicked() }) {
+                        Button(onClick = { onRequestPermissionsClick() }) {
                             Text(stringResource(R.string.grant_permission))
                         }
                     }
@@ -104,7 +104,7 @@ fun CameraAndRecordAudioPermission(
                 }
             }
 
-            Button(onClick = { onBackClicked() }) {
+            Button(onClick = { onBackClick() }) {
                 Text(stringResource(R.string.back))
             }
         }

app/src/main/java/com/google/android/samples/socialite/ui/camera/CameraXViewfinder.kt

@@ -28,6 +28,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.produceState
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Modifier
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Runnable
@@ -58,9 +59,10 @@ fun CameraXViewfinder(
     implementationMode: ImplementationMode = ImplementationMode.PERFORMANCE,
     onSurfaceProviderReady: (Preview.SurfaceProvider) -> Unit = {},
 ) {
+    val latestOnSurfaceProviderReady by rememberUpdatedState(onSurfaceProviderReady)
     val viewfinderArgs by produceState<ViewfinderArgs?>(initialValue = null, implementationMode) {
         val requests = MutableStateFlow<SurfaceRequest?>(null)
-        onSurfaceProviderReady(
+        latestOnSurfaceProviderReady(
             Preview.SurfaceProvider { request ->
                 requests.update { oldRequest ->
                     oldRequest?.willNotProvideSurface()

app/src/main/java/com/google/android/samples/socialite/ui/camera/ViewFinder.kt

@@ -31,6 +31,7 @@ import androidx.compose.ui.graphics.Color
 @Composable
 fun ViewFinder(
     cameraState: CameraState,
+    modifier: Modifier = Modifier,
     onSurfaceProviderReady: (Preview.SurfaceProvider) -> Unit = {},
     onZoomChange: (Float) -> Unit,
 ) {
@@ -40,7 +41,7 @@ fun ViewFinder(
         },
     )
     Box(
-        Modifier
+        modifier
             .background(Color.Black)
             .fillMaxSize(),
         contentAlignment = Alignment.Center,