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.

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

Adds Javascript API to customize the font picker #363

Merged
merged 3 commits into from
May 25, 2020
Merged

Adds Javascript API to customize the font picker #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39a5970
Add Javascript API to customize the font picker on iOS
Apr 13, 2020
6b72996
Add support for availableFontNames and selectedFontName on Android
Apr 16, 2020
cc92d1a
Improve the usage of the custom picker view controller
May 13, 2020
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
18 changes: 11 additions & 7 deletions android/src/main/java/com/pspdfkit/react/ReactPdfViewManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,7 @@
import com.facebook.react.uimanager.annotations.ReactProp;
import com.pspdfkit.annotations.Annotation;
import com.pspdfkit.preferences.PSPDFKitPreferences;
import com.pspdfkit.react.events.PdfViewAnnotationChangedEvent;
import com.pspdfkit.react.events.PdfViewAnnotationTappedEvent;
import com.pspdfkit.react.events.PdfViewDataReturnedEvent;
import com.pspdfkit.react.events.PdfViewDocumentLoadFailedEvent;
import com.pspdfkit.react.events.PdfViewDocumentSaveFailedEvent;
import com.pspdfkit.react.events.PdfViewDocumentSavedEvent;
import com.pspdfkit.react.events.PdfViewStateChangedEvent;
import com.pspdfkit.react.menu.ReactGroupingRule;
import com.pspdfkit.views.PdfView;

Expand Down Expand Up @@ -154,10 +148,20 @@ public void setShowNavigationButtonInToolbar(@NonNull final PdfView view, final
}

@ReactProp(name= "hideDefaultToolbar")
public void setHideDefaultToolbar(@NonNull final PdfView view,final boolean hideDefaultToolbar) {
public void setHideDefaultToolbar(@NonNull final PdfView view, final boolean hideDefaultToolbar) {
view.setHideDefaultToolbar(hideDefaultToolbar);
}

@ReactProp(name = "availableFontNames")
public void setAvailableFontNames(@NonNull final PdfView view, @Nullable final ReadableArray availableFontNames) {
view.setAvailableFontNames(availableFontNames);
}

@ReactProp(name = "selectedFontName")
public void setSelectedFontName(@NonNull final PdfView view, @Nullable final String selectedFontName) {
view.setSelectedFontName(selectedFontName);
}

@Nullable
@Override
public Map getExportedCustomDirectEventTypeConstants() {
Expand Down
79 changes: 78 additions & 1 deletion android/src/main/java/com/pspdfkit/views/PdfView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import android.content.Context;
import android.net.Uri;
import android.util.AttributeSet;
import android.util.Log;
import android.util.Pair;
import android.view.Choreographer;
import android.view.View;
Expand All @@ -13,10 +14,14 @@
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentManager;

import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.common.MapBuilder;
import com.facebook.react.uimanager.events.EventDispatcher;
import com.pspdfkit.PSPDFKit;
import com.pspdfkit.annotations.Annotation;
import com.pspdfkit.annotations.AnnotationType;
import com.pspdfkit.annotations.configuration.FreeTextAnnotationConfiguration;
import com.pspdfkit.configuration.activity.PdfActivityConfiguration;
import com.pspdfkit.document.PdfDocument;
import com.pspdfkit.document.PdfDocumentLoader;
Expand All @@ -42,9 +47,11 @@
import com.pspdfkit.ui.PdfFragment;
import com.pspdfkit.ui.PdfUiFragment;
import com.pspdfkit.ui.PdfUiFragmentBuilder;
import com.pspdfkit.ui.fonts.Font;
import com.pspdfkit.ui.fonts.FontManager;
import com.pspdfkit.ui.search.PdfSearchView;
import com.pspdfkit.ui.search.PdfSearchViewInline;
import com.pspdfkit.ui.toolbar.MainToolbar;
import com.pspdfkit.ui.special_mode.controller.AnnotationTool;
import com.pspdfkit.ui.toolbar.grouping.MenuItemGroupingRule;

import org.json.JSONArray;
Expand Down Expand Up @@ -84,6 +91,7 @@ public class PdfView extends FrameLayout {

/** Key to use when setting the id argument of PdfFragments created by this PdfView. */
private static final String ARG_ROOT_ID = "root_id";
private static final String TAG = "PdfView";

private FragmentManager fragmentManager;
private EventDispatcher eventDispatcher;
Expand Down Expand Up @@ -116,6 +124,18 @@ public class PdfView extends FrameLayout {
/** We keep track if the inline search view is shown since we don't want to add a second navigation button while it is shown. */
private boolean isSearchViewShown = false;

/** Disposable keeping track of our subscription to update the annotation configuration on each emitted PdfFragment. */
@Nullable
private Disposable updateAnnotationConfigurationDisposable;

/** The currently configured array of available font names for free text annotations. */
@Nullable
private ReadableArray availableFontNames;

/** The currently configured default font name for free text annotations. */
@Nullable
private String selectedFontName;

public PdfView(@NonNull Context context) {
super(context);
init();
Expand Down Expand Up @@ -233,6 +253,63 @@ public void setMenuItemGroupingRule(@NonNull MenuItemGroupingRule groupingRule)
pdfViewModeController.setMenuItemGroupingRule(groupingRule);
}

public void setAvailableFontNames(@Nullable final ReadableArray availableFontNames) {
this.availableFontNames = availableFontNames;
updateAnnotationConfiguration();
}

public void setSelectedFontName(@Nullable final String selectedFontName) {
this.selectedFontName = selectedFontName;
updateAnnotationConfiguration();
}

private void updateAnnotationConfiguration() {
if (updateAnnotationConfigurationDisposable != null) {
updateAnnotationConfigurationDisposable.dispose();
}

// First we create the new FreeTextAnnotationConfiguration.
FreeTextAnnotationConfiguration.Builder builder = FreeTextAnnotationConfiguration.builder(getContext());
FontManager systemFontManager = PSPDFKit.getSystemFontManager();
if (availableFontNames != null) {
// Custom list of available fonts is set.
final ArrayList<Font> availableFonts = new ArrayList<>();
for (int i = 0; i < availableFontNames.size(); i++) {
final String fontName = availableFontNames.getString(i);
final Font font = systemFontManager.getFontByName(fontName);
if (font != null) {
availableFonts.add(font);
} else {
Log.w(TAG, String.format("Failed to add font %s to list of available fonts since it wasn't found in the list of system fonts.", fontName));
}
}
builder.setAvailableFonts(availableFonts);
}

if (selectedFontName != null) {
final Font defaultFont = systemFontManager.getFontByName(selectedFontName);
if (defaultFont != null) {
builder.setDefaultFont(defaultFont);
} else {
Log.w(TAG, String.format("Failed to set default font to %s since it wasn't found in the list of system fonts.", selectedFontName));
}
}

final FreeTextAnnotationConfiguration configuration = builder.build();
// We want to set this on the current PdfFragment and all future ones.
// We use the observable emitting PdfFragments for this purpose.
updateAnnotationConfigurationDisposable = getPdfFragment()
.observeOn(AndroidSchedulers.mainThread())
.subscribe(pdfFragment -> {
pdfFragment.getAnnotationConfiguration().put(
AnnotationTool.FREETEXT,configuration);
pdfFragment.getAnnotationConfiguration().put(
AnnotationType.FREETEXT,configuration);
pdfFragment.getAnnotationConfiguration().put(
AnnotationTool.FREETEXT_CALLOUT,configuration);
});
}

public void setShowNavigationButtonInToolbar(final boolean showNavigationButtonInToolbar) {
isNavigationButtonShown = showNavigationButtonInToolbar;
pendingFragmentActions.add(getCurrentPdfUiFragment()
Expand Down
Loading