Skip to content
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

refactor: reorganize and rename settings #1307

Merged
merged 36 commits into from
Oct 15, 2023
Merged

refactor: reorganize and rename settings #1307

merged 36 commits into from
Oct 15, 2023

Conversation

KobeW50
Copy link
Contributor

@KobeW50 KobeW50 commented Sep 24, 2023

Closes #1296
Closes #1297

I renamed some of the options, partially based off of palms comment in #1296 (comment)

Huge thanks to @validcube for compiling and testing (bec i have no clue what im doing)

Screenshot_20230924_051747_ReVanced Manager.jpg

@validcube validcube changed the title reorganize and rename settings refactor: reorganize and rename settings Sep 24, 2023
@@ -241,15 +240,15 @@
"importPatchesHint": "Import patches selection from a JSON file",
"importedPatches": "Patches selection imported",

"resetStoredPatchesLabel": "Reset patches",
"resetStoredPatchesLabel": "Reset patches selection",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Im not sure if it should be "Reset patches selection" or "Reset patch selection" (same question for the similar options)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe "Reset selection of patches"?

Copy link
Contributor Author

@KobeW50 KobeW50 Oct 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that sounds clunky. If this is changed the other options need to be changed too for consistency (Ie: "Export selection of patches")

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you think @PalmDevs

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically, it should be patch selections, since it is multiple selections of patches. This can be combined with options which would result in something along the lines of:

Reset patch selections and options

Patches selection just doesn't sound right in my opinion.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, ill make these changes today

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

@validcube validcube requested a review from Ushie September 24, 2023 09:37
Copy link
Member

@validcube validcube left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🥞 LGTM

@validcube validcube requested review from PalmDevs and removed request for Ushie September 24, 2023 09:37
@KobeW50
Copy link
Contributor Author

KobeW50 commented Sep 24, 2023

Should the 'Allow experimental patches' be renamed to something like "Ignore version restraints"?

The current title is generic

@PalmDevs
Copy link
Member

PalmDevs commented Sep 24, 2023

Noticed some inconsistencies:

  • Regenerate keystore (description)
    - used to sign the app
    + used to sign apps
  • Sources & API URL (description)
    Remove custom as you can also reset the setting which means it is not always custom.
    - custom
  • Allow changing patch selection (title)
    - patch selection
    + patches selection
  • Import keystore & Export keystore (description)
    Add the in front of the word keystore. This will imply there can only be one keystore at a time.
    - keystore
    + the keystore
  • Show universal patches (description)
    Change to:
    Display all apps and universal patches (may slow down the app)
    
  • Allow experimental patches (description)
    Change Enable to Allow
    - Enable
    + Allow

@PalmDevs
Copy link
Member

Should the 'Allow experimental patches' be renamed to something like "Ignore version restraints"?

The current title is generic

What does CLI say for the --force flag?

@KobeW50
Copy link
Contributor Author

KobeW50 commented Sep 24, 2023

  • Import keystore & Export keystore (description)
    Add the in front of the word keystore. This will imply there can only be one keystore at a time.
    - keystore
    + the keystore

Even for importing a keystore? Saying "Import the keystore used to sign apps" makes it sounds like there is only one keystore in existence. I think "a keystore" is more appropriate in this context

@PalmDevs
Copy link
Member

Even for importing a keystore? Saying "Import the keystore used to sign apps" makes it sounds like there is only one keystore in existence. I think "a keystore" is more appropriate in this context

Good point, use a instead.

@KobeW50
Copy link
Contributor Author

KobeW50 commented Sep 24, 2023

Should the 'Allow experimental patches' be renamed to something like "Ignore version restraints"?

The current title is generic

What does CLI say for the --force flag?

Im not sure, and idk how to find out

@PalmDevs
Copy link
Member

Here it is. This is unfortunately too nerdy/advanced for an average user to understand however. Any suggestions based on this?

@KobeW50
Copy link
Contributor Author

KobeW50 commented Sep 24, 2023

Thanks. I cant think of anything except that "force" may sound like the user doesn't have a choice

@KobeW50
Copy link
Contributor Author

KobeW50 commented Sep 24, 2023

I asked on discord. osum, ushie, and taku discussed it and came up with these

  1. Bypass version compatibility checks
  2. Bypass version check
  3. Ignore version restrictions
  4. Ignore version constraints
  5. Ignore incompatible version

I dont think it matters too much. All these are better than the current title, but more context will be needed in the description anyway

@PalmDevs
Copy link
Member

I asked on discord. osum, ushie, and taku discussed it and came up with these

  1. Bypass version compatibility checks
  2. Bypass version check
  3. Ignore version restrictions
  4. Ignore version constraints
  5. Ignore incompatible version

I dont think it matters too much. All these are better than the current title, but more context will be needed in the description anyway

5 is out of the question, it's not necessarily incompatible at times. 1 is unfortunately too long. However, combinations of 2 and 3 or 4 might work.

  1. Bypass version restrictions
  2. Bypass version constraints

@oSumAtrIX
Copy link
Member

How about negating and calling the switch "Version compatibility check" and having it on by default?

@PalmDevs
Copy link
Member

How about negating and calling the switch "Version compatibility check" and having it on by default?

Good idea. It makes you feel like you're turning off a feature.

changed a file name and string
@KobeW50
Copy link
Contributor Author

KobeW50 commented Sep 26, 2023

Should I rename all strings relating to the Info section to refer to it as the Debug section instead so it is easier to understand the code? And should I do the same while renaming the "experimental patches" to "Version compatibility check"?

(edit: I reflected these changes locally and can push them. I just don't know how to revert a push or commit so I'm waiting for a "go-ahead")

Also, I'm not sure how to change the default value for the Version compatibility check toggle so ill need someone to help me out. I asked validcube on discord. Will see if he's down

Lastly, do I need to build the apk after the final changes are made to test? Some of you may know that I cant figure flutter out 😅

@KobeW50
Copy link
Contributor Author

KobeW50 commented Sep 26, 2023

  • Show universal patches (description)
    Change to:

Display all apps and universal patches (may slow down the app)

This implies that the app will be slower in general, but only the app list loading speed is affected

changes all references to the experimental patches support to "version compatibility check"
@Ushie
Copy link
Member

Ushie commented Oct 13, 2023

@PalmDevs

2023-10-13.23-03-02.mp4

@KobeW50
Copy link
Contributor Author

KobeW50 commented Oct 13, 2023

We ended up keeping the 'Reset patch options' in the import/export section because it is closely related to the 'Reset patch selections'.

Copy link
Member

@PalmDevs PalmDevs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs a few string changes and documentation changes.

assets/i18n/en_US.json Outdated Show resolved Hide resolved
assets/i18n/en_US.json Outdated Show resolved Hide resolved
docs/2_4_settings.md Outdated Show resolved Hide resolved
docs/2_4_settings.md Outdated Show resolved Hide resolved
docs/2_4_settings.md Outdated Show resolved Hide resolved
docs/2_4_settings.md Outdated Show resolved Hide resolved
docs/2_4_settings.md Outdated Show resolved Hide resolved
docs/2_4_settings.md Outdated Show resolved Hide resolved
docs/2_4_settings.md Outdated Show resolved Hide resolved
@KobeW50
Copy link
Contributor Author

KobeW50 commented Oct 13, 2023

@PalmDevs I'm not sure if it sends notifications for code review replies (sorry for the extra ping if it did)

@PalmDevs
Copy link
Member

@KobeW50 Press change any "Patch selections" to "Patch selection", the pluralized form of selection is not needed. Thank you! 🙏

@KobeW50
Copy link
Contributor Author

KobeW50 commented Oct 13, 2023

@KobeW50 Press change any "Patch selections" to "Patch selection", the pluralized form of selection is not needed. Thank you! 🙏

What about what was discussed here? Are we considering all selections as one collective selection? I think what you and oSum said earlier is the correct wording

When we are referring to the selection of all apps, it should be patch selections.

@PalmDevs
Copy link
Member

What about what was discussed here? Are we considering all selections as one collective selection? I think what you and oSum said earlier is the correct wording

When we are referring to the selection of all apps, it should be patch selections.

Yes, we'll be considering every selection as one collective selection.

@KobeW50
Copy link
Contributor Author

KobeW50 commented Oct 13, 2023

Yes, we'll be considering every selection as one collective selection.

It seems confusing to use the same term to refer to a single selection and the collective of multiple selections.

When Patch selections is used, the user immediately knows that it is referring to all selections. I don't see a downside to using plural selections if the context allows it.

@oSumAtrIX
Copy link
Member

If you can say Selection of patches instead of Selections of patches then you should also be able to say Patch selection.

@KobeW50
Copy link
Contributor Author

KobeW50 commented Oct 15, 2023

There are still instances of "ReVanced Patches" in the consent dialog, but as far as I know, this dialog only appears the first time the app is opened, so the source and API will always be from ReVanced.

SmartSelect_20231014_203241_ReVanced Manager.jpg

@KobeW50 KobeW50 requested a review from PalmDevs October 15, 2023 04:21
@KobeW50
Copy link
Contributor Author

KobeW50 commented Oct 15, 2023

I believe this is ready to be merged.

@KobeW50 KobeW50 requested a review from oSumAtrIX October 15, 2023 04:22
Copy link
Member

@PalmDevs PalmDevs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few changes I've missed (sorry!) and we're good.

assets/i18n/en_US.json Outdated Show resolved Hide resolved
assets/i18n/en_US.json Outdated Show resolved Hide resolved
Copy link
Member

@PalmDevs PalmDevs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Inconsistent settings option name and description feat: Improve manager settings order
5 participants