Issue #47 | Added font color font size property for text annotations (#53)

Author: koleslena

package.json

@@ -17,9 +17,9 @@
   },
   "homepage": "https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java-Spring#readme",
   "dependencies": {
-    "@groupdocs.examples.jquery/annotation": "^0.13.0",
-    "@groupdocs.examples.jquery/common": "^0.13.0",
-    "@groupdocs.examples.jquery/viewer": "^0.13.0"
+    "@groupdocs.examples.jquery/annotation": "^0.14.0",
+    "@groupdocs.examples.jquery/common": "^0.14.0",
+    "@groupdocs.examples.jquery/viewer": "^0.14.0"
   },
   "devDependencies": {
     "gulp": "^4.0.0"

src/main/java/com/groupdocs/ui/annotation/annotator/AbstractTextAnnotator.java

@@ -20,6 +20,7 @@ protected AnnotationInfo initAnnotationInfo() throws ParseException {
         annotationInfo.setFieldText(annotationData.getText());
         annotationInfo.setFontFamily(StringUtils.capitalize(annotationData.getFont()));
         annotationInfo.setFontSize(annotationData.getFontSize());
+        annotationInfo.setFontColor(annotationData.getFontColor());
         return annotationInfo;
     }
 

src/main/java/com/groupdocs/ui/annotation/annotator/TextFieldAnnotator.java

@@ -33,7 +33,6 @@ public AnnotationInfo annotatePdf() throws ParseException {
         // Text field annotation
         AnnotationInfo textFieldAnnotation = initAnnotationInfo();
         textFieldAnnotation.setAnnotationPosition(new Point(annotationData.getLeft(), annotationData.getTop()));
-        textFieldAnnotation.setFontColor(255);
         textFieldAnnotation.setBackgroundColor(16777215);
         return textFieldAnnotation;
     }
@@ -54,15 +53,13 @@ public AnnotationInfo annotateSlides() throws ParseException {
     public AnnotationInfo annotateImage() throws ParseException {
         // init possible types of annotations
         AnnotationInfo textFieldAnnotation = initAnnotationInfo();
-        textFieldAnnotation.setFontColor(-15988609);
         return textFieldAnnotation;
     }
 
     @Override
     public AnnotationInfo annotateDiagram() throws ParseException {
         // init possible types of annotations
         AnnotationInfo textFieldAnnotation = initAnnotationInfo();
-        textFieldAnnotation.setFontColor(-15988609);
         return textFieldAnnotation;
     }
 

src/main/java/com/groupdocs/ui/annotation/annotator/WatermarkAnnotator.java

@@ -51,7 +51,6 @@ public AnnotationInfo annotateSlides() throws ParseException {
     public AnnotationInfo annotateImage() throws ParseException {
         // init possible types of annotations
         AnnotationInfo watermarkAnnotation = initAnnotationInfo();
-        watermarkAnnotation.setFontColor(15988609);
         return watermarkAnnotation;
     }
 

src/main/java/com/groupdocs/ui/annotation/entity/web/AnnotationDataEntity.java

@@ -58,6 +58,10 @@ public class AnnotationDataEntity {
      * Imported annotations
      */
     private boolean imported;
+    /**
+     * font color
+     */
+    private int fontColor;
 
     public int getId() {
         return id;
@@ -162,4 +166,12 @@ public boolean isImported() {
     public void setImported(boolean imported) {
         this.imported = imported;
     }
+
+    public int getFontColor() {
+        return fontColor;
+    }
+
+    public void setFontColor(int fontColor) {
+        this.fontColor = fontColor;
+    }
 }

src/main/java/com/groupdocs/ui/annotation/util/AnnotationMapper.java

@@ -52,6 +52,7 @@ public AnnotationDataEntity[] mapForPage(AnnotationInfo[] annotations, int pageN
     public AnnotationDataEntity mapAnnotationDataEntity(AnnotationInfo annotationInfo) {
         AnnotationDataEntity annotation = new AnnotationDataEntity();
         annotation.setFont(annotationInfo.getFontFamily());
+        annotation.setFontColor(annotationInfo.getFontColor());
         annotation.setFontSize(annotationInfo.getFontSize());
         Rectangle box = annotationInfo.getBox();
         annotation.setHeight(box.getHeight());

src/main/resources/templates/annotation.html

@@ -12,6 +12,8 @@
     <link type="text/css" rel="stylesheet" th:href="@{'/assets/viewer/css/viewer.mobile.css'}"/>
     <link type="text/css" rel="stylesheet" th:href="@{'/assets/viewer/css/viewer-dark.css'}"/>
     <link type="text/css" rel="stylesheet" th:href="@{'/assets/annotation/css/annotation.css'}"/>
+    <link type="text/css" rel="stylesheet" th:href="@{'/assets/annotation/css/bcPicker.css'}" />
+    <link type="text/css" rel="stylesheet" th:href="@{'/assets/annotation/css/bcPicker.mobile.css'}" />
     <script type="text/javascript" th:src="@{'/assets/common/js/jquery.min.js'}"></script>
     <script type="text/javascript" th:src="@{'/assets/common/js/swiper.min.js'}"></script>
     <script type="text/javascript" th:src="@{'/assets/common/js/jquery-ui.min.js'}"></script>
@@ -22,6 +24,7 @@
     <script type="text/javascript" th:src="@{'/assets/common/js/jquery.timeago.js'}"></script>
     <script type="text/javascript" th:src="@{'/assets/annotation/js/svg.min.js'}"></script>
     <script type="text/javascript" th:src="@{'/assets/annotation/js/svg.draw.js'}"></script>
+    <script type="text/javascript" th:src="@{'/assets/annotation/js/bcPicker.js'}"></script>
     <script type="text/javascript" th:src="@{'/assets/annotation/js/drawSvgAnnotation.js'}"></script>
     <script type="text/javascript" th:src="@{'/assets/annotation/js/drawTextAnnotation.js'}"></script>
     <script type="text/javascript" th:src="@{'/assets/annotation/js/annotation.js'}"></script>