Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,40 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed

- Replaced checkboxes with switches (https://github.com/orgs/FossifyOrg/discussions/78)

### Fixed

- Security label color in settings

## [1.1.1] - 2025-03-18

### Changed

- Minor bug fixes and improvements
- Added more translations

### Fixed

- Fixed security vulnerability in app lock

## [1.1.0] - 2024-07-22

### Added

- Added collapsible checked items section at the bottom

### Changed

- Minor bug fixes and improvements
- Added new translations

## [1.0.0] - 2024-04-14

### Added

- Initial release

[Unreleased]: https://github.com/FossifyOrg/Notes/compare/1.1.1...HEAD
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ class SettingsActivity : SimpleActivity() {
binding.settingsTextLabel,
binding.settingsStartupLabel,
binding.settingsSavingLabel,
binding.settingsSecurityLabel,
binding.settingsMigratingLabel,
binding.settingsBackupsLabel,
).forEach {
Expand Down
90 changes: 45 additions & 45 deletions app/src/main/res/layout/activity_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,13 @@

<RelativeLayout
android:id="@+id/settings_use_english_holder"
style="@style/SettingsHolderCheckboxStyle"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyAppCompatCheckbox
<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_use_english"
style="@style/SettingsCheckboxStyle"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/use_english_language" />
Expand Down Expand Up @@ -154,13 +154,13 @@

<RelativeLayout
android:id="@+id/settings_show_word_count_holder"
style="@style/SettingsHolderCheckboxStyle"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyAppCompatCheckbox
<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_show_word_count"
style="@style/SettingsCheckboxStyle"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/show_word_count" />
Expand All @@ -169,13 +169,13 @@

<RelativeLayout
android:id="@+id/settings_clickable_links_holder"
style="@style/SettingsHolderCheckboxStyle"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyAppCompatCheckbox
<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_clickable_links"
style="@style/SettingsCheckboxStyle"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/links_and_emails_clickable" />
Expand All @@ -184,13 +184,13 @@

<RelativeLayout
android:id="@+id/settings_monospaced_font_holder"
style="@style/SettingsHolderCheckboxStyle"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyAppCompatCheckbox
<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_monospaced_font"
style="@style/SettingsCheckboxStyle"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/monospaced_font" />
Expand All @@ -199,13 +199,13 @@

<RelativeLayout
android:id="@+id/settings_use_incognito_mode_holder"
style="@style/SettingsHolderCheckboxStyle"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyAppCompatCheckbox
<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_use_incognito_mode"
style="@style/SettingsCheckboxStyle"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/use_incognito_mode" />
Expand All @@ -214,13 +214,13 @@

<RelativeLayout
android:id="@+id/settings_enable_line_wrap_holder"
style="@style/SettingsHolderCheckboxStyle"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyAppCompatCheckbox
<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_enable_line_wrap"
style="@style/SettingsCheckboxStyle"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/enable_line_wrap" />
Expand All @@ -229,13 +229,13 @@

<RelativeLayout
android:id="@+id/settings_move_undone_checklist_items_holder"
style="@style/SettingsHolderCheckboxStyle"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyAppCompatCheckbox
<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_move_undone_checklist_items"
style="@style/SettingsCheckboxStyle"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/move_done_checklist_items" />
Expand Down Expand Up @@ -278,13 +278,13 @@

<RelativeLayout
android:id="@+id/settings_cursor_placement_holder"
style="@style/SettingsHolderCheckboxStyle"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyAppCompatCheckbox
<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_cursor_placement"
style="@style/SettingsCheckboxStyle"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/place_cursor_end" />
Expand All @@ -293,13 +293,13 @@

<RelativeLayout
android:id="@+id/settings_show_keyboard_holder"
style="@style/SettingsHolderCheckboxStyle"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyAppCompatCheckbox
<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_show_keyboard"
style="@style/SettingsCheckboxStyle"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/show_keyboard" />
Expand All @@ -308,13 +308,13 @@

<RelativeLayout
android:id="@+id/settings_show_note_picker_holder"
style="@style/SettingsHolderCheckboxStyle"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyAppCompatCheckbox
<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_show_note_picker"
style="@style/SettingsCheckboxStyle"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/show_note_picker" />
Expand All @@ -334,13 +334,13 @@

<RelativeLayout
android:id="@+id/settings_autosave_notes_holder"
style="@style/SettingsHolderCheckboxStyle"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyAppCompatCheckbox
<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_autosave_notes"
style="@style/SettingsCheckboxStyle"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/autosave_notes" />
Expand All @@ -349,13 +349,13 @@

<RelativeLayout
android:id="@+id/settings_display_success_holder"
style="@style/SettingsHolderCheckboxStyle"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyAppCompatCheckbox
<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_display_success"
style="@style/SettingsCheckboxStyle"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/display_success_message" />
Expand All @@ -379,13 +379,13 @@

<RelativeLayout
android:id="@+id/settings_app_password_protection_holder"
style="@style/SettingsHolderCheckboxStyle"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyAppCompatCheckbox
<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_app_password_protection"
style="@style/SettingsCheckboxStyle"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/password_protect_whole_app" />
Expand All @@ -394,13 +394,13 @@

<RelativeLayout
android:id="@+id/settings_note_deletion_password_protection_holder"
style="@style/SettingsHolderCheckboxStyle"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyAppCompatCheckbox
<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_note_deletion_password_protection"
style="@style/SettingsCheckboxStyle"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/password_protect_note_deletion" />
Expand All @@ -420,13 +420,13 @@

<RelativeLayout
android:id="@+id/settings_enable_automatic_backups_holder"
style="@style/SettingsHolderCheckboxStyle"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.fossify.commons.views.MyAppCompatCheckbox
<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/settings_enable_automatic_backups"
style="@style/SettingsCheckboxStyle"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/enable_automatic_backups" />
Expand Down
11 changes: 5 additions & 6 deletions app/src/main/res/layout/widget_config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,16 @@

<RelativeLayout
android:id="@+id/show_note_title_holder"
style="@style/SettingsHolderSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:padding="@dimen/activity_margin">
android:background="?attr/selectableItemBackground">

<org.fossify.commons.views.MyAppCompatCheckbox
<org.fossify.commons.views.MyMaterialSwitch
android:id="@+id/show_note_title"
style="@style/SettingsSwitchStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:clickable="false"
android:layoutDirection="rtl"
android:text="@string/show_note_title"
app:switchPadding="@dimen/medium_margin" />

Expand All @@ -45,6 +43,7 @@
android:layout_marginTop="@dimen/medium_margin"
android:layout_marginBottom="@dimen/normal_margin"
android:paddingStart="@dimen/activity_margin"
android:paddingEnd="@dimen/activity_margin"
android:text="@string/note_shown_widget" />

<org.fossify.commons.views.MyTextView
Expand Down
Loading