PDFSamples(Android) - 1.Samples 代码优化

samples/build.gradle

@@ -32,7 +32,6 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    testImplementation 'junit:junit:4.13.2'
 
     api project(path:':compdfkit-repo:compdfkit')
     api project(path:':compdfkit-repo:compdfkit-ui')

samples/src/androidTest/java/com/compdfkit/samples/ExampleInstrumentedTest.java

@@ -1,26 +0,0 @@
-package com.compdfkit.samples;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("com.compdfkit.samples", appContext.getPackageName());
-    }
-}

samples/src/main/java/com/compdfkit/samples/PDFSamples.java

@@ -21,7 +21,6 @@ import com.compdfkit.samples.util.OutputListener;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.LinkedHashSet;
 import java.util.List;
 
 public abstract class PDFSamples {

samples/src/main/java/com/compdfkit/samples/SampleApplication.java

@@ -11,7 +11,6 @@ package com.compdfkit.samples;
 
 
 import android.app.Application;
-import android.media.Image;
 
 import com.compdfkit.samples.samples.AnnotationImportExportTest;
 import com.compdfkit.samples.samples.AnnotationTest;

samples/src/main/java/com/compdfkit/samples/SampleDetailActivity.java

@@ -10,12 +10,9 @@
 package com.compdfkit.samples;
 
 
-import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Environment;
-import android.view.View;
 import android.widget.ScrollView;
 
 import androidx.annotation.Nullable;
@@ -23,14 +20,12 @@ import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.AppCompatTextView;
-import androidx.appcompat.widget.Toolbar;
 
 import com.compdfkit.samples.util.FileUtils;
 import com.compdfkit.samples.util.LoggingOutputListener;
 import com.google.android.material.button.MaterialButton;
 
 import java.io.File;
-import java.util.function.IntFunction;
 
 public class SampleDetailActivity extends AppCompatActivity {
 
@@ -53,8 +48,7 @@ public class SampleDetailActivity extends AppCompatActivity {
         AppCompatTextView logTextView = findViewById(R.id.tv_logging);
         ScrollView scrollView = findViewById(R.id.scroll_view);
         AppCompatTextView tvDescription = findViewById(R.id.tv_description);
-//        File file = getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS);
-//        FileUtils.deleteFile(file);
+
         ActionBar actionBar = getSupportActionBar();
         LoggingOutputListener outputListener = new LoggingOutputListener(logTextView, scrollView);
         if (getIntent().hasExtra(EXTRA_SAMPLE_ID)) {
@@ -66,6 +60,7 @@ public class SampleDetailActivity extends AppCompatActivity {
                 actionBar.setTitle(pdfSamples.getTitle());
                 tvDescription.setText(pdfSamples.getDescription());
             }
+            pdfSamples.getOutputFileList().clear();
         }
         btnRun.setOnClickListener(v -> {
             new Thread(() -> {

samples/src/main/java/com/compdfkit/samples/SampleListActivity.java

@@ -1,6 +1,6 @@
 /**
  * Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.
- *
+ * <p>
  * THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  * AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE ComPDFKit LICENSE AGREEMENT.
  * UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES.
@@ -9,11 +9,16 @@
 
 package com.compdfkit.samples;
 
+import android.os.Bundle;
+import android.os.Environment;
+
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import android.os.Bundle;
+import com.compdfkit.samples.util.FileUtils;
+
+import java.io.File;
 
 public class SampleListActivity extends AppCompatActivity {
 
@@ -21,6 +26,8 @@ public class SampleListActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_sample_list);
+        File file = getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS);
+        FileUtils.deleteFile(file);
         RecyclerView recyclerView = findViewById(R.id.rv_sample_list);
 
         SampleListAdapter listAdapter = new SampleListAdapter();

samples/src/main/java/com/compdfkit/samples/samples/AnnotationTest.java

@@ -14,7 +14,6 @@ import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.PointF;
 import android.graphics.RectF;
-import android.os.Environment;
 import android.text.TextUtils;
 
 import com.compdfkit.core.annotation.CPDFAnnotation;
@@ -41,10 +40,8 @@ import com.compdfkit.core.page.CPDFTextSelection;
 import com.compdfkit.samples.PDFSamples;
 import com.compdfkit.samples.R;
 import com.compdfkit.samples.SampleApplication;
-import com.compdfkit.samples.util.DateUtil;
 import com.compdfkit.samples.util.FileUtils;
 import com.compdfkit.samples.util.OutputListener;
-import com.compdfkit.ui.attribute.CPDFFreetextAttr;
 import com.compdfkit.ui.reader.CPDFReaderView;
 import com.compdfkit.ui.textsearch.ITextSearcher;
 

samples/src/main/java/com/compdfkit/samples/samples/BackgroundTest.java

@@ -12,14 +12,12 @@ package com.compdfkit.samples.samples;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
-import android.os.Environment;
 
 import com.compdfkit.core.annotation.CPDFImageScaleType;
 import com.compdfkit.core.document.CPDFBackground;
 import com.compdfkit.core.document.CPDFDocument;
 import com.compdfkit.samples.PDFSamples;
 import com.compdfkit.samples.R;
-import com.compdfkit.samples.SampleApplication;
 import com.compdfkit.samples.util.FileUtils;
 import com.compdfkit.samples.util.OutputListener;
 

samples/src/main/java/com/compdfkit/samples/samples/BatesTest.java

@@ -10,14 +10,11 @@
 package com.compdfkit.samples.samples;
 
 import android.graphics.Color;
-import android.os.Environment;
 
 import com.compdfkit.core.document.CPDFBates;
 import com.compdfkit.core.document.CPDFDocument;
-import com.compdfkit.core.document.CPDFHeaderFooter;
 import com.compdfkit.samples.PDFSamples;
 import com.compdfkit.samples.R;
-import com.compdfkit.samples.SampleApplication;
 import com.compdfkit.samples.util.FileUtils;
 import com.compdfkit.samples.util.OutputListener;
 

samples/src/main/java/com/compdfkit/samples/samples/BookmarkTest.java

@@ -9,15 +9,12 @@
 
 package com.compdfkit.samples.samples;
 
-import android.os.Environment;
-
 import com.compdfkit.core.common.CPDFDate;
 import com.compdfkit.core.document.CPDFBookmark;
 import com.compdfkit.core.document.CPDFDocument;
 import com.compdfkit.core.utils.TTimeUtil;
 import com.compdfkit.samples.PDFSamples;
 import com.compdfkit.samples.R;
-import com.compdfkit.samples.SampleApplication;
 import com.compdfkit.samples.util.FileUtils;
 import com.compdfkit.samples.util.OutputListener;
 

samples/src/main/java/com/compdfkit/samples/samples/DocumentInfoTest.java

@@ -16,7 +16,6 @@ import com.compdfkit.core.document.CPDFDocumentPermissionInfo;
 import com.compdfkit.core.document.CPDFInfo;
 import com.compdfkit.samples.PDFSamples;
 import com.compdfkit.samples.R;
-import com.compdfkit.samples.SampleApplication;
 import com.compdfkit.samples.util.DateUtil;
 import com.compdfkit.samples.util.FileUtils;
 import com.compdfkit.samples.util.OutputListener;

samples/src/main/java/com/compdfkit/samples/samples/EncryptTest.java

@@ -9,14 +9,11 @@
 
 package com.compdfkit.samples.samples;
 
-import android.os.Environment;
-
 import com.compdfkit.core.common.CPDFDocumentException;
 import com.compdfkit.core.document.CPDFDocument;
 import com.compdfkit.core.document.CPDFDocumentPermissionInfo;
 import com.compdfkit.samples.PDFSamples;
 import com.compdfkit.samples.R;
-import com.compdfkit.samples.SampleApplication;
 import com.compdfkit.samples.util.FileUtils;
 import com.compdfkit.samples.util.OutputListener;
 

samples/src/main/java/com/compdfkit/samples/samples/FlattenTest.java

@@ -9,13 +9,10 @@
 
 package com.compdfkit.samples.samples;
 
-import android.os.Environment;
-
 import com.compdfkit.core.document.CPDFDocument;
 import com.compdfkit.core.page.CPDFPage;
 import com.compdfkit.samples.PDFSamples;
 import com.compdfkit.samples.R;
-import com.compdfkit.samples.SampleApplication;
 import com.compdfkit.samples.util.FileUtils;
 import com.compdfkit.samples.util.OutputListener;
 

samples/src/main/java/com/compdfkit/samples/samples/HeaderFooterTest.java

@@ -10,13 +10,11 @@
 package com.compdfkit.samples.samples;
 
 import android.graphics.Color;
-import android.os.Environment;
 
 import com.compdfkit.core.document.CPDFDocument;
 import com.compdfkit.core.document.CPDFHeaderFooter;
 import com.compdfkit.samples.PDFSamples;
 import com.compdfkit.samples.R;
-import com.compdfkit.samples.SampleApplication;
 import com.compdfkit.samples.util.FileUtils;
 import com.compdfkit.samples.util.OutputListener;
 

samples/src/main/java/com/compdfkit/samples/samples/ImageExtractTest.java

@@ -9,17 +9,13 @@
 
 package com.compdfkit.samples.samples;
 
-import android.os.Environment;
-
 import com.compdfkit.core.document.CPDFDocument;
 import com.compdfkit.samples.PDFSamples;
 import com.compdfkit.samples.R;
-import com.compdfkit.samples.SampleApplication;
 import com.compdfkit.samples.util.FileUtils;
 import com.compdfkit.samples.util.OutputListener;
 
 import java.io.File;
-import java.io.FileFilter;
 
 
 public class ImageExtractTest extends PDFSamples {

samples/src/main/java/com/compdfkit/samples/samples/InteractiveFormsTest.java

@@ -11,7 +11,6 @@ package com.compdfkit.samples.samples;
 
 import android.graphics.Color;
 import android.graphics.RectF;
-import android.os.Environment;
 
 import com.compdfkit.core.annotation.CPDFAnnotation;
 import com.compdfkit.core.annotation.form.CPDFCheckboxWidget;
@@ -29,10 +28,10 @@ import com.compdfkit.core.document.action.CPDFAction;
 import com.compdfkit.core.document.action.CPDFGoToAction;
 import com.compdfkit.core.document.action.CPDFUriAction;
 import com.compdfkit.core.page.CPDFPage;
-import com.compdfkit.samples.SampleApplication;
-import com.compdfkit.samples.util.OutputListener;
 import com.compdfkit.samples.PDFSamples;
 import com.compdfkit.samples.R;
+import com.compdfkit.samples.SampleApplication;
+import com.compdfkit.samples.util.OutputListener;
 
 import java.io.File;
 

samples/src/main/java/com/compdfkit/samples/samples/OutlineTest.java

@@ -10,14 +10,11 @@
 package com.compdfkit.samples.samples;
 
 
-import android.os.Environment;
-
 import com.compdfkit.core.document.CPDFDestination;
 import com.compdfkit.core.document.CPDFDocument;
 import com.compdfkit.core.document.CPDFOutline;
 import com.compdfkit.samples.PDFSamples;
 import com.compdfkit.samples.R;
-import com.compdfkit.samples.SampleApplication;
 import com.compdfkit.samples.util.FileUtils;
 import com.compdfkit.samples.util.OutputListener;
 

samples/src/main/java/com/compdfkit/samples/samples/PDFATest.java

@@ -9,20 +9,13 @@
 
 package com.compdfkit.samples.samples;
 
-import android.os.Environment;
-
-import com.compdfkit.core.common.CPDFDate;
-import com.compdfkit.core.document.CPDFBookmark;
 import com.compdfkit.core.document.CPDFDocument;
-import com.compdfkit.core.utils.TTimeUtil;
 import com.compdfkit.samples.PDFSamples;
 import com.compdfkit.samples.R;
-import com.compdfkit.samples.SampleApplication;
 import com.compdfkit.samples.util.FileUtils;
 import com.compdfkit.samples.util.OutputListener;
 
 import java.io.File;
-import java.util.List;
 
 
 public class PDFATest extends PDFSamples {

samples/src/main/java/com/compdfkit/samples/samples/PDFPageTest.java

@@ -9,12 +9,9 @@
 
 package com.compdfkit.samples.samples;
 
-import android.os.Environment;
-
 import com.compdfkit.core.document.CPDFDocument;
 import com.compdfkit.samples.PDFSamples;
 import com.compdfkit.samples.R;
-import com.compdfkit.samples.SampleApplication;
 import com.compdfkit.samples.util.FileUtils;
 import com.compdfkit.samples.util.OutputListener;
 

samples/src/main/java/com/compdfkit/samples/samples/PDFRedactTest.java

@@ -11,7 +11,6 @@ package com.compdfkit.samples.samples;
 
 import android.graphics.Color;
 import android.graphics.RectF;
-import android.os.Environment;
 
 import com.compdfkit.core.annotation.CPDFAnnotation;
 import com.compdfkit.core.annotation.CPDFRedactAnnotation;
@@ -20,7 +19,6 @@ import com.compdfkit.core.document.CPDFDocument;
 import com.compdfkit.core.page.CPDFPage;
 import com.compdfkit.samples.PDFSamples;
 import com.compdfkit.samples.R;
-import com.compdfkit.samples.SampleApplication;
 import com.compdfkit.samples.util.FileUtils;
 import com.compdfkit.samples.util.OutputListener;
 

samples/src/main/java/com/compdfkit/samples/samples/PDFToImageTest.java

@@ -11,16 +11,12 @@ package com.compdfkit.samples.samples;
 
 
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.RectF;
-import android.os.Environment;
 
-import com.compdfkit.core.document.CPDFBackground;
 import com.compdfkit.core.document.CPDFDocument;
 import com.compdfkit.samples.PDFSamples;
 import com.compdfkit.samples.R;
-import com.compdfkit.samples.SampleApplication;
 import com.compdfkit.samples.util.FileUtils;
 import com.compdfkit.samples.util.OutputListener;
 import com.compdfkit.ui.utils.CPDFBitmapUtils;

samples/src/main/java/com/compdfkit/samples/samples/TextExtractTest.java

@@ -11,7 +11,6 @@
 package com.compdfkit.samples.samples;
 
 import android.graphics.RectF;
-import android.os.Environment;
 
 import com.compdfkit.core.document.CPDFDocument;
 import com.compdfkit.core.page.CPDFPage;
@@ -20,12 +19,9 @@ import com.compdfkit.core.page.CPDFTextRange;
 import com.compdfkit.core.page.CPDFTextSelection;
 import com.compdfkit.samples.PDFSamples;
 import com.compdfkit.samples.R;
-import com.compdfkit.samples.SampleApplication;
 import com.compdfkit.samples.util.FileUtils;
 import com.compdfkit.samples.util.OutputListener;
 
-import java.io.File;
-
 
 public class TextExtractTest extends PDFSamples {
 

samples/src/main/java/com/compdfkit/samples/samples/TextSearchTest.java

@@ -12,7 +12,6 @@ package com.compdfkit.samples.samples;
 
 import android.graphics.Color;
 import android.graphics.RectF;
-import android.os.Environment;
 import android.os.Handler;
 import android.os.Looper;
 import android.text.TextUtils;
@@ -27,7 +26,6 @@ import com.compdfkit.core.page.CPDFTextSearcher;
 import com.compdfkit.core.page.CPDFTextSelection;
 import com.compdfkit.samples.PDFSamples;
 import com.compdfkit.samples.R;
-import com.compdfkit.samples.SampleApplication;
 import com.compdfkit.samples.util.FileUtils;
 import com.compdfkit.samples.util.OutputListener;
 import com.compdfkit.ui.reader.CPDFReaderView;

samples/src/main/java/com/compdfkit/samples/samples/WatermarkTest.java

@@ -12,13 +12,11 @@ package com.compdfkit.samples.samples;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
-import android.os.Environment;
 
 import com.compdfkit.core.document.CPDFDocument;
 import com.compdfkit.core.watermark.CPDFWatermark;
 import com.compdfkit.samples.PDFSamples;
 import com.compdfkit.samples.R;
-import com.compdfkit.samples.SampleApplication;
 import com.compdfkit.samples.util.FileUtils;
 import com.compdfkit.samples.util.OutputListener;
 

samples/src/main/java/com/compdfkit/samples/util/CPDFGlideModule.java

@@ -1,12 +1,5 @@
 package com.compdfkit.samples.util;
 
-import android.content.Context;
-import android.graphics.Bitmap;
-
-import androidx.annotation.NonNull;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.Registry;
 import com.bumptech.glide.annotation.GlideModule;
 import com.bumptech.glide.module.AppGlideModule;
 

samples/src/main/res/layout/activity_sample_list.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"

samples/src/main/res/values-night/themes.xml

@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
     <style name="Base.Theme.Compdfkit_android_demo" parent="Theme.Material3.DayNight">
         <!-- Customize your dark theme here. -->

samples/src/main/res/values/themes.xml

@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
     <style name="Base.Theme.Compdfkit_android_demo" parent="Theme.Material3.DayNight">
         <!-- Customize your light theme here. -->

samples/src/test/java/com/compdfkit/samples/ExampleUnitTest.java

@@ -1,17 +0,0 @@
-package com.compdfkit.samples;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}