Implement resolution enhancements and adaptive scaling - #1759
Open
Meloon33 wants to merge 10 commits into
Open
Conversation
Contributor
|
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
📝 WalkthroughWalkthroughThe container configuration dialog now combines resource-defined presets with device-specific native, optimized, and half-resolution entries, applies even-pixel rounding, and calculates aspect-ratio labels. Language dropdown names use localized resources, resolution utilities are tested, and dialog composables receive KDoc documentation. ChangesResolution and localization updates
Estimated code review effort: 3 (Moderate) | ~25 minutes Sequence Diagram(s)sequenceDiagram
participant Dialog as rememberContainerConfigDialogStaticData
participant Metrics as displayMetrics
participant Resources as Android resources
participant Tests as ResolutionUtilsTest
Dialog->>Resources: load presets and resolution labels
Dialog->>Metrics: derive native, optimized, and half resolutions
Dialog->>Dialog: round dimensions and calculate aspect ratios
Dialog->>Dialog: append missing adaptive entries
Tests->>Dialog: verify resolution utility behavior
Possibly related PRs
Suggested reviewers: 🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 3
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In
`@app/src/main/java/app/gamenative/ui/component/dialog/ContainerConfigDialog.kt`:
- Around line 226-233: Update the adaptive-entry construction in the resolution
list’s forEach to compute a reduced aspect ratio from each final device
resolution and include it in the label, matching the existing resolution (ratio)
format while retaining the resolution token first so parsing remains unchanged.
Apply this consistently to Native, Optimized, and Half entries.
- Around line 217-221: Update the resolution construction near deviceRes,
halfRes, and optimizedRes to normalize every width and height to even numbers,
including the unscaled native dimensions. Add one shared helper for
even-dimension normalization and apply it after calculating each scaled value
before constructing the resolution strings.
In `@app/src/main/res/values/arrays.xml`:
- Around line 10-13: Correct the aspect-ratio labels for the 1200x540 and
1600x720 entries in the preset array from 16:9 to 20:9. Leave the existing
labels for the other presets unchanged.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro
Run ID: 86f9b2ad-6517-43f3-a544-a01ef100ec58
📒 Files selected for processing (3)
app/src/main/java/app/gamenative/ui/component/dialog/ContainerConfigDialog.ktapp/src/main/res/values/arrays.xmlapp/src/main/res/values/strings.xml
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
All reported issues were addressed across 3 files
Reply with feedback, questions, or to request a fix.
Re-trigger cubic
added 2 commits
July 23, 2026 12:19
- Corrected aspect ratio labels for 1200x540 and 1600x720 in arrays.xml. - Implemented even-rounding for adaptive resolutions in ContainerConfigDialog.kt to ensure GPU driver compatibility. - Added dynamic aspect ratio calculation for adaptive resolution labels.
Contributor
There was a problem hiding this comment.
All reported issues were addressed across 2 files (changes from recent commits).
Reply with feedback, questions, or to request a fix.
Re-trigger cubic
Contributor
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In @.artifacts/a5345eb0-5a51-42f9-84d8-40ce8706dc06/walkthrough.artifact.md:
- Around line 14-25: Update the walkthrough’s references to
ContainerConfigDialogKt and the toEven helper to match the final evenRound
nearest-even implementation and its actual rounding behavior, including the
Logic Verification examples; alternatively, clearly mark this walkthrough as
historical and retain the implementation plan as authoritative.
In @.artifacts/de870e5b-22ce-4650-9bd4-dcd53c8444da/task.artifact.md:
- Around line 1-12: Update the checklist in the task artifact to mark the
completed implementation and verification items as [x], including the
strings.xml, ContainerConfigDialog.kt, GeneralTab.kt, GraphicsTab.kt, and
verification tasks, so it accurately reflects the finished work.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro Plus
Run ID: 90aaea6b-7684-4a7c-a106-1f5a08b635f2
📒 Files selected for processing (10)
.artifacts/a5345eb0-5a51-42f9-84d8-40ce8706dc06/implementation_plan.artifact.md.artifacts/a5345eb0-5a51-42f9-84d8-40ce8706dc06/task.artifact.md.artifacts/a5345eb0-5a51-42f9-84d8-40ce8706dc06/walkthrough.artifact.md.artifacts/de870e5b-22ce-4650-9bd4-dcd53c8444da/implementation_plan.artifact.md.artifacts/de870e5b-22ce-4650-9bd4-dcd53c8444da/task.artifact.md.artifacts/de870e5b-22ce-4650-9bd4-dcd53c8444da/walkthrough.artifact.mdapp/src/main/java/app/gamenative/ui/component/dialog/ContainerConfigDialog.ktapp/src/main/java/app/gamenative/ui/component/dialog/GeneralTab.ktapp/src/main/java/app/gamenative/ui/component/dialog/GraphicsTab.ktapp/src/main/res/values/strings.xml
🚧 Files skipped from review as they are similar to previous changes (2)
- app/src/main/res/values/strings.xml
- app/src/main/java/app/gamenative/ui/component/dialog/ContainerConfigDialog.kt
Contributor
There was a problem hiding this comment.
Actionable comments posted: 5
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In
@.artifacts/6d5f4ef6-352e-4825-ae35-a9fd50d40231/implementation_plan.artifact.md:
- Line 3: Remove the implementation_plan artifact describing PR `#1760`, or
retarget it to accurately document PR `#1759`’s resolution and localization
changes. Ensure no references to the out-of-scope cross-store/source-switcher
work remain.
- Around line 9-10: Update all machine-local file links in the implementation
plan, including the references to StringUtils.kt and the additionally affected
entries, to use repository-relative Markdown links. Preserve each link’s
displayed filename and target the corresponding path relative to the repository
root.
In
@.artifacts/de870e5b-22ce-4650-9bd4-dcd53c8444da/implementation_plan.artifact.md:
- Around line 28-30: Correct the implementation plan’s testing sections by
moving the manual code inspection and mental KDoc coverage bullets out of
“Automated Tests” into the manual-verification section. Replace them in
“Automated Tests” with the actual unit-test coverage from
ResolutionUtilsTest.kt, describing the tests that verify the ResolutionUtils
behavior.
- Line 20: Update the task.artifact.md link in the implementation plan to use
the repository-relative target task.artifact.md instead of the author-specific
file:///E:/... URI, preserving the existing MODIFY reference and link text.
In `@app/src/main/java/app/gamenative/ui/component/dialog/AdvancedTab.kt`:
- Around line 12-18: Limit each tab’s KDoc to controls actually rendered by its
composable: remove the suspend-policy claim from AdvancedTab.kt lines 12-18,
shooter-mode and physical-mapping claims from ControllerTab.kt lines 19-26, and
TSO/x87 claims from EmulationTab.kt lines 16-22; do not add controls.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro Plus
Run ID: c33d1f7e-645c-4f48-8146-ae4e87a8d83b
📒 Files selected for processing (15)
.artifacts/6d5f4ef6-352e-4825-ae35-a9fd50d40231/implementation_plan.artifact.md.artifacts/6d5f4ef6-352e-4825-ae35-a9fd50d40231/task.artifact.md.artifacts/6d5f4ef6-352e-4825-ae35-a9fd50d40231/walkthrough.artifact.md.artifacts/de870e5b-22ce-4650-9bd4-dcd53c8444da/implementation_plan.artifact.md.artifacts/de870e5b-22ce-4650-9bd4-dcd53c8444da/task.artifact.md.artifacts/de870e5b-22ce-4650-9bd4-dcd53c8444da/walkthrough.artifact.mdapp/src/main/java/app/gamenative/ui/component/dialog/AdvancedTab.ktapp/src/main/java/app/gamenative/ui/component/dialog/ContainerConfigDialog.ktapp/src/main/java/app/gamenative/ui/component/dialog/ControllerTab.ktapp/src/main/java/app/gamenative/ui/component/dialog/DrivesTab.ktapp/src/main/java/app/gamenative/ui/component/dialog/EmulationTab.ktapp/src/main/java/app/gamenative/ui/component/dialog/EnvironmentTab.ktapp/src/main/java/app/gamenative/ui/component/dialog/WinComponentsTab.ktapp/src/main/java/app/gamenative/ui/component/dialog/WineTab.ktapp/src/test/java/app/gamenative/ui/component/dialog/ResolutionUtilsTest.kt
🚧 Files skipped from review as they are similar to previous changes (1)
- .artifacts/de870e5b-22ce-4650-9bd4-dcd53c8444da/walkthrough.artifact.md
| @@ -0,0 +1,57 @@ | |||
| # Implementation Plan - Cross-Store Awareness and Source Switcher Improvements | |||
|
|
|||
| This plan addresses the feedback from PR #1760 regarding the "cross-store awareness and source switcher" feature. It aims to improve name normalization, sibling filtering logic, data scope for source switching, and UI accessibility/layout. | |||
Contributor
There was a problem hiding this comment.
📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win
Remove or retarget this out-of-scope artifact.
This plan describes PR #1760’s cross-store/source-switcher work, while the reviewed PR objectives cover PR #1759’s resolution and localization changes. Keeping it here misrepresents the PR scope and can confuse implementation and audit records.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In
@.artifacts/6d5f4ef6-352e-4825-ae35-a9fd50d40231/implementation_plan.artifact.md
at line 3, Remove the implementation_plan artifact describing PR `#1760`, or
retarget it to accurately document PR `#1759`’s resolution and localization
changes. Ensure no references to the out-of-scope cross-store/source-switcher
work remain.
Contributor
There was a problem hiding this comment.
1 issue found across 15 files (changes from recent commits).
Prompt for AI agents (unresolved issues)
Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.
<file name="app/src/main/java/app/gamenative/ui/component/dialog/ContainerConfigDialog.kt">
<violation number="1" location="app/src/main/java/app/gamenative/ui/component/dialog/ContainerConfigDialog.kt:1118">
P2: Custom resolutions can become square after passing validation: e.g. `4x3` is accepted, then independent nearest-even rounding saves `4x4`. Validate the rounded dimensions (or round before validation) so saved resolutions still meet the width-greater-than-height constraint.</violation>
</file>
Tip: Review your code locally with the cubic CLI to iterate faster.
Re-trigger cubic
| val widthInt = customScreenWidth.toIntOrNull() ?: 0 | ||
| val heightInt = customScreenHeight.toIntOrNull() ?: 0 | ||
| if (widthInt != 0 && heightInt != 0) { | ||
| "${evenRound(widthInt.toFloat())}x${evenRound(heightInt.toFloat())}" |
Contributor
There was a problem hiding this comment.
P2: Custom resolutions can become square after passing validation: e.g. 4x3 is accepted, then independent nearest-even rounding saves 4x4. Validate the rounded dimensions (or round before validation) so saved resolutions still meet the width-greater-than-height constraint.
Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At app/src/main/java/app/gamenative/ui/component/dialog/ContainerConfigDialog.kt, line 1118:
<comment>Custom resolutions can become square after passing validation: e.g. `4x3` is accepted, then independent nearest-even rounding saves `4x4`. Validate the rounded dimensions (or round before validation) so saved resolutions still meet the width-greater-than-height constraint.</comment>
<file context>
@@ -1113,8 +1112,10 @@ fun ContainerConfigDialog(
+ val widthInt = customScreenWidth.toIntOrNull() ?: 0
+ val heightInt = customScreenHeight.toIntOrNull() ?: 0
+ if (widthInt != 0 && heightInt != 0) {
+ "${evenRound(widthInt.toFloat())}x${evenRound(heightInt.toFloat())}"
} else {
config.screenSize
</file context>
…_plan.artifact.md Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
…pect ratio validation, and cleanup documentation
Contributor
There was a problem hiding this comment.
2 issues found across 15 files (changes from recent commits).
Prompt for AI agents (unresolved issues)
Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.
<file name="app/src/main/java/app/gamenative/ui/component/dialog/GeneralTab.kt">
<violation number="1" location="app/src/main/java/app/gamenative/ui/component/dialog/GeneralTab.kt:127">
P2: Custom resolutions with a positive dimension below 1 effective pixel can pass validation but be saved with a zero dimension after `applyScreenSizeToConfig()` rounds the raw input (for example, `1x2` becomes `0x2`). Validating the rounded dimensions should also require `widthInt > 0 && heightInt > 0`, or the rounded values should be passed directly into the applied configuration.</violation>
</file>
<file name="gradle.properties">
<violation number="1" location="gradle.properties:27">
P2: The later `org.gradle.jvmargs` definition overrides the existing JVM settings, silently reducing Gradle's heap from 8 GB to 4 GB and removing `HeapDumpOnOutOfMemoryError` and `file.encoding=UTF-8`. Please merge the intended new option into the existing property instead of defining the key twice.</violation>
</file>
Tip: Review your code locally with the cubic CLI to iterate faster.
Re-trigger cubic
| val widthInt = evenRound(widthRaw.toFloat()) | ||
| val heightInt = evenRound(heightRaw.toFloat()) | ||
|
|
||
| if (widthRaw == 0 || heightRaw == 0) { |
Contributor
There was a problem hiding this comment.
P2: Custom resolutions with a positive dimension below 1 effective pixel can pass validation but be saved with a zero dimension after applyScreenSizeToConfig() rounds the raw input (for example, 1x2 becomes 0x2). Validating the rounded dimensions should also require widthInt > 0 && heightInt > 0, or the rounded values should be passed directly into the applied configuration.
Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At app/src/main/java/app/gamenative/ui/component/dialog/GeneralTab.kt, line 127:
<comment>Custom resolutions with a positive dimension below 1 effective pixel can pass validation but be saved with a zero dimension after `applyScreenSizeToConfig()` rounds the raw input (for example, `1x2` becomes `0x2`). Validating the rounded dimensions should also require `widthInt > 0 && heightInt > 0`, or the rounded values should be passed directly into the applied configuration.</comment>
<file context>
@@ -119,9 +119,12 @@ fun GeneralTabContent(
+ val widthInt = evenRound(widthRaw.toFloat())
+ val heightInt = evenRound(heightRaw.toFloat())
+
+ if (widthRaw == 0 || heightRaw == 0) {
state.customResolutionValidationError.value = nonzeroResolutionError
} else if (widthInt <= heightInt) {
</file context>
Suggested change
| if (widthRaw == 0 || heightRaw == 0) { | |
| if (widthInt <= 0 || heightInt <= 0) { |
| android.nonTransitiveRClass=true | ||
| org.gradle.daemon=true | ||
| org.gradle.parallel=true | ||
| org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g |
Contributor
There was a problem hiding this comment.
P2: The later org.gradle.jvmargs definition overrides the existing JVM settings, silently reducing Gradle's heap from 8 GB to 4 GB and removing HeapDumpOnOutOfMemoryError and file.encoding=UTF-8. Please merge the intended new option into the existing property instead of defining the key twice.
Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At gradle.properties, line 27:
<comment>The later `org.gradle.jvmargs` definition overrides the existing JVM settings, silently reducing Gradle's heap from 8 GB to 4 GB and removing `HeapDumpOnOutOfMemoryError` and `file.encoding=UTF-8`. Please merge the intended new option into the existing property instead of defining the key twice.</comment>
<file context>
@@ -22,3 +22,10 @@ kotlin.code.style=official
android.nonTransitiveRClass=true
+org.gradle.daemon=true
+org.gradle.parallel=true
+org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g
+# Skip tests by default in some tasks
+
</file context>
Owner
|
Hey @Meloon33 - please don't make PRs without discussing in #code-changes in Discord. As these are clearly AI-generated without any human input at all, and touch critical areas of the app, they are unlikely to be approved or merged. Still, we need to discuss each change you're making or planning to make on Discord first. |
christopher-s
added a commit
to christopher-s/GameNative
that referenced
this pull request
Jul 29, 2026
Resolved strings.xml tail conflict (kept both fork mod-import strings and PR aspect-ratio/language strings). Dropped PR junk: .artifacts/ agent output dirs and touched_files.txt.
christopher-s
added a commit
to christopher-s/GameNative
that referenced
this pull request
Jul 29, 2026
…CPU, GPU, KISS)
- Revert gradle.properties to fork version (PR silently downgraded
jvmargs 8g->4g, dropped UTF-8/HeapDump flags, added dead config)
- Extract resolution helpers to ui/util/ResolutionUtils.kt; test moved
to matching package and extended to 8 tests incl. adaptive generation
- Fix contains() substring collision in screenSize index resolution:
custom '200x540' matched preset '1200x540 (20:9)' - now exact token
- Coerce restored screenSizeIndex against rebuilt adaptive list (OOB risk)
- Validate custom resolution post-rounding (negative raw could save 0)
- deviceNativeResolution uses WindowMetrics on API 30+ (multi-window safe)
- Hoist getGPUCards/preset managers into remember{} (config-change jank)
- Replace startsWith dedupe with parsed-resolution comparison; dedupe
among adaptive scales; guard zero dimensions; aspect map for special
ratios; delete dead aspect_ratio string resources
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Description
This PR enhances the resolution selection logic in the container settings to provide better defaults for modern mobile devices and flexible scaling options based on hardware.
Key changes:
1600x720 (20:9)and1200x540 (20:9)as hardcoded options inarrays.xml.Recording
[Placeholder: Resolution dropdown showing Native/75%/50% options]
Type of Change
Checklist
#code-changes, I have discussed this change there and it has been green-lighted. If I do not have access, I have still provided clear context in this PR. If I skip both, I accept that this change may face delays in review, may not be reviewed at all, or may be closed.CONTRIBUTING.md.Summary by cubic
Adds adaptive resolution scaling with even-pixel rounding and aspect‑ratio labels, plus new 20:9 presets for modern phones. Also rounds and validates custom inputs to prevent driver issues and bad aspect ratios.
New Features
1600x720 (20:9)and1200x540 (20:9)presets.Refactors
evenRound; custom dialog now rounds before validating width > height and saves even values. Added unit tests forevenRound,gcd, and ratio formatting.evenRound,gcd, andcalculateAspectRatioto top-level helpers and expands KDoc across all config tabs.strings.xmlforschinese,tchinese,koreana,latam,brazilian.Written for commit d6e092f. Summary will update on new commits.
Summary by CodeRabbit