Repository navigation
Round the zoom bar indicator's ends on the first and last stops #638
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
5cbde6a
Round the zoom bar indicator's ends on the first and last stops
temcguir 4567b07
Make zoom bar screenshot previews private
temcguir fb09934
Make zoom bar screenshot previews internal so they can be invoked ref…
temcguir 0635687
Merge remote-tracking branch 'origin/main' into temcguir/zoombar-roun…
temcguir 177c1a5
Merge branch 'main' into temcguir/zoombar-rounded-endcaps
temcguir File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 77 additions & 0 deletions
77
...enshotTest/kotlin/com/google/jetpackcamera/ui/components/capture/ZoomBarScreenshotTest.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| /* | ||
| * Copyright (C) 2026 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.google.jetpackcamera.ui.components.capture | ||
|
|
||
| import androidx.compose.foundation.gestures.Orientation | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import com.android.tools.screenshot.PreviewTest | ||
|
|
||
| /** Horizontal zoom bar with the first stop selected. */ | ||
| @PreviewTest | ||
| @Preview | ||
| @Composable | ||
| internal fun ZoomBarHorizontalFirstStopScreenshotPreview() { | ||
| ZoomBarPreview(zoomRatio = 0.5f) | ||
| } | ||
|
|
||
| /** Horizontal zoom bar with a middle stop selected. */ | ||
| @PreviewTest | ||
| @Preview | ||
| @Composable | ||
| internal fun ZoomBarHorizontalMiddleStopScreenshotPreview() { | ||
| ZoomBarPreview(zoomRatio = 1.0f) | ||
| } | ||
|
|
||
| /** Horizontal zoom bar with the last stop selected. */ | ||
| @PreviewTest | ||
| @Preview | ||
| @Composable | ||
| internal fun ZoomBarHorizontalLastStopScreenshotPreview() { | ||
| ZoomBarPreview(zoomRatio = 5.0f) | ||
| } | ||
|
|
||
| /** Vertical zoom bar with the first stop selected. */ | ||
| @PreviewTest | ||
| @Preview | ||
| @Composable | ||
| internal fun ZoomBarVerticalFirstStopScreenshotPreview() { | ||
| ZoomBarPreview(zoomRatio = 0.5f, orientation = Orientation.Vertical) | ||
| } | ||
|
|
||
| /** Vertical zoom bar with a middle stop selected. */ | ||
| @PreviewTest | ||
| @Preview | ||
| @Composable | ||
| internal fun ZoomBarVerticalMiddleStopScreenshotPreview() { | ||
| ZoomBarPreview(zoomRatio = 1.0f, orientation = Orientation.Vertical) | ||
| } | ||
|
|
||
| /** Vertical zoom bar with the last stop selected. */ | ||
| @PreviewTest | ||
| @Preview | ||
| @Composable | ||
| internal fun ZoomBarVerticalLastStopScreenshotPreview() { | ||
| ZoomBarPreview(zoomRatio = 5.0f, orientation = Orientation.Vertical) | ||
| } | ||
|
|
||
| /** Zoom bar with a single stop. */ | ||
| @PreviewTest | ||
| @Preview | ||
| @Composable | ||
| internal fun ZoomBarSingleStopScreenshotPreview() { | ||
| ZoomBarPreview(zoomRatio = 1.0f, zoomLevels = listOf(1.0f), colors = ZoomBarDefaults.colors()) | ||
| } | ||
Binary file added
BIN
+6.75 KB
...pture/ZoomBarScreenshotTestKt/ZoomBarHorizontalFirstStopScreenshotPreview_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+6.75 KB
...apture/ZoomBarScreenshotTestKt/ZoomBarHorizontalLastStopScreenshotPreview_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+6.07 KB
...ture/ZoomBarScreenshotTestKt/ZoomBarHorizontalMiddleStopScreenshotPreview_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+4.55 KB
...onents/capture/ZoomBarScreenshotTestKt/ZoomBarSingleStopScreenshotPreview_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+7.7 KB
...capture/ZoomBarScreenshotTestKt/ZoomBarVerticalFirstStopScreenshotPreview_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+7.71 KB
.../capture/ZoomBarScreenshotTestKt/ZoomBarVerticalLastStopScreenshotPreview_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+8.03 KB
...apture/ZoomBarScreenshotTestKt/ZoomBarVerticalMiddleStopScreenshotPreview_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.