2
5
Fork
You've already forked SoundRecorderPlus
0

New Compose UI Part 1: Merge build variants and add empty UI #14

Open
generic-pers0n wants to merge 3 commits from new-compose-ui into main
pull from: new-compose-ui
merge into: generic-pers0n:main
generic-pers0n:main

This PR enables the Compose Compiler plugin and adds a new compose build variant to enable the new Compose-based UI. The Views-based UI, which is under the views build variant, is still the default when building SR+.

This PR enables the Compose Compiler plugin and adds a new `compose` build variant to enable the new Compose-based UI. The Views-based UI, which is under the `views` build variant, is still the default when building SR+.
Signed-off-by: Avery King <avery98@pm.me>
There are two new build variants:
* 'compose' variant: builds SR+ with the new Compose UI (nothing yet)
* 'views' variant: builds SR+ with the old Views UI (default)
Signed-off-by: Avery King <avery98@pm.me>
Signed-off-by: Avery King <avery98@pm.me>
Contributor
Copy link

compose build variant is dead because the compose compiler plugin is required.

compose build variant is dead because the compose compiler plugin is required.
Author
Owner
Copy link

compose build variant is dead because the compose compiler plugin is required.

Wouldn't this be intentional? The compose build variant would require it since it's using a Compose-based UI. I could be mistaken...

> compose build variant is dead because the compose compiler plugin is required. Wouldn't this be intentional? The compose build variant would require it since it's using a Compose-based UI. I could be mistaken...
This pull request has changes conflicting with the target branch.
  • app/build.gradle.kts
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin new-compose-ui:new-compose-ui
git switch new-compose-ui

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff new-compose-ui
git switch new-compose-ui
git rebase main
git switch main
git merge --ff-only new-compose-ui
git switch new-compose-ui
git rebase main
git switch main
git merge --no-ff new-compose-ui
git switch main
git merge --squash new-compose-ui
git switch main
git merge --ff-only new-compose-ui
git switch main
git merge new-compose-ui
git push origin main
Sign in to join this conversation.
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
generic-pers0n/SoundRecorderPlus!14
Reference in a new issue
generic-pers0n/SoundRecorderPlus
No description provided.
Delete branch "new-compose-ui"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?