Skip to content

Commit

Permalink
Add setting to enable swipe to go back in Look and Feel settings (#1191)
Browse files Browse the repository at this point in the history 
* * Add setting to enable swipe to go back in Look and Feel settings. It is enabled by default.
* Implemented settings check in SwipeToNavigateBack to facilitate disabling functionality.
  • Loading branch information
@sthomas727
sthomas727 authored Aug 21, 2023
1 parent b3ddfee commit 6abe938
Show file tree
Hide file tree
Showing 9 changed files with 356 additions and 28 deletions.
253 changes: 253 additions & 0 deletions app/schemas/com.jerboa.db.AppDB/26.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,253 @@
{
"formatVersion": 1,
"database": {
"version": 26,
"identityHash": "bf20da38fc7d03e28121589dfb372eaf",
"entities": [
{
"tableName": "Account",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `current` INTEGER NOT NULL, `instance` TEXT NOT NULL, `name` TEXT NOT NULL, `jwt` TEXT NOT NULL, `default_listing_type` INTEGER NOT NULL DEFAULT 0, `default_sort_type` INTEGER NOT NULL DEFAULT 0, `verification_state` INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`id`))",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "current",
"columnName": "current",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "instance",
"columnName": "instance",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "jwt",
"columnName": "jwt",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "defaultListingType",
"columnName": "default_listing_type",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "0"
},
{
"fieldPath": "defaultSortType",
"columnName": "default_sort_type",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "0"
},
{
"fieldPath": "verificationState",
"columnName": "verification_state",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "0"
}
],
"primaryKey": {
"autoGenerate": false,
"columnNames": [
"id"
]
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "AppSettings",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `font_size` INTEGER NOT NULL DEFAULT 16, `theme` INTEGER NOT NULL DEFAULT 0, `theme_color` INTEGER NOT NULL DEFAULT 0, `viewed_changelog` INTEGER NOT NULL DEFAULT 0, `post_view_mode` INTEGER NOT NULL DEFAULT 0, `show_bottom_nav` INTEGER NOT NULL DEFAULT 1, `post_navigation_gesture_mode` INTEGER NOT NULL DEFAULT 0, `show_collapsed_comment_content` INTEGER NOT NULL DEFAULT 0, `show_comment_action_bar_by_default` INTEGER NOT NULL DEFAULT 1, `show_voting_arrows_in_list_view` INTEGER NOT NULL DEFAULT 1, `show_parent_comment_navigation_buttons` INTEGER NOT NULL DEFAULT 0, `navigate_parent_comments_with_volume_buttons` INTEGER NOT NULL DEFAULT 0, `use_custom_tabs` INTEGER NOT NULL DEFAULT 1, `use_private_tabs` INTEGER NOT NULL DEFAULT 0, `secure_window` INTEGER NOT NULL DEFAULT 0, `blur_nsfw` INTEGER NOT NULL DEFAULT 1, `show_text_descriptions_in_navbar` INTEGER NOT NULL DEFAULT 1, `markAsReadOnScroll` INTEGER NOT NULL DEFAULT 0, `backConfirmationMode` INTEGER NOT NULL DEFAULT 1, `show_post_link_previews` INTEGER NOT NULL DEFAULT 1, `post_actionbar_mode` INTEGER NOT NULL DEFAULT 0, `auto_play_gifs` INTEGER NOT NULL DEFAULT 0)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "fontSize",
"columnName": "font_size",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "16"
},
{
"fieldPath": "theme",
"columnName": "theme",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "0"
},
{
"fieldPath": "themeColor",
"columnName": "theme_color",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "0"
},
{
"fieldPath": "viewedChangelog",
"columnName": "viewed_changelog",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "0"
},
{
"fieldPath": "postViewMode",
"columnName": "post_view_mode",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "0"
},
{
"fieldPath": "showBottomNav",
"columnName": "show_bottom_nav",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "1"
},
{
"fieldPath": "postNavigationGestureMode",
"columnName": "post_navigation_gesture_mode",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "0"
},
{
"fieldPath": "showCollapsedCommentContent",
"columnName": "show_collapsed_comment_content",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "0"
},
{
"fieldPath": "showCommentActionBarByDefault",
"columnName": "show_comment_action_bar_by_default",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "1"
},
{
"fieldPath": "showVotingArrowsInListView",
"columnName": "show_voting_arrows_in_list_view",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "1"
},
{
"fieldPath": "showParentCommentNavigationButtons",
"columnName": "show_parent_comment_navigation_buttons",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "0"
},
{
"fieldPath": "navigateParentCommentsWithVolumeButtons",
"columnName": "navigate_parent_comments_with_volume_buttons",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "0"
},
{
"fieldPath": "useCustomTabs",
"columnName": "use_custom_tabs",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "1"
},
{
"fieldPath": "usePrivateTabs",
"columnName": "use_private_tabs",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "0"
},
{
"fieldPath": "secureWindow",
"columnName": "secure_window",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "0"
},
{
"fieldPath": "blurNSFW",
"columnName": "blur_nsfw",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "1"
},
{
"fieldPath": "showTextDescriptionsInNavbar",
"columnName": "show_text_descriptions_in_navbar",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "1"
},
{
"fieldPath": "markAsReadOnScroll",
"columnName": "markAsReadOnScroll",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "0"
},
{
"fieldPath": "backConfirmationMode",
"columnName": "backConfirmationMode",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "1"
},
{
"fieldPath": "showPostLinkPreviews",
"columnName": "show_post_link_previews",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "1"
},
{
"fieldPath": "postActionbarMode",
"columnName": "post_actionbar_mode",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "0"
},
{
"fieldPath": "autoPlayGifs",
"columnName": "auto_play_gifs",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "0"
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
},
"indices": [],
"foreignKeys": []
}
],
"views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'bf20da38fc7d03e28121589dfb372eaf')"
]
}
}
6 changes: 5 additions & 1 deletion app/src/main/java/com/jerboa/MainActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,11 @@ class MainActivity : AppCompatActivity() {
),
) {
val args = Route.PostArgs(it)
SwipeToNavigateBack(appState::navigateUp) {

SwipeToNavigateBack(
appSettings.postNavigationGestureMode,
appState::navigateUp,
) {
PostActivity(
id = Either.Left(args.id),
accountViewModel = accountViewModel,
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/jerboa/db/AppDB.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ val APP_SETTINGS_DEFAULT = AppSettings(
themeColor = 0,
viewedChangelog = 0,
postViewMode = 0,
postNavigationGestureMode = 0,
showBottomNav = true,
showCollapsedCommentContent = false,
showCommentActionBarByDefault = true,
Expand All @@ -41,7 +42,7 @@ val APP_SETTINGS_DEFAULT = AppSettings(
)

@Database(
version = 25,
version = 26,
entities = [Account::class, AppSettings::class],
exportSchema = true,
)
Expand Down
18 changes: 18 additions & 0 deletions app/src/main/java/com/jerboa/db/AppDBMigrations.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,22 @@ val MIGRATION_25_24 = object : Migration(25, 24) {
}
}

val MIGRATION_25_26 = object : Migration(25, 26) {
override fun migrate(database: SupportSQLiteDatabase) {
database.execSQL(
"ALTER TABLE AppSettings ADD COLUMN post_navigation_gesture_mode INTEGER NOT NULL DEFAULT 0",
)
}
}

val MIGRATION_26_25 = object : Migration(26, 25) {
override fun migrate(database: SupportSQLiteDatabase) {
database.execSQL(
"ALTER TABLE AppSettings DROP COLUMN post_navigation_gesture_mode",
)
}
}

// Don't forget to test your migration with `./gradlew app:connectAndroidTest`
val MIGRATIONS_LIST = arrayOf(
MIGRATION_1_2,
Expand Down Expand Up @@ -368,4 +384,6 @@ val MIGRATIONS_LIST = arrayOf(
MIGRATION_24_23,
MIGRATION_24_25,
MIGRATION_25_24,
MIGRATION_25_26,
MIGRATION_26_25,
)
5 changes: 5 additions & 0 deletions app/src/main/java/com/jerboa/db/entity/AppSettings.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ data class AppSettings(
defaultValue = "1",
)
val showBottomNav: Boolean,
@ColumnInfo(
name = "post_navigation_gesture_mode",
defaultValue = "0",
)
val postNavigationGestureMode: Int,
@ColumnInfo(
name = "show_collapsed_comment_content",
defaultValue = "0",
Expand Down
15 changes: 15 additions & 0 deletions app/src/main/java/com/jerboa/feat/PostNavigationGestureMode.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.jerboa.feat

import com.jerboa.R

enum class PostNavigationGestureMode(val mode: Int) {
/**
* Disable all navigation gestures within posts.
*/
Disabled(R.string.look_and_feel_post_navigation_gesture_mode_disabled),

/**
* Enable swiping left to navigate away from a post.
*/
SwipeLeft(R.string.look_and_feel_post_navigation_gesture_mode_swipe_left),
}
Loading

0 comments on commit 6abe938

Please sign in to comment.