12 Commits
v0.0.4 ... main

Author SHA1 Message Date
91bcc6072f Fix image resize mode
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
2023-08-06 15:13:07 +03:00
231c9b0d79 Add skeleton placeholders
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
2023-08-04 14:15:03 +03:00
1b09b058e4 Improve performance
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
2023-08-04 13:39:55 +03:00
5958cf57ee Fix crash when creating tag inside meme editor
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
2023-08-04 12:21:41 +03:00
e550fcd881 Fix a couple of bugs
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
2023-08-03 21:01:25 +03:00
665931f7b9 Add text recognition
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
2023-08-03 14:20:23 +03:00
d2054b028a Reorganize files
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
2023-08-01 14:53:10 +03:00
b83407f1f4 Add video support
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
2023-08-01 14:35:10 +03:00
f1f969c8ea Refactor editor architecture
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
2023-08-01 08:58:35 +03:00
880c20661e Fix crash when deleting memes
Again.

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
2023-07-31 10:03:16 +03:00
f635c9d961 Improve mime type handling using magic byes
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
2023-07-30 16:07:06 +03:00
5a35191d12 Fix crash when changing column numbers
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
2023-07-30 10:13:41 +03:00
56 changed files with 1534 additions and 766 deletions

View File

@@ -79,7 +79,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "0.0.4"
versionName "0.0.8"
}
signingConfigs {
debug {

View File

@@ -28,6 +28,21 @@
<data android:mimeType="image/png" />
<data android:mimeType="image/webp" />
<data android:mimeType="image/gif" />
<data android:mimeType="video/av01" />
<data android:mimeType="video/3gpp" />
<data android:mimeType="video/avc" />
<data android:mimeType="video/hevc" />
<data android:mimeType="video/x-matroska" />
<data android:mimeType="video/mp2t" />
<data android:mimeType="video/mp4" />
<data android:mimeType="video/mp42" />
<data android:mimeType="video/mp43" />
<data android:mimeType="video/mp4v-es" />
<data android:mimeType="video/mpeg" />
<data android:mimeType="video/mpeg2" />
<data android:mimeType="video/x-vnd.on2.vp8" />
<data android:mimeType="video/x-vnd.on2.vp9" />
<data android:mimeType="video/webm" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND_MULTIPLE" />
@@ -37,6 +52,21 @@
<data android:mimeType="image/png" />
<data android:mimeType="image/webp" />
<data android:mimeType="image/gif" />
<data android:mimeType="video/av01" />
<data android:mimeType="video/3gpp" />
<data android:mimeType="video/avc" />
<data android:mimeType="video/hevc" />
<data android:mimeType="video/x-matroska" />
<data android:mimeType="video/mp2t" />
<data android:mimeType="video/mp4" />
<data android:mimeType="video/mp42" />
<data android:mimeType="video/mp43" />
<data android:mimeType="video/mp4v-es" />
<data android:mimeType="video/mpeg" />
<data android:mimeType="video/mpeg2" />
<data android:mimeType="video/x-vnd.on2.vp8" />
<data android:mimeType="video/x-vnd.on2.vp9" />
<data android:mimeType="video/webm" />
</intent-filter>
</activity>
</application>

149
package-lock.json generated
View File

@@ -12,18 +12,23 @@
"@bankify/redux-persist-realm": "^0.1.3",
"@react-native-clipboard/clipboard": "^1.11.2",
"@react-native-community/hooks": "^3.0.0",
"@react-native-masked-view/masked-view": "^0.2.9",
"@react-native-ml-kit/text-recognition": "^1.2.1",
"@react-navigation/bottom-tabs": "^6.5.8",
"@react-navigation/native": "^6.1.7",
"@react-navigation/native-stack": "^6.9.13",
"@realm/react": "^0.5.1",
"@reduxjs/toolkit": "^1.9.5",
"@shopify/flash-list": "^1.4.3",
"magic-bytes.js": "^1.0.15",
"react": "18.2.0",
"react-native": "0.72.2",
"react-native-document-picker": "^9.0.1",
"react-native-fast-image": "^8.6.3",
"react-native-file-access": "^3.0.4",
"react-native-gesture-handler": "^2.12.0",
"react-native-get-random-values": "^1.9.0",
"react-native-linear-gradient": "^2.8.1",
"react-native-mime-types": "^2.4.0",
"react-native-paper": "^5.9.1",
"react-native-reanimated": "^3.3.0",
@@ -32,6 +37,7 @@
"react-native-screens": "^3.22.1",
"react-native-share": "^9.2.3",
"react-native-share-menu": "^6.0.0",
"react-native-skeleton-placeholder": "^5.2.4",
"react-native-vector-icons": "^9.2.0",
"react-native-video": "^6.0.0-alpha.6",
"react-redux": "^8.1.1",
@@ -4112,6 +4118,24 @@
"react-native": ">=0.65"
}
},
"node_modules/@react-native-masked-view/masked-view": {
"version": "0.2.9",
"resolved": "https://registry.npmjs.org/@react-native-masked-view/masked-view/-/masked-view-0.2.9.tgz",
"integrity": "sha512-Hs4vKBKj+15VxHZHFtMaFWSBxXoOE5Ea8saoigWhahp8Mepssm0ezU+2pTl7DK9z8Y9s5uOl/aPb4QmBZ3R3Zw==",
"peerDependencies": {
"react": ">=16",
"react-native": ">=0.57"
}
},
"node_modules/@react-native-ml-kit/text-recognition": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/@react-native-ml-kit/text-recognition/-/text-recognition-1.2.1.tgz",
"integrity": "sha512-pJrnf8AvihzYdPAZoZZEeKbOUOMjdsetDjHlleXOoVcoPo6qjfh6Il/Q0ey3boIQuO3HglvNjcMPGEPThF3sPA==",
"peerDependencies": {
"react": ">=16.8.1",
"react-native": ">=0.60.0-rc.0 <1.0.x"
}
},
"node_modules/@react-native/assets-registry": {
"version": "0.72.0",
"resolved": "https://registry.npmjs.org/@react-native/assets-registry/-/assets-registry-0.72.0.tgz",
@@ -5617,6 +5641,29 @@
"readable-stream": "^3.4.0"
}
},
"node_modules/bl/node_modules/buffer": {
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/feross"
},
{
"type": "patreon",
"url": "https://www.patreon.com/feross"
},
{
"type": "consulting",
"url": "https://feross.org/support"
}
],
"dependencies": {
"base64-js": "^1.3.1",
"ieee754": "^1.1.13"
}
},
"node_modules/brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -5687,7 +5734,7 @@
"node": ">=6.9.0"
}
},
"node_modules/buffer": {
"node_modules/bson/node_modules/buffer": {
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
@@ -11095,6 +11142,11 @@
"yallist": "^3.0.2"
}
},
"node_modules/magic-bytes.js": {
"version": "1.0.15",
"resolved": "https://registry.npmjs.org/magic-bytes.js/-/magic-bytes.js-1.0.15.tgz",
"integrity": "sha512-bpRmwbRHqongRhA+mXzbLWjVy7ylqmfMBYaQkSs6pac0z6hBTvsgrH0r4FBYd/UYVJBmS6Rp/O+oCCQVLzKV1g=="
},
"node_modules/magic-string": {
"version": "0.30.1",
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.1.tgz",
@@ -13395,6 +13447,15 @@
}
}
},
"node_modules/react-native-fast-image": {
"version": "8.6.3",
"resolved": "https://registry.npmjs.org/react-native-fast-image/-/react-native-fast-image-8.6.3.tgz",
"integrity": "sha512-Sdw4ESidXCXOmQ9EcYguNY2swyoWmx53kym2zRsvi+VeFCHEdkO+WG1DK+6W81juot40bbfLNhkc63QnWtesNg==",
"peerDependencies": {
"react": "^17 || ^18",
"react-native": ">=0.60.0"
}
},
"node_modules/react-native-file-access": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/react-native-file-access/-/react-native-file-access-3.0.4.tgz",
@@ -13431,6 +13492,15 @@
"react-native": ">=0.56"
}
},
"node_modules/react-native-linear-gradient": {
"version": "2.8.1",
"resolved": "https://registry.npmjs.org/react-native-linear-gradient/-/react-native-linear-gradient-2.8.1.tgz",
"integrity": "sha512-934R4Bnjo7mYT38W9ypS1Dq/YW6TgyGdkHg+w72HNxN0ZDKG1GqAnZ6XlicMUYJDh7ViiJAKN8eOF3Ho0N4J0Q==",
"peerDependencies": {
"react": "*",
"react-native": "*"
}
},
"node_modules/react-native-mime-types": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/react-native-mime-types/-/react-native-mime-types-2.4.0.tgz",
@@ -13543,6 +13613,17 @@
"resolved": "https://registry.npmjs.org/react-native-share-menu/-/react-native-share-menu-6.0.0.tgz",
"integrity": "sha512-KdmRnqjI/B2MigSxGmhbYJ3WMJxKXj+0c47ANcVZ/PTzc2vtz6d1r4KQJgkBImXgNC+vowpuD2UGdPllxadr2A=="
},
"node_modules/react-native-skeleton-placeholder": {
"version": "5.2.4",
"resolved": "https://registry.npmjs.org/react-native-skeleton-placeholder/-/react-native-skeleton-placeholder-5.2.4.tgz",
"integrity": "sha512-OZntVq1hU1UX33FltxK2ezT2v9vHIhV8YnEbnMWUCvxT0N9OsgD1qxiHm6qb9YRJVgq2o5z3S7dNPsPnDF/jNg==",
"peerDependencies": {
"@react-native-masked-view/masked-view": "^0.2.8",
"react": ">=0.14.8",
"react-native": ">=0.50.1",
"react-native-linear-gradient": "^2.5.6"
}
},
"node_modules/react-native-vector-icons": {
"version": "9.2.0",
"resolved": "https://registry.npmjs.org/react-native-vector-icons/-/react-native-vector-icons-9.2.0.tgz",
@@ -18770,6 +18851,18 @@
"integrity": "sha512-g2OyxXHfwIytXUJitBR6Z/ISoOfp0WKx5FOv+NqJ/CrWjRDcTw6zXE5I1C9axfuh30kJqzWchVfCDrkzZYTxqg==",
"requires": {}
},
"@react-native-masked-view/masked-view": {
"version": "0.2.9",
"resolved": "https://registry.npmjs.org/@react-native-masked-view/masked-view/-/masked-view-0.2.9.tgz",
"integrity": "sha512-Hs4vKBKj+15VxHZHFtMaFWSBxXoOE5Ea8saoigWhahp8Mepssm0ezU+2pTl7DK9z8Y9s5uOl/aPb4QmBZ3R3Zw==",
"requires": {}
},
"@react-native-ml-kit/text-recognition": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/@react-native-ml-kit/text-recognition/-/text-recognition-1.2.1.tgz",
"integrity": "sha512-pJrnf8AvihzYdPAZoZZEeKbOUOMjdsetDjHlleXOoVcoPo6qjfh6Il/Q0ey3boIQuO3HglvNjcMPGEPThF3sPA==",
"requires": {}
},
"@react-native/assets-registry": {
"version": "0.72.0",
"resolved": "https://registry.npmjs.org/@react-native/assets-registry/-/assets-registry-0.72.0.tgz",
@@ -19947,6 +20040,17 @@
"buffer": "^5.5.0",
"inherits": "^2.0.4",
"readable-stream": "^3.4.0"
},
"dependencies": {
"buffer": {
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
"requires": {
"base64-js": "^1.3.1",
"ieee754": "^1.1.13"
}
}
}
},
"brace-expansion": {
@@ -19991,15 +20095,17 @@
"integrity": "sha512-Uu4OCZa0jouQJCKOk1EmmyqtdWAP5HVLru4lQxTwzJzxT+sJ13lVpEZU/MATDxtHiekWMAL84oQY3Xn1LpJVSg==",
"requires": {
"buffer": "^5.6.0"
}
},
"buffer": {
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
"requires": {
"base64-js": "^1.3.1",
"ieee754": "^1.1.13"
},
"dependencies": {
"buffer": {
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
"requires": {
"base64-js": "^1.3.1",
"ieee754": "^1.1.13"
}
}
}
},
"buffer-from": {
@@ -23979,6 +24085,11 @@
"yallist": "^3.0.2"
}
},
"magic-bytes.js": {
"version": "1.0.15",
"resolved": "https://registry.npmjs.org/magic-bytes.js/-/magic-bytes.js-1.0.15.tgz",
"integrity": "sha512-bpRmwbRHqongRhA+mXzbLWjVy7ylqmfMBYaQkSs6pac0z6hBTvsgrH0r4FBYd/UYVJBmS6Rp/O+oCCQVLzKV1g=="
},
"magic-string": {
"version": "0.30.1",
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.1.tgz",
@@ -25798,6 +25909,12 @@
"invariant": "^2.2.4"
}
},
"react-native-fast-image": {
"version": "8.6.3",
"resolved": "https://registry.npmjs.org/react-native-fast-image/-/react-native-fast-image-8.6.3.tgz",
"integrity": "sha512-Sdw4ESidXCXOmQ9EcYguNY2swyoWmx53kym2zRsvi+VeFCHEdkO+WG1DK+6W81juot40bbfLNhkc63QnWtesNg==",
"requires": {}
},
"react-native-file-access": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/react-native-file-access/-/react-native-file-access-3.0.4.tgz",
@@ -25824,6 +25941,12 @@
"fast-base64-decode": "^1.0.0"
}
},
"react-native-linear-gradient": {
"version": "2.8.1",
"resolved": "https://registry.npmjs.org/react-native-linear-gradient/-/react-native-linear-gradient-2.8.1.tgz",
"integrity": "sha512-934R4Bnjo7mYT38W9ypS1Dq/YW6TgyGdkHg+w72HNxN0ZDKG1GqAnZ6XlicMUYJDh7ViiJAKN8eOF3Ho0N4J0Q==",
"requires": {}
},
"react-native-mime-types": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/react-native-mime-types/-/react-native-mime-types-2.4.0.tgz",
@@ -25910,6 +26033,12 @@
"resolved": "https://registry.npmjs.org/react-native-share-menu/-/react-native-share-menu-6.0.0.tgz",
"integrity": "sha512-KdmRnqjI/B2MigSxGmhbYJ3WMJxKXj+0c47ANcVZ/PTzc2vtz6d1r4KQJgkBImXgNC+vowpuD2UGdPllxadr2A=="
},
"react-native-skeleton-placeholder": {
"version": "5.2.4",
"resolved": "https://registry.npmjs.org/react-native-skeleton-placeholder/-/react-native-skeleton-placeholder-5.2.4.tgz",
"integrity": "sha512-OZntVq1hU1UX33FltxK2ezT2v9vHIhV8YnEbnMWUCvxT0N9OsgD1qxiHm6qb9YRJVgq2o5z3S7dNPsPnDF/jNg==",
"requires": {}
},
"react-native-vector-icons": {
"version": "9.2.0",
"resolved": "https://registry.npmjs.org/react-native-vector-icons/-/react-native-vector-icons-9.2.0.tgz",

View File

@@ -1,6 +1,6 @@
{
"name": "@karaolidis/terminally-online",
"version": "0.0.4",
"version": "0.0.8",
"private": true,
"scripts": {
"postinstall": "patch-package",
@@ -17,18 +17,23 @@
"@bankify/redux-persist-realm": "^0.1.3",
"@react-native-clipboard/clipboard": "^1.11.2",
"@react-native-community/hooks": "^3.0.0",
"@react-native-masked-view/masked-view": "^0.2.9",
"@react-native-ml-kit/text-recognition": "^1.2.1",
"@react-navigation/bottom-tabs": "^6.5.8",
"@react-navigation/native": "^6.1.7",
"@react-navigation/native-stack": "^6.9.13",
"@realm/react": "^0.5.1",
"@reduxjs/toolkit": "^1.9.5",
"@shopify/flash-list": "^1.4.3",
"magic-bytes.js": "^1.0.15",
"react": "18.2.0",
"react-native": "0.72.2",
"react-native-document-picker": "^9.0.1",
"react-native-fast-image": "^8.6.3",
"react-native-file-access": "^3.0.4",
"react-native-gesture-handler": "^2.12.0",
"react-native-get-random-values": "^1.9.0",
"react-native-linear-gradient": "^2.8.1",
"react-native-mime-types": "^2.4.0",
"react-native-paper": "^5.9.1",
"react-native-reanimated": "^3.3.0",
@@ -37,6 +42,7 @@
"react-native-screens": "^3.22.1",
"react-native-share": "^9.2.3",
"react-native-share-menu": "^6.0.0",
"react-native-skeleton-placeholder": "^5.2.4",
"react-native-vector-icons": "^9.2.0",
"react-native-video": "^6.0.0-alpha.6",
"react-redux": "^8.1.1",

View File

@@ -0,0 +1,169 @@
diff --git a/node_modules/react-native-file-access/README.md b/node_modules/react-native-file-access/README.md
index e0540e0..9eb3295 100644
--- a/node_modules/react-native-file-access/README.md
+++ b/node_modules/react-native-file-access/README.md
@@ -155,6 +155,12 @@ type ManagedFetchResult = {
- Read the content of a file.
- Default encoding of returned string is utf8.
+`FileSystem.read(path: string, length?: number, position?: number): Promise<number[]>`
+
+- Read a file as a byte array.
+ - `length` - Optional number of bytes to read.
+ - `position` - Optional position to start reading from.
+
```
FileSystem.stat(path: string): Promise<FileStat>
diff --git a/node_modules/react-native-file-access/android/src/main/java/com/alpha0010/fs/FileAccessModule.kt b/node_modules/react-native-file-access/android/src/main/java/com/alpha0010/fs/FileAccessModule.kt
index 248a938..cbd4fe7 100644
--- a/node_modules/react-native-file-access/android/src/main/java/com/alpha0010/fs/FileAccessModule.kt
+++ b/node_modules/react-native-file-access/android/src/main/java/com/alpha0010/fs/FileAccessModule.kt
@@ -13,6 +13,8 @@ import com.facebook.react.bridge.Promise
import com.facebook.react.bridge.ReactApplicationContext
import com.facebook.react.bridge.ReactMethod
import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.WritableArray
+import com.facebook.react.bridge.WritableNativeArray
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
@@ -400,6 +402,27 @@ class FileAccessModule internal constructor(context: ReactApplicationContext) :
}
}
+ @ReactMethod
+ override fun read(path: String, length: Double, position: Double, promise: Promise) {
+ ioScope.launch {
+ try {
+ val data = openForReading(path).use {
+ it.skip(position.toLong())
+ val byteArray = ByteArray(length.toInt())
+ it.read(byteArray)
+ byteArray
+ }
+ val writableArray: WritableArray = WritableNativeArray()
+ for (byte in data) {
+ writableArray.pushInt(byte.toInt() and 0xFF)
+ }
+ promise.resolve(writableArray)
+ } catch (e: Throwable) {
+ promise.reject(e)
+ }
+ }
+ }
+
@ReactMethod
override fun stat(path: String, promise: Promise) {
ioScope.launch {
diff --git a/node_modules/react-native-file-access/android/src/oldarch/FileAccessSpec.kt b/node_modules/react-native-file-access/android/src/oldarch/FileAccessSpec.kt
index 736324b..c223276 100644
--- a/node_modules/react-native-file-access/android/src/oldarch/FileAccessSpec.kt
+++ b/node_modules/react-native-file-access/android/src/oldarch/FileAccessSpec.kt
@@ -30,6 +30,7 @@ abstract class FileAccessSpec internal constructor(context: ReactApplicationCont
abstract fun mkdir(path: String, promise: Promise)
abstract fun mv(source: String, target: String, promise: Promise)
abstract fun readFile(path: String, encoding: String, promise: Promise)
+ abstract fun read(path: String, length: Double, position: Double, promise: Promise)
abstract fun stat(path: String, promise: Promise)
abstract fun statDir(path: String, promise: Promise)
abstract fun unlink(path: String, promise: Promise)
diff --git a/node_modules/react-native-file-access/lib/commonjs/index.js b/node_modules/react-native-file-access/lib/commonjs/index.js
index 88f1c2c..20eb70b 100644
--- a/node_modules/react-native-file-access/lib/commonjs/index.js
+++ b/node_modules/react-native-file-access/lib/commonjs/index.js
@@ -209,6 +209,12 @@ const FileSystem = {
let encoding = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'utf8';
return FileAccessNative.readFile(path, encoding);
},
+ /**
+ * Read the content of a file as a byte array.
+ */
+ read(path, length, position) {
+ return FileAccessNative.read(path, length, position);
+ },
/**
* Read file metadata.
*/
diff --git a/node_modules/react-native-file-access/lib/module/index.js b/node_modules/react-native-file-access/lib/module/index.js
index 0581920..22c37d3 100644
--- a/node_modules/react-native-file-access/lib/module/index.js
+++ b/node_modules/react-native-file-access/lib/module/index.js
@@ -198,6 +198,12 @@ export const FileSystem = {
let encoding = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'utf8';
return FileAccessNative.readFile(path, encoding);
},
+ /**
+ * Read the content of a file as a byte array.
+ */
+ read(path, length, position) {
+ return FileAccessNative.read(path, length, position);
+ },
/**
* Read file metadata.
*/
diff --git a/node_modules/react-native-file-access/lib/typescript/NativeFileAccess.d.ts b/node_modules/react-native-file-access/lib/typescript/NativeFileAccess.d.ts
index 0c58874..ed84081 100644
--- a/node_modules/react-native-file-access/lib/typescript/NativeFileAccess.d.ts
+++ b/node_modules/react-native-file-access/lib/typescript/NativeFileAccess.d.ts
@@ -63,6 +63,7 @@ export interface Spec extends TurboModule {
mkdir(path: string): Promise<string>;
mv(source: string, target: string): Promise<void>;
readFile(path: string, encoding: string): Promise<string>;
+ read(path: string, length: number, position: number): Promise<number[]>;
stat(path: string): Promise<FileStat>;
statDir(path: string): Promise<FileStat[]>;
unlink(path: string): Promise<void>;
diff --git a/node_modules/react-native-file-access/lib/typescript/index.d.ts b/node_modules/react-native-file-access/lib/typescript/index.d.ts
index 5433d53..12854ca 100644
--- a/node_modules/react-native-file-access/lib/typescript/index.d.ts
+++ b/node_modules/react-native-file-access/lib/typescript/index.d.ts
@@ -84,6 +84,10 @@ export declare const FileSystem: {
* Read the content of a file.
*/
readFile(path: string, encoding?: Encoding): Promise<string>;
+ /**
+ * Read the content of a file as a byte array.
+ */
+ read(path: string, length?: number, position?: number): Promise<number[]>;
/**
* Read file metadata.
*/
diff --git a/node_modules/react-native-file-access/src/NativeFileAccess.ts b/node_modules/react-native-file-access/src/NativeFileAccess.ts
index b3a7baa..affd76c 100644
--- a/node_modules/react-native-file-access/src/NativeFileAccess.ts
+++ b/node_modules/react-native-file-access/src/NativeFileAccess.ts
@@ -71,6 +71,7 @@ export interface Spec extends TurboModule {
mkdir(path: string): Promise<string>;
mv(source: string, target: string): Promise<void>;
readFile(path: string, encoding: string): Promise<string>;
+ read(path: string, length: number, position: number): Promise<number[]>;
stat(path: string): Promise<FileStat>;
statDir(path: string): Promise<FileStat[]>;
unlink(path: string): Promise<void>;
diff --git a/node_modules/react-native-file-access/src/index.ts b/node_modules/react-native-file-access/src/index.ts
index 1b38d45..5c9fd5e 100644
--- a/node_modules/react-native-file-access/src/index.ts
+++ b/node_modules/react-native-file-access/src/index.ts
@@ -31,7 +31,6 @@ const LINKING_ERROR =
'- You rebuilt the app after installing the package\n' +
'- You are not using Expo Go\n';
-// @ts-expect-error
const isTurboModuleEnabled = global.__turboModuleProxy != null;
const FileAccessModule = isTurboModuleEnabled
@@ -275,6 +274,13 @@ export const FileSystem = {
return FileAccessNative.readFile(path, encoding);
},
+ /**
+ * Read the content of a file as a byte array.
+ */
+ read(path: string, length: number = 1000, position: number = 0) {
+ return FileAccessNative.read(path, length, position);
+ },
+
/**
* Read file metadata.
*/

View File

@@ -9,14 +9,9 @@ import {
useKeyboard,
} from '@react-native-community/hooks';
import Clipboard from '@react-native-clipboard/clipboard';
import { documentPickerResponseToAddMemeFile, ROUTE } from '../types';
import {
allowedMimeTypes,
getFilenameFromUri,
guessMimeType,
noOp,
} from '../utilities';
import { useDispatch } from 'react-redux';
import { documentPickerResponseToAddMemeFile, ROUTE } from '../types';
import { allowedMimeTypes, getFilenameFromUri, noOp } from '../utilities';
import { setSnackbarMessage } from '../state';
const floatingActionButtonStyles = StyleSheet.create({
@@ -59,17 +54,11 @@ const FloatingActionButton = ({ visible = true }: { visible?: boolean }) => {
dispatch(setSnackbarMessage('Clipboard does not contain a URI.'));
return;
}
const mimeType = guessMimeType(uri);
if (!mimeType) {
dispatch(setSnackbarMessage('Unsupported MIME type.'));
return;
}
navigate(ROUTE.ADD_MEME, {
files: [
{
uri: uri,
filename: getFilenameFromUri(uri),
type: mimeType,
},
],
});

View File

@@ -1,15 +1,9 @@
export {
MemesList,
MemeEditor,
MemeFail,
MemesHeader,
MemeTagSelector,
MemeViewItem,
} from './memes';
export { TagChip, TagEditor, TagPreview, TagRow, TagsHeader } from './tags';
export { default as AnimatedImage } from './animatedImage';
export { default as FloatingActionButton } from './floatingActionButton';
export { default as HideableBottomNavigationBar } from './hideableBottomNavigationBar';
export { default as HideableHeader } from './hideableHeader';
export { default as LoadingView } from './loadingView';
export { default as storageLocationChangeDialog } from './storageLocationChangeDialog';
export { default as MemeFail } from './memeFail';
export { default as TagChip } from './tagChip';
export { default as TextOverlay } from './textOverlay';
export { default as ThemedSkeletonPlaceholder } from './themedSkeletonPlaceholder';

View File

@@ -1,4 +1,4 @@
import React from 'react';
import React, { ComponentProps } from 'react';
import { ActivityIndicator, StyleSheet, View } from 'react-native';
import { useTheme } from 'react-native-paper';
@@ -10,12 +10,17 @@ const loadingViewStyles = StyleSheet.create({
},
});
const LoadingView = () => {
const LoadingView = ({ ...props }: ComponentProps<typeof View>) => {
const { colors } = useTheme();
return (
<View
style={[loadingViewStyles.view, { backgroundColor: colors.background }]}>
{...props}
style={[
props.style,
loadingViewStyles.view,
{ backgroundColor: colors.background },
]}>
<ActivityIndicator size="large" color={colors.primary} />
</View>
);

View File

@@ -2,7 +2,7 @@ import React, { ComponentProps } from 'react';
import { StyleSheet, View } from 'react-native';
import { useTheme } from 'react-native-paper';
import FontAwesome5 from 'react-native-vector-icons/FontAwesome5';
import { rgbToRgba } from '../../utilities';
import { rgbToRgba } from '../utilities';
const memeFailStyles = StyleSheet.create({
view: {

View File

@@ -1,6 +0,0 @@
export { default as MemesList } from './memesList/memesList';
export { default as MemeEditor } from './memeEditor';
export { default as MemeFail } from './memeFail';
export { default as MemesHeader } from './memesHeader';
export { default as MemeTagSelector } from './memeTagSelector/memeTagSelector';
export { default as MemeViewItem } from './memeViewItem';

View File

@@ -1,112 +0,0 @@
import React, { useEffect } from 'react';
import { HelperText, Text, TextInput, useTheme } from 'react-native-paper';
import { Image } from 'react-native';
import { useSafeAreaFrame } from 'react-native-safe-area-context';
import { useImageDimensions } from '@react-native-community/hooks/lib/useImageDimensions';
import { MemeFail, MemeTagSelector, LoadingView } from '..';
import { Tag } from '../../database';
import { StringValidationResult, validateMemeTitle } from '../../utilities';
const memeEditorStyles = {
image: {
marginBottom: 15,
borderRadius: 5,
},
uri: {
marginBottom: 15,
marginHorizontal: 5,
},
memeTagSelector: {
marginBottom: 10,
},
description: {
marginBottom: 10,
},
};
const MemeEditor = ({
memeUri,
memeFilename,
memeError,
setMemeError,
memeTitle,
setMemeTitle,
memeTags,
setMemeTags,
}: {
memeUri: string;
memeFilename?: string;
memeError: Error | undefined;
setMemeError: (error: Error | undefined) => void;
memeTitle: StringValidationResult;
setMemeTitle: (name: StringValidationResult) => void;
memeTags: Map<string, Tag>;
setMemeTags: (tags: Map<string, Tag>) => void;
}) => {
const { width } = useSafeAreaFrame();
const { colors } = useTheme();
const { dimensions, loading, error } = useImageDimensions({ uri: memeUri });
useEffect(() => setMemeError(error), [error, setMemeError]);
if (!memeError && (loading || !dimensions)) return <LoadingView />;
return (
<>
<TextInput
mode="outlined"
label="Title"
value={memeTitle.raw}
onChangeText={title => setMemeTitle(validateMemeTitle(title))}
error={!memeTitle.valid}
selectTextOnFocus
/>
<HelperText type="error" visible={!memeTitle.valid}>
{memeTitle.error}
</HelperText>
{memeError || !dimensions ? (
<MemeFail
style={[
{
width: width * 0.92,
height: width * 0.92,
},
memeEditorStyles.image,
]}
iconSize={50}
/>
) : (
<Image
source={{ uri: memeUri }}
style={[
{
width: width * 0.92,
height: Math.max(
Math.min(
((width * 0.92) / dimensions.width) * dimensions.height,
500,
),
100,
),
},
memeEditorStyles.image,
]}
resizeMode="contain"
/>
)}
<Text
variant="bodySmall"
style={[memeEditorStyles.uri, { color: colors.onSurfaceDisabled }]}
numberOfLines={1}>
{memeFilename}
</Text>
<MemeTagSelector
memeTags={memeTags}
setMemeTags={setMemeTags}
style={memeEditorStyles.memeTagSelector}
/>
</>
);
};
export default MemeEditor;

View File

@@ -1,68 +0,0 @@
import React from 'react';
import { StyleSheet, View } from 'react-native';
import { useSafeAreaFrame } from 'react-native-safe-area-context';
import { useImageDimensions } from '@react-native-community/hooks';
import { AndroidScoped } from 'react-native-file-access';
import { useSelector } from 'react-redux';
import { Meme } from '../../database';
import { RootState } from '../../state';
import { AnimatedImage, LoadingView, MemeFail } from '..';
const memeViewItemStyles = StyleSheet.create({
view: {
justifyContent: 'center',
alignItems: 'center',
},
});
const MemeViewItem = ({ meme }: { meme: Meme }) => {
const { height, width } = useSafeAreaFrame();
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const storageUri = useSelector(
(state: RootState) => state.settings.storageUri,
)!;
const uri = AndroidScoped.appendPath(storageUri, meme.filename);
const { dimensions, loading, error } = useImageDimensions({ uri });
if (!error && (loading || !dimensions)) {
return (
<View style={{ width, height }}>
<LoadingView />
</View>
);
}
return (
<View style={[{ width, height }, memeViewItemStyles.view]}>
{error || !dimensions ? (
<MemeFail
style={{
width: Math.min(width, height - 128),
height: Math.min(width, height - 128),
}}
iconSize={50}
/>
) : (
<AnimatedImage
source={{ uri }}
style={
dimensions.aspectRatio > width / (height - 128)
? {
width,
height: width / (dimensions.width / dimensions.height),
}
: {
width:
(height - 128) * (dimensions.width / dimensions.height),
height: height - 128,
}
}
/>
)}
</View>
);
};
export default MemeViewItem;

View File

@@ -1,61 +0,0 @@
import React from 'react';
import { Image, TouchableHighlight } from 'react-native';
import { useSelector } from 'react-redux';
import { useSafeAreaFrame } from 'react-native-safe-area-context';
import { useImageDimensions } from '@react-native-community/hooks';
import { AndroidScoped } from 'react-native-file-access';
import { Meme } from '../../../database';
import { RootState } from '../../../state';
import { MemeFail } from '..';
import { getFontAwesome5IconSize } from '../../../utilities';
const MemesGridItem = ({
meme,
index,
focusMeme,
}: {
meme: Meme;
index: number;
focusMeme: (index: number) => void;
}) => {
const { width } = useSafeAreaFrame();
const gridColumns = useSelector(
(state: RootState) => state.settings.gridColumns,
);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const storageUri = useSelector(
(state: RootState) => state.settings.storageUri,
)!;
const uri = AndroidScoped.appendPath(storageUri, meme.filename);
const { dimensions, loading, error } = useImageDimensions({ uri });
if (!error && (loading || !dimensions)) return <></>;
return (
<TouchableHighlight onPress={() => focusMeme(index)}>
{error ? (
<MemeFail
style={{
width: (width * 0.92 - 5) / gridColumns,
height: (width * 0.92 - 5) / gridColumns,
}}
iconSize={getFontAwesome5IconSize(gridColumns)}
/>
) : (
<Image
source={{ uri }}
style={[
{
width: (width * 0.92 - 5) / gridColumns,
height: (width * 0.92 - 5) / gridColumns,
},
]}
/>
)}
</TouchableHighlight>
);
};
export default MemesGridItem;

View File

@@ -1,78 +0,0 @@
import React from 'react';
import { Image, StyleSheet, TouchableHighlight } from 'react-native';
import { useSelector } from 'react-redux';
import { useSafeAreaFrame } from 'react-native-safe-area-context';
import { AndroidScoped } from 'react-native-file-access';
import { useImageDimensions } from '@react-native-community/hooks';
import { Meme } from '../../../database';
import { RootState } from '../../../state';
import { MemeFail } from '..';
import { getFontAwesome5IconSize } from '../../../utilities';
const memeMasonryItemStyles = StyleSheet.create({
view: {
margin: 2.5,
borderRadius: 5,
},
image: {
borderRadius: 5,
},
});
const MemesMasonryItem = ({
meme,
index,
focusMeme,
}: {
meme: Meme;
index: number;
focusMeme: (index: number) => void;
}) => {
const { width } = useSafeAreaFrame();
const masonryColumns = useSelector(
(state: RootState) => state.settings.masonryColumns,
);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const storageUri = useSelector(
(state: RootState) => state.settings.storageUri,
)!;
const uri = AndroidScoped.appendPath(storageUri, meme.filename);
const { dimensions, loading, error } = useImageDimensions({ uri });
if (!error && (loading || !dimensions)) return <></>;
return (
<TouchableHighlight
onPress={() => focusMeme(index)}
style={memeMasonryItemStyles.view}>
{error || !dimensions ? (
<MemeFail
style={[
memeMasonryItemStyles.image,
{
width: (width * 0.92) / masonryColumns - 5,
height: (width * 0.92) / masonryColumns - 5,
},
]}
iconSize={getFontAwesome5IconSize(masonryColumns)}
/>
) : (
<Image
source={{ uri }}
style={[
memeMasonryItemStyles.image,
{
width: (width * 0.92) / masonryColumns - 5,
height:
((width * 0.92) / masonryColumns - 5) / dimensions.aspectRatio,
},
]}
/>
)}
</TouchableHighlight>
);
};
export default MemesMasonryItem;

View File

@@ -1,9 +1,9 @@
import React, { ComponentProps, useMemo } from 'react';
import { getContrastColor } from '../../utilities';
import { Chip, useTheme } from 'react-native-paper';
import { Tag } from '../../database';
import FontAwesome5 from 'react-native-vector-icons/FontAwesome5';
import { StyleSheet } from 'react-native';
import { getContrastColor } from '../utilities';
import { Tag } from '../database';
const tagChipStyles = StyleSheet.create({
chip: {

View File

@@ -1,5 +0,0 @@
export { default as TagChip } from './tagChip';
export { default as TagEditor } from './tagEditor';
export { default as TagPreview } from './tagPreview';
export { default as TagRow } from './tagRow';
export { default as TagsHeader } from './tagsHeader';

View File

@@ -1,66 +0,0 @@
import React, { useEffect, useRef } from 'react';
import { HelperText, TextInput } from 'react-native-paper';
import TagPreview from './tagPreview';
import {
StringValidationResult,
generateRandomColor,
validateColor,
validateTagName,
} from '../../utilities';
const TagEditor = ({
tagName,
setTagName,
tagColor,
setTagColor,
}: {
tagName: StringValidationResult;
setTagName: (name: StringValidationResult) => void;
tagColor: StringValidationResult;
setTagColor: (color: StringValidationResult) => void;
}) => {
const lastValidTagColor = useRef(tagColor.parsed);
useEffect(() => {
if (tagColor.valid) lastValidTagColor.current = tagColor.parsed;
}, [tagColor]);
return (
<>
<TagPreview
name={tagName.parsed}
color={tagColor.valid ? tagColor.parsed : lastValidTagColor.current}
/>
<TextInput
mode="outlined"
label="Name"
value={tagName.raw}
onChangeText={name => setTagName(validateTagName(name))}
error={!tagName.valid}
selectTextOnFocus
/>
<HelperText type="error" visible={!tagName.valid}>
{tagName.error}
</HelperText>
<TextInput
mode="outlined"
label="Color"
value={tagColor.raw}
onChangeText={color => setTagColor(validateColor(color))}
error={!tagColor.valid}
autoCorrect={false}
right={
<TextInput.Icon
icon="palette"
onPress={() => setTagColor(validateColor(generateRandomColor()))}
/>
}
/>
<HelperText type="error" visible={!tagColor.valid}>
{tagColor.error}
</HelperText>
</>
);
};
export default TagEditor;

View File

@@ -0,0 +1,64 @@
import React from 'react';
import { TextBlock } from '@react-native-ml-kit/text-recognition';
import { TouchableRipple, useTheme } from 'react-native-paper';
import { StyleSheet } from 'react-native';
import { Dimensions } from '../types';
const textOverlayStyles = StyleSheet.create({
touchable: {
position: 'absolute',
borderWidth: 1,
zIndex: 1,
},
});
const TextOverlay = ({
blocks,
onTextPress,
onTextLongPress,
imageDimensions,
frameDimensions,
}: {
blocks: TextBlock[];
onTextPress: (text: string) => void;
onTextLongPress: (text: string) => void;
imageDimensions: Dimensions;
frameDimensions: Dimensions;
}) => {
const { colors } = useTheme();
const widthScale = frameDimensions.width / imageDimensions.width;
const heightScale = frameDimensions.height / imageDimensions.height;
return (
<>
{blocks.map(
(block, index) =>
block.frame && (
<TouchableRipple
key={index}
style={[
textOverlayStyles.touchable,
{
top: block.frame.top * heightScale - 5,
left: block.frame.left * widthScale - 5,
width: block.frame.width * widthScale + 10,
height: block.frame.height * heightScale + 10,
borderColor: colors.error,
},
]}
onPress={() =>
onTextPress(block.text.replaceAll('\n', ' ').trim())
}
onLongPress={() =>
onTextLongPress(block.text.replaceAll('\n', ' ').trim())
}>
<></>
</TouchableRipple>
),
)}
</>
);
};
export default TextOverlay;

View File

@@ -0,0 +1,20 @@
import React, { ComponentProps } from 'react';
import SkeletonPlaceholder from 'react-native-skeleton-placeholder';
import { useTheme } from 'react-native-paper';
import { rgbToRgba } from '../utilities';
const ThemedSkeletonPlaceholder = ({
...props
}: ComponentProps<typeof SkeletonPlaceholder>) => {
const { colors } = useTheme();
return (
<SkeletonPlaceholder
backgroundColor={rgbToRgba(colors.surfaceVariant, 0.2)}
highlightColor={rgbToRgba(colors.surfaceVariant, 0.7)}
{...props}
/>
);
};
export default ThemedSkeletonPlaceholder;

View File

@@ -1,5 +1,5 @@
import { BSON, Object, ObjectSchema } from 'realm';
import { Tag } from './tag';
import { Tag } from '.';
enum MEME_TYPE {
IMAGE = 'Image',
@@ -17,11 +17,10 @@ const memeTypePlural = {
[MEME_TYPE.TEXT]: 'Text',
};
// eslint-disable-next-line @typescript-eslint/naming-convention
class Meme extends Object<Meme> {
id!: BSON.UUID;
type!: MEME_TYPE;
filename!: string;
memeType!: MEME_TYPE;
mimeType!: string;
size!: number;
title!: string;
@@ -38,8 +37,8 @@ class Meme extends Object<Meme> {
primaryKey: 'id',
properties: {
id: { type: 'uuid', default: () => new BSON.UUID() },
type: { type: 'string', indexed: true },
filename: 'string',
memeType: { type: 'string', indexed: true },
mimeType: 'string',
size: 'int',
title: 'string',

View File

@@ -1,8 +1,7 @@
import { BSON, Object, ObjectSchema } from 'realm';
import { Meme } from './meme';
import { Meme } from '.';
import { generateRandomColor } from '../utilities';
// eslint-disable-next-line @typescript-eslint/naming-convention
class Tag extends Object<Tag> {
id!: BSON.UUID;
name!: string;

1
src/hooks/index.ts Normal file
View File

@@ -0,0 +1 @@
export { default as useMemeDimensions } from './useMemeDimensions';

View File

@@ -0,0 +1,56 @@
import { useEffect, useState } from 'react';
import { Image } from 'react-native';
import { Dimensions } from '../types';
const useMediaDimensions = (
uri?: string,
mimeType?: string,
onLoad?: (width: number, height: number, aspectRatio: number) => void,
onError?: (error: Error) => void,
) => {
const [dimensions, setDimensions] = useState<Dimensions | undefined>();
const [loading, setLoading] = useState(true);
const [error, setError] = useState<Error | undefined>();
useEffect(() => {
const getDimensions = () => {
if (!uri || !mimeType) return;
const mimeStart = mimeType.split('/')[0];
switch (mimeStart) {
case 'image':
case 'video': {
Image.getSize(
uri,
(width, height) => {
const aspectRatio = width / height;
setDimensions({ width, height, aspectRatio });
setLoading(false);
onLoad?.(width, height, aspectRatio);
},
(errorIn: string) => {
const errorOut = new Error(errorIn);
setError(errorOut);
setLoading(false);
onError?.(errorOut);
},
);
break;
}
default: {
const errorOut = new Error(`Unknown mime type: ${mimeType}`);
setError(errorOut);
setLoading(false);
onError?.(errorOut);
}
}
};
getDimensions();
}, [mimeType, onError, onLoad, uri]);
return { dimensions, loading, error };
};
export default useMediaDimensions;

View File

@@ -1,4 +1,4 @@
import React, { useCallback, useRef, useState } from 'react';
import React, { useCallback, useEffect, useRef, useState } from 'react';
import { Appbar, Banner, Button, useTheme } from 'react-native-paper';
import { useNavigation } from '@react-navigation/native';
import { ScrollView, View } from 'react-native';
@@ -14,16 +14,18 @@ import {
documentPickerResponseToAddMemeFile,
ROUTE,
RootStackParamList,
} from '../../types';
import { Meme, Tag } from '../../database';
import { RootState } from '../../state';
StagingMeme,
} from '../../../types';
import { Meme, Tag } from '../../../database';
import { RootState } from '../../../state';
import {
allowedMimeTypes,
getMemeType,
getMemeTypeFromMimeType,
guessMimeType,
validateMemeTitle,
} from '../../utilities';
import { MemeEditor } from '../../components';
import editorStyles from './editorStyles';
} from '../../../utilities';
import MemeEditor from './memeEditor';
import editorStyles from '../editorStyles';
const AddMeme = ({
route,
@@ -42,54 +44,83 @@ const AddMeme = ({
const file = useRef(files.current[index]);
const isLastFile = index === files.current.length - 1;
const [memeUri, setMemeUri] = useState(file.current.uri);
const [memeFilename, setMemeFilename] = useState(file.current.filename);
const [memeError, setMemeError] = useState<Error>();
const [memeTitle, setMemeTitle] = useState(validateMemeTitle('New Meme'));
const [memeIsFavorite, setMemeIsFavorite] = useState(false);
const [memeTags, setMemeTags] = useState(new Map<string, Tag>());
const [isSaving, setIsSaving] = useState(false);
const [isSavingAndAddingMore, setIsSavingAndAddingMore] = useState(false);
const saveMeme = useCallback(async () => {
const uuid = new BSON.UUID();
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const mimeType = file.current.type!;
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const memeType = getMemeType(mimeType)!;
const [uri, setUri] = useState<string>();
const [mimeType, setMimeType] = useState<string>();
const [loading, setLoading] = useState(true);
const [error, setError] = useState<Error>();
const [staging, setStaging] = useState<StagingMeme>();
const fileExtension = extension(mimeType) as string;
if (!fileExtension) goBack();
const resetState = useCallback(async (newIndex: number) => {
setLoading(true);
// eslint-disable-next-line unicorn/no-useless-undefined
setError(undefined);
setIndex(newIndex);
file.current = files.current[newIndex];
setUri(file.current.uri);
const guessedMimeType = await guessMimeType(file.current.uri);
if (!guessedMimeType) {
setError(
new Error('Could not determine MIME type or file is not supported.'),
);
return;
}
setMimeType(guessedMimeType);
setStaging({
title: validateMemeTitle('New Meme'),
isFavorite: false,
tags: new Map<string, Tag>(),
});
setLoading(false);
}, []);
useEffect(() => void resetState(0), [resetState]);
const saveMeme = useCallback(async () => {
if (!mimeType || !staging) return;
const uuid = new BSON.UUID();
const memeType = getMemeTypeFromMimeType(mimeType);
if (!memeType) return;
const fileExtension = extension(mimeType);
if (!fileExtension) return;
const filename = `${uuid.toHexString()}-${Math.round(
Date.now() / 1000,
)}.${fileExtension}`;
const uri = AndroidScoped.appendPath(storageUri, filename);
const finalUri = AndroidScoped.appendPath(storageUri, filename);
await FileSystem.cp(file.current.uri, uri);
const { size } = await FileSystem.stat(uri);
await FileSystem.cp(file.current.uri, finalUri);
const { size } = await FileSystem.stat(finalUri);
realm.write(() => {
const meme: Meme | undefined = realm.create<Meme>(Meme.schema.name, {
id: uuid,
type: memeType,
memeType,
filename,
mimeType,
mimeType: mimeType,
size,
title: memeTitle.parsed,
isFavorite: memeIsFavorite,
tags: [...memeTags.values()],
tagsLength: memeTags.size,
title: staging.title.parsed,
isFavorite: staging.isFavorite,
tags: [...staging.tags.values()],
tagsLength: staging.tags.size,
});
memeTags.forEach(tag => {
staging.tags.forEach(tag => {
tag.dateModified = new Date();
tag.memes.push(meme);
tag.memesLength = tag.memes.length;
});
});
}, [goBack, memeIsFavorite, memeTags, memeTitle.parsed, realm, storageUri]);
}, [mimeType, realm, staging, storageUri]);
const handleSave = useCallback(async () => {
setIsSaving(true);
@@ -101,37 +132,21 @@ const AddMeme = ({
setIsSaving(true);
await saveMeme();
setIsSaving(false);
setIndex(index + 1);
file.current = files.current[index + 1];
setMemeUri(file.current.uri);
setMemeFilename(file.current.filename);
setMemeTitle(validateMemeTitle('New Meme'));
setMemeIsFavorite(false);
setMemeTags(new Map<string, Tag>());
}, [index, saveMeme]);
await resetState(index + 1);
}, [index, resetState, saveMeme]);
const handleSaveAndAddMore = useCallback(async () => {
setIsSavingAndAddingMore(true);
await saveMeme();
setIsSavingAndAddingMore(false);
setIndex(0);
const response = await pick({
type: allowedMimeTypes,
allowMultiSelection: true,
}).catch(goBack);
if (!response) return;
files.current = documentPickerResponseToAddMemeFile(response);
file.current = files.current[0];
setMemeUri(file.current.uri);
setMemeFilename(file.current.filename);
setMemeTitle(validateMemeTitle('New Meme'));
setMemeIsFavorite(false);
setMemeTags(new Map<string, Tag>());
}, [goBack, saveMeme]);
await resetState(0);
}, [goBack, resetState, saveMeme]);
return (
<>
@@ -139,20 +154,23 @@ const AddMeme = ({
<Appbar.BackAction onPress={() => goBack()} />
<Appbar.Content title={'Add Meme'} />
<Appbar.Action
icon={memeIsFavorite ? 'heart' : 'heart-outline'}
onPress={() => setMemeIsFavorite(!memeIsFavorite)}
icon={staging?.isFavorite ? 'heart' : 'heart-outline'}
disabled={!staging}
onPress={() =>
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
setStaging({ ...staging!, isFavorite: !staging!.isFavorite })
}
/>
</Appbar.Header>
<Banner
visible={!!memeError}
visible={!!error}
actions={[
{
label: 'Cancel',
onPress: goBack,
},
]}>
The selected URI appears to be broken. This may have been caused by the
file being corrupted or unsupported.
{error?.message}
</Banner>
<ScrollView
contentContainerStyle={[
@@ -164,14 +182,14 @@ const AddMeme = ({
]}>
<View style={editorStyles.editorView}>
<MemeEditor
memeUri={memeUri}
memeFilename={memeFilename}
memeError={memeError}
setMemeError={setMemeError}
memeTitle={memeTitle}
setMemeTitle={setMemeTitle}
memeTags={memeTags}
setMemeTags={setMemeTags}
uri={uri}
mimeType={mimeType}
loading={loading}
setLoading={setLoading}
error={error}
setError={setError}
staging={staging}
setStaging={setStaging}
/>
</View>
<View style={editorStyles.saveButtonView}>
@@ -180,10 +198,11 @@ const AddMeme = ({
icon="plus"
onPress={handleSaveAndAddMore}
disabled={
!memeTitle.valid ||
loading ||
!!error ||
isSaving ||
isSavingAndAddingMore ||
!!memeError ||
!staging?.title.valid ||
!isLastFile
}
loading={isSavingAndAddingMore}
@@ -195,10 +214,11 @@ const AddMeme = ({
icon="floppy"
onPress={isLastFile ? handleSave : handleSaveAndNext}
disabled={
!memeTitle.valid ||
loading ||
!!error ||
isSaving ||
isSavingAndAddingMore ||
!!memeError
!staging?.title.valid
}
loading={isSaving}
style={editorStyles.saveButton}>

View File

@@ -1,4 +1,4 @@
import React, { useCallback, useState } from 'react';
import React, { useCallback, useEffect, useRef, useState } from 'react';
import { ScrollView, View } from 'react-native';
import { Appbar, Banner, Button, useTheme } from 'react-native-paper';
import { useNavigation } from '@react-navigation/native';
@@ -6,24 +6,24 @@ import { NativeStackScreenProps } from '@react-navigation/native-stack';
import { useObject, useRealm } from '@realm/react';
import { useDeviceOrientation } from '@react-native-community/hooks';
import { BSON } from 'realm';
import { RootStackParamList, ROUTE } from '../../types';
import { pickSingle } from 'react-native-document-picker';
import { AndroidScoped, FileSystem } from 'react-native-file-access';
import { extension } from 'react-native-mime-types';
import { useSelector } from 'react-redux';
import { Tag, Meme } from '../../database';
import { RootStackParamList, ROUTE, StagingMeme } from '../../../types';
import { Meme } from '../../../database';
import {
StringValidationResult,
allowedMimeTypes,
deleteMeme,
favoriteMeme,
getMemeType,
getMemeTypeFromMimeType,
guessMimeType,
noOp,
validateMemeTitle,
} from '../../utilities';
import { MemeEditor } from '../../components';
import editorStyles from './editorStyles';
import { RootState } from '../../state';
} from '../../../utilities';
import { RootState } from '../../../state';
import MemeEditor from './memeEditor';
import editorStyles from '../editorStyles';
const EditMeme = ({
route,
@@ -42,41 +42,67 @@ const EditMeme = ({
Meme.schema.name,
BSON.UUID.createFromHexString(route.params.id),
)!;
const uri = AndroidScoped.appendPath(storageUri, meme.filename);
const [hasChanges, setHasChanges] = useState(false);
const [memeError, setMemeError] = useState<Error>();
const [memeTitle, setMemeTitle] = useState(validateMemeTitle(meme.title));
const [memeTags, setMemeTags] = useState(
new Map<string, Tag>(meme.tags.map(tag => [tag.id.toHexString(), tag])),
);
const handleMemeTitleChange = useCallback((title: StringValidationResult) => {
setMemeTitle(title);
setHasChanges(true);
}, []);
const handleMemeTagsChange = useCallback((tags: Map<string, Tag>) => {
setMemeTags(tags);
setHasChanges(true);
}, []);
const [isSaving, setIsSaving] = useState(false);
const [uri, setUri] = useState<string>();
const [mimeType, setMimeType] = useState<string>();
const [loading, setLoading] = useState(true);
const [error, setError] = useState<Error>();
const [staging, setStaging] = useState<StagingMeme>();
const originalStaging = useRef<StagingMeme>();
const resetState = useCallback(
async (newUri: string) => {
setLoading(true);
// eslint-disable-next-line unicorn/no-useless-undefined
setError(undefined);
setUri(newUri);
const guessedMimeType = await guessMimeType(newUri);
if (!guessedMimeType) {
setError(
new Error('Could not determine MIME type or file is not supported.'),
);
return;
}
setMimeType(guessedMimeType);
const stagingMeme = {
title: validateMemeTitle(meme.title),
isFavorite: meme.isFavorite,
tags: new Map(meme.tags.map(tag => [tag.id.toHexString(), tag])),
};
setStaging(stagingMeme);
originalStaging.current = stagingMeme;
setLoading(false);
},
[meme.isFavorite, meme.tags, meme.title],
);
useEffect(
() => void resetState(AndroidScoped.appendPath(storageUri, meme.filename)),
[meme.filename, resetState, storageUri],
);
const handleSave = useCallback(() => {
if (!mimeType || !staging) return;
setIsSaving(true);
realm.write(() => {
meme.tags.forEach(tag => {
if (!memeTags.has(tag.id.toHexString())) {
if (!staging.tags.has(tag.id.toHexString())) {
tag.memes.slice(tag.memes.indexOf(meme), 1);
tag.memesLength -= 1;
tag.dateModified = new Date();
}
});
memeTags.forEach(tag => {
staging.tags.forEach(tag => {
if (!meme.tags.some(memeTag => memeTag.id.equals(tag.id))) {
tag.memes.push(meme);
tag.memesLength = tag.memes.length;
@@ -84,15 +110,15 @@ const EditMeme = ({
}
});
meme.title = memeTitle.parsed;
meme.title = staging.title.parsed;
// @ts-expect-error - Realm is a fuck
meme.tags = [...memeTags.values()];
meme.tagsLength = memeTags.size;
meme.tags = [...staging.tags.values()];
meme.tagsLength = staging.tags.size;
meme.dateModified = new Date();
});
goBack();
}, [goBack, meme, memeTags, memeTitle.parsed, realm]);
}, [goBack, meme, mimeType, realm, staging]);
const handleDelete = useCallback(async () => {
setIsSaving(true);
@@ -104,12 +130,18 @@ const EditMeme = ({
const file = await pickSingle({ type: allowedMimeTypes }).catch(noOp);
if (!file) return;
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const mimeType = file.type!;
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const memeType = getMemeType(mimeType)!;
const guessedMimeType = await guessMimeType(file.uri, file.type);
if (!guessedMimeType) {
setError(
new Error('Could not determine MIME type or file is not supported.'),
);
return;
}
const fileExtension = extension(mimeType) as string;
const memeType = getMemeTypeFromMimeType(guessedMimeType);
if (!memeType) return;
const fileExtension = extension(guessedMimeType);
if (!fileExtension) return;
const filename = `${meme.id.toHexString()}-${
@@ -122,11 +154,13 @@ const EditMeme = ({
realm.write(() => {
meme.filename = filename;
meme.type = memeType;
meme.mimeType = mimeType;
meme.memeType = memeType;
meme.mimeType = guessedMimeType;
meme.size = size;
});
}, [meme, realm, storageUri]);
void resetState(newUri);
}, [meme, realm, resetState, storageUri]);
return (
<>
@@ -140,7 +174,7 @@ const EditMeme = ({
<Appbar.Action icon="delete" onPress={handleDelete} />
</Appbar.Header>
<Banner
visible={!!memeError}
visible={!!error}
actions={[
{
label: 'Fix URI',
@@ -151,8 +185,7 @@ const EditMeme = ({
onPress: handleDelete,
},
]}>
The URI for this meme appears to be broken. This may have been caused by
the file being moved or deleted.
{error?.message}
</Banner>
<ScrollView
contentContainerStyle={[
@@ -164,14 +197,14 @@ const EditMeme = ({
]}>
<View style={editorStyles.editorView}>
<MemeEditor
memeUri={uri}
memeFilename={meme.filename}
memeError={memeError}
setMemeError={setMemeError}
memeTitle={memeTitle}
setMemeTitle={handleMemeTitleChange}
memeTags={memeTags}
setMemeTags={handleMemeTagsChange}
uri={uri}
mimeType={mimeType}
loading={loading}
setLoading={setLoading}
error={error}
setError={setError}
staging={staging}
setStaging={setStaging}
/>
</View>
<View style={editorStyles.saveButtonView}>
@@ -180,7 +213,11 @@ const EditMeme = ({
icon="floppy"
onPress={handleSave}
disabled={
!memeTitle.valid || !hasChanges || isSaving || !!memeError
loading ||
!!error ||
isSaving ||
!staging?.title.valid ||
originalStaging.current === staging
}
loading={isSaving}
style={editorStyles.soloSaveButton}>

View File

@@ -0,0 +1,194 @@
import React, { useEffect, useMemo, useState } from 'react';
import { HelperText, Text, TextInput, useTheme } from 'react-native-paper';
import { LayoutAnimation, View } from 'react-native';
import { useSafeAreaFrame } from 'react-native-safe-area-context';
import Video from 'react-native-video';
import TextRecognition, {
TextRecognitionResult,
} from '@react-native-ml-kit/text-recognition';
import FastImage from 'react-native-fast-image';
import { LoadingView, MemeFail, TextOverlay } from '../../../components';
import {
getFilenameFromUri,
getMemeTypeFromMimeType,
validateMemeTitle,
} from '../../../utilities';
import { StagingMeme } from '../../../types';
import { useMemeDimensions } from '../../../hooks';
import { MEME_TYPE } from '../../../database';
import MemeTagSelector from './memeTagSelector/memeTagSelector';
const memeEditorStyles = {
media: {
marginBottom: 15,
borderRadius: 5,
},
uri: {
marginBottom: 15,
marginHorizontal: 5,
},
memeTagSelector: {
marginBottom: 10,
},
description: {
marginBottom: 10,
},
};
const MemeEditor = ({
uri,
mimeType,
loading,
setLoading,
error,
setError,
staging,
setStaging,
}: {
uri?: string;
mimeType?: string;
loading: boolean;
setLoading: (loading: boolean) => void;
error: Error | undefined;
setError: (error: Error | undefined) => void;
staging?: StagingMeme;
setStaging: (staging: StagingMeme) => void;
}) => {
const { width } = useSafeAreaFrame();
const { colors } = useTheme();
const { dimensions } = useMemeDimensions(
uri,
mimeType,
useMemo(
() => () => {
setLoading(false);
LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut);
},
[setLoading],
),
useMemo(() => (errorIn: Error) => setError(errorIn), [setError]),
);
const [recognizedText, setRecognizedText] = useState<TextRecognitionResult>();
useEffect(() => {
if (!uri || !mimeType || !mimeType.startsWith('image')) return;
void TextRecognition.recognize(uri).then(setRecognizedText);
}, [mimeType, uri]);
const mediaComponent = useMemo(() => {
if (!mimeType || !dimensions || !staging) return <></>;
const dimensionStyles = {
width: width * 0.92,
height: Math.max(
Math.min((width * 0.92) / dimensions.aspectRatio, 500),
100,
),
};
const memeType = getMemeTypeFromMimeType(mimeType);
if (!memeType) return <></>;
switch (memeType) {
case MEME_TYPE.IMAGE:
case MEME_TYPE.GIF: {
return (
<View>
<FastImage
source={{ uri }}
style={[memeEditorStyles.media, dimensionStyles]}
resizeMode="contain"
/>
{recognizedText && (
<TextOverlay
blocks={recognizedText.blocks}
onTextPress={text =>
setStaging({
...staging,
title: validateMemeTitle(text),
})
}
onTextLongPress={text =>
setStaging({
...staging,
title: validateMemeTitle(`${staging.title.parsed} ${text}`),
})
}
imageDimensions={dimensions}
frameDimensions={{
...dimensionStyles,
aspectRatio: dimensionStyles.width / dimensionStyles.height,
}}
/>
)}
</View>
);
}
case MEME_TYPE.VIDEO: {
return (
<Video
source={{ uri }}
style={[memeEditorStyles.media, dimensionStyles]}
resizeMode="contain"
controls
/>
);
}
default: {
return <></>;
}
}
}, [dimensions, mimeType, recognizedText, setStaging, staging, uri, width]);
if (!uri || !mimeType || !staging) return <LoadingView />;
return (
<>
<TextInput
mode="outlined"
label="Title"
value={staging.title.raw}
onChangeText={title =>
setStaging({ ...staging, title: validateMemeTitle(title) })
}
error={!staging.title.valid}
selectTextOnFocus
/>
<HelperText type="error" visible={!staging.title.valid}>
{staging.title.error}
</HelperText>
{error ? (
<MemeFail
style={[
{
width: width * 0.92,
height: width * 0.92,
},
memeEditorStyles.media,
]}
iconSize={50}
/>
) : // eslint-disable-next-line unicorn/no-nested-ternary
loading || !dimensions ? (
<></>
) : (
mediaComponent
)}
<Text
variant="bodySmall"
style={[memeEditorStyles.uri, { color: colors.onSurfaceDisabled }]}
numberOfLines={1}>
{getFilenameFromUri(uri)}
</Text>
<MemeTagSelector
memeTags={staging.tags}
setMemeTags={tags => setStaging({ ...staging, tags })}
style={memeEditorStyles.memeTagSelector}
/>
</>
);
};
export default MemeEditor;

View File

@@ -4,10 +4,10 @@ import { Chip, Modal, Portal, Searchbar, useTheme } from 'react-native-paper';
import { LayoutAnimation, StyleSheet } from 'react-native';
import { FlashList } from '@shopify/flash-list';
import { useSafeAreaFrame } from 'react-native-safe-area-context';
import { TAG_SORT, tagSortQuery } from '../../../types';
import { TagChip } from '../../tags';
import { Tag } from '../../../database';
import { validateTagName } from '../../../utilities';
import { TAG_SORT, tagSortQuery } from '../../../../types';
import { TagChip } from '../../../../components';
import { Tag } from '../../../../database';
import { validateTagName } from '../../../../utilities';
const memeTagSearchModalStyles = StyleSheet.create({
modal: {
@@ -87,6 +87,8 @@ const MemeTagSearchModal = ({
[search],
);
const [refreshKey, setRefreshKey] = useState(0);
const handleTagPress = (tag: Tag) => {
const id = tag.id.toHexString();
memeTags.delete(id) || memeTags.set(id, tag);
@@ -105,6 +107,7 @@ const MemeTagSearchModal = ({
if (!tag) return;
memeTags.set(tag.id.toHexString(), tag);
setMemeTags(new Map(memeTags));
setRefreshKey(refreshKey + 1);
flashListRef.current?.prepareForLayoutAnimationRender();
LayoutAnimation.configureNext(tagLayoutAnimation);
};
@@ -129,6 +132,7 @@ const MemeTagSearchModal = ({
/>
<FlashList
ref={flashListRef}
key={refreshKey}
data={tags}
extraData={memeTags}
keyExtractor={tag => tag.id.toHexString()}
@@ -148,7 +152,7 @@ const MemeTagSearchModal = ({
active={memeTags.has(tag.id.toHexString())}
/>
)}
ListEmptyComponent={() => (
ListFooterComponent={() => (
<Chip
icon="plus"
mode="outlined"

View File

@@ -3,8 +3,8 @@ import { LayoutAnimation, StyleSheet, View } from 'react-native';
import { Chip } from 'react-native-paper';
import { FlashList } from '@shopify/flash-list';
import { useSafeAreaFrame } from 'react-native-safe-area-context';
import { TagChip } from '../../tags';
import { Tag } from '../../../database';
import { TagChip } from '../../../../components';
import { Tag } from '../../../../database';
import MemeTagSearchModal from './memeTagSearchModal';
const memeTagSelectorStyles = StyleSheet.create({

View File

@@ -8,10 +8,11 @@ import {
generateRandomColor,
validateColor,
validateTagName,
} from '../../utilities';
import { Tag } from '../../database';
import { TagEditor } from '../../components';
import editorStyles from './editorStyles';
} from '../../../utilities';
import { Tag } from '../../../database';
import { StagingTag } from '../../../types';
import TagEditor from './tagEditor';
import editorStyles from '../editorStyles';
const AddTag = () => {
const { goBack } = useNavigation();
@@ -19,10 +20,10 @@ const AddTag = () => {
const orientation = useDeviceOrientation();
const realm = useRealm();
const [tagName, setTagName] = useState(validateTagName('newTag'));
const [tagColor, setTagColor] = useState(
validateColor(generateRandomColor()),
);
const [staging, setStaging] = useState<StagingTag>({
name: validateTagName('newTag'),
color: validateColor(generateRandomColor()),
});
// Although saving tags is instantaneous, we still want to show a loading
// indicator to prevent the user from spamming the save button.
@@ -31,11 +32,11 @@ const AddTag = () => {
const saveTag = useCallback(() => {
realm.write(() => {
realm.create(Tag.schema.name, {
name: tagName.parsed,
color: tagColor.parsed,
name: staging.name.parsed,
color: staging.color.parsed,
});
});
}, [realm, tagColor.parsed, tagName.parsed]);
}, [realm, staging.color.parsed, staging.name.parsed]);
const handleSave = useCallback(() => {
saveTag();
@@ -46,8 +47,10 @@ const AddTag = () => {
setIsSavingAndAddingMore(true);
saveTag();
setTimeout(() => setIsSavingAndAddingMore(false), 250);
setTagName(validateTagName('newTag'));
setTagColor(validateColor(generateRandomColor()));
setStaging({
name: validateTagName('newTag'),
color: validateColor(generateRandomColor()),
});
}, [saveTag]);
return (
@@ -65,19 +68,14 @@ const AddTag = () => {
{ backgroundColor: colors.background },
]}>
<View style={editorStyles.editorView}>
<TagEditor
tagName={tagName}
setTagName={setTagName}
tagColor={tagColor}
setTagColor={setTagColor}
/>
<TagEditor staging={staging} setStaging={setStaging} />
</View>
<View style={editorStyles.saveButtonView}>
<Button
mode="contained-tonal"
icon="plus"
onPress={handleSaveAndAddMore}
disabled={!tagName.valid || isSavingAndAddingMore}
disabled={!staging.name.valid || isSavingAndAddingMore}
loading={isSavingAndAddingMore}
style={editorStyles.saveAndAddButton}>
Save & Add
@@ -86,7 +84,7 @@ const AddTag = () => {
mode="contained"
icon="floppy"
onPress={handleSave}
disabled={!tagName.valid || isSavingAndAddingMore}
disabled={!staging.name.valid || isSavingAndAddingMore}
style={editorStyles.saveButton}>
Save
</Button>

View File

@@ -1,4 +1,4 @@
import React, { useCallback, useState } from 'react';
import React, { useCallback, useRef, useState } from 'react';
import { ScrollView, View } from 'react-native';
import { Appbar, Button, useTheme } from 'react-native-paper';
import { useNavigation } from '@react-navigation/native';
@@ -6,16 +6,11 @@ import { NativeStackScreenProps } from '@react-navigation/native-stack';
import { BSON } from 'realm';
import { useObject, useRealm } from '@realm/react';
import { useDeviceOrientation } from '@react-native-community/hooks';
import { TagEditor } from '../../components';
import { ROUTE, RootStackParamList } from '../../types';
import { Tag } from '../../database';
import {
StringValidationResult,
deleteTag,
validateColor,
validateTagName,
} from '../../utilities';
import editorStyles from './editorStyles';
import { ROUTE, RootStackParamList, StagingTag } from '../../../types';
import { Tag } from '../../../database';
import { deleteTag, validateColor, validateTagName } from '../../../utilities';
import TagEditor from './tagEditor';
import editorStyles from '../editorStyles';
const EditTag = ({
route,
@@ -31,29 +26,21 @@ const EditTag = ({
BSON.UUID.createFromHexString(route.params.id),
)!;
const [hasChanges, setHasChanges] = useState(false);
const [tagName, setTagName] = useState(validateTagName(tag.name));
const [tagColor, setTagColor] = useState(validateColor(tag.color));
const handleTagNameChange = useCallback((name: StringValidationResult) => {
setTagName(name);
setHasChanges(true);
}, []);
const handleTagColorChange = useCallback((color: StringValidationResult) => {
setTagColor(color);
setHasChanges(true);
}, []);
const [staging, setStaging] = useState<StagingTag>({
name: validateTagName(tag.name),
color: validateColor(tag.color),
});
const originalStaging = useRef<StagingTag>(staging);
const handleSave = useCallback(() => {
realm.write(() => {
tag.name = tagName.parsed;
tag.color = tagColor.parsed;
tag.name = staging.name.parsed;
tag.color = staging.color.parsed;
tag.dateModified = new Date();
});
goBack();
}, [goBack, realm, tag, tagColor.parsed, tagName.parsed]);
}, [goBack, realm, staging.color.parsed, staging.name.parsed, tag]);
return (
<>
@@ -78,19 +65,18 @@ const EditTag = ({
]}
nestedScrollEnabled>
<View style={editorStyles.editorView}>
<TagEditor
tagName={tagName}
setTagName={handleTagNameChange}
tagColor={tagColor}
setTagColor={handleTagColorChange}
/>
<TagEditor staging={staging} setStaging={setStaging} />
</View>
<View style={editorStyles.saveButtonView}>
<Button
mode="contained"
icon="floppy"
onPress={handleSave}
disabled={!tagName.valid || !tagColor.valid || !hasChanges}
disabled={
!staging.name.valid ||
!staging.color.valid ||
originalStaging.current === staging
}
style={editorStyles.soloSaveButton}>
Save
</Button>

View File

@@ -0,0 +1,73 @@
import React, { useEffect, useRef } from 'react';
import { HelperText, TextInput } from 'react-native-paper';
import {
generateRandomColor,
validateColor,
validateTagName,
} from '../../../utilities';
import { StagingTag } from '../../../types';
import TagPreview from './tagPreview';
const TagEditor = ({
staging,
setStaging,
}: {
staging: StagingTag;
setStaging: (staging: StagingTag) => void;
}) => {
const lastValidColor = useRef(staging.color.parsed);
useEffect(() => {
if (staging.color.valid) lastValidColor.current = staging.color.parsed;
}, [staging.color.parsed, staging.color.valid]);
return (
<>
<TagPreview
name={staging.name.parsed}
color={
staging.color.valid ? staging.color.parsed : lastValidColor.current
}
/>
<TextInput
mode="outlined"
label="Name"
value={staging.name.raw}
onChangeText={name =>
setStaging({ ...staging, name: validateTagName(name) })
}
error={!staging.name.valid}
selectTextOnFocus
/>
<HelperText type="error" visible={!staging.name.valid}>
{staging.name.error}
</HelperText>
<TextInput
mode="outlined"
label="Color"
value={staging.color.raw}
onChangeText={color =>
setStaging({ ...staging, color: validateColor(color) })
}
error={!staging.color.valid}
autoCorrect={false}
right={
<TextInput.Icon
icon="palette"
onPress={() =>
setStaging({
...staging,
color: validateColor(generateRandomColor()),
})
}
/>
}
/>
<HelperText type="error" visible={!staging.color.valid}>
{staging.color.error}
</HelperText>
</>
);
};
export default TagEditor;

View File

@@ -2,7 +2,7 @@ import React, { useMemo } from 'react';
import { StyleSheet, View } from 'react-native';
import FontAwesome5 from 'react-native-vector-icons/FontAwesome5';
import { Chip, useTheme } from 'react-native-paper';
import { getContrastColor } from '../../utilities';
import { getContrastColor } from '../../../utilities';
const tagPreviewStyles = StyleSheet.create({
view: {

View File

@@ -1,9 +1,9 @@
export { default as AddMeme } from './editors/addMeme';
export { default as AddTag } from './editors/addTag';
export { default as EditMeme } from './editors/editMeme';
export { default as EditTag } from './editors/editTag';
export { default as Memes } from './memes';
export { default as MemeView } from './memeView';
export { default as Settings } from './settings';
export { default as Tags } from './tags';
export { default as AddMeme } from './editors/meme/addMeme';
export { default as AddTag } from './editors/tag/addTag';
export { default as EditMeme } from './editors/meme/editMeme';
export { default as EditTag } from './editors/tag/editTag';
export { default as Memes } from './memes/memes';
export { default as MemeView } from './memeView/memeView';
export { default as Settings } from './settings/settings';
export { default as Tags } from './tags/tags';
export { default as Welcome } from './welcome';

View File

@@ -1,4 +1,4 @@
import React, { useRef, useState } from 'react';
import React, { useEffect, useRef, useState } from 'react';
import { NativeStackScreenProps } from '@react-navigation/native-stack';
import { StyleSheet } from 'react-native';
import { useQuery, useRealm } from '@realm/react';
@@ -6,9 +6,15 @@ import { FlashList } from '@shopify/flash-list';
import { Appbar, Portal, Snackbar } from 'react-native-paper';
import { useSafeAreaFrame } from 'react-native-safe-area-context';
import { NavigationProp, useNavigation } from '@react-navigation/native';
import { RootStackParamList, ROUTE } from '../types';
import { Meme } from '../database';
import { MemeViewItem } from '../components';
import { useSelector } from 'react-redux';
import {
memesSortQuery,
RootStackParamList,
ROUTE,
SORT_DIRECTION,
} from '../../types';
import { Meme } from '../../database';
import { LoadingView } from '../../components';
import {
copyMeme,
deleteMeme,
@@ -16,9 +22,9 @@ import {
favoriteMeme,
multipleIdQuery,
shareMeme,
} from '../utilities';
import { useSelector } from 'react-redux';
import { RootState } from '../state';
} from '../../utilities';
import { RootState } from '../../state';
import MemeViewItem from './memeViewItem';
const memeViewStyles = StyleSheet.create({
// eslint-disable-next-line react-native/no-color-literals
@@ -50,28 +56,45 @@ const MemeView = ({
}: NativeStackScreenProps<RootStackParamList, ROUTE.MEME_VIEW>) => {
const { height, width } = useSafeAreaFrame();
const navigation = useNavigation<NavigationProp<RootStackParamList>>();
const sort = useSelector((state: RootState) => state.memes.sort);
const sortDirection = useSelector(
(state: RootState) => state.memes.sortDirection,
);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const storageUri = useSelector(
(state: RootState) => state.settings.storageUri,
)!;
const realm = useRealm();
const { ids } = route.params;
const [index, setIndex] = useState(route.params.index);
const [isBlocked, setIsBlocked] = useState(false);
const [snackbarMessage, setSnackbarMessage] = useState<string>();
const flashListRef = useRef<FlashList<Meme>>(null);
const [index, setIndex] = useState(route.params.index);
const memes = useQuery<Meme>(Meme.schema.name, collectionIn => {
return collectionIn.filtered(multipleIdQuery(ids));
return collectionIn
.filtered(multipleIdQuery(route.params.ids))
.sorted(
memesSortQuery(sort),
sortDirection === SORT_DIRECTION.DESCENDING,
);
});
useEffect(() => {
if (memes.length === 0) navigation.goBack();
if (index >= memes.length) {
setIndex(memes.length - 1);
flashListRef.current?.scrollToIndex({ index: memes.length - 1 });
}
}, [index, memes.length, navigation]);
return (
<>
<Appbar.Header style={memeViewStyles.header}>
<Appbar.BackAction onPress={() => navigation.goBack()} />
<Appbar.Content title={memes[index].title} />
{/* eslint-disable-next-line @typescript-eslint/no-unnecessary-condition */}
<Appbar.Content title={memes[index]?.title} />
</Appbar.Header>
<FlashList
ref={flashListRef}
@@ -90,12 +113,22 @@ const MemeView = ({
pagingEnabled
horizontal
showsHorizontalScrollIndicator={false}
renderItem={({ item: meme }) => <MemeViewItem meme={meme} />}
renderItem={({ item }) =>
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
item ? (
<MemeViewItem meme={item} />
) : (
<LoadingView style={{ width, height }} />
)
}
scrollEnabled={!isBlocked}
/>
<Appbar style={memeViewStyles.footer}>
<Appbar.Action
icon={memes[index].isFavorite ? 'heart' : 'heart-outline'}
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
icon={memes[index]?.isFavorite ? 'heart' : 'heart-outline'}
onPress={() => favoriteMeme(realm, memes[index])}
disabled={isBlocked}
/>
<Appbar.Action
icon="share"
@@ -104,6 +137,7 @@ const MemeView = ({
setSnackbarMessage('Failed to share meme!'),
);
}}
disabled={isBlocked}
/>
<Appbar.Action
icon="content-copy"
@@ -112,25 +146,23 @@ const MemeView = ({
.then(() => setSnackbarMessage('Meme copied!'))
.catch(() => setSnackbarMessage('Failed to copy meme!'));
}}
disabled={isBlocked}
/>
<Appbar.Action
icon="pencil"
onPress={() => {
editMeme(navigation, memes[index]);
}}
disabled={isBlocked}
/>
<Appbar.Action
icon="delete"
onPress={() => {
void deleteMeme(realm, storageUri, memes[index]);
if (index === memes.length - 1) {
setIndex(index - 1);
flashListRef.current?.scrollToIndex({
index: index - 1,
});
}
if (memes.length === 1) navigation.goBack();
onPress={async () => {
setIsBlocked(true);
await deleteMeme(realm, storageUri, memes[index]);
setIsBlocked(false);
}}
disabled={isBlocked}
/>
</Appbar>
<Portal>

View File

@@ -0,0 +1,90 @@
import React, { useMemo } from 'react';
import { StyleSheet, View } from 'react-native';
import { useSafeAreaFrame } from 'react-native-safe-area-context';
import { AndroidScoped } from 'react-native-file-access';
import { useSelector } from 'react-redux';
import Video from 'react-native-video';
import { MEME_TYPE, Meme } from '../../database';
import { RootState } from '../../state';
import { AnimatedImage, LoadingView, MemeFail } from '../../components';
import { useMemeDimensions } from '../../hooks';
const memeViewItemStyles = StyleSheet.create({
view: {
justifyContent: 'center',
alignItems: 'center',
},
});
const MemeViewItem = ({ meme }: { meme: Meme }) => {
const { height, width } = useSafeAreaFrame();
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const storageUri = useSelector(
(state: RootState) => state.settings.storageUri,
)!;
const uri = AndroidScoped.appendPath(storageUri, meme.filename);
const { dimensions, loading, error } = useMemeDimensions(uri, meme.mimeType);
const mediaComponent = useMemo(() => {
if (!dimensions) return <></>;
const dimensionStyles =
dimensions.aspectRatio > width / (height - 128)
? {
width,
height: width / (dimensions.width / dimensions.height),
}
: {
width: (height - 128) * (dimensions.width / dimensions.height),
height: height - 128,
};
switch (meme.memeType) {
case MEME_TYPE.IMAGE:
case MEME_TYPE.GIF: {
return (
<AnimatedImage
source={{ uri }}
style={dimensionStyles}
resizeMode="contain"
/>
);
}
default: {
return (
<Video
source={{ uri }}
style={dimensionStyles}
resizeMode="contain"
paused
controls
/>
);
}
}
}, [dimensions, height, meme.memeType, uri, width]);
if (!error && (loading || !dimensions)) {
return <LoadingView style={{ width, height }} />;
}
return (
<View style={[{ width, height }, memeViewItemStyles.view]}>
{error || !dimensions ? (
<MemeFail
style={{
width: Math.min(width, height - 128),
height: Math.min(width, height - 128),
}}
iconSize={50}
/>
) : (
mediaComponent
)}
</View>
);
};
export default MemeViewItem;

View File

@@ -17,11 +17,13 @@ import {
useNavigation,
} from '@react-navigation/native';
import { NativeStackNavigationProp } from '@react-navigation/native-stack';
import { ROUTE, SORT_DIRECTION, memesSortQuery } from '../types';
import { RootState, setNavVisible } from '../state';
import { Meme } from '../database';
import { HideableHeader, MemesHeader, MemesList } from '../components';
import { useDeviceOrientation } from '@react-native-community/hooks';
import { ROUTE, SORT_DIRECTION, memesSortQuery } from '../../types';
import { RootState, setNavVisible } from '../../state';
import { Meme } from '../../database';
import { HideableHeader } from '../../components';
import MemesHeader from './memesHeader';
import MemesList from './memesList/memesList';
const memesStyles = StyleSheet.create({
listView: {
@@ -80,7 +82,7 @@ const Memes = () => {
.join(' OR ');
if (favoritesOnly) collection = collection.filtered('isFavorite == true');
if (filter) collection = collection.filtered('type == $0', filter);
if (filter) collection = collection.filtered('memeType == $0', filter);
if (tags && tagsQuery) {
collection = collection.filtered(tagsQuery, ...tags);
}
@@ -98,7 +100,7 @@ const Memes = () => {
[sort, sortDirection, favoritesOnly, filter, search],
);
const [scrollOffset, setScrollOffset] = useState(0);
const previousOffset = useRef(0);
const handleScroll = (event: NativeSyntheticEvent<NativeScrollEvent>) => {
const currentOffset = event.nativeEvent.contentOffset.y;
@@ -106,13 +108,13 @@ const Memes = () => {
if (currentOffset <= 150) {
dispatch(setNavVisible(true));
} else {
const diff = currentOffset - scrollOffset;
if (Math.abs(diff) > 50) {
const diff = currentOffset - previousOffset.current;
if (Math.abs(diff) > 35) {
dispatch(setNavVisible(diff < 0));
}
}
setScrollOffset(currentOffset);
previousOffset.current = currentOffset;
};
const flashListRef = useRef<FlashList<Meme>>(null);
@@ -120,7 +122,7 @@ const Memes = () => {
useFocusEffect(
useCallback(() => {
const handleBackPress = () => {
if (scrollOffset <= 0) return false;
if (previousOffset.current <= 0) return false;
flashListRef.current?.scrollToOffset({ offset: 0, animated: true });
return true;
};
@@ -129,7 +131,7 @@ const Memes = () => {
return () =>
BackHandler.removeEventListener('hardwareBackPress', handleBackPress);
}, [scrollOffset]),
}, []),
);
useFocusEffect(

View File

@@ -0,0 +1,74 @@
import React, { useMemo } from 'react';
import { TouchableHighlight } from 'react-native';
import { useSafeAreaFrame } from 'react-native-safe-area-context';
import FastImage from 'react-native-fast-image';
import SkeletonPlaceholder from 'react-native-skeleton-placeholder';
import { MEME_TYPE, Meme } from '../../../database';
import { MemeFail, ThemedSkeletonPlaceholder } from '../../../components';
import { getFontAwesome5IconSize } from '../../../utilities';
import { useMemeDimensions } from '../../../hooks';
const MemesGridItem = ({
meme,
focusMeme,
uri,
columns,
}: {
meme: Meme;
focusMeme: () => void;
uri: string;
columns: number;
}) => {
const { width } = useSafeAreaFrame();
const itemWidth = useMemo(
() => (width * 0.92 - 5) / columns,
[columns, width],
);
const { dimensions, loading, error } = useMemeDimensions(uri, meme.mimeType);
const mediaComponent = useMemo(() => {
switch (meme.memeType) {
case MEME_TYPE.IMAGE:
case MEME_TYPE.GIF:
case MEME_TYPE.VIDEO: {
return (
<FastImage
source={{ uri }}
style={{ width: itemWidth, height: itemWidth }}
/>
);
}
default: {
return <></>;
}
}
}, [itemWidth, meme.memeType, uri]);
const skeletonComponent = useMemo(
() => (
<ThemedSkeletonPlaceholder>
<SkeletonPlaceholder.Item width={itemWidth} height={itemWidth} />
</ThemedSkeletonPlaceholder>
),
[itemWidth],
);
if (!error && (loading || !dimensions)) return skeletonComponent;
return (
<TouchableHighlight onPress={focusMeme}>
{error ? (
<MemeFail
style={{ width: itemWidth, height: itemWidth }}
iconSize={getFontAwesome5IconSize(columns)}
/>
) : (
mediaComponent
)}
</TouchableHighlight>
);
};
export default MemesGridItem;

View File

@@ -15,6 +15,7 @@ import { getFlashListItemHeight } from '../../../utilities';
import MemesMasonryItem from './memesMasonryItem';
import MemesGridItem from './memesGridItem';
import MemesListItem from './memesListItem';
import { AndroidScoped } from 'react-native-file-access';
const sharedMemesListStyles = StyleSheet.create({
flashList: {
@@ -66,6 +67,10 @@ const MemesList = ({
const gridColumns = useSelector(
(state: RootState) => state.settings.gridColumns,
);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const storageUri = useSelector(
(state: RootState) => state.settings.storageUri,
)!;
return (
<>
@@ -73,6 +78,7 @@ const MemesList = ({
<MasonryFlashList
ref={flashListRef}
data={memes}
key={masonryColumns}
estimatedItemSize={getFlashListItemHeight(masonryColumns)}
estimatedListSize={{
height,
@@ -81,7 +87,12 @@ const MemesList = ({
numColumns={masonryColumns}
showsVerticalScrollIndicator={false}
renderItem={({ item: meme, index }) => (
<MemesMasonryItem meme={meme} index={index} focusMeme={focusMeme} />
<MemesMasonryItem
meme={meme}
focusMeme={() => focusMeme(index)}
uri={AndroidScoped.appendPath(storageUri, meme.filename)}
columns={masonryColumns}
/>
)}
contentContainerStyle={{
paddingTop: flashListPadding,
@@ -95,12 +106,14 @@ const MemesList = ({
)}
onScroll={handleScroll}
fadingEdgeLength={100}
overScrollMode="never"
/>
)}
{view === VIEW.GRID && (
<FlashList
ref={flashListRef}
data={memes}
key={gridColumns}
estimatedItemSize={getFlashListItemHeight(gridColumns)}
estimatedListSize={{
height: height,
@@ -109,7 +122,12 @@ const MemesList = ({
numColumns={gridColumns}
showsVerticalScrollIndicator={false}
renderItem={({ item: meme, index }) => (
<MemesGridItem meme={meme} index={index} focusMeme={focusMeme} />
<MemesGridItem
meme={meme}
focusMeme={() => focusMeme(index)}
uri={AndroidScoped.appendPath(storageUri, meme.filename)}
columns={gridColumns}
/>
)}
contentContainerStyle={{
paddingTop: flashListPadding,
@@ -123,20 +141,25 @@ const MemesList = ({
)}
onScroll={handleScroll}
fadingEdgeLength={100}
overScrollMode="never"
/>
)}
{view === VIEW.LIST && (
<FlashList
ref={flashListRef}
data={memes}
estimatedItemSize={50}
estimatedItemSize={90}
estimatedListSize={{
height: height,
width: width * 0.92,
}}
showsVerticalScrollIndicator={false}
renderItem={({ item: meme, index }) => (
<MemesListItem meme={meme} index={index} focusMeme={focusMeme} />
<MemesListItem
meme={meme}
focusMeme={() => focusMeme(index)}
uri={AndroidScoped.appendPath(storageUri, meme.filename)}
/>
)}
ItemSeparatorComponent={() => <Divider />}
contentContainerStyle={{
@@ -151,6 +174,7 @@ const MemesList = ({
)}
onScroll={handleScroll}
fadingEdgeLength={100}
overScrollMode="never"
/>
)}
</>

View File

@@ -1,13 +1,12 @@
import React from 'react';
import { Image, StyleSheet, View } from 'react-native';
import React, { useMemo } from 'react';
import { StyleSheet, View } from 'react-native';
import { Text, TouchableRipple } from 'react-native-paper';
import { useSafeAreaFrame } from 'react-native-safe-area-context';
import { useImageDimensions } from '@react-native-community/hooks';
import { AndroidScoped } from 'react-native-file-access';
import { useSelector } from 'react-redux';
import { Meme } from '../../../database';
import { MemeFail } from '..';
import { RootState } from '../../../state';
import FastImage from 'react-native-fast-image';
import SkeletonPlaceholder from 'react-native-skeleton-placeholder';
import { MEME_TYPE, Meme } from '../../../database';
import { MemeFail, ThemedSkeletonPlaceholder } from '../../../components';
import { useMemeDimensions } from '../../../hooks';
const memesListItemStyles = StyleSheet.create({
view: {
@@ -35,42 +34,58 @@ const memesListItemStyles = StyleSheet.create({
const MemesListItem = ({
meme,
index,
focusMeme,
uri,
}: {
meme: Meme;
index: number;
focusMeme: (index: number) => void;
focusMeme: () => void;
uri: string;
}) => {
const { width } = useSafeAreaFrame();
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const storageUri = useSelector(
(state: RootState) => state.settings.storageUri,
)!;
const uri = AndroidScoped.appendPath(storageUri, meme.filename);
const listItemWidth = useMemo(
() => ({ width: width * 0.92 - 75 - 10 }),
[width],
);
const { dimensions, loading, error } = useImageDimensions({ uri });
const { dimensions, loading, error } = useMemeDimensions(uri, meme.mimeType);
if (!error && (loading || !dimensions)) return <></>;
const mediaComponent = useMemo(() => {
switch (meme.memeType) {
case MEME_TYPE.IMAGE:
case MEME_TYPE.GIF:
case MEME_TYPE.VIDEO: {
return <FastImage source={{ uri }} style={memesListItemStyles.image} />;
}
default: {
return <></>;
}
}
}, [meme.memeType, uri]);
const skeletonComponent = useMemo(
() => (
<ThemedSkeletonPlaceholder>
<SkeletonPlaceholder.Item
width={listItemWidth.width + 75}
height={90}
/>
</ThemedSkeletonPlaceholder>
),
[listItemWidth.width],
);
if (!error && (loading || !dimensions)) return skeletonComponent;
return (
<TouchableRipple
onPress={() => focusMeme(index)}
style={memesListItemStyles.view}>
<TouchableRipple onPress={focusMeme} style={memesListItemStyles.view}>
<>
{error ? (
<MemeFail style={memesListItemStyles.image} />
) : (
<Image source={{ uri }} style={memesListItemStyles.image} />
mediaComponent
)}
<View
style={[
memesListItemStyles.detailsView,
{
width: width * 0.92 - 75 - 10,
},
]}>
<View style={[memesListItemStyles.detailsView, listItemWidth]}>
<Text variant="titleMedium" style={memesListItemStyles.text}>
{meme.title}
</Text>

View File

@@ -0,0 +1,99 @@
import React, { useMemo } from 'react';
import { StyleSheet, TouchableHighlight } from 'react-native';
import { useSafeAreaFrame } from 'react-native-safe-area-context';
import FastImage from 'react-native-fast-image';
import SkeletonPlaceholder from 'react-native-skeleton-placeholder';
import { MEME_TYPE, Meme } from '../../../database';
import { MemeFail, ThemedSkeletonPlaceholder } from '../../../components';
import { getFontAwesome5IconSize } from '../../../utilities';
import { useMemeDimensions } from '../../../hooks';
const memeMasonryItemStyles = StyleSheet.create({
view: {
margin: 2.5,
borderRadius: 5,
},
image: {
borderRadius: 5,
},
});
const MemesMasonryItem = ({
meme,
focusMeme,
uri,
columns,
}: {
meme: Meme;
focusMeme: () => void;
uri: string;
columns: number;
}) => {
const { width } = useSafeAreaFrame();
const { dimensions, loading, error } = useMemeDimensions(uri, meme.mimeType);
const itemWidth = useMemo(
() => (width * 0.92 - 5) / columns - 5,
[columns, width],
);
const itemHeight = useMemo(
() => itemWidth / (dimensions?.aspectRatio ?? 1),
[dimensions?.aspectRatio, itemWidth],
);
const mediaComponent = useMemo(() => {
switch (meme.memeType) {
case MEME_TYPE.IMAGE:
case MEME_TYPE.GIF:
case MEME_TYPE.VIDEO: {
return (
<FastImage
source={{ uri }}
style={[
memeMasonryItemStyles.image,
{ width: itemWidth, height: itemHeight },
]}
/>
);
}
default: {
return <></>;
}
}
}, [itemHeight, itemWidth, meme.memeType, uri]);
const skeletonComponent = useMemo(
() => (
<ThemedSkeletonPlaceholder borderRadius={5}>
<SkeletonPlaceholder.Item
width={itemWidth}
height={itemWidth}
style={memeMasonryItemStyles.view}
/>
</ThemedSkeletonPlaceholder>
),
[itemWidth],
);
if (!error && (loading || !dimensions)) return skeletonComponent;
return (
<TouchableHighlight onPress={focusMeme} style={memeMasonryItemStyles.view}>
{error || !dimensions ? (
<MemeFail
style={[
memeMasonryItemStyles.image,
{ width: itemWidth, height: itemHeight },
]}
iconSize={getFontAwesome5IconSize(columns)}
/>
) : (
mediaComponent
)}
</TouchableHighlight>
);
};
export default MemesMasonryItem;

View File

@@ -11,6 +11,8 @@ import {
} from 'react-native-paper';
import { useDispatch, useSelector } from 'react-redux';
import type {} from 'redux-thunk/extend-redux';
import { useRealm } from '@realm/react';
import { FileSystem, FileStat } from 'react-native-file-access';
import {
RootState,
setAutofocusMemesSearch,
@@ -19,11 +21,9 @@ import {
setMasonryColumns,
setNoMedia,
setSnackbarMessage,
} from '../state';
import StorageLocationChangeDialog from '../components/storageLocationChangeDialog';
import { useRealm } from '@realm/react';
import { FileSystem, FileStat } from 'react-native-file-access';
import { Meme } from '../database';
} from '../../state';
import { Meme } from '../../database';
import StorageLocationChangeDialog from './storageLocationChangeDialog';
const settingsStyles = StyleSheet.create({
scrollView: {

View File

@@ -4,8 +4,8 @@ import { Dialog, ProgressBar, Text } from 'react-native-paper';
import { openDocumentTree } from 'react-native-scoped-storage';
import { useDispatch, useSelector } from 'react-redux';
import { AndroidScoped, FileSystem } from 'react-native-file-access';
import { RootState, setStorageUri } from '../state';
import { clearPermissions, isPermissionForPath, noOp } from '../utilities';
import { RootState, setStorageUri } from '../../state';
import { clearPermissions, isPermissionForPath, noOp } from '../../utilities';
const storageLocationChangeDialogStyles = StyleSheet.create({
progressBar: {

View File

@@ -13,10 +13,12 @@ import { FlashList } from '@shopify/flash-list';
import { useFocusEffect } from '@react-navigation/native';
import { useDeviceOrientation } from '@react-native-community/hooks';
import { useSafeAreaFrame } from 'react-native-safe-area-context';
import { HideableHeader, TagRow, TagsHeader } from '../components';
import { Tag } from '../database';
import { RootState, setNavVisible } from '../state';
import { SORT_DIRECTION, tagSortQuery } from '../types';
import { HideableHeader } from '../../components';
import { Tag } from '../../database';
import { RootState, setNavVisible } from '../../state';
import { SORT_DIRECTION, tagSortQuery } from '../../types';
import TagsHeader from './tagsHeader';
import TagRow from './tagsList/tagRow';
const tagsStyles = StyleSheet.create({
listView: {
@@ -71,7 +73,7 @@ const Tags = () => {
[search, sort, sortDirection],
);
const [scrollOffset, setScrollOffset] = useState(0);
const previousOffset = useRef(0);
const handleScroll = (event: NativeSyntheticEvent<NativeScrollEvent>) => {
const currentOffset = event.nativeEvent.contentOffset.y;
@@ -79,11 +81,11 @@ const Tags = () => {
if (currentOffset <= 150) {
dispatch(setNavVisible(true));
} else {
const diff = currentOffset - scrollOffset;
const diff = currentOffset - previousOffset.current;
if (Math.abs(diff) > 50) dispatch(setNavVisible(diff < 0));
}
setScrollOffset(currentOffset);
previousOffset.current = currentOffset;
};
const flashListRef = useRef<FlashList<Tag>>(null);
@@ -91,7 +93,7 @@ const Tags = () => {
useFocusEffect(
useCallback(() => {
const handleBackPress = () => {
if (scrollOffset > 0) {
if (previousOffset.current > 0) {
flashListRef.current?.scrollToOffset({ offset: 0, animated: true });
return true;
}
@@ -102,7 +104,7 @@ const Tags = () => {
return () =>
BackHandler.removeEventListener('hardwareBackPress', handleBackPress);
}, [scrollOffset]),
}, []),
);
useFocusEffect(

View File

@@ -2,9 +2,9 @@ import React from 'react';
import { StyleSheet, View } from 'react-native';
import { TouchableRipple, Text } from 'react-native-paper';
import { useNavigation, NavigationProp } from '@react-navigation/native';
import { Tag } from '../../database';
import { ROUTE, RootStackParamList } from '../../types';
import { TagChip } from '.';
import { Tag } from '../../../database';
import { ROUTE, RootStackParamList } from '../../../types';
import { TagChip } from '../../../components';
const tagRowStyles = StyleSheet.create({
view: {

View File

@@ -91,8 +91,7 @@ const updateNoMedia = createAsyncThunk(
const validateSettings = createAsyncThunk(
'settings/validateSettings',
// eslint-disable-next-line @typescript-eslint/naming-convention
async (_, { dispatch, getState }) => {
async (ignored, { dispatch, getState }) => {
const state = getState() as RootState;
const { storageUri, noMedia } = state.settings;

View File

@@ -1,6 +1,7 @@
interface Dimensions {
width: number;
height: number;
aspectRatio: number;
}
export { type Dimensions };

View File

@@ -13,4 +13,5 @@ export {
tagSortQuery,
SORT_DIRECTION,
} from './sort';
export { type StagingMeme, type StagingTag } from './staging';
export { VIEW } from './view';

View File

@@ -1,6 +1,6 @@
import { DocumentPickerResponse } from 'react-native-document-picker';
import { getFilenameFromUri, guessMimeType } from '../utilities';
import { SharedItem } from './share';
import { getFilenameFromUri } from '../utilities';
import { SharedItem } from '.';
enum ROUTE {
MAIN = 'Main',
@@ -34,7 +34,7 @@ const documentPickerResponseToAddMemeFile = (
return {
uri,
filename: name ?? getFilenameFromUri(uri),
type: type ?? guessMimeType(uri),
type: type ?? undefined,
};
});
};
@@ -55,7 +55,7 @@ const sharedItemToAddMemeFile = (item: SharedItem): AddMemeFile[] => {
return data.map(uri => ({
uri,
filename: getFilenameFromUri(uri),
type: guessMimeType(uri),
type: mimeType,
}));
};

15
src/types/staging.ts Normal file
View File

@@ -0,0 +1,15 @@
import { Tag } from '../database';
import { StringValidationResult } from '../utilities';
interface StagingMeme {
title: StringValidationResult;
isFavorite: boolean;
tags: Map<string, Tag>;
}
interface StagingTag {
name: StringValidationResult;
color: StringValidationResult;
}
export { type StagingMeme, type StagingTag };

View File

@@ -1,8 +1,7 @@
const packageName = 'com.karaolidis.terminallyonline';
const appName = 'Terminally Online';
const fileProvider = 'com.karaolidis.terminallyonline.rnshare.fileprovider';
// eslint-disable-next-line @typescript-eslint/no-empty-function
const noOp = () => {};
export { packageName, appName, fileProvider, noOp };
export { packageName, appName, noOp };

View File

@@ -1,3 +1,6 @@
import { FileSystem } from 'react-native-file-access';
import filetypemime from 'magic-bytes.js';
import { lookup } from 'react-native-mime-types';
import { MEME_TYPE } from '../database';
const allowedImageMimeTypes = [
@@ -10,42 +13,77 @@ const allowedImageMimeTypes = [
const allowedGifMimeTypes = ['image/gif'];
const allowedMimeTypes = [...allowedImageMimeTypes, ...allowedGifMimeTypes];
const allowedVideoMimeTypes = [
'video/av01',
'video/3gpp',
'video/avc',
'video/hevc',
'video/x-matroska',
'video/mp2t',
'video/mp4',
'video/mp42',
'video/mp43',
'video/mp4v-es',
'video/mpeg',
'video/mpeg2',
'video/x-vnd.on2.vp8',
'video/x-vnd.on2.vp9',
'video/webm',
];
const getMemeType = (mimeType: string): MEME_TYPE | undefined => {
switch (mimeType) {
case 'image/bmp':
case 'image/jpg':
case 'image/jpeg':
case 'image/png':
case 'image/webp': {
const allowedMimeTypes = [
...allowedImageMimeTypes,
...allowedGifMimeTypes,
...allowedVideoMimeTypes,
];
const getMemeTypeFromMimeType = (mimeType: string): MEME_TYPE | undefined => {
if (!allowedMimeTypes.includes(mimeType)) return undefined;
const mimeStart = mimeType.split('/')[0];
switch (mimeStart) {
case 'image': {
if (mimeType === 'image/gif') return MEME_TYPE.GIF;
return MEME_TYPE.IMAGE;
}
case 'image/gif': {
return MEME_TYPE.GIF;
case 'video': {
return MEME_TYPE.VIDEO;
}
}
};
const guessMimeType = (filename: string): string | undefined => {
const guessMimeTypeFromExtension = (filename: string): string | undefined => {
const extension = filename.split('.').pop()?.toLowerCase();
switch (extension) {
case 'bmp': {
return 'image/bmp';
}
case 'jpg':
case 'jpeg': {
return 'image/jpeg';
}
case 'png': {
return 'image/png';
}
case 'webp': {
return 'image/webp';
}
case 'gif': {
return 'image/gif';
}
if (!extension) return undefined;
const guessedMimeType = lookup(extension);
if (!guessedMimeType) return undefined;
return guessedMimeType;
};
const guessMimeTypeFromMagicBytes = async (
uri: string,
): Promise<string | undefined> => {
const fileContent = await FileSystem.read(uri, 100);
const possibleMimeTypes = filetypemime(fileContent);
if (possibleMimeTypes.length === 0) return undefined;
return possibleMimeTypes[0].mime;
};
const guessMimeType = async (
uri: string,
hint?: string | null,
): Promise<string | undefined> => {
if (hint && allowedMimeTypes.includes(hint)) return hint;
let guessedMimeType = guessMimeTypeFromExtension(uri);
if (guessedMimeType && allowedMimeTypes.includes(guessedMimeType)) {
return guessedMimeType;
}
guessedMimeType = await guessMimeTypeFromMagicBytes(uri);
if (guessedMimeType && allowedMimeTypes.includes(guessedMimeType)) {
return guessedMimeType;
}
};
@@ -53,6 +91,6 @@ export {
allowedImageMimeTypes,
allowedGifMimeTypes,
allowedMimeTypes,
getMemeType,
getMemeTypeFromMimeType,
guessMimeType,
};

View File

@@ -7,14 +7,14 @@ export {
rgbToRgba,
generateRandomColor,
} from './color';
export { packageName, appName, fileProvider, noOp } from './constants';
export { packageName, appName, noOp } from './constants';
export { multipleIdQuery } from './database';
export { getFlashListItemHeight, getFontAwesome5IconSize } from './dimensions';
export {
allowedImageMimeTypes,
allowedGifMimeTypes,
allowedMimeTypes,
getMemeType,
getMemeTypeFromMimeType,
guessMimeType,
} from './filesystem';
export { getSortIcon, getViewIcon } from './icon';

View File

@@ -4,7 +4,7 @@ import Share from 'react-native-share';
import Clipboard from '@react-native-clipboard/clipboard';
import { Meme } from '../database';
import { ROUTE, RootStackParamList } from '../types';
import { noOp } from './constants';
import { noOp } from '.';
const favoriteMeme = (realm: Realm, meme: Meme) => {
realm.write(() => {

View File

@@ -1,4 +1,4 @@
import { isHexColor, isRgbColor } from './color';
import { isHexColor, isRgbColor } from '.';
interface StringValidationResult {
valid: boolean;