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

Add non mirrored only votes swipe action #1421

Merged
merged 6 commits into from Mar 8, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
279 changes: 279 additions & 0 deletions app/schemas/com.jerboa.db.AppDB/30.json
@@ -0,0 +1,279 @@
{
"formatVersion": 1,
"database": {
"version": 30,
"identityHash": "9ba87658605a1a57d0a4bebb42d35828",
"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, `is_admin` INTEGER NOT NULL, `is_mod` INTEGER NOT NULL, 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"
},
{
"fieldPath": "isAdmin",
"columnName": "is_admin",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "isMod",
"columnName": "is_mod",
"affinity": "INTEGER",
"notNull": true
}
],
"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, `swipe_to_action_preset` INTEGER NOT NULL DEFAULT 0, `last_version_code_viewed` 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"
},
{
"fieldPath": "swipeToActionPreset",
"columnName": "swipe_to_action_preset",
"affinity": "INTEGER",
"notNull": true,
"defaultValue": "0"
},
{
"fieldPath": "lastVersionCodeViewed",
"columnName": "last_version_code_viewed",
"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, '9ba87658605a1a57d0a4bebb42d35828')"
]
}
}
4 changes: 2 additions & 2 deletions app/src/main/java/com/jerboa/db/AppDB.kt
Expand Up @@ -41,11 +41,11 @@ val APP_SETTINGS_DEFAULT =
showPostLinkPreviews = true,
postActionBarMode = 0,
autoPlayGifs = false,
swipeToActionPreset = SwipeToActionPreset.DEFAULT.ordinal,
swipeToActionPreset = SwipeToActionPreset.DISABLED.ordinal,
Copy link
Member

Choose a reason for hiding this comment

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

I agree, disabled default is probably best.

)

@Database(
version = 29,
version = 30,
entities = [Account::class, AppSettings::class],
exportSchema = true,
)
Expand Down
48 changes: 48 additions & 0 deletions app/src/main/java/com/jerboa/db/AppDBMigrations.kt
Expand Up @@ -371,6 +371,53 @@ val MIGRATION_28_29 =
}
}

val MIGRATION_29_30 =
object : Migration(29, 30) {
override fun migrate(db: SupportSQLiteDatabase) {
// Add new default swipe_to_action_preset to 0

db.execSQL(
"""
CREATE TABLE IF NOT EXISTS AppSettingsBackup (
`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,
`swipe_to_action_preset` INTEGER NOT NULL DEFAULT 0,
`last_version_code_viewed` INTEGER NOT NULL DEFAULT 0
)
""".trimIndent(),
)

db.execSQL(
"""
INSERT INTO AppSettingsBackup SELECT * FROM AppSettings
""",
)
db.execSQL("DROP TABLE AppSettings")
db.execSQL("ALTER TABLE AppSettingsBackup RENAME to AppSettings")
}
}

// Don't forget to test your migration with `./gradlew app:connectAndroidTest`
val MIGRATIONS_LIST =
arrayOf(
Expand Down Expand Up @@ -402,4 +449,5 @@ val MIGRATIONS_LIST =
MIGRATION_26_27,
MIGRATION_27_28,
MIGRATION_28_29,
MIGRATION_29_30,
)
2 changes: 1 addition & 1 deletion app/src/main/java/com/jerboa/db/entity/AppSettings.kt
Expand Up @@ -122,7 +122,7 @@ data class AppSettings(
val autoPlayGifs: Boolean,
@ColumnInfo(
name = "swipe_to_action_preset",
defaultValue = "1",
defaultValue = "0",
)
val swipeToActionPreset: Int,
@ColumnInfo(
Expand Down
11 changes: 8 additions & 3 deletions app/src/main/java/com/jerboa/feat/SwipeToAction.kt
Copy link
Contributor

Choose a reason for hiding this comment

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

That doesn't really fix the issue, I tried

Copy link
Collaborator Author

@MV-GH MV-GH Mar 5, 2024

Choose a reason for hiding this comment

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

Yeah it doesn't ;/

Maybe messing with the dampner options?

Edit nvm this seems only for the color animation

Copy link
Contributor

@Snow4DV Snow4DV Mar 6, 2024

Choose a reason for hiding this comment

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

Yeah it doesn't ;/

Maybe messing with the dampner options?

I also tried this workaround: https://stackoverflow.com/a/76604939 (change velocity threshold of anchoreddraggable) modifying stuff using java's reflections and it behaves the same sadly :(

I'll try digging deeper when i have time. There's resistance param in old material (not material3) swipetodismiss. It might improve the situation

Expand Up @@ -18,7 +18,7 @@ enum class SwipeToActionType {
;

companion object {
const val START_THRESHOLD = 0.05f
const val START_THRESHOLD = 0.10f

fun getActionToRangeList(actions: List<SwipeToActionType>): List<Pair<OpenEndRange<Float>, SwipeToActionType>> {
val start = START_THRESHOLD + 0.05f
Expand Down Expand Up @@ -74,7 +74,7 @@ enum class SwipeToActionPreset(
val resId: Int,
) {
DISABLED(emptyList(), emptyList(), R.string.swipe_action_preset_disabled),
DEFAULT(
TWO_SIDES(
listOf(SwipeToActionType.Reply, SwipeToActionType.Save),
listOf(SwipeToActionType.Upvote, SwipeToActionType.Downvote),
R.string.swipe_action_preset_default,
Expand Down Expand Up @@ -104,9 +104,14 @@ enum class SwipeToActionPreset(
emptyList(),
R.string.only_left_swipe_action_preset,
),
ONLY_VOTES(
ONLY_VOTES_MIRRORED(
listOf(SwipeToActionType.Downvote),
listOf(SwipeToActionType.Upvote),
R.string.swipe_action_preset_only_votes_mirrored,
),
ONLY_VOTES(
listOf(SwipeToActionType.Upvote),
listOf(SwipeToActionType.Downvote),
R.string.swipe_action_preset_only_votes,
),
}