flow layout

Author: plotn

android/AndroidManifest.xml

@@ -31,6 +31,7 @@
         android:icon="@mipmap/cr3_logo"
         android:allowClearUserData="true"
         android:process="org.coolreader"
+        android:usesCleartextTraffic="true"
         >
 <!--
             android:configChanges="orientation|keyboardHidden|locale|screenSize"
@@ -71,6 +72,10 @@
                 <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fb2"/>
                 <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fb2"/>
                 <!-- end of inner files in archive -->
+                <data android:pathPattern=".*\\.fb3"/>
+                <data android:pathPattern=".*\\..*\\.fb3"/>
+                <data android:pathPattern=".*\\..*\\..*\\.fb3"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.fb3"/>
                 <data android:pathPattern=".*\\.txt"/>
                 <data android:pathPattern=".*\\.html"/>
                 <data android:pathPattern=".*\\.xhtml"/>
@@ -86,6 +91,7 @@
                 <data android:pathPattern=".*\\..*\\..*\\..*\\.fb2\\.epub"/>
                 <data android:pathPattern=".*\\.pdb"/>
                 <data android:pathPattern=".*\\.doc"/>
+                <data android:pathPattern=".*\\.docx"/>
                 <data android:pathPattern=".*\\.prc"/>
                 <data android:pathPattern=".*\\.pml"/>
                 <data android:pathPattern=".*\\.mobi"/>
@@ -117,6 +123,7 @@
                 <data android:mimeType="application/x-chm"/>
                 <data android:mimeType="application/fb2"/>
                 <data android:mimeType="application/fb2.zip"/>
+                <data android:mimeType="application/fb3"/>
                 <data android:mimeType="application/epub"/>
                 <data android:mimeType="application/epub+zip"/>
                 <data android:mimeType="application/x-fictionbook"/>
@@ -131,6 +138,7 @@
                 <data android:mimeType="application/word"/>
                 <data android:mimeType="application/x-msw6"/>
                 <data android:mimeType="application/x-msword"/>
+                <data android:mimeType="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
             </intent-filter>
         </activity>
 

android/app/CMakeLists.txt

@@ -34,9 +34,9 @@ set(LOCAL_CFLAGS "${LOCAL_CFLAGS} -funwind-tables")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LOCAL_CFLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LOCAL_CFLAGS}")
 
-set(CMAKE_C_FLAGS_DEBUG             "-O0 -g3")
-set(CMAKE_C_FLAGS_RELEASE           "-O2 -g0 -DNDEBUG")
-set(CMAKE_C_FLAGS_RELWITHDEBINFO    "-O2 -g1 -DNDEBUG")
+set(CMAKE_C_FLAGS_DEBUG             "-O0 -g")
+set(CMAKE_C_FLAGS_RELEASE           "-O3 -g0 -flto -DNDEBUG")
+set(CMAKE_C_FLAGS_RELWITHDEBINFO    "-O3 -g1 -flto -DNDEBUG")
 set(CMAKE_CXX_FLAGS_DEBUG           ${CMAKE_C_FLAGS_DEBUG})
 set(CMAKE_CXX_FLAGS_RELEASE         ${CMAKE_C_FLAGS_RELEASE})
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO  ${CMAKE_C_FLAGS_RELWITHDEBINFO})
@@ -57,12 +57,17 @@ set(CRENGINE_SRC_FILES
     ${CR3_ROOT}/crengine/src/epubfmt.cpp
     ${CR3_ROOT}/crengine/src/pdbfmt.cpp
     ${CR3_ROOT}/crengine/src/wordfmt.cpp
+    ${CR3_ROOT}/crengine/src/lvopc.cpp
+    ${CR3_ROOT}/crengine/src/docxfmt.cpp
+    ${CR3_ROOT}/crengine/src/fb3fmt.cpp
     ${CR3_ROOT}/crengine/src/lvstsheet.cpp
     ${CR3_ROOT}/crengine/src/txtselector.cpp
     ${CR3_ROOT}/crengine/src/crtest.cpp
     ${CR3_ROOT}/crengine/src/lvbmpbuf.cpp
     ${CR3_ROOT}/crengine/src/lvfnt.cpp
     ${CR3_ROOT}/crengine/src/hyphman.cpp
+    ${CR3_ROOT}/crengine/src/lvfont.cpp
+    ${CR3_ROOT}/crengine/src/lvembeddedfont.cpp
     ${CR3_ROOT}/crengine/src/lvfntman.cpp
     ${CR3_ROOT}/crengine/src/lvimg.cpp
     ${CR3_ROOT}/crengine/src/crskin.cpp
@@ -74,6 +79,12 @@ set(CRENGINE_SRC_FILES
     ${CR3_ROOT}/crengine/src/wolutil.cpp
     ${CR3_ROOT}/crengine/src/crconcurrent.cpp
     ${CR3_ROOT}/crengine/src/hist.cpp
+    ${CR3_ROOT}/crengine/src/private/lvfontglyphcache.cpp
+    ${CR3_ROOT}/crengine/src/private/lvfontboldtransform.cpp
+    ${CR3_ROOT}/crengine/src/private/lvfontcache.cpp
+    ${CR3_ROOT}/crengine/src/private/lvfontdef.cpp
+    ${CR3_ROOT}/crengine/src/private/lvfreetypeface.cpp
+    ${CR3_ROOT}/crengine/src/private/lvfreetypefontman.cpp
     ${CR3_ROOT}/crengine/fc-lang/fc-lang-cat.c
 )
 #    ${CR3_ROOT}/crengine/src/cri18n.cpp

android/app/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "org.coolreader.mod.plotn"
-        minSdkVersion 14
-        targetSdkVersion 26
+        minSdkVersion 24
+        targetSdkVersion 28
         multiDexEnabled true
         // When new version released, version code must be incremented at least by 8
         // for compatibility with ABI versioning of split apk (see below).
@@ -64,7 +64,6 @@ android {
         debug {
             minifyEnabled false
             shrinkResources false
-            //useProguard false
             jniDebuggable true
             debuggable true
             externalNativeBuild {
@@ -149,4 +148,7 @@ dependencies {
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support:support-annotations:28.0.0'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation files('libs/commons.jar')
+    implementation files('libs/OpenDocument.jar')
+    //implementation 'org.jopendocument:jOpenDocument:1.3'
 }