Version bump

* This glue can't work with latest libfuse and require c++ STL for no reason, drop it and try find better impl

.github/workflows/android.yml

@@ -13,8 +13,8 @@ jobs:
       - name: Setup Java 11
         uses: actions/setup-java@v3
         with:
-            distribution: temurin
-            java-version: 11
+          distribution: temurin
+          java-version: 11
 
       - name: Setup Android SDK Tools
         uses: android-actions/setup-android@v2
@@ -32,11 +32,23 @@ jobs:
       - name: Update ARM64
         uses: actions/upload-artifact@v3
         with:
-            name: arm64-${{ github.sha }}
-            path: app/build/outputs/apk/release/app-arm64-v8a-release.apk
+          name: arm64-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-arm64-v8a-release.apk
 
       - name: Update x86_64
         uses: actions/upload-artifact@v3
         with:
           name: x86_64-${{ github.sha }}
-          path: app/build/outputs/apk/release/app-x86_64-release.apk
+          path: app/build/outputs/apk/release/app-x86_64-release.apk
+
+      - name: Update ARM32
+        uses: actions/upload-artifact@v3
+        with:
+          name: armeabi-v7a-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-armeabi-v7a-release.apk
+
+      - name: Update x86
+        uses: actions/upload-artifact@v3
+        with:
+          name: x86-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-x86-release.apk

.github/workflows/releases.yml

@@ -16,8 +16,8 @@ jobs:
       - name: Setup Java 11
         uses: actions/setup-java@v3
         with:
-            distribution: temurin
-            java-version: 11
+          distribution: temurin
+          java-version: 11
 
       - name: Setup Android SDK Tools
         uses: android-actions/setup-android@v2
@@ -39,3 +39,5 @@ jobs:
           files: |
             app/build/outputs/apk/release/app-arm64-v8a-release.apk
             app/build/outputs/apk/release/app-x86_64-release.apk
+            app/build/outputs/apk/release/app-x86-release.apk
+            app/build/outputs/apk/release/app-armeabi-v7a-release.apk

.gitmodules

@@ -16,3 +16,6 @@
 [submodule "native/src/main/jni/libzstd"]
 	path = native/src/main/jni/libzstd
 	url = https://github.com/facebook/zstd
+[submodule "native/src/main/jni/libfuse/libfuse"]
+	path = native/src/main/jni/libfuse/libfuse
+	url = https://github.com/libfuse/libfuse/

app/build.gradle

@@ -17,7 +17,7 @@ android {
         abi {
             enable = true
             reset()
-            include 'arm64-v8a', 'x86_64'
+            include 'arm64-v8a', 'x86_64', 'armeabi-v7a', 'x86'
         }
     }
 
@@ -38,8 +38,8 @@ android {
         applicationId "io.github.nekoinverter.ehviewer"
         minSdkVersion 31
         targetSdkVersion 32
-        versionCode 114522
-        versionName "1.7.27.2"
+        versionCode 114524
+        versionName "1.7.27.4"
         resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th'
     }
 
@@ -133,7 +133,6 @@ dependencies {
     implementation 'dev.rikka.rikkax.layoutinflater:layoutinflater:1.2.0'
     implementation 'dev.rikka.rikkax.material:material:2.4.0'
     implementation 'dev.rikka.rikkax.recyclerview:recyclerview-ktx:1.3.1'
-    implementation 'dev.rikka.rikkax.widget:borderview:1.1.0'
     implementation 'dev.rikka.rikkax.preference:simplemenu-preference:1.0.3'
     implementation 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
     implementation 'org.greenrobot:greendao:3.3.0'

app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.kt

@@ -99,6 +99,11 @@ class SearchLayout @JvmOverloads constructor(
             mChip.setText(mPair.second)
             mChip.idt = mPair.first
             mChip.isChecked = NumberUtils.int2boolean(mPair.first and mCategoryStored)
+            mChip.setOnLongClickListener {
+                mCategoryGroup.clearCheck()
+                mChip.isChecked = true
+                true
+            }
             mCategoryGroup.addView(mChip)
         }
         mCategoryGroup.setOnCheckedStateChangeListener { _, checkedIds ->

app/src/main/res/layout/item_gallery_list.xml

@@ -19,8 +19,7 @@
     style="@style/Widget.Material3.CardView.Elevated"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="2dp"
-    android:background="?selectableItemBackground"
+    android:layout_margin="4dp"
     android:checkable="true"
     android:clickable="true"
     android:focusable="true">
@@ -61,8 +60,8 @@
             style="@style/CardMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/title"
             android:layout_alignStart="@id/title"
+            android:layout_above="@id/rating"
             android:layout_marginTop="2dp" />
 
         <TextView
@@ -86,7 +85,7 @@
             android:layout_height="wrap_content"
             android:layout_above="@id/category"
             android:layout_alignStart="@id/title"
-            android:layout_marginBottom="4dp" />
+            android:layout_marginBottom="2dp" />
 
         <TextView
             android:id="@+id/posted"

app/src/main/res/values/styles.xml

@@ -28,38 +28,19 @@
         <item name="android:minHeight">48dp</item>
     </style>
 
-    <style name="TextAppearance.CardTitle">
-        <item name="android:textSize">@dimen/text_little_small</item>
-    </style>
-
     <style name="CardTitle">
-        <item name="android:textAppearance">@style/TextAppearance.CardTitle</item>
+        <item name="android:textAppearance">@style/TextAppearance.Material3.TitleSmall</item>
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">2</item>
-        <item name="android:lineSpacingExtra">0sp</item>
-    </style>
-
-    <style name="TextAppearance.CardMessage">
-        <item name="android:textSize">@dimen/text_small</item>
     </style>
 
     <style name="CardMessage">
-        <item name="android:textAppearance">@style/TextAppearance.CardMessage</item>
+        <item name="android:textAppearance">@style/TextAppearance.Material3.BodyMedium</item>
         <item name="android:ellipsize">end</item>
         <item name="android:singleLine">true</item>
         <item name="android:maxLines">1</item>
     </style>
 
-    <!-- CategoryText -->
-    <style name="CategoryText">
-        <item name="android:textAppearance">@style/TextAppearance.Material3.ActionBar.Subtitle
-        </item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:gravity">center</item>
-        <item name="android:minHeight">@dimen/category_table_item_height</item>
-        <item name="android:foreground">@drawable/check_text_view_foreground</item>
-    </style>
-
     <style name="TextAppearance.CategoryTitle" parent="TextAppearance.Material3.TitleMedium">
         <item name="android:textStyle">bold</item>
     </style>

native/build.gradle

@@ -12,8 +12,14 @@ android {
         targetSdkVersion 32
         consumerProguardFiles 'proguard-rules.pro'
 
+        externalNativeBuild {
+            cmake {
+                arguments '-DANDROID_STL=none'
+            }
+        }
+
         ndk {
-            abiFilters 'arm64-v8a', 'x86_64'
+            abiFilters 'arm64-v8a', 'x86_64', 'armeabi-v7a', 'x86'
         }
     }
 

native/src/main/jni/CMakeLists.txt

@@ -31,7 +31,11 @@ add_subdirectory(libarchive)
 # Build hippo's image lib
 add_subdirectory(image)
 
+# Build libfuse
+add_subdirectory(libfuse)
+include_directories(libfuse/libfuse/include)
+
 # Build and link our app's native lib
 add_library(${PROJECT_NAME} SHARED main.c archive.c)
 target_include_directories(${PROJECT_NAME} PUBLIC image/image libarchive/libarchive)
-target_link_libraries(${PROJECT_NAME} image archive)
+target_link_libraries(${PROJECT_NAME} image archive fuse)

native/src/main/jni/image/giflib/CMakeLists.txt

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 cmake_minimum_required(VERSION 3.4.1)
-project(giflib C)
+project(gif C)
 
 set(GIFLIB_SOURCES
         giflib/dgif_lib.c
@@ -23,5 +23,5 @@ set(GIFLIB_SOURCES
         )
 set(GIFLIB_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/giflib)
 
-add_library(giflib STATIC ${GIFLIB_SOURCES})
-target_include_directories(giflib PUBLIC ${GIFLIB_INCLUDES})
+add_library(gif SHARED ${GIFLIB_SOURCES})
+target_include_directories(gif PUBLIC ${GIFLIB_INCLUDES})

native/src/main/jni/image/image/CMakeLists.txt

@@ -34,11 +34,11 @@ set(IMAGE_LIBRARIES
         jnigraphics
         GLESv2
         stream
-        libjpeg-turbo
-        libpng
-        giflib
+        jpeg
+        png
+        gif
         )
 
-add_library(image STATIC ${IMAGE_SOURCES})
+add_library(image SHARED ${IMAGE_SOURCES})
 target_include_directories(image PRIVATE ${IMAGE_INCLUDES})
 target_link_libraries(image PRIVATE ${IMAGE_LIBRARIES})

native/src/main/jni/image/libjpeg-turbo/CMakeLists.txt

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 cmake_minimum_required(VERSION 3.4.1)
-project(libjpeg-turbo C)
+project(jpeg C)
 
 set(LIBJPEG_TURBO_SOURCES
         libjpeg-turbo/jaricom.c
@@ -207,5 +207,5 @@ else ()
 
 endif ()
 
-add_library(libjpeg-turbo STATIC ${LIBJPEG_TURBO_SOURCES})
-target_include_directories(libjpeg-turbo PUBLIC ${LIBJPEG_TURBO_INCLUDES})
+add_library(jpeg SHARED ${LIBJPEG_TURBO_SOURCES})
+target_include_directories(jpeg PUBLIC ${LIBJPEG_TURBO_INCLUDES})

native/src/main/jni/image/libjpeg-turbo/jconfigint.h

@@ -17,7 +17,7 @@
 #define VERSION  "2.1.3"
 
 /* The size of `size_t', as computed by sizeof. */
-#define SIZEOF_SIZE_T  8
+#define SIZEOF_SIZE_T  __SIZEOF_SIZE_T__
 
 /* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) == sizeof(size_t). */
 #define HAVE_BUILTIN_CTZL

native/src/main/jni/image/libpng/CMakeLists.txt

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 cmake_minimum_required(VERSION 3.4.1)
-project(libpng C)
+project(png C)
 
 set(LIBPNG_SOURCES
         libpng/png.c
@@ -91,7 +91,7 @@ elseif (${ANDROID_ABI} STREQUAL "arm64-v8a")
 
 endif ()
 
-add_library(libpng STATIC ${LIBPNG_SOURCES})
-target_include_directories(libpng PUBLIC ${LIBPNG_INCLUDES})
-target_compile_definitions(libpng PRIVATE ${LIBPNG_DEFINITIONS})
-target_link_libraries(libpng PRIVATE ${LIBPNG_LIBRARIES})
+add_library(png SHARED ${LIBPNG_SOURCES})
+target_include_directories(png PUBLIC ${LIBPNG_INCLUDES})
+target_compile_definitions(png PRIVATE ${LIBPNG_DEFINITIONS})
+target_link_libraries(png PRIVATE ${LIBPNG_LIBRARIES})

native/src/main/jni/image/stream/CMakeLists.txt

@@ -24,5 +24,6 @@ set(STREAM_SOURCES
 )
 set(STREAM_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR})
 
-add_library(stream STATIC ${STREAM_SOURCES})
+add_library(stream SHARED ${STREAM_SOURCES})
 target_include_directories(stream PUBLIC ${STREAM_INCLUDES})
+target_link_libraries(stream PRIVATE log)

native/src/main/jni/libfuse/CMakeLists.txt

@@ -0,0 +1,30 @@
+cmake_minimum_required(VERSION 3.4.1)
+project(fuse C)
+
+add_definitions(-D_FILE_OFFSET_BITS=64)
+add_definitions(-DFUSERMOUNT_DIR=\"/system/bin\")
+add_definitions(-DFUSE_USE_VERSION=35)
+
+SET(FUSE_SOURCES
+        libfuse/lib/fuse.c
+        libfuse/lib/fuse_loop.c
+        libfuse/lib/fuse_loop_mt.c
+        libfuse/lib/fuse_lowlevel.c
+        libfuse/lib/fuse_opt.c
+        libfuse/lib/fuse_signals.c
+        libfuse/lib/buffer.c
+        libfuse/lib/cuse_lowlevel.c
+        libfuse/lib/helper.c
+        libfuse/lib/modules/subdir.c
+        libfuse/lib/modules/iconv.c
+        libfuse/lib/mount_util.c
+        libfuse/lib/mount.c
+        libfuse/lib/fuse_log.c)
+
+set(FUSE_INCLUDES
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        libfuse/lib
+        libfuse/include)
+set(CMAKE_SHARED_LINKER_FLAGS  "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script=${CMAKE_SOURCE_DIR}/libfuse/libfuse/lib/fuse_versionscript")
+add_library(${PROJECT_NAME} SHARED ${FUSE_SOURCES})
+target_include_directories(${PROJECT_NAME} PRIVATE ${FUSE_INCLUDES})

native/src/main/jni/libfuse/android_config.h

@@ -0,0 +1,2 @@
+#define pthread_setcancelstate(x, y)
+#define pthread_cancel(c)

native/src/main/jni/libfuse/config.h

@@ -0,0 +1,24 @@
+/*
+ * Autogenerated by the Meson build system.
+ * Do not edit, your changes will be lost.
+ */
+#pragma once
+#define HAVE_COPY_FILE_RANGE
+#define HAVE_FALLOCATE
+#define HAVE_FDATASYNC
+#define HAVE_FORK
+#define HAVE_FSTATAT
+#define HAVE_ICONV
+#define HAVE_OPENAT
+#define HAVE_PIPE2
+#define HAVE_POSIX_FALLOCATE
+#define HAVE_READLINKAT
+#define HAVE_SETXATTR
+#define HAVE_SPLICE
+#define HAVE_STRUCT_STAT_ST_ATIM
+#undef HAVE_STRUCT_STAT_ST_ATIMESPEC
+#define HAVE_UTIMENSAT
+#define HAVE_VMSPLICE
+#define PACKAGE_VERSION "3.6.1"
+
+#include "android_config.h"