v2.6.8

Author: xiaolongrick

ComPDFKit_Repo/compdfkit-ui/ComPDFKit-UI.aar

@@ -55,8 +55,8 @@ dependencies {
 //    api project(path:':ComPDFKit_Repo:compdfkit')
 //    api project(path:':ComPDFKit_Repo:compdfkit-ui')
     // or use
-     api ('com.compdf:compdfkit:2.6.7')
-     api ('com.compdf:compdfkit-ui:2.6.7')
+    api ('com.compdf:compdfkit:2.6.8')
+    api ('com.compdf:compdfkit-ui:2.6.8')
     api 'com.github.bumptech.glide:glide:4.15.1'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.15.1'
     api "androidx.print:print:1.0.0"

ComPDFKit_Repo/compdfkit/ComPDFKit.aar

@@ -270,6 +270,7 @@
     "cropMode": false,
     "themes": "light",
     "enableSliderBar": true,
+    "slideBarPosition": "right",
     "enablePageIndicator": true,
     "pageSpacing": 10,
     "margins": [0, 0, 0, 0],

ComPDFKit_Tools/build.gradle

@@ -10,7 +10,9 @@
 package com.compdfkit.tools.annotation.pdfproperties.pdfpic;
 
 import android.Manifest;
+import android.net.Uri;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 
 import androidx.activity.result.ActivityResultLauncher;
@@ -20,7 +22,9 @@
 
 import com.compdfkit.tools.R;
 import com.compdfkit.tools.common.utils.CFileUtils;
+import com.compdfkit.tools.common.utils.CLog;
 import com.compdfkit.tools.common.utils.CPermissionUtil;
+import com.compdfkit.tools.common.utils.CUriUtil;
 import com.compdfkit.tools.common.utils.activitycontracts.CImageResultContracts;
 import com.compdfkit.tools.common.utils.activitycontracts.CPermissionResultLauncher;
 import com.compdfkit.tools.common.utils.date.CDateUtil;
@@ -31,12 +35,24 @@
 
 public class CImageStyleFragment extends CBasicPropertiesFragment {
 
-    private ActivityResultLauncher<CImageResultContracts.RequestType> imageLauncher = registerForActivityResult(new CImageResultContracts(), result -> {
+    private ActivityResultLauncher<CImageResultContracts.Request> imageLauncher = registerForActivityResult(new CImageResultContracts(), result -> {
         if (result != null && viewModel != null) {
+            CUriUtil.logImageUriInfo(getContext(), "pic result uri", result);
             File file = new File(getContext().getFilesDir(), CFileUtils.CACHE_FOLDER);
-            String path = CFileUtils.copyFileToInternalDirectory(getContext(), result, file.getAbsolutePath(), "pic_" + CDateUtil.getDataTime(CDateUtil.NORMAL_DATE_FORMAT) + ".png");
-            viewModel.getStyle().setImagePath(path);
-            dismissStyleDialog();
+            String ext = CUriUtil.getImageExtension(getContext(), result);
+            String path = CFileUtils.copyFileToInternalDirectory(getContext(), result, file.getAbsolutePath(), "pic_" + CDateUtil.getDataTime(CDateUtil.NORMAL_DATE_FORMAT) + ext);
+            CLog.e("ImageAnnot", "pic copied, uri=" + result + ", ext=" + ext + ", path=" + path);
+            CUriUtil.logImageFileInfo("pic copied file", path);
+            if (!TextUtils.isEmpty(path)) {
+                CLog.e("ImageAnnot", "pic setImagePath before, path=" + path);
+                viewModel.getStyle().setImagePath(path);
+                CLog.e("ImageAnnot", "pic setImagePath after, path=" + path);
+                dismissStyleDialog();
+            } else {
+                CLog.e("ImageAnnot", "pic copy failed, uri=" + result);
+            }
+        } else {
+            CLog.e("ImageAnnot", "pic result ignored, result=" + result + ", viewModel=" + viewModel);
         }
     });
 
@@ -56,15 +72,15 @@ protected void onCreateView(View rootView) {
         ConstraintLayout clFromAlbum = rootView.findViewById(R.id.cl_from_album);
         ConstraintLayout clFromCamera = rootView.findViewById(R.id.cl_from_camera);
         clFromAlbum.setOnClickListener(v -> {
-            imageLauncher.launch(CImageResultContracts.RequestType.PHOTO_ALBUM);
+            imageLauncher.launch(new CImageResultContracts.Request(CImageResultContracts.RequestType.PHOTO_ALBUM));
         });
         clFromCamera.setOnClickListener(v -> {
             if (!CPermissionUtil.checkManifestPermission(getContext(), Manifest.permission.CAMERA)){
-                imageLauncher.launch(CImageResultContracts.RequestType.CAMERA);
+                launchCamera();
             }else {
                 permissionResultLauncher.launch(Manifest.permission.CAMERA, granted -> {
                     if (granted){
-                        imageLauncher.launch(CImageResultContracts.RequestType.CAMERA);
+                        launchCamera();
                     } else {
                         if (getActivity() != null) {
                             if (!CPermissionUtil.shouldShowRequestPermissionRationale(requireActivity(), Manifest.permission.CAMERA)) {
@@ -77,6 +93,15 @@ protected void onCreateView(View rootView) {
         });
     }
 
+    private void launchCamera() {
+        Uri outputUri = CImageResultContracts.createCameraOutputUri(getContext());
+        if (outputUri == null) {
+            CLog.e("ImageAnnot", "pic camera output uri is null");
+            return;
+        }
+        imageLauncher.launch(new CImageResultContracts.Request(CImageResultContracts.RequestType.CAMERA, outputUri));
+    }
+
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);

ComPDFKit_Tools/src/main/assets/tools_default_configuration.json

@@ -136,7 +136,7 @@ private void applyReaderViewConfig(CPDFDocumentFragment fragment,
                     break;
             }
             readerView.setContinueMode(readerViewConfig.continueMode);
-            readerView.setVerticalMode(readerViewConfig.verticalMode);
+            fragment.pdfView.setVerticalMode(readerViewConfig.verticalMode);
             readerView.setCropMode(readerViewConfig.cropMode);
             readerView.setPageSameWidth(readerViewConfig.pageSameWidth);
             readerView.setMinScaleEnable(readerViewConfig.enableMinScale);

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/annotation/pdfproperties/pdfpic/CImageStyleFragment.java

@@ -223,6 +223,20 @@ private static ReaderViewConfig parseReaderViewConfig(@Nullable JSONObject jsonO
             default:break;
         }
         readerViewConfig.enableSliderBar = jsonObject.optBoolean("enableSliderBar", true);
+        switch (jsonObject.optString("slideBarPosition", "right").toLowerCase()) {
+            case "left":
+                readerViewConfig.slideBarPosition = ReaderViewConfig.SlideBarPosition.Left;
+                break;
+            case "top":
+                readerViewConfig.slideBarPosition = ReaderViewConfig.SlideBarPosition.Top;
+                break;
+            case "bottom":
+                readerViewConfig.slideBarPosition = ReaderViewConfig.SlideBarPosition.Bottom;
+                break;
+            default:
+                readerViewConfig.slideBarPosition = ReaderViewConfig.SlideBarPosition.Right;
+                break;
+        }
         readerViewConfig.enablePageIndicator = jsonObject.optBoolean("enablePageIndicator", true);
         readerViewConfig.pageSpacing = jsonObject.optInt("pageSpacing", 10);
         readerViewConfig.pageScale = (float) jsonObject.optDouble("pageScale", 1.0);

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/pdf/CPDFApplyConfigUtil.java

@@ -217,7 +217,7 @@ public static CPDFDocumentFragment newInstance(Bundle bundle) {
                 editToolBar.setEditMode(false);
                 boolean enableSliderBar = pdfView.isEnableSliderBar();
                 if (enableSliderBar && !screenManager.isFillScreen) {
-                    screenManager.fillScreenManager.showFromRight(pdfView.slideBar, CFillScreenManager.CONFIG_SHORT_ANIM_TIME);
+                    screenManager.fillScreenManager.showFromRight(pdfView.getSlideBarView(), CFillScreenManager.CONFIG_SHORT_ANIM_TIME);
                 }
             });
         }
@@ -865,7 +865,7 @@ public void showPageEdit(boolean enterEditMode, boolean enableEditMode) {
                     boolean show = pageCount > 1;
                     pdfView.enableSliderBar(show);
                     if (show && !screenManager.isFillScreen) {
-                        screenManager.fillScreenManager.showFromRight(pdfView.slideBar, CFillScreenManager.CONFIG_SHORT_ANIM_TIME);
+                        screenManager.fillScreenManager.showFromRight(pdfView.getSlideBarView(), CFillScreenManager.CONFIG_SHORT_ANIM_TIME);
                     }
                 }
             }

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/pdf/CPDFConfigurationUtils.java

@@ -37,7 +37,7 @@ public class CSampleScreenManager {
     public void bind(CPDFDocumentFragment documentFragment){
         this.documentFragment = documentFragment;
         constraintSet.clone(documentFragment.clRoot);
-        fillScreenManager.bindRightToolViewList(documentFragment.pdfView.slideBar);
+        fillScreenManager.bindRightToolViewList(documentFragment.pdfView.getSlideBarView());
         fillScreenManager.bindBottomToolViewList(documentFragment.pdfView.indicatorView);
         fillScreenManager.bindBottomToolViewList(documentFragment.flBottomToolBar);
     }

ComPDFKit_Tools/src/main/java/com/compdfkit/tools/common/pdf/CPDFDocumentFragment.java

@@ -33,6 +33,8 @@ public class ReaderViewConfig implements Serializable {
 
     public boolean enableSliderBar = true;
 
+    public SlideBarPosition slideBarPosition = SlideBarPosition.Right;
+
     public boolean enablePageIndicator = true;
 
     public int pageSpacing = 10;
@@ -66,6 +68,7 @@ public String toString() {
                 "cropMode:" + cropMode + ", " +
                 "themes:" + themes.name() + ", " +
                 "enableSliderBar:" + enableSliderBar + ", " +
+                "slideBarPosition:" + slideBarPosition.name() + ", " +
                 "enablePageIndicator:" + enablePageIndicator + ", " +
                 "pageSpacing:" + pageSpacing + ", " +
                 "pageScale:" + pageScale + ", " +
@@ -98,4 +101,15 @@ public enum Themes{
         Reseda
 
     }
+
+    public enum SlideBarPosition {
+
+        Left,
+
+        Top,
+
+        Right,
+
+        Bottom
+    }
 }