Skip to content

Commit 5dea4dd

Browse files
authored
Merge pull request #191 from PSPDFKit/reinhard/update-config-adapter
Get rid of default configuration and use the one the SDK provides
2 parents fbe920f + 455ea46 commit 5dea4dd

File tree

1 file changed

+3
-28
lines changed

1 file changed

+3
-28
lines changed

android/src/main/java/com/pspdfkit/react/ConfigurationAdapter.java

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,9 @@ public class ConfigurationAdapter {
6565

6666
public ConfigurationAdapter(@NonNull Context context, ReadableMap configuration) {
6767
ReadableMapKeySetIterator iterator = configuration.keySetIterator();
68-
boolean emptyConfiguration = iterator.hasNextKey() ? false : true;
69-
if (emptyConfiguration) {
70-
this.configuration = getDefaultConfiguration(context);
71-
} else {
72-
this.configuration = new PdfActivityConfiguration.Builder(context);
73-
68+
boolean hasConfiguration = iterator.hasNextKey();
69+
this.configuration = new PdfActivityConfiguration.Builder(context);
70+
if (hasConfiguration) {
7471
if (configuration.hasKey(PAGE_SCROLL_DIRECTION)) {
7572
configurePageScrollDirection(configuration.getString(PAGE_SCROLL_DIRECTION));
7673
}
@@ -300,26 +297,4 @@ private void configureShowDocumentTitleOverlay(boolean showDocumentTitleOverlay)
300297
public PdfActivityConfiguration build() {
301298
return configuration.build();
302299
}
303-
304-
public static PdfActivityConfiguration.Builder getDefaultConfiguration(Context context) {
305-
306-
final PageScrollDirection pageScrollDirection = PageScrollDirection.HORIZONTAL;
307-
final PageScrollMode pageScrollMode = PageScrollMode.PER_PAGE;
308-
final PageFitMode pageFitMode = PageFitMode.FIT_TO_WIDTH;
309-
final int searchType = PdfActivityConfiguration.SEARCH_INLINE;
310-
final UserInterfaceViewMode userInterfaceViewMode = UserInterfaceViewMode.USER_INTERFACE_VIEW_MODE_AUTOMATIC;
311-
final ThumbnailBarMode thumbnailBarMode = ThumbnailBarMode.THUMBNAIL_BAR_MODE_DEFAULT;
312-
int startPage = 0;
313-
314-
PdfActivityConfiguration.Builder configuration = new PdfActivityConfiguration.Builder(context)
315-
.scrollDirection(pageScrollDirection)
316-
.scrollMode(pageScrollMode)
317-
.fitMode(pageFitMode)
318-
.setUserInterfaceViewMode(userInterfaceViewMode)
319-
.setSearchType(searchType)
320-
.setThumbnailBarMode(thumbnailBarMode)
321-
.page(startPage);
322-
323-
return configuration;
324-
}
325300
}

0 commit comments

Comments
 (0)