diff --git a/folioreader/build.gradle b/folioreader/build.gradle
index f41712cc4..25693d46c 100644
--- a/folioreader/build.gradle
+++ b/folioreader/build.gradle
@@ -84,6 +84,7 @@ dependencies {
implementation "androidx.constraintlayout:constraintlayout:$versions.constraintLayout"
implementation "androidx.recyclerview:recyclerview:$versions.recyclerview"
implementation "com.google.android.material:material:$versions.material"
+ implementation 'androidx.legacy:legacy-support-v4:1.0.0'
testImplementation 'junit:junit:4.12'
implementation 'org.slf4j:slf4j-android:1.7.25'
diff --git a/folioreader/res/drawable-hdpi/ic_action_define.png b/folioreader/res/drawable-hdpi/ic_action_define.png
new file mode 100644
index 000000000..c47e3503e
Binary files /dev/null and b/folioreader/res/drawable-hdpi/ic_action_define.png differ
diff --git a/folioreader/res/drawable-hdpi/ic_action_fiber_manual_blue.png b/folioreader/res/drawable-hdpi/ic_action_fiber_manual_blue.png
new file mode 100644
index 000000000..79a3efdd8
Binary files /dev/null and b/folioreader/res/drawable-hdpi/ic_action_fiber_manual_blue.png differ
diff --git a/folioreader/res/drawable-hdpi/ic_action_fiber_manual_green.png b/folioreader/res/drawable-hdpi/ic_action_fiber_manual_green.png
new file mode 100644
index 000000000..8de15962c
Binary files /dev/null and b/folioreader/res/drawable-hdpi/ic_action_fiber_manual_green.png differ
diff --git a/folioreader/res/drawable-hdpi/ic_action_fiber_manual_red.png b/folioreader/res/drawable-hdpi/ic_action_fiber_manual_red.png
new file mode 100644
index 000000000..b7f2f1907
Binary files /dev/null and b/folioreader/res/drawable-hdpi/ic_action_fiber_manual_red.png differ
diff --git a/folioreader/res/drawable-hdpi/ic_action_fiber_manual_yellow.png b/folioreader/res/drawable-hdpi/ic_action_fiber_manual_yellow.png
new file mode 100644
index 000000000..13988872a
Binary files /dev/null and b/folioreader/res/drawable-hdpi/ic_action_fiber_manual_yellow.png differ
diff --git a/folioreader/res/drawable-hdpi/ic_action_file_copy.png b/folioreader/res/drawable-hdpi/ic_action_file_copy.png
new file mode 100644
index 000000000..8a988b50e
Binary files /dev/null and b/folioreader/res/drawable-hdpi/ic_action_file_copy.png differ
diff --git a/folioreader/res/drawable-hdpi/ic_action_g_translate.png b/folioreader/res/drawable-hdpi/ic_action_g_translate.png
new file mode 100644
index 000000000..219167680
Binary files /dev/null and b/folioreader/res/drawable-hdpi/ic_action_g_translate.png differ
diff --git a/folioreader/res/drawable-hdpi/ic_action_library_add.png b/folioreader/res/drawable-hdpi/ic_action_library_add.png
new file mode 100644
index 000000000..29cbc254e
Binary files /dev/null and b/folioreader/res/drawable-hdpi/ic_action_library_add.png differ
diff --git a/folioreader/res/drawable-hdpi/ic_action_share.png b/folioreader/res/drawable-hdpi/ic_action_share.png
new file mode 100644
index 000000000..7494d7784
Binary files /dev/null and b/folioreader/res/drawable-hdpi/ic_action_share.png differ
diff --git a/folioreader/res/drawable-mdpi/ic_action_35972.png b/folioreader/res/drawable-mdpi/ic_action_35972.png
new file mode 100644
index 000000000..b84bf2efd
Binary files /dev/null and b/folioreader/res/drawable-mdpi/ic_action_35972.png differ
diff --git a/folioreader/res/drawable-mdpi/ic_action_define.png b/folioreader/res/drawable-mdpi/ic_action_define.png
new file mode 100644
index 000000000..0880a09cc
Binary files /dev/null and b/folioreader/res/drawable-mdpi/ic_action_define.png differ
diff --git a/folioreader/res/drawable-mdpi/ic_action_fiber_manual_blue.png b/folioreader/res/drawable-mdpi/ic_action_fiber_manual_blue.png
new file mode 100644
index 000000000..a482473b8
Binary files /dev/null and b/folioreader/res/drawable-mdpi/ic_action_fiber_manual_blue.png differ
diff --git a/folioreader/res/drawable-mdpi/ic_action_fiber_manual_green.png b/folioreader/res/drawable-mdpi/ic_action_fiber_manual_green.png
new file mode 100644
index 000000000..4b3b1737f
Binary files /dev/null and b/folioreader/res/drawable-mdpi/ic_action_fiber_manual_green.png differ
diff --git a/folioreader/res/drawable-mdpi/ic_action_fiber_manual_red.png b/folioreader/res/drawable-mdpi/ic_action_fiber_manual_red.png
new file mode 100644
index 000000000..1813e97b7
Binary files /dev/null and b/folioreader/res/drawable-mdpi/ic_action_fiber_manual_red.png differ
diff --git a/folioreader/res/drawable-mdpi/ic_action_fiber_manual_yellow.png b/folioreader/res/drawable-mdpi/ic_action_fiber_manual_yellow.png
new file mode 100644
index 000000000..ebadc5691
Binary files /dev/null and b/folioreader/res/drawable-mdpi/ic_action_fiber_manual_yellow.png differ
diff --git a/folioreader/res/drawable-mdpi/ic_action_file_copy.png b/folioreader/res/drawable-mdpi/ic_action_file_copy.png
new file mode 100644
index 000000000..ca24c9fc3
Binary files /dev/null and b/folioreader/res/drawable-mdpi/ic_action_file_copy.png differ
diff --git a/folioreader/res/drawable-mdpi/ic_action_g_translate.png b/folioreader/res/drawable-mdpi/ic_action_g_translate.png
new file mode 100644
index 000000000..7a247ad07
Binary files /dev/null and b/folioreader/res/drawable-mdpi/ic_action_g_translate.png differ
diff --git a/folioreader/res/drawable-mdpi/ic_action_library_add.png b/folioreader/res/drawable-mdpi/ic_action_library_add.png
new file mode 100644
index 000000000..01a30d3f5
Binary files /dev/null and b/folioreader/res/drawable-mdpi/ic_action_library_add.png differ
diff --git a/folioreader/res/drawable-mdpi/ic_action_share.png b/folioreader/res/drawable-mdpi/ic_action_share.png
new file mode 100644
index 000000000..f4d872123
Binary files /dev/null and b/folioreader/res/drawable-mdpi/ic_action_share.png differ
diff --git a/folioreader/res/drawable-xhdpi/define_image.9.png b/folioreader/res/drawable-xhdpi/define_image.9.png
new file mode 100644
index 000000000..8f1ff9e0d
Binary files /dev/null and b/folioreader/res/drawable-xhdpi/define_image.9.png differ
diff --git a/folioreader/res/drawable-xhdpi/delete_btn_background.9.png b/folioreader/res/drawable-xhdpi/delete_btn_background.9.png
new file mode 100644
index 000000000..45c76ea69
Binary files /dev/null and b/folioreader/res/drawable-xhdpi/delete_btn_background.9.png differ
diff --git a/folioreader/res/drawable-xhdpi/drawable-hdpi/ic_action_library_add.png b/folioreader/res/drawable-xhdpi/drawable-hdpi/ic_action_library_add.png
new file mode 100644
index 000000000..29cbc254e
Binary files /dev/null and b/folioreader/res/drawable-xhdpi/drawable-hdpi/ic_action_library_add.png differ
diff --git a/folioreader/res/drawable-xhdpi/drawable-mdpi/ic_action_library_add.png b/folioreader/res/drawable-xhdpi/drawable-mdpi/ic_action_library_add.png
new file mode 100644
index 000000000..01a30d3f5
Binary files /dev/null and b/folioreader/res/drawable-xhdpi/drawable-mdpi/ic_action_library_add.png differ
diff --git a/folioreader/res/drawable-xhdpi/drawable-xhdpi/ic_action_library_add.png b/folioreader/res/drawable-xhdpi/drawable-xhdpi/ic_action_library_add.png
new file mode 100644
index 000000000..21843e4f3
Binary files /dev/null and b/folioreader/res/drawable-xhdpi/drawable-xhdpi/ic_action_library_add.png differ
diff --git a/folioreader/res/drawable-xhdpi/drawable-xxhdpi/ic_action_library_add.png b/folioreader/res/drawable-xhdpi/drawable-xxhdpi/ic_action_library_add.png
new file mode 100644
index 000000000..1c67c68ba
Binary files /dev/null and b/folioreader/res/drawable-xhdpi/drawable-xxhdpi/ic_action_library_add.png differ
diff --git a/folioreader/res/drawable-xhdpi/drawable-xxxhdpi/ic_action_library_add.png b/folioreader/res/drawable-xhdpi/drawable-xxxhdpi/ic_action_library_add.png
new file mode 100644
index 000000000..13c561573
Binary files /dev/null and b/folioreader/res/drawable-xhdpi/drawable-xxxhdpi/ic_action_library_add.png differ
diff --git a/folioreader/res/drawable-xhdpi/ic_action_35972.png b/folioreader/res/drawable-xhdpi/ic_action_35972.png
new file mode 100644
index 000000000..43a438bdd
Binary files /dev/null and b/folioreader/res/drawable-xhdpi/ic_action_35972.png differ
diff --git a/folioreader/res/drawable-xhdpi/ic_action_define.png b/folioreader/res/drawable-xhdpi/ic_action_define.png
new file mode 100644
index 000000000..39dd72845
Binary files /dev/null and b/folioreader/res/drawable-xhdpi/ic_action_define.png differ
diff --git a/folioreader/res/drawable-xhdpi/ic_action_fiber_manual_blue.png b/folioreader/res/drawable-xhdpi/ic_action_fiber_manual_blue.png
new file mode 100644
index 000000000..04a950120
Binary files /dev/null and b/folioreader/res/drawable-xhdpi/ic_action_fiber_manual_blue.png differ
diff --git a/folioreader/res/drawable-xhdpi/ic_action_fiber_manual_green.png b/folioreader/res/drawable-xhdpi/ic_action_fiber_manual_green.png
new file mode 100644
index 000000000..cba2a3c81
Binary files /dev/null and b/folioreader/res/drawable-xhdpi/ic_action_fiber_manual_green.png differ
diff --git a/folioreader/res/drawable-xhdpi/ic_action_fiber_manual_red.png b/folioreader/res/drawable-xhdpi/ic_action_fiber_manual_red.png
new file mode 100644
index 000000000..7ab730ec3
Binary files /dev/null and b/folioreader/res/drawable-xhdpi/ic_action_fiber_manual_red.png differ
diff --git a/folioreader/res/drawable-xhdpi/ic_action_fiber_manual_yellow.png b/folioreader/res/drawable-xhdpi/ic_action_fiber_manual_yellow.png
new file mode 100644
index 000000000..11331a330
Binary files /dev/null and b/folioreader/res/drawable-xhdpi/ic_action_fiber_manual_yellow.png differ
diff --git a/folioreader/res/drawable-xhdpi/ic_action_file_copy.png b/folioreader/res/drawable-xhdpi/ic_action_file_copy.png
new file mode 100644
index 000000000..aa3442597
Binary files /dev/null and b/folioreader/res/drawable-xhdpi/ic_action_file_copy.png differ
diff --git a/folioreader/res/drawable-xhdpi/ic_action_g_translate.png b/folioreader/res/drawable-xhdpi/ic_action_g_translate.png
new file mode 100644
index 000000000..d0ed24de2
Binary files /dev/null and b/folioreader/res/drawable-xhdpi/ic_action_g_translate.png differ
diff --git a/folioreader/res/drawable-xhdpi/ic_action_library_add.png b/folioreader/res/drawable-xhdpi/ic_action_library_add.png
new file mode 100644
index 000000000..21843e4f3
Binary files /dev/null and b/folioreader/res/drawable-xhdpi/ic_action_library_add.png differ
diff --git a/folioreader/res/drawable-xhdpi/ic_action_share.png b/folioreader/res/drawable-xhdpi/ic_action_share.png
new file mode 100644
index 000000000..ac1a0e12e
Binary files /dev/null and b/folioreader/res/drawable-xhdpi/ic_action_share.png differ
diff --git a/folioreader/res/drawable-xhdpi/icon_moon_sel.png b/folioreader/res/drawable-xhdpi/icon_moon_sel.png
index ecc727599..7cae13d06 100644
Binary files a/folioreader/res/drawable-xhdpi/icon_moon_sel.png and b/folioreader/res/drawable-xhdpi/icon_moon_sel.png differ
diff --git a/folioreader/res/drawable-xhdpi/icon_sun_sel.png b/folioreader/res/drawable-xhdpi/icon_sun_sel.png
index 2af010582..b31cf20fb 100644
Binary files a/folioreader/res/drawable-xhdpi/icon_sun_sel.png and b/folioreader/res/drawable-xhdpi/icon_sun_sel.png differ
diff --git a/folioreader/res/drawable-xhdpi/shadow_replace.9.png b/folioreader/res/drawable-xhdpi/shadow_replace.9.png
new file mode 100644
index 000000000..bee264335
Binary files /dev/null and b/folioreader/res/drawable-xhdpi/shadow_replace.9.png differ
diff --git a/folioreader/res/drawable-xxhdpi/ic_action_35972.png b/folioreader/res/drawable-xxhdpi/ic_action_35972.png
new file mode 100644
index 000000000..de716f9ef
Binary files /dev/null and b/folioreader/res/drawable-xxhdpi/ic_action_35972.png differ
diff --git a/folioreader/res/drawable-xxhdpi/ic_action_define.png b/folioreader/res/drawable-xxhdpi/ic_action_define.png
new file mode 100644
index 000000000..e1eb35914
Binary files /dev/null and b/folioreader/res/drawable-xxhdpi/ic_action_define.png differ
diff --git a/folioreader/res/drawable-xxhdpi/ic_action_fiber_manual_blue.png b/folioreader/res/drawable-xxhdpi/ic_action_fiber_manual_blue.png
new file mode 100644
index 000000000..bf3490d41
Binary files /dev/null and b/folioreader/res/drawable-xxhdpi/ic_action_fiber_manual_blue.png differ
diff --git a/folioreader/res/drawable-xxhdpi/ic_action_fiber_manual_green.png b/folioreader/res/drawable-xxhdpi/ic_action_fiber_manual_green.png
new file mode 100644
index 000000000..c783bd83a
Binary files /dev/null and b/folioreader/res/drawable-xxhdpi/ic_action_fiber_manual_green.png differ
diff --git a/folioreader/res/drawable-xxhdpi/ic_action_fiber_manual_red.png b/folioreader/res/drawable-xxhdpi/ic_action_fiber_manual_red.png
new file mode 100644
index 000000000..7925fb5a4
Binary files /dev/null and b/folioreader/res/drawable-xxhdpi/ic_action_fiber_manual_red.png differ
diff --git a/folioreader/res/drawable-xxhdpi/ic_action_fiber_manual_yellow.png b/folioreader/res/drawable-xxhdpi/ic_action_fiber_manual_yellow.png
new file mode 100644
index 000000000..d90b1f0ab
Binary files /dev/null and b/folioreader/res/drawable-xxhdpi/ic_action_fiber_manual_yellow.png differ
diff --git a/folioreader/res/drawable-xxhdpi/ic_action_file_copy.png b/folioreader/res/drawable-xxhdpi/ic_action_file_copy.png
new file mode 100644
index 000000000..553d18d45
Binary files /dev/null and b/folioreader/res/drawable-xxhdpi/ic_action_file_copy.png differ
diff --git a/folioreader/res/drawable-xxhdpi/ic_action_g_translate.png b/folioreader/res/drawable-xxhdpi/ic_action_g_translate.png
new file mode 100644
index 000000000..19f7f7230
Binary files /dev/null and b/folioreader/res/drawable-xxhdpi/ic_action_g_translate.png differ
diff --git a/folioreader/res/drawable-xxhdpi/ic_action_library_add.png b/folioreader/res/drawable-xxhdpi/ic_action_library_add.png
new file mode 100644
index 000000000..1c67c68ba
Binary files /dev/null and b/folioreader/res/drawable-xxhdpi/ic_action_library_add.png differ
diff --git a/folioreader/res/drawable-xxhdpi/ic_action_share.png b/folioreader/res/drawable-xxhdpi/ic_action_share.png
new file mode 100644
index 000000000..ed0c88705
Binary files /dev/null and b/folioreader/res/drawable-xxhdpi/ic_action_share.png differ
diff --git a/folioreader/res/drawable-xxxhdpi/ic_action_35972.png b/folioreader/res/drawable-xxxhdpi/ic_action_35972.png
new file mode 100644
index 000000000..20b34c05c
Binary files /dev/null and b/folioreader/res/drawable-xxxhdpi/ic_action_35972.png differ
diff --git a/folioreader/res/drawable-xxxhdpi/ic_action_define.png b/folioreader/res/drawable-xxxhdpi/ic_action_define.png
new file mode 100644
index 000000000..db8b05b94
Binary files /dev/null and b/folioreader/res/drawable-xxxhdpi/ic_action_define.png differ
diff --git a/folioreader/res/drawable-xxxhdpi/ic_action_fiber_manual_blue.png b/folioreader/res/drawable-xxxhdpi/ic_action_fiber_manual_blue.png
new file mode 100644
index 000000000..76d232223
Binary files /dev/null and b/folioreader/res/drawable-xxxhdpi/ic_action_fiber_manual_blue.png differ
diff --git a/folioreader/res/drawable-xxxhdpi/ic_action_fiber_manual_green.png b/folioreader/res/drawable-xxxhdpi/ic_action_fiber_manual_green.png
new file mode 100644
index 000000000..8aa8a29d0
Binary files /dev/null and b/folioreader/res/drawable-xxxhdpi/ic_action_fiber_manual_green.png differ
diff --git a/folioreader/res/drawable-xxxhdpi/ic_action_fiber_manual_red.png b/folioreader/res/drawable-xxxhdpi/ic_action_fiber_manual_red.png
new file mode 100644
index 000000000..cf3cd5c2a
Binary files /dev/null and b/folioreader/res/drawable-xxxhdpi/ic_action_fiber_manual_red.png differ
diff --git a/folioreader/res/drawable-xxxhdpi/ic_action_fiber_manual_yellow.png b/folioreader/res/drawable-xxxhdpi/ic_action_fiber_manual_yellow.png
new file mode 100644
index 000000000..b3152e4d8
Binary files /dev/null and b/folioreader/res/drawable-xxxhdpi/ic_action_fiber_manual_yellow.png differ
diff --git a/folioreader/res/drawable-xxxhdpi/ic_action_file_copy.png b/folioreader/res/drawable-xxxhdpi/ic_action_file_copy.png
new file mode 100644
index 000000000..f5306e4e6
Binary files /dev/null and b/folioreader/res/drawable-xxxhdpi/ic_action_file_copy.png differ
diff --git a/folioreader/res/drawable-xxxhdpi/ic_action_g_translate.png b/folioreader/res/drawable-xxxhdpi/ic_action_g_translate.png
new file mode 100644
index 000000000..031277377
Binary files /dev/null and b/folioreader/res/drawable-xxxhdpi/ic_action_g_translate.png differ
diff --git a/folioreader/res/drawable-xxxhdpi/ic_action_library_add.png b/folioreader/res/drawable-xxxhdpi/ic_action_library_add.png
new file mode 100644
index 000000000..13c561573
Binary files /dev/null and b/folioreader/res/drawable-xxxhdpi/ic_action_library_add.png differ
diff --git a/folioreader/res/drawable-xxxhdpi/ic_action_share.png b/folioreader/res/drawable-xxxhdpi/ic_action_share.png
new file mode 100644
index 000000000..3c7ee03f2
Binary files /dev/null and b/folioreader/res/drawable-xxxhdpi/ic_action_share.png differ
diff --git a/folioreader/res/drawable/ic_close_green_24dp.xml b/folioreader/res/drawable/ic_close_green_24dp.xml
index 62dfc837c..fb02a8edd 100644
--- a/folioreader/res/drawable/ic_close_green_24dp.xml
+++ b/folioreader/res/drawable/ic_close_green_24dp.xml
@@ -5,6 +5,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
\ No newline at end of file
diff --git a/folioreader/res/drawable/ic_drawer.xml b/folioreader/res/drawable/ic_drawer.xml
index d51676b75..fcff6da30 100644
--- a/folioreader/res/drawable/ic_drawer.xml
+++ b/folioreader/res/drawable/ic_drawer.xml
@@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
diff --git a/folioreader/res/drawable/ic_search.xml b/folioreader/res/drawable/ic_search.xml
index 2774870ad..e8b723935 100644
--- a/folioreader/res/drawable/ic_search.xml
+++ b/folioreader/res/drawable/ic_search.xml
@@ -5,6 +5,6 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
diff --git a/folioreader/res/drawable/icon_font.xml b/folioreader/res/drawable/icon_font.xml
index f25b3bf10..cfacff5db 100644
--- a/folioreader/res/drawable/icon_font.xml
+++ b/folioreader/res/drawable/icon_font.xml
@@ -4,6 +4,6 @@
android:viewportHeight="24"
android:viewportWidth="24">
\ No newline at end of file
diff --git a/folioreader/res/drawable/man_speech_icon.xml b/folioreader/res/drawable/man_speech_icon.xml
index 9c71ce2b0..4785a0cf1 100644
--- a/folioreader/res/drawable/man_speech_icon.xml
+++ b/folioreader/res/drawable/man_speech_icon.xml
@@ -4,9 +4,9 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
diff --git a/folioreader/res/drawable/shape_highlight_blue.xml b/folioreader/res/drawable/shape_highlight_blue.xml
index 4ff69b693..fd705ff11 100644
--- a/folioreader/res/drawable/shape_highlight_blue.xml
+++ b/folioreader/res/drawable/shape_highlight_blue.xml
@@ -6,6 +6,6 @@
android:width="48dp"
android:height="48dp" />
-
+
\ No newline at end of file
diff --git a/folioreader/res/drawable/shape_highlight_green.xml b/folioreader/res/drawable/shape_highlight_green.xml
index 26c6fe633..985f618fe 100644
--- a/folioreader/res/drawable/shape_highlight_green.xml
+++ b/folioreader/res/drawable/shape_highlight_green.xml
@@ -6,6 +6,6 @@
android:width="48dp"
android:height="48dp" />
-
+
\ No newline at end of file
diff --git a/folioreader/res/drawable/shape_highlight_yellow.xml b/folioreader/res/drawable/shape_highlight_orange.xml
similarity index 79%
rename from folioreader/res/drawable/shape_highlight_yellow.xml
rename to folioreader/res/drawable/shape_highlight_orange.xml
index 8219d4f8e..620b8df1a 100644
--- a/folioreader/res/drawable/shape_highlight_yellow.xml
+++ b/folioreader/res/drawable/shape_highlight_orange.xml
@@ -6,6 +6,6 @@
android:width="48dp"
android:height="48dp" />
-
+
\ No newline at end of file
diff --git a/folioreader/res/drawable/shape_highlight_pink.xml b/folioreader/res/drawable/shape_highlight_pink.xml
index bbd5f6f07..7c1f747b8 100644
--- a/folioreader/res/drawable/shape_highlight_pink.xml
+++ b/folioreader/res/drawable/shape_highlight_pink.xml
@@ -6,6 +6,6 @@
android:width="48dp"
android:height="48dp" />
-
+
\ No newline at end of file
diff --git a/folioreader/res/layout/fragment_highlight_note.xml b/folioreader/res/layout/fragment_highlight_note.xml
new file mode 100644
index 000000000..13c38a7e4
--- /dev/null
+++ b/folioreader/res/layout/fragment_highlight_note.xml
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/folioreader/res/layout/fragment_verify_delete_note_frm.xml b/folioreader/res/layout/fragment_verify_delete_note_frm.xml
new file mode 100644
index 000000000..c7e4b9f33
--- /dev/null
+++ b/folioreader/res/layout/fragment_verify_delete_note_frm.xml
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/folioreader/res/layout/progress_dialog.xml b/folioreader/res/layout/progress_dialog.xml
index 0d823fe0e..7f7d5ee62 100644
--- a/folioreader/res/layout/progress_dialog.xml
+++ b/folioreader/res/layout/progress_dialog.xml
@@ -14,7 +14,7 @@
android:id="@+id/loading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- style="?android:attr/android:progressBarStyle" />
+ style="?android:attr/progressBarStyle" />
@@ -25,26 +25,46 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
-
+
+
+
+
+ android:src="@drawable/ic_action_file_copy" />
+
-
+ android:src="@drawable/ic_action_g_translate" />
+
+
+
+
+
+
+
-
+ android:src="@drawable/ic_action_define" />
@@ -69,36 +89,33 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
-
+ android:src="@drawable/shape_highlight_pink" />
+ android:src="@drawable/shape_highlight_orange" />
+
+ android:src="@drawable/shape_highlight_green" />
+
-
+ app:srcCompat="@drawable/ic_highlight_delete" />
diff --git a/folioreader/res/layout/view_config.xml b/folioreader/res/layout/view_config.xml
index 341574794..19270dccd 100644
--- a/folioreader/res/layout/view_config.xml
+++ b/folioreader/res/layout/view_config.xml
@@ -120,9 +120,12 @@
+ android:progressTint="@color/note_blue"
+ tools:indeterminateTint="@color/note_blue" />
\ No newline at end of file
diff --git a/folioreader/res/layout/view_webview_pager.xml b/folioreader/res/layout/view_webview_pager.xml
index c6b233746..42be2af63 100644
--- a/folioreader/res/layout/view_webview_pager.xml
+++ b/folioreader/res/layout/view_webview_pager.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:background="@drawable/green_border_background">
+ tools:background="#03a9f4">
+ tools:showAsAction="always"
+
+ />
\ No newline at end of file
diff --git a/folioreader/res/values/colors.xml b/folioreader/res/values/colors.xml
index c2bd97086..019262a68 100644
--- a/folioreader/res/values/colors.xml
+++ b/folioreader/res/values/colors.xml
@@ -1,11 +1,11 @@
- #008577
+ #03a9f4
#00574B
#D81B60
- #71C951
+ #03a9f4
#80000000
#F1EFF2
#000000
@@ -25,8 +25,22 @@
#AAAAAA
#FFEB6B
- #C0ED72
+ #03a9f4
#ADD8FF
#FFB0CA
+ #606060
+ #363636
+ #30363636
+ #606061
+ #f44336
+ #ffc107
+ #03a9f4
+ #8bc34a
+ #0000
+ #30f44336
+ #30ffc107
+ #3003a9f4
+ #308bc34a
+
\ No newline at end of file
diff --git a/folioreader/src/main/java/com/folioreader/ui/fragment/HighlightNoteFragment/BookReadingHighlightNoteFrm.java b/folioreader/src/main/java/com/folioreader/ui/fragment/HighlightNoteFragment/BookReadingHighlightNoteFrm.java
new file mode 100644
index 000000000..7c9a9d7f1
--- /dev/null
+++ b/folioreader/src/main/java/com/folioreader/ui/fragment/HighlightNoteFragment/BookReadingHighlightNoteFrm.java
@@ -0,0 +1,119 @@
+package com.folioreader.ui.fragment.HighlightNoteFragment;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageButton;
+
+import androidx.fragment.app.Fragment;
+
+import com.folioreader.R;
+
+public class BookReadingHighlightNoteFrm extends Fragment implements HighlightNoteFrmContract.HighlightNoteView, View.OnClickListener {
+
+ private HighlightNotePresenter presenter;
+ // private Note note;
+ private int color_index;
+ private Context context;
+ private View view;
+ private ImageButton imgBtn_red;
+ private ImageButton imgBtn_green;
+ private ImageButton imgBtn_blue;
+ private ImageButton imgBtn_yellow;
+ private EditText editText_Note;
+ private Button btn_DeleteNote;
+ private Button btn_SaveNote;
+ private Button btn_verify_delete_note;
+ private Button btn_no_verify_detete_note;
+
+ AlertDialog dialog;
+
+ public BookReadingHighlightNoteFrm(Context context) {
+ this.context = context;
+ // Required empty public constructor
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ // Inflate the layout for this fragment
+ view = inflater.inflate(R.layout.fragment_highlight_note, container, false);
+ color_index = 1;
+ // note = new Note("", "", color_index);
+ presenter = new HighlightNotePresenter(this);
+
+ setUpView();
+ return view;
+ }
+
+ private void setUpView() {
+ AlertDialog.Builder mBuilder = new AlertDialog.Builder(getContext());
+ View mView = getLayoutInflater().inflate(R.layout.fragment_verify_delete_note_frm, null);
+ mBuilder.setView(mView);
+ dialog = mBuilder.create();
+ dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
+ btn_verify_delete_note = mView.findViewById(R.id.verify_delete_btn);
+ btn_no_verify_detete_note = mView.findViewById(R.id.no_verify_delete_btn);
+
+ imgBtn_green = view.findViewById(R.id.btn_highlight_frm_green);
+ imgBtn_yellow = view.findViewById(R.id.btn_highlight_frm_yellow);
+ imgBtn_red = view.findViewById(R.id.btn_highlight_frm_red);
+ imgBtn_blue = view.findViewById(R.id.btn_highlight_frm_blue);
+ editText_Note = view.findViewById(R.id.edittext_highlight_frm);
+ btn_DeleteNote = view.findViewById(R.id.note_delete_btn);
+ btn_SaveNote = view.findViewById(R.id.note_save_btn);
+ btn_SaveNote.setOnClickListener(this);
+ btn_DeleteNote.setOnClickListener(this);
+ btn_verify_delete_note.setOnClickListener(this);
+ btn_no_verify_detete_note.setOnClickListener(this);
+
+ presenter.showNote();
+ }
+
+ @Override
+ public void onClick(View view) {
+ if (view.getId() == R.id.note_save_btn) {
+ // presenter.saveNote(note, color_index, editText_Note.getText().toString());
+ } else if (view.getId() == R.id.note_delete_btn) {
+ presenter.negativeToVerifyFrm();
+ } else if (view.getId() == R.id.verify_delete_btn) {
+ // presenter.deleteNote(note);
+ } else if (view.getId() == R.id.btn_highlight_frm_red) {
+ color_index = 1;
+ } else if (view.getId() == R.id.btn_highlight_frm_yellow) {
+ color_index = 2;
+ } else if (view.getId() == R.id.btn_highlight_frm_blue) {
+ color_index = 3;
+
+ } else if (view.getId() == R.id.btn_highlight_frm_green) {
+ color_index = 4;
+
+ }
+ }
+
+ @Override
+ public void killDialogOnView() {
+ dialog.dismiss();
+ }
+
+// @Override
+// public void showNoteToView(Note note) {
+// editText_Note.setText(note.getText());
+// }
+
+ @Override
+ public void negativeToVerifyFrm() {
+ dialog.show();
+ }
+
+ // @Override
+ // public void deleteNoteOnView(Note note) {
+ // delete highlight in text
+//}
+
+}
diff --git a/folioreader/src/main/java/com/folioreader/ui/fragment/HighlightNoteFragment/HighlightNoteFrmContract.java b/folioreader/src/main/java/com/folioreader/ui/fragment/HighlightNoteFragment/HighlightNoteFrmContract.java
new file mode 100644
index 000000000..5c1d27d96
--- /dev/null
+++ b/folioreader/src/main/java/com/folioreader/ui/fragment/HighlightNoteFragment/HighlightNoteFrmContract.java
@@ -0,0 +1,31 @@
+package com.folioreader.ui.fragment.HighlightNoteFragment;
+
+public interface HighlightNoteFrmContract {
+ interface HighlightNoteView {
+ //show note from presenter
+ void killDialogOnView();
+
+ // void showNoteToView(Note note);
+
+ void negativeToVerifyFrm();
+
+ // void deleteNoteOnView(Note note);
+ }
+
+ interface HighlightNoteFrmPresenter {
+
+ void showNote();
+ void killDialog();
+
+ void negativeToVerifyFrm();
+
+ // void saveNote(Note note, int color_index, String text);
+
+ // void deleteNote(Note note);
+
+ // void deleteNoteInDataBase(Note note);
+
+ // Note getNotesFromDB();
+ }
+
+}
diff --git a/folioreader/src/main/java/com/folioreader/ui/fragment/HighlightNoteFragment/HighlightNotePresenter.java b/folioreader/src/main/java/com/folioreader/ui/fragment/HighlightNoteFragment/HighlightNotePresenter.java
new file mode 100644
index 000000000..df48aca44
--- /dev/null
+++ b/folioreader/src/main/java/com/folioreader/ui/fragment/HighlightNoteFragment/HighlightNotePresenter.java
@@ -0,0 +1,54 @@
+package com.folioreader.ui.fragment.HighlightNoteFragment;
+
+public class HighlightNotePresenter implements HighlightNoteFrmContract.HighlightNoteFrmPresenter {
+
+ HighlightNoteFrmContract.HighlightNoteView view;
+ //private Note model;
+ // private Note[] Database = {new Note("Location", "This note has been load from Database", 1)};
+
+ HighlightNotePresenter(HighlightNoteFrmContract.HighlightNoteView view) {
+ this.view = view;
+ //db = ...getInstance();
+ }
+
+ @Override
+ public void showNote() {
+
+ // view.showNoteToView(getNotesFromDB());
+ }
+
+ @Override
+ public void killDialog() {
+ view.killDialogOnView();
+ }
+
+ @Override
+ public void negativeToVerifyFrm() {
+ view.negativeToVerifyFrm();
+ }
+
+ // @Override
+ // public void saveNote(Note note, int color_index, String text) {
+ // model = note;
+ // model.setColor(color_index);
+ // model.setText(text);
+ // //Database.save(model);
+ // }
+
+// @Override
+// public void deleteNote(Note note) {
+// view.deleteNoteOnView(note);
+// view.killDialogOnView();
+// }
+//
+// @Override
+// public void deleteNoteInDataBase(Note note) {
+// //Database.deleteNote(note);
+// }
+//
+// @Override
+// public Note getNotesFromDB() {
+// return Database[0];
+// }
+
+}
diff --git a/folioreader/src/main/java/com/folioreader/ui/view/FolioWebView.kt b/folioreader/src/main/java/com/folioreader/ui/view/FolioWebView.kt
index 7ee774e56..6e177956f 100644
--- a/folioreader/src/main/java/com/folioreader/ui/view/FolioWebView.kt
+++ b/folioreader/src/main/java/com/folioreader/ui/view/FolioWebView.kt
@@ -264,7 +264,7 @@ class FolioWebView : WebView {
viewTextSelection = LayoutInflater.from(ctw).inflate(R.layout.text_selection, null)
viewTextSelection.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED)
- viewTextSelection.yellowHighlight.setOnClickListener {
+ viewTextSelection.orangeHighlight.setOnClickListener {
Log.v(LOG_TAG, "-> onClick -> yellowHighlight")
onHighlightColorItemsClicked(HighlightStyle.Yellow, false)
}
@@ -276,8 +276,8 @@ class FolioWebView : WebView {
Log.v(LOG_TAG, "-> onClick -> blueHighlight")
onHighlightColorItemsClicked(HighlightStyle.Blue, false)
}
- viewTextSelection.pinkHighlight.setOnClickListener {
- Log.v(LOG_TAG, "-> onClick -> pinkHighlight")
+ viewTextSelection.redHighlight.setOnClickListener {
+ Log.v(LOG_TAG, "-> onClick -> redHighlight")
onHighlightColorItemsClicked(HighlightStyle.Pink, false)
}
viewTextSelection.underlineHighlight.setOnClickListener {
@@ -296,10 +296,10 @@ class FolioWebView : WebView {
dismissPopupWindow()
loadUrl("javascript:onTextSelectionItemClicked(${it.id})")
}
- viewTextSelection.shareSelection.setOnClickListener {
- dismissPopupWindow()
- loadUrl("javascript:onTextSelectionItemClicked(${it.id})")
- }
+// viewTextSelection.shareSelection.setOnClickListener {
+// dismissPopupWindow()
+// loadUrl("javascript:onTextSelectionItemClicked(${it.id})")
+// }
viewTextSelection.defineSelection.setOnClickListener {
dismissPopupWindow()
loadUrl("javascript:onTextSelectionItemClicked(${it.id})")
@@ -317,10 +317,10 @@ class FolioWebView : WebView {
UiUtil.copyToClipboard(context, selectedText)
Toast.makeText(context, context.getString(R.string.copied), Toast.LENGTH_SHORT).show()
}
- R.id.shareSelection -> {
- Log.v(LOG_TAG, "-> onTextSelectionItemClicked -> shareSelection -> $selectedText")
- UiUtil.share(context, selectedText)
- }
+// R.id.shareSelection -> {
+// Log.v(LOG_TAG, "-> onTextSelectionItemClicked -> shareSelection -> $selectedText")
+// UiUtil.share(context, selectedText)
+// }
R.id.defineSelection -> {
Log.v(LOG_TAG, "-> onTextSelectionItemClicked -> defineSelection -> $selectedText")
uiHandler.post { showDictDialog(selectedText) }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0abc9e252..de4d7b224 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Sep 25 12:48:54 IST 2018
+#Fri Dec 06 11:43:53 ICT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/sample/src/main/assets/WakeUp.epub b/sample/src/main/assets/WakeUp.epub
new file mode 100644
index 000000000..2316f06eb
Binary files /dev/null and b/sample/src/main/assets/WakeUp.epub differ
diff --git a/sample/src/main/java/com/folioreader/android/sample/HomeActivity.java b/sample/src/main/java/com/folioreader/android/sample/HomeActivity.java
index 25c63427d..6b6399dbb 100644
--- a/sample/src/main/java/com/folioreader/android/sample/HomeActivity.java
+++ b/sample/src/main/java/com/folioreader/android/sample/HomeActivity.java
@@ -19,8 +19,10 @@
import android.util.Log;
import android.view.View;
import android.widget.Toast;
+
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
+
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.folioreader.Config;
@@ -84,7 +86,7 @@ public void onClick(View v) {
folioReader.setReadLocator(readLocator);
folioReader.setConfig(config, true)
- .openBook("file:///android_asset/TheSilverChair.epub");
+ .openBook("file:///android_asset/WakeUp.epub");
}
});
}
diff --git a/sample/src/main/res/values/colors.xml b/sample/src/main/res/values/colors.xml
index 69b22338c..0bc580b7a 100644
--- a/sample/src/main/res/values/colors.xml
+++ b/sample/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
- #008577
+ #03a4f9
#00574B
#D81B60
diff --git a/sample/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml
index 5885930df..87323a24a 100644
--- a/sample/src/main/res/values/styles.xml
+++ b/sample/src/main/res/values/styles.xml
@@ -3,7 +3,7 @@
diff --git a/versions.gradle b/versions.gradle
index 8c420eed1..335d4c40b 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -1,6 +1,6 @@
def versions = [:]
-versions.folioreaderSdk = "0.5.4"
+versions.folioreaderSdk = "0.5.4-1"
versions.r2SharedKotlin = "1.0.4-2"
versions.r2StreamerKotlin = "1.0.4-2"
@@ -11,7 +11,7 @@ versions.androidMinSdk = 21
versions.androidCompileSdk = 28
versions.androidTargetSdk = 28
-versions.androidGradlePlugin = "3.2.1"
+versions.androidGradlePlugin = '3.5.2'
versions.kotlin = "1.3.11"
versions.appcompat = "1.0.2"