Skip to content

Commit 903c284

Browse files
Fix compilation errors from merge/rebase: missing Row import, duplicate vars, private PREFS_NAME access
1 parent b12089f commit 903c284

3 files changed

Lines changed: 2 additions & 3 deletions

File tree

app/src/main/kotlin/com/google/ai/sample/MainActivity.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
4747
import androidx.compose.foundation.layout.height
4848
import androidx.compose.foundation.layout.PaddingValues
4949
import androidx.compose.foundation.layout.padding
50+
import androidx.compose.foundation.layout.Row
5051
import androidx.compose.material3.Button
5152
import androidx.compose.material3.Card
5253
import androidx.compose.material3.CircularProgressIndicator

app/src/main/kotlin/com/google/ai/sample/feature/multimodal/PhotoReasoningScreen.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,6 @@ internal fun PhotoReasoningRoute(
180180
val coroutineScope = rememberCoroutineScope()
181181
val imageRequestBuilder = ImageRequest.Builder(LocalContext.current)
182182
val imageLoader = ImageLoader.Builder(LocalContext.current).build()
183-
val context = LocalContext.current
184-
val mainActivity = context as? MainActivity
185183

186184
val isAccessibilityServiceEffectivelyEnabled by mainActivity?.isAccessibilityServiceEnabledFlow?.collectAsState() ?: mutableStateOf(false)
187185
val isMediaProjectionPermissionGranted by mainActivity?.isMediaProjectionPermissionGrantedFlow?.collectAsState() ?: mutableStateOf(false)

app/src/main/kotlin/com/google/ai/sample/feature/multimodal/PhotoReasoningViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1389,7 +1389,7 @@ class PhotoReasoningViewModel(
13891389

13901390
private fun postTaskToHumanExpert(text: String) {
13911391
val context = getApplication<Application>().applicationContext
1392-
val prefs = context.getSharedPreferences(com.google.ai.sample.MainActivity.PREFS_NAME, Context.MODE_PRIVATE)
1392+
val prefs = context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
13931393
val supportId = prefs.getString("payment_support_id", null)
13941394

13951395
signalingClient?.postTask(text, hasScreenshot = false, supportId = supportId) // Capture live stream instead

0 commit comments

Comments
 (0)