Skip to content

Get rid of default configuration and use the one the SDK provides #191

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.

Sign up for GitHub

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

Merged
irgendeinich merged 1 commit into from
Mar 22, 2019
Merged

Get rid of default configuration and use the one the SDK provides #191

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 3 additions & 28 deletions android/src/main/java/com/pspdfkit/react/ConfigurationAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,9 @@ public class ConfigurationAdapter {

public ConfigurationAdapter(@NonNull Context context, ReadableMap configuration) {
ReadableMapKeySetIterator iterator = configuration.keySetIterator();
boolean emptyConfiguration = iterator.hasNextKey() ? false : true;
if (emptyConfiguration) {
this.configuration = getDefaultConfiguration(context);
} else {
this.configuration = new PdfActivityConfiguration.Builder(context);

boolean hasConfiguration = iterator.hasNextKey();
this.configuration = new PdfActivityConfiguration.Builder(context);
if (hasConfiguration) {
if (configuration.hasKey(PAGE_SCROLL_DIRECTION)) {
configurePageScrollDirection(configuration.getString(PAGE_SCROLL_DIRECTION));
}
Expand Down Expand Up @@ -300,26 +297,4 @@ private void configureShowDocumentTitleOverlay(boolean showDocumentTitleOverlay)
public PdfActivityConfiguration build() {
return configuration.build();
}

public static PdfActivityConfiguration.Builder getDefaultConfiguration(Context context) {

final PageScrollDirection pageScrollDirection = PageScrollDirection.HORIZONTAL;
final PageScrollMode pageScrollMode = PageScrollMode.PER_PAGE;
final PageFitMode pageFitMode = PageFitMode.FIT_TO_WIDTH;
final int searchType = PdfActivityConfiguration.SEARCH_INLINE;
final UserInterfaceViewMode userInterfaceViewMode = UserInterfaceViewMode.USER_INTERFACE_VIEW_MODE_AUTOMATIC;
final ThumbnailBarMode thumbnailBarMode = ThumbnailBarMode.THUMBNAIL_BAR_MODE_DEFAULT;
int startPage = 0;

PdfActivityConfiguration.Builder configuration = new PdfActivityConfiguration.Builder(context)
.scrollDirection(pageScrollDirection)
.scrollMode(pageScrollMode)
.fitMode(pageFitMode)
.setUserInterfaceViewMode(userInterfaceViewMode)
.setSearchType(searchType)
.setThumbnailBarMode(thumbnailBarMode)
.page(startPage);

return configuration;
}
}