Skip to content

Enhance MediaRepository with reactive flow and update ImageWell animation #531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
temcguir wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Enhance MediaRepository with reactive flow and update ImageWell animation #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7c6694e
Enhance ImageWell UI with vertical push animation and sticky content
temcguir Apr 8, 2026
56e46c7
Optimize MediaStore repository with reactive flow, URI filtering, and…
temcguir Jun 12, 2026
761e5d0
Address code review: Fix race condition, refine ownership check, and …
temcguir Jun 12, 2026
690535e
Address code review and fix b/522926012: Dynamic prefix for media search
temcguir Jun 12, 2026
20fd15d
Address code review and fix b/522926012: Robust RELATIVE_PATH media f…
temcguir Jun 12, 2026
76ac88a
Address code review and fix b/522926012: Update unit tests for robust…
temcguir Jun 12, 2026
6ca114b
Fix CameraAppSettingsViewModelTest mock for ConcurrentCamera
Jul 22, 2026
14bc40d
Merge branch 'main' into temcguir/imagewell_uistate_refactor
Jul 22, 2026
0a50b3e
Fix PreviewViewModel unresolved reference to getLastCapturedMedia()
Jul 23, 2026
53802d4
Refactor ImageWellController to fully embrace reactive StateFlow from…
Jul 23, 2026
34b088e
Apply spotless formatting
Jul 23, 2026
e27982b
Fix LocalMediaRepositoryTest failures caused by recent main merge
Jul 23, 2026
58726f8
Apply spotless formatting\n\nTAG=agy\nCONV=c141a4e9-d7bd-4552-afba-b0…
Jul 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ dependencies {

// Access settings & model data
implementation(project(":data:settings"))
implementation(project(":data:media"))
implementation(project(":core:settings:datastore-prefs"))
implementation(project(":core:settings"))
implementation(project(":core:model"))
Expand Down
9 changes: 7 additions & 2 deletions app/src/main/java/com/google/jetpackcamera/JcaFilePathGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ class JcaFilePathGenerator : FilePathGenerator {
private val RELATIVE_OUTPUT_PATH: String =
"${Environment.DIRECTORY_DCIM}${File.separator}Camera"
}

override val prefix: String = "JCA"

override val baseRelativePath: String = RELATIVE_OUTPUT_PATH

override val relativeImageOutputPath: String = RELATIVE_OUTPUT_PATH

override val relativeVideoOutputPath: String = RELATIVE_OUTPUT_PATH
Expand Down Expand Up @@ -64,7 +69,7 @@ class JcaFilePathGenerator : FilePathGenerator {

override fun generateImageFilename(suffixText: String?, fileExtension: String?): String {
return constructFilename(
"JCA-photo",
"$prefix-photo",
createTimestamp().toString(),
suffixText,
fileExtension
Expand All @@ -73,7 +78,7 @@ class JcaFilePathGenerator : FilePathGenerator {

override fun generateVideoFilename(suffixText: String?, fileExtension: String?): String {
return constructFilename(
"JCA-recording",
"$prefix-recording",
createTimestamp().toString(),
suffixText,
fileExtension
Expand Down
307 changes: 307 additions & 0 deletions build_err.txt
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions core/common/src/main/java/com/google/jetpackcamera/core/common/FilePathGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@ package com.google.jetpackcamera.core.common
*/
interface FilePathGenerator {

/**
* The prefix used for generated filenames.
*/
val prefix: String

/**
* The base relative path where media is stored (e.g., "DCIM/Camera").
* Used for filtering in the MediaStore on API 29+.
*/
val baseRelativePath: String

/**
* Provides the relative output path for an image file, used for MediaStore.
*
Expand Down
8 changes: 6 additions & 2 deletions ...sting/src/main/java/com/google/jetpackcamera/core/common/testing/FakeFilePathGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ class FakeFilePathGenerator : FilePathGenerator {
"${Environment.DIRECTORY_DCIM}${File.separator}Camera"
}

override val prefix: String = "JCA"

override val baseRelativePath: String = RELATIVE_OUTPUT_PATH

override val relativeImageOutputPath: String = RELATIVE_OUTPUT_PATH

override val relativeVideoOutputPath: String = RELATIVE_OUTPUT_PATH
Expand Down Expand Up @@ -63,7 +67,7 @@ class FakeFilePathGenerator : FilePathGenerator {

override fun generateImageFilename(suffixText: String?, fileExtension: String?): String {
return constructFilename(
"JCA-test-photo",
"$prefix-test-photo",
createTimestamp().toString(),
suffixText,
fileExtension
Expand All @@ -72,7 +76,7 @@ class FakeFilePathGenerator : FilePathGenerator {

override fun generateVideoFilename(suffixText: String?, fileExtension: String?): String {
return constructFilename(
"JCA-test-recording",
"$prefix-test-recording",
createTimestamp().toString(),
suffixText,
fileExtension
Expand Down
Loading
Loading