Fix scroll direction being ignored on first run #178
Conversation
Setting currentScrollDirection to .horizontal was ignored before the user changed it manually. Now, setting it like mentioned, the book scrolls horizontally as expected, and if the user changes it to vertical, it is respected by the app. Not setting the property still scrolls vertically by default, as before.
|
I am not sure about this, how can I reproduce this behavior? |
|
This is easily reproducible by creating a sample app and setting the More easy than this is to open your example app, and, IIRC, none of the 2 books are being able to be scrolled horizontally on the first run, even though it's set this way for one of them. |
| @@ -69,7 +69,7 @@ open class FolioReaderContainer: UIViewController { | |||
| kCurrentHighlightStyle: 0, | |||
| kCurrentTOCMenu: 0, | |||
| kCurrentMediaOverlayStyle: MediaOverlayStyle.default.rawValue, | |||
| kCurrentScrollDirection: FolioReaderScrollDirection.vertical.rawValue | |||
| kCurrentScrollDirection: FolioReaderScrollDirection.defaultVertical.rawValue | |||
There was a problem hiding this comment.
This makes sure the initial value of the scroll direction is the new .defaultVertical, and not .vertical. This default value works as vertical if the user doesn't sets another value for the config's scroll direction.
| @@ -95,8 +95,13 @@ open class FolioReaderContainer: UIViewController { | |||
|
|
|||
| // If user can change scroll direction use the last saved | |||
| if readerConfig.canChangeScrollDirection { | |||
| let direction = FolioReaderScrollDirection(rawValue: FolioReader.currentScrollDirection) ?? .vertical | |||
| readerConfig.scrollDirection = direction | |||
| var scrollDirection = FolioReaderScrollDirection(rawValue: FolioReader.currentScrollDirection) ?? .vertical | |||
There was a problem hiding this comment.
This loads the persisted scroll direction, which, in the first app run, is .defaultVertical as set by the line #72.
| readerConfig.scrollDirection = direction | ||
| var scrollDirection = FolioReaderScrollDirection(rawValue: FolioReader.currentScrollDirection) ?? .vertical | ||
|
|
||
| if (scrollDirection == .defaultVertical && readerConfig.scrollDirection != .defaultVertical) { |
There was a problem hiding this comment.
If the persisted value is .defaultVertical, meaning this is the first app run, and the user has set a scroll direction different from the default one, use the user's scroll direction.
| @@ -234,7 +234,14 @@ class FolioReaderFontsMenu: UIViewController, SMSegmentViewDelegate, UIGestureRe | |||
| layoutDirection.tag = 3 | |||
| layoutDirection.addSegmentWithTitle(readerConfig.localizedLayoutVertical, onSelectionImage: verticalSelected, offSelectionImage: verticalNormal) | |||
| layoutDirection.addSegmentWithTitle(readerConfig.localizedLayoutHorizontal, onSelectionImage: horizontalSelected, offSelectionImage: horizontalNormal) | |||
| layoutDirection.selectSegmentAtIndex(Int(FolioReader.currentScrollDirection)) | |||
|
|
|||
| var scrollDirection = FolioReaderScrollDirection(rawValue: FolioReader.currentScrollDirection) | |||
There was a problem hiding this comment.
Can't remember why didn't it require me to add ?? .vertical here too, as on the line #98.
|
|
||
| var scrollDirection = FolioReaderScrollDirection(rawValue: FolioReader.currentScrollDirection) | ||
|
|
||
| if scrollDirection == .defaultVertical && readerConfig.scrollDirection != .defaultVertical { |
Setting currentScrollDirection to .horizontal was ignored before the
user changed it manually. Now, setting it like mentioned, the book
scrolls horizontally as expected, and if the user changes it to
vertical, it is respected by the app. Not setting the property still
scrolls vertically by default, as before.