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

Use real wordings and icons for Theme Settings #30

Merged
merged 13 commits into from
Aug 22, 2024
Merged

Conversation

tevincent
Copy link
Contributor

@tevincent tevincent commented Aug 21, 2024

Depends on #27

@tevincent tevincent changed the base branch from main to settings-selector August 21, 2024 07:25
app/src/main/res/values-it/strings.xml Outdated Show resolved Hide resolved
app/src/main/res/values-it/strings.xml Outdated Show resolved Hide resolved
app/src/main/res/values-it/strings.xml Outdated Show resolved Hide resolved
app/src/main/res/values-it/strings.xml Outdated Show resolved Hide resolved
app/src/main/res/values-it/strings.xml Outdated Show resolved Hide resolved
app/src/main/res/values-it/strings.xml Outdated Show resolved Hide resolved
app/src/main/res/values-it/strings.xml Outdated Show resolved Hide resolved
# Conflicts:
#	app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsThemeScreen.kt
Base automatically changed from settings-selector to main August 21, 2024 14:11
Copy link

@tevincent tevincent enabled auto-merge August 22, 2024 04:16
@tevincent tevincent disabled auto-merge August 22, 2024 04:16
@tevincent tevincent merged commit 375f8c2 into main Aug 22, 2024
4 checks passed
@tevincent tevincent deleted the settings-theme branch August 22, 2024 04:16
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.

3 participants