7 Commits

Author SHA1 Message Date
7b39d80c9b Add searchbar autofocus
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
2023-07-29 23:23:22 +03:00
e794832f38 Add root snackbar
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
2023-07-29 23:11:00 +03:00
5770a9b234 Add pasting from clipboard
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
2023-07-29 22:43:58 +03:00
391e232bf7 Add custom AnimatedImage component
This also fixes the white flashing when loading images

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
2023-07-29 20:56:37 +03:00
a5911ff617 Fix crash when deleting memes
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
2023-07-29 20:55:18 +03:00
f33fe2c54b Add share intent
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
2023-07-29 19:14:19 +03:00
a0b7a6310b Enable backups
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
2023-07-29 13:23:04 +03:00
31 changed files with 781 additions and 166 deletions

View File

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

View File

@@ -7,7 +7,7 @@
android:label="@string/app_name" android:label="@string/app_name"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:allowBackup="false" android:allowBackup="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
@@ -20,6 +20,24 @@
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="image/bmp" />
<data android:mimeType="image/jpeg" />
<data android:mimeType="image/png" />
<data android:mimeType="image/webp" />
<data android:mimeType="image/gif" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND_MULTIPLE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="image/bmp" />
<data android:mimeType="image/jpeg" />
<data android:mimeType="image/png" />
<data android:mimeType="image/webp" />
<data android:mimeType="image/gif" />
</intent-filter>
</activity> </activity>
</application> </application>
</manifest> </manifest>

46
package-lock.json generated
View File

@@ -1,16 +1,15 @@
{ {
"name": "@karaolidis/terminally-online", "name": "@karaolidis/terminally-online",
"version": "0.0.3", "version": "0.0.4",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@karaolidis/terminally-online", "name": "@karaolidis/terminally-online",
"version": "0.0.3", "version": "0.0.4",
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
"@bankify/redux-persist-realm": "^0.1.3", "@bankify/redux-persist-realm": "^0.1.3",
"@likashefqet/react-native-image-zoom": "^1.3.0",
"@react-native-clipboard/clipboard": "^1.11.2", "@react-native-clipboard/clipboard": "^1.11.2",
"@react-native-community/hooks": "^3.0.0", "@react-native-community/hooks": "^3.0.0",
"@react-navigation/bottom-tabs": "^6.5.8", "@react-navigation/bottom-tabs": "^6.5.8",
@@ -32,6 +31,7 @@
"react-native-scoped-storage": "^1.9.3", "react-native-scoped-storage": "^1.9.3",
"react-native-screens": "^3.22.1", "react-native-screens": "^3.22.1",
"react-native-share": "^9.2.3", "react-native-share": "^9.2.3",
"react-native-share-menu": "^6.0.0",
"react-native-vector-icons": "^9.2.0", "react-native-vector-icons": "^9.2.0",
"react-native-video": "^6.0.0-alpha.6", "react-native-video": "^6.0.0-alpha.6",
"react-redux": "^8.1.1", "react-redux": "^8.1.1",
@@ -49,6 +49,7 @@
"@types/jest": "^29.5.2", "@types/jest": "^29.5.2",
"@types/metro-config": "^0.76.3", "@types/metro-config": "^0.76.3",
"@types/react": "^18.2.14", "@types/react": "^18.2.14",
"@types/react-native-share-menu": "^5.0.2",
"@types/react-native-vector-icons": "^6.4.13", "@types/react-native-vector-icons": "^6.4.13",
"@types/react-native-video": "^5.0.15", "@types/react-native-video": "^5.0.15",
"@types/react-test-renderer": "^18.0.0", "@types/react-test-renderer": "^18.0.0",
@@ -2989,17 +2990,6 @@
"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
"integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
}, },
"node_modules/@likashefqet/react-native-image-zoom": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/@likashefqet/react-native-image-zoom/-/react-native-image-zoom-1.3.0.tgz",
"integrity": "sha512-PLRd1hNMHe9LUn8b4rmLt86282geuaqP4Qd2rFWIloxMS2ePNTIaNlEUu3T3LaO8Pg9vhVV97TxfFeU8F+tcYQ==",
"peerDependencies": {
"react": ">=16.x.x",
"react-native": ">=0.62.x",
"react-native-gesture-handler": ">=2.x.x",
"react-native-reanimated": ">=2.x.x"
}
},
"node_modules/@nicolo-ribaudo/eslint-scope-5-internals": { "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
"version": "5.1.1-v1", "version": "5.1.1-v1",
"resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz", "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
@@ -4615,6 +4605,12 @@
"@types/react": "*" "@types/react": "*"
} }
}, },
"node_modules/@types/react-native-share-menu": {
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/@types/react-native-share-menu/-/react-native-share-menu-5.0.2.tgz",
"integrity": "sha512-Qa9DGfL6Bvng2DXgCK0fFzdi9SJMGfs06MLSkCfSXBCGKlFLzSHCsXztvXlCCChn3dQArFHyz/uRUN3Sbt6LtQ==",
"dev": true
},
"node_modules/@types/react-native-vector-icons": { "node_modules/@types/react-native-vector-icons": {
"version": "6.4.13", "version": "6.4.13",
"resolved": "https://registry.npmjs.org/@types/react-native-vector-icons/-/react-native-vector-icons-6.4.13.tgz", "resolved": "https://registry.npmjs.org/@types/react-native-vector-icons/-/react-native-vector-icons-6.4.13.tgz",
@@ -13542,6 +13538,11 @@
"resolved": "https://registry.npmjs.org/react-native-share/-/react-native-share-9.2.3.tgz", "resolved": "https://registry.npmjs.org/react-native-share/-/react-native-share-9.2.3.tgz",
"integrity": "sha512-y6ju4HS6ydJoPVoacZ/Hp3i47AfI9W4e76Jv00r01dVbr6SCCcuqk37kIbn+kYivdTxOW77UGEbhtBHHtXnhzg==" "integrity": "sha512-y6ju4HS6ydJoPVoacZ/Hp3i47AfI9W4e76Jv00r01dVbr6SCCcuqk37kIbn+kYivdTxOW77UGEbhtBHHtXnhzg=="
}, },
"node_modules/react-native-share-menu": {
"version": "6.0.0",
"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-vector-icons": { "node_modules/react-native-vector-icons": {
"version": "9.2.0", "version": "9.2.0",
"resolved": "https://registry.npmjs.org/react-native-vector-icons/-/react-native-vector-icons-9.2.0.tgz", "resolved": "https://registry.npmjs.org/react-native-vector-icons/-/react-native-vector-icons-9.2.0.tgz",
@@ -17927,12 +17928,6 @@
} }
} }
}, },
"@likashefqet/react-native-image-zoom": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/@likashefqet/react-native-image-zoom/-/react-native-image-zoom-1.3.0.tgz",
"integrity": "sha512-PLRd1hNMHe9LUn8b4rmLt86282geuaqP4Qd2rFWIloxMS2ePNTIaNlEUu3T3LaO8Pg9vhVV97TxfFeU8F+tcYQ==",
"requires": {}
},
"@nicolo-ribaudo/eslint-scope-5-internals": { "@nicolo-ribaudo/eslint-scope-5-internals": {
"version": "5.1.1-v1", "version": "5.1.1-v1",
"resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz", "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
@@ -19197,6 +19192,12 @@
"@types/react": "*" "@types/react": "*"
} }
}, },
"@types/react-native-share-menu": {
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/@types/react-native-share-menu/-/react-native-share-menu-5.0.2.tgz",
"integrity": "sha512-Qa9DGfL6Bvng2DXgCK0fFzdi9SJMGfs06MLSkCfSXBCGKlFLzSHCsXztvXlCCChn3dQArFHyz/uRUN3Sbt6LtQ==",
"dev": true
},
"@types/react-native-vector-icons": { "@types/react-native-vector-icons": {
"version": "6.4.13", "version": "6.4.13",
"resolved": "https://registry.npmjs.org/@types/react-native-vector-icons/-/react-native-vector-icons-6.4.13.tgz", "resolved": "https://registry.npmjs.org/@types/react-native-vector-icons/-/react-native-vector-icons-6.4.13.tgz",
@@ -25904,6 +25905,11 @@
"resolved": "https://registry.npmjs.org/react-native-share/-/react-native-share-9.2.3.tgz", "resolved": "https://registry.npmjs.org/react-native-share/-/react-native-share-9.2.3.tgz",
"integrity": "sha512-y6ju4HS6ydJoPVoacZ/Hp3i47AfI9W4e76Jv00r01dVbr6SCCcuqk37kIbn+kYivdTxOW77UGEbhtBHHtXnhzg==" "integrity": "sha512-y6ju4HS6ydJoPVoacZ/Hp3i47AfI9W4e76Jv00r01dVbr6SCCcuqk37kIbn+kYivdTxOW77UGEbhtBHHtXnhzg=="
}, },
"react-native-share-menu": {
"version": "6.0.0",
"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-vector-icons": { "react-native-vector-icons": {
"version": "9.2.0", "version": "9.2.0",
"resolved": "https://registry.npmjs.org/react-native-vector-icons/-/react-native-vector-icons-9.2.0.tgz", "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", "name": "@karaolidis/terminally-online",
"version": "0.0.3", "version": "0.0.4",
"private": true, "private": true,
"scripts": { "scripts": {
"postinstall": "patch-package", "postinstall": "patch-package",
@@ -15,7 +15,6 @@
}, },
"dependencies": { "dependencies": {
"@bankify/redux-persist-realm": "^0.1.3", "@bankify/redux-persist-realm": "^0.1.3",
"@likashefqet/react-native-image-zoom": "^1.3.0",
"@react-native-clipboard/clipboard": "^1.11.2", "@react-native-clipboard/clipboard": "^1.11.2",
"@react-native-community/hooks": "^3.0.0", "@react-native-community/hooks": "^3.0.0",
"@react-navigation/bottom-tabs": "^6.5.8", "@react-navigation/bottom-tabs": "^6.5.8",
@@ -37,6 +36,7 @@
"react-native-scoped-storage": "^1.9.3", "react-native-scoped-storage": "^1.9.3",
"react-native-screens": "^3.22.1", "react-native-screens": "^3.22.1",
"react-native-share": "^9.2.3", "react-native-share": "^9.2.3",
"react-native-share-menu": "^6.0.0",
"react-native-vector-icons": "^9.2.0", "react-native-vector-icons": "^9.2.0",
"react-native-video": "^6.0.0-alpha.6", "react-native-video": "^6.0.0-alpha.6",
"react-redux": "^8.1.1", "react-redux": "^8.1.1",
@@ -54,6 +54,7 @@
"@types/jest": "^29.5.2", "@types/jest": "^29.5.2",
"@types/metro-config": "^0.76.3", "@types/metro-config": "^0.76.3",
"@types/react": "^18.2.14", "@types/react": "^18.2.14",
"@types/react-native-share-menu": "^5.0.2",
"@types/react-native-vector-icons": "^6.4.13", "@types/react-native-vector-icons": "^6.4.13",
"@types/react-native-video": "^5.0.15", "@types/react-native-video": "^5.0.15",
"@types/react-test-renderer": "^18.0.0", "@types/react-test-renderer": "^18.0.0",

View File

@@ -1,11 +1,134 @@
diff --git a/node_modules/@react-native-clipboard/clipboard/android/src/main/java/com/reactnativecommunity/clipboard/ClipboardModule.java b/node_modules/@react-native-clipboard/clipboard/android/src/main/java/com/reactnativecommunity/clipboard/ClipboardModule.java diff --git a/node_modules/@react-native-clipboard/clipboard/android/src/main/java/com/reactnativecommunity/clipboard/ClipboardModule.java b/node_modules/@react-native-clipboard/clipboard/android/src/main/java/com/reactnativecommunity/clipboard/ClipboardModule.java
index 048ebe5..8afa5b2 100644 index 048ebe5..01fa3ad 100644
--- a/node_modules/@react-native-clipboard/clipboard/android/src/main/java/com/reactnativecommunity/clipboard/ClipboardModule.java --- a/node_modules/@react-native-clipboard/clipboard/android/src/main/java/com/reactnativecommunity/clipboard/ClipboardModule.java
+++ b/node_modules/@react-native-clipboard/clipboard/android/src/main/java/com/reactnativecommunity/clipboard/ClipboardModule.java +++ b/node_modules/@react-native-clipboard/clipboard/android/src/main/java/com/reactnativecommunity/clipboard/ClipboardModule.java
@@ -156,6 +156,17 @@ public class ClipboardModule extends ReactContextBaseJavaModule { @@ -24,6 +24,7 @@ import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.bridge.ReactMethod;
import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.WritableNativeMap;
import com.facebook.react.module.annotations.ReactModule;
import com.facebook.react.modules.core.DeviceEventManagerModule;
@@ -70,9 +71,9 @@ public class ClipboardModule extends ReactContextBaseJavaModule {
ClipData clipData = clipboard.getPrimaryClip();
if (clipData != null && clipData.getItemCount() >= 1) {
ClipData.Item firstItem = clipboard.getPrimaryClip().getItemAt(0);
- promise.resolve("" + firstItem.getText());
+ promise.resolve(firstItem.getText());
} else {
- promise.resolve("");
+ promise.resolve(null);
}
} catch (Exception e) {
promise.reject(e);
@@ -95,34 +96,37 @@ public class ClipboardModule extends ReactContextBaseJavaModule {
try {
ClipboardManager clipboard = getClipboardService();
ClipData clipData = clipboard.getPrimaryClip();
- promise.resolve(clipData != null && clipData.getItemCount() >= 1);
+ if (clipData != null && clipData.getItemCount() >= 1) {
+ ClipData.Item firstItem = clipboard.getPrimaryClip().getItemAt(0);
+ promise.resolve(firstItem.getText() != null);
+ } else {
+ promise.resolve(false);
+ }
} catch (Exception e) {
promise.reject(e);
} }
} }
@ReactMethod
- public void getImage(Promise promise){
+ public void getImage(Promise promise) {
ClipboardManager clipboardManager = getClipboardService();
- if (!(clipboardManager.hasPrimaryClip())){
- promise.resolve("");
- }
- else if (clipboardManager.getPrimaryClipDescription().hasMimeType(ClipDescription.MIMETYPE_TEXT_PLAIN)){
- promise.resolve("");
- }
- else {
+ if (!(clipboardManager.hasPrimaryClip())) {
+ promise.resolve(null);
+ } else if (clipboardManager.getPrimaryClipDescription().hasMimeType(ClipDescription.MIMETYPE_TEXT_PLAIN)) {
+ promise.resolve(null);
+ } else {
ClipData clipData = clipboardManager.getPrimaryClip();
- if(clipData != null){
+ if (clipData != null) {
ClipData.Item item = clipData.getItemAt(0);
Uri pasteUri = item.getUri();
- if (pasteUri != null){
+ if (pasteUri != null) {
ContentResolver cr = reactContext.getContentResolver();
String mimeType = cr.getType(pasteUri);
- if (mimeType != null){
+ if (mimeType != null) {
try {
Bitmap bitmap = MediaStore.Images.Media.getBitmap(cr, pasteUri);
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- switch(mimeType){
+ switch (mimeType) {
case MIMETYPE_JPEG:
case MIMETYPE_JPG:
bitmap.compress(Bitmap.CompressFormat.JPEG, 100, outputStream);
@@ -133,7 +137,7 @@ public class ClipboardModule extends ReactContextBaseJavaModule {
bitmap.compress(Bitmap.CompressFormat.PNG, 100, outputStream);
break;
case MIMETYPE_WEBP:
- if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q){
+ if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) {
bitmap.compress(Bitmap.CompressFormat.WEBP_LOSSLESS, 100, outputStream);
break;
}
@@ -156,6 +160,77 @@ public class ClipboardModule extends ReactContextBaseJavaModule {
}
}
+ @ReactMethod
+ public void hasImage(Promise promise) {
+ try {
+ ClipboardManager clipboard = getClipboardService();
+ ClipData clipData = clipboard.getPrimaryClip();
+ if (clipData != null && clipData.getItemCount() >= 1) {
+ ClipData.Item firstItem = clipboard.getPrimaryClip().getItemAt(0);
+ Uri pasteUri = firstItem.getUri();
+ if (pasteUri != null) {
+ ContentResolver cr = reactContext.getContentResolver();
+ String mimeType = cr.getType(pasteUri);
+ if (mimeType != null) {
+ promise.resolve(mimeType.startsWith("image/"));
+ return;
+ }
+ }
+ }
+ promise.resolve(false);
+ } catch (Exception e) {
+ promise.reject(e);
+ }
+ }
+
+ @ReactMethod
+ public void getURI(Promise promise) {
+ try {
+ ClipboardManager clipboard = getClipboardService();
+ ClipData clipData = clipboard.getPrimaryClip();
+ if (clipData != null && clipData.getItemCount() >= 1) {
+ ClipData.Item firstItem = clipboard.getPrimaryClip().getItemAt(0);
+ Uri uri = firstItem.getUri();
+ if (uri != null) {
+ promise.resolve(uri.toString());
+ } else {
+ promise.resolve(null);
+ }
+ }
+ promise.resolve(null);
+ } catch (Exception e) {
+ promise.reject(e);
+ }
+ }
+
+ @ReactMethod + @ReactMethod
+ public void setURI(String uri) { + public void setURI(String uri) {
+ try { + try {
@@ -16,20 +139,69 @@ index 048ebe5..8afa5b2 100644
+ e.printStackTrace(); + e.printStackTrace();
+ } + }
+ } + }
+
+ @ReactMethod
+ public void hasURI(Promise promise) {
+ try {
+ ClipboardManager clipboard = getClipboardService();
+ ClipData clipData = clipboard.getPrimaryClip();
+ if (clipData != null && clipData.getItemCount() >= 1) {
+ ClipData.Item firstItem = clipboard.getPrimaryClip().getItemAt(0);
+ Uri pasteUri = firstItem.getUri();
+ promise.resolve(pasteUri != null);
+ } else {
+ promise.resolve(false);
+ }
+ } catch (Exception e) {
+ promise.reject(e);
+ }
+ }
+ +
@ReactMethod @ReactMethod
public void setListener() { public void setListener() {
try { try {
@@ -164,8 +239,8 @@ public class ClipboardModule extends ReactContextBaseJavaModule {
@Override
public void onPrimaryClipChanged() {
reactContext
- .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
- .emit(CLIPBOARD_TEXT_CHANGED, null);
+ .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+ .emit(CLIPBOARD_TEXT_CHANGED, null);
}
};
clipboard.addPrimaryClipChangedListener(listener);
@@ -176,8 +251,8 @@ public class ClipboardModule extends ReactContextBaseJavaModule {
@ReactMethod
public void removeListener() {
- if(listener != null){
- try{
+ if (listener != null) {
+ try {
ClipboardManager clipboard = getClipboardService();
clipboard.removePrimaryClipChangedListener(listener);
} catch (Exception e) {
diff --git a/node_modules/@react-native-clipboard/clipboard/dist/Clipboard.d.ts b/node_modules/@react-native-clipboard/clipboard/dist/Clipboard.d.ts diff --git a/node_modules/@react-native-clipboard/clipboard/dist/Clipboard.d.ts b/node_modules/@react-native-clipboard/clipboard/dist/Clipboard.d.ts
index a3e4abd..904a199 100644 index a3e4abd..9fc11e6 100644
--- a/node_modules/@react-native-clipboard/clipboard/dist/Clipboard.d.ts --- a/node_modules/@react-native-clipboard/clipboard/dist/Clipboard.d.ts
+++ b/node_modules/@react-native-clipboard/clipboard/dist/Clipboard.d.ts +++ b/node_modules/@react-native-clipboard/clipboard/dist/Clipboard.d.ts
@@ -81,6 +81,17 @@ export declare const Clipboard: { @@ -81,6 +81,38 @@ export declare const Clipboard: {
* @param the content to be stored in the clipboard. * @param the content to be stored in the clipboard.
*/ */
setStrings(content: string[]): void; setStrings(content: string[]): void;
+ /** + /**
+ * (Android Only) + * (Android Only)
+ * Get content of URI type. You can use following code to get clipboard content
+ * ```javascript
+ * async _getContent() {
+ * var content = await Clipboard.getURI();
+ * }
+ * ```
+ */
+ getURI(): Promise<string>;
+ /**
+ * (Android Only)
+ * Set content of URI type. You can use following code to set clipboard content + * Set content of URI type. You can use following code to set clipboard content
+ * ```javascript + * ```javascript
+ * _setContent() { + * _setContent() {
@@ -39,19 +211,90 @@ index a3e4abd..904a199 100644
+ * @param the content to be stored in the clipboard. + * @param the content to be stored in the clipboard.
+ */ + */
+ setURI(content: string): void; + setURI(content: string): void;
+ /**
+ * (Android Only)
+ * Returns whether the clipboard has a URI or is empty.
+ * This method returns a `Promise`, so you can use following code to check clipboard content
+ * ```javascript
+ * async _hasContent() {
+ * var hasContent = await Clipboard.hasURI();
+ * }
+ * ```
+ */
+ hasURI(): Promise<boolean>;
/** /**
* Returns whether the clipboard has content or is empty. * Returns whether the clipboard has content or is empty.
* This method returns a `Promise`, so you can use following code to get clipboard content * This method returns a `Promise`, so you can use following code to get clipboard content
@@ -90,7 +122,7 @@ export declare const Clipboard: {
* }
* ```
*/
- hasString(): any;
+ hasString(): Promise<boolean>;
/**
* Returns whether the clipboard has an image or is empty.
* This method returns a `Promise`, so you can use following code to check clipboard content
@@ -100,7 +132,7 @@ export declare const Clipboard: {
* }
* ```
*/
- hasImage(): any;
+ hasImage(): Promise<boolean>;
/**
* (iOS Only)
* Returns whether the clipboard has a URL content. Can check
@@ -112,7 +144,7 @@ export declare const Clipboard: {
* }
* ```
*/
- hasURL(): any;
+ hasURL(): Promise<boolean>;
/**
* (iOS 14+ Only)
* Returns whether the clipboard has a Number(UIPasteboardDetectionPatternNumber) content. Can check
@@ -124,7 +156,7 @@ export declare const Clipboard: {
* }
* ```
*/
- hasNumber(): any;
+ hasNumber(): Promise<boolean>;
/**
* (iOS 14+ Only)
* Returns whether the clipboard has a WebURL(UIPasteboardDetectionPatternProbableWebURL) content. Can check
@@ -136,7 +168,7 @@ export declare const Clipboard: {
* }
* ```
*/
- hasWebURL(): any;
+ hasWebURL(): Promise<boolean>;
/**
* (iOS and Android Only)
* Adds a listener to get notifications when the clipboard has changed.
diff --git a/node_modules/@react-native-clipboard/clipboard/dist/Clipboard.js b/node_modules/@react-native-clipboard/clipboard/dist/Clipboard.js diff --git a/node_modules/@react-native-clipboard/clipboard/dist/Clipboard.js b/node_modules/@react-native-clipboard/clipboard/dist/Clipboard.js
index 67b7237..0a74329 100644 index 67b7237..df3bff6 100644
--- a/node_modules/@react-native-clipboard/clipboard/dist/Clipboard.js --- a/node_modules/@react-native-clipboard/clipboard/dist/Clipboard.js
+++ b/node_modules/@react-native-clipboard/clipboard/dist/Clipboard.js +++ b/node_modules/@react-native-clipboard/clipboard/dist/Clipboard.js
@@ -123,6 +123,22 @@ exports.Clipboard = { @@ -123,6 +123,53 @@ exports.Clipboard = {
setStrings: function (content) { setStrings: function (content) {
NativeClipboard_1.default.setStrings(content); NativeClipboard_1.default.setStrings(content);
}, },
+ /** + /**
+ * (Android Only) + * (Android Only)
+ * Get content of URI type. You can use following code to get clipboard content
+ * ```javascript
+ * async _getContent() {
+ * var content = await Clipboard.getURI();
+ * }
+ * ```
+ */
+ getURI: function () {
+ if (react_native_1.Platform.OS !== 'android') {
+ return;
+ }
+ return NativeClipboard_1.default.getURI();
+ },
+ /**
+ * (Android Only)
+ * Set content of URI type. You can use following code to set clipboard content + * Set content of URI type. You can use following code to set clipboard content
+ * ```javascript + * ```javascript
+ * _setContent() { + * _setContent() {
@@ -65,6 +308,22 @@ index 67b7237..0a74329 100644
+ return; + return;
+ } + }
+ return NativeClipboard_1.default.setURI(content); + return NativeClipboard_1.default.setURI(content);
+ },
+ /**
+ * (Android Only)
+ * Returns whether the clipboard has a URI or is empty.
+ * This method returns a `Promise`, so you can use following code to check clipboard content
+ * ```javascript
+ * async _hasContent() {
+ * var hasContent = await Clipboard.hasURI();
+ * }
+ * ```
+ */
+ hasURI: function () {
+ if (react_native_1.Platform.OS !== 'android') {
+ return;
+ }
+ return NativeClipboard_1.default.hasURI();
+ }, + },
/** /**
* Returns whether the clipboard has content or is empty. * Returns whether the clipboard has content or is empty.

View File

@@ -0,0 +1,38 @@
diff --git a/node_modules/react-native-share-menu/android/build.gradle b/node_modules/react-native-share-menu/android/build.gradle
index 9557fdb..b0503cb 100644
--- a/node_modules/react-native-share-menu/android/build.gradle
+++ b/node_modules/react-native-share-menu/android/build.gradle
@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'
android {
- compileSdkVersion 29
- buildToolsVersion "29.0.2"
+ compileSdkVersion 33
+ buildToolsVersion "33.0.0"
defaultConfig {
- minSdkVersion 16
- targetSdkVersion 29
+ minSdkVersion 21
+ targetSdkVersion 33
versionCode 1
versionName "1.0"
ndk {
diff --git a/node_modules/react-native-share-menu/android/src/main/java/com/meedan/ShareMenuModule.java b/node_modules/react-native-share-menu/android/src/main/java/com/meedan/ShareMenuModule.java
index 09abd7b..af552b1 100644
--- a/node_modules/react-native-share-menu/android/src/main/java/com/meedan/ShareMenuModule.java
+++ b/node_modules/react-native-share-menu/android/src/main/java/com/meedan/ShareMenuModule.java
@@ -163,4 +163,12 @@ public class ShareMenuModule extends ReactContextBaseJavaModule implements Activ
// Update intent in case the user calls `getSharedText` again
currentActivity.setIntent(intent);
}
+
+ @ReactMethod
+ public void addListener(String eventName) {
+ }
+
+ @ReactMethod
+ public void removeListeners(Integer count) {
+ }
}

View File

@@ -0,0 +1,56 @@
import React, { ComponentProps, useMemo } from 'react';
import { Image } from 'react-native';
import { Gesture, GestureDetector } from 'react-native-gesture-handler';
import Animated, {
useAnimatedStyle,
useSharedValue,
withSpring,
} from 'react-native-reanimated';
const AnimatedImage = ({ ...props }: ComponentProps<typeof Image>) => {
const scale = useSharedValue(1);
const translateX = useSharedValue(0);
const translateY = useSharedValue(0);
const animatedStyles = useAnimatedStyle(() => {
return {
transform: [
{ translateX: translateX.value },
{ translateY: translateY.value },
{ scale: scale.value },
],
};
});
const gesture = useMemo(
() =>
Gesture.Simultaneous(
Gesture.Pinch()
.onUpdate(event => {
scale.value = event.scale;
})
.onFinalize(() => {
scale.value = withSpring(1);
}),
Gesture.Pan()
.minPointers(2)
.onUpdate(event => {
translateX.value = event.translationX;
translateY.value = event.translationY;
})
.onFinalize(() => {
translateX.value = withSpring(0);
translateY.value = withSpring(0);
}),
),
[scale, translateX, translateY],
);
return (
<GestureDetector gesture={gesture}>
<Animated.Image {...props} style={[props.style, animatedStyles]} />
</GestureDetector>
);
};
export default AnimatedImage;

View File

@@ -1,12 +1,23 @@
import React, { useEffect, useState } from 'react'; import React, { useCallback, useState } from 'react';
import { Keyboard, StyleSheet } from 'react-native'; import { StyleSheet } from 'react-native';
import { FAB } from 'react-native-paper'; import { FAB } from 'react-native-paper';
import { ParamListBase, useNavigation } from '@react-navigation/native'; import { ParamListBase, useNavigation } from '@react-navigation/native';
import { NativeStackNavigationProp } from '@react-navigation/native-stack'; import { NativeStackNavigationProp } from '@react-navigation/native-stack';
import { pick } from 'react-native-document-picker'; import { pick } from 'react-native-document-picker';
import { useDeviceOrientation } from '@react-native-community/hooks'; import {
import { ROUTE } from '../types'; useDeviceOrientation,
import { allowedMimeTypes, noOp } from '../utilities'; 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 { setSnackbarMessage } from '../state';
const floatingActionButtonStyles = StyleSheet.create({ const floatingActionButtonStyles = StyleSheet.create({
fab: { fab: {
@@ -23,61 +34,78 @@ const FloatingActionButton = ({ visible = true }: { visible?: boolean }) => {
const { navigate } = const { navigate } =
useNavigation<NativeStackNavigationProp<ParamListBase>>(); useNavigation<NativeStackNavigationProp<ParamListBase>>();
const orientation = useDeviceOrientation(); const orientation = useDeviceOrientation();
const keyboardOpen = useKeyboard().keyboardShown;
const dispatch = useDispatch();
const [state, setState] = useState(false); const [state, setState] = useState(false);
const [keyboardOpen, setKeyboardOpen] = useState(false);
useEffect(() => { const handleAddMeme = useCallback(async () => {
const keyboardDidShowListener = Keyboard.addListener( const response = await pick({
'keyboardDidShow', type: allowedMimeTypes,
() => setKeyboardOpen(true), allowMultiSelection: true,
); }).catch(noOp);
const keyboardDidHideListener = Keyboard.addListener( if (!response) return;
'keyboardDidHide', const files = documentPickerResponseToAddMemeFile(response);
() => setKeyboardOpen(false), navigate(ROUTE.ADD_MEME, { files });
); }, [navigate]);
return () => { const handleAddTag = useCallback(() => {
keyboardDidShowListener.remove(); navigate(ROUTE.ADD_TAG);
keyboardDidHideListener.remove(); }, [navigate]);
};
}, []); const handlePaste = useCallback(async () => {
const uri = await Clipboard.getURI();
if (!uri) {
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,
},
],
});
}, [dispatch, navigate]);
return ( return (
<FAB.Group <>
open={state} <FAB.Group
visible={visible && !keyboardOpen} open={state}
icon={state ? 'image' : 'plus'} visible={visible && !keyboardOpen}
actions={[ icon={state ? 'close' : 'plus'}
{ actions={[
icon: 'tag', {
label: 'Tag', icon: 'content-paste',
onPress: () => navigate(ROUTE.ADD_TAG), label: 'Paste',
}, onPress: handlePaste,
{
icon: 'note-text',
label: 'Text',
onPress: () => {
throw new Error('Not yet implemented');
}, },
}, {
]} icon: 'tag',
onStateChange={({ open }) => setState(open)} label: 'Tag',
onPress={async () => { onPress: handleAddTag,
if (!state) return; },
const files = await pick({ {
type: allowedMimeTypes, icon: 'image',
allowMultiSelection: true, label: 'Meme',
}).catch(noOp); onPress: handleAddMeme,
if (!files) return; },
navigate(ROUTE.ADD_MEME, { files }); ]}
}} onStateChange={({ open }) => setState(open)}
style={ style={
orientation === 'portrait' orientation === 'portrait'
? floatingActionButtonStyles.fab ? floatingActionButtonStyles.fab
: floatingActionButtonStyles.fabLandscape : floatingActionButtonStyles.fabLandscape
} }
/> />
</>
); );
}; };

View File

@@ -1,11 +1,13 @@
export { export {
MemesList, MemesList,
MemeEditor, MemeEditor,
MemeFail,
MemesHeader, MemesHeader,
MemeTagSelector, MemeTagSelector,
MemeViewItem, MemeViewItem,
} from './memes'; } from './memes';
export { TagChip, TagEditor, TagPreview, TagRow, TagsHeader } from './tags'; export { TagChip, TagEditor, TagPreview, TagRow, TagsHeader } from './tags';
export { default as AnimatedImage } from './animatedImage';
export { default as FloatingActionButton } from './floatingActionButton'; export { default as FloatingActionButton } from './floatingActionButton';
export { default as HideableBottomNavigationBar } from './hideableBottomNavigationBar'; export { default as HideableBottomNavigationBar } from './hideableBottomNavigationBar';
export { default as HideableHeader } from './hideableHeader'; export { default as HideableHeader } from './hideableHeader';

View File

@@ -3,8 +3,7 @@ import { HelperText, Text, TextInput, useTheme } from 'react-native-paper';
import { Image } from 'react-native'; import { Image } from 'react-native';
import { useSafeAreaFrame } from 'react-native-safe-area-context'; import { useSafeAreaFrame } from 'react-native-safe-area-context';
import { useImageDimensions } from '@react-native-community/hooks/lib/useImageDimensions'; import { useImageDimensions } from '@react-native-community/hooks/lib/useImageDimensions';
import LoadingView from '../loadingView'; import { MemeFail, MemeTagSelector, LoadingView } from '..';
import { MemeFail, MemeTagSelector } from '.';
import { Tag } from '../../database'; import { Tag } from '../../database';
import { StringValidationResult, validateMemeTitle } from '../../utilities'; import { StringValidationResult, validateMemeTitle } from '../../utilities';

View File

@@ -1,14 +1,12 @@
import React from 'react'; import React from 'react';
import { ImageZoom } from '@likashefqet/react-native-image-zoom';
import { StyleSheet, View } from 'react-native'; import { StyleSheet, View } from 'react-native';
import { useSafeAreaFrame } from 'react-native-safe-area-context'; import { useSafeAreaFrame } from 'react-native-safe-area-context';
import { useImageDimensions } from '@react-native-community/hooks'; import { useImageDimensions } from '@react-native-community/hooks';
import { AndroidScoped } from 'react-native-file-access'; import { AndroidScoped } from 'react-native-file-access';
import LoadingView from '../loadingView';
import { Meme } from '../../database';
import MemeFail from './memeFail';
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
import { Meme } from '../../database';
import { RootState } from '../../state'; import { RootState } from '../../state';
import { AnimatedImage, LoadingView, MemeFail } from '..';
const memeViewItemStyles = StyleSheet.create({ const memeViewItemStyles = StyleSheet.create({
view: { view: {
@@ -47,7 +45,7 @@ const MemeViewItem = ({ meme }: { meme: Meme }) => {
iconSize={50} iconSize={50}
/> />
) : ( ) : (
<ImageZoom <AnimatedImage
source={{ uri }} source={{ uri }}
style={ style={
dimensions.aspectRatio > width / (height - 128) dimensions.aspectRatio > width / (height - 128)
@@ -61,7 +59,6 @@ const MemeViewItem = ({ meme }: { meme: Meme }) => {
height: height - 128, height: height - 128,
} }
} }
minScale={0.5}
/> />
)} )}
</View> </View>

View File

@@ -41,10 +41,12 @@ const memesHeaderStyles = StyleSheet.create({
const MemesHeader = ({ const MemesHeader = ({
search, search,
setSearch, setSearch,
autoFocus,
...props ...props
}: { }: {
search: string; search: string;
setSearch: (search: string) => void; setSearch: (search: string) => void;
autoFocus: boolean;
} & ComponentProps<typeof View>) => { } & ComponentProps<typeof View>) => {
const { colors } = useTheme(); const { colors } = useTheme();
const sort = useSelector((state: RootState) => state.memes.sort); const sort = useSelector((state: RootState) => state.memes.sort);
@@ -86,6 +88,7 @@ const MemesHeader = ({
placeholder="Search Memes" placeholder="Search Memes"
value={search} value={search}
onChangeText={setSearch} onChangeText={setSearch}
autoFocus={autoFocus}
/> />
<View style={memesHeaderStyles.buttonView}> <View style={memesHeaderStyles.buttonView}>
<View style={memesHeaderStyles.buttonSection}> <View style={memesHeaderStyles.buttonSection}>

View File

@@ -16,12 +16,10 @@ const storageLocationChangeDialogStyles = StyleSheet.create({
const StorageLocationChangeDialog = ({ const StorageLocationChangeDialog = ({
visible, visible,
setVisible, setVisible,
setSnackbarVisible,
setSnackbarMessage, setSnackbarMessage,
}: { }: {
visible: boolean; visible: boolean;
setVisible: (visible: boolean) => void; setVisible: (visible: boolean) => void;
setSnackbarVisible: (visible: boolean) => void;
setSnackbarMessage: (message: string) => void; setSnackbarMessage: (message: string) => void;
}) => { }) => {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -45,7 +43,6 @@ const StorageLocationChangeDialog = ({
if (isPermissionForPath(storageUri, newStorageUri)) { if (isPermissionForPath(storageUri, newStorageUri)) {
setSnackbarMessage('Folder already selected.'); setSnackbarMessage('Folder already selected.');
setSnackbarVisible(true);
setVisible(false); setVisible(false);
return; return;
} }

View File

@@ -25,10 +25,12 @@ const tagsHeaderStyles = StyleSheet.create({
const TagsHeader = ({ const TagsHeader = ({
search, search,
setSearch, setSearch,
autoFocus,
...props ...props
}: { }: {
search: string; search: string;
setSearch: (search: string) => void; setSearch: (search: string) => void;
autoFocus: boolean;
} & ComponentProps<typeof View>) => { } & ComponentProps<typeof View>) => {
const sort = useSelector((state: RootState) => state.tags.sort); const sort = useSelector((state: RootState) => state.tags.sort);
const sortDirection = useSelector( const sortDirection = useSelector(
@@ -60,6 +62,7 @@ const TagsHeader = ({
onChangeText={(value: string) => { onChangeText={(value: string) => {
setSearch(value); setSearch(value);
}} }}
autoFocus={autoFocus}
/> />
<View style={tagsHeaderStyles.buttonView}> <View style={tagsHeaderStyles.buttonView}>
<Menu <Menu

View File

@@ -1,10 +1,14 @@
import React from 'react'; import React, { useCallback, useEffect } from 'react';
import { NavigationContainer as NavigationContainerBase } from '@react-navigation/native'; import {
NavigationContainer as NavigationContainerBase,
ParamListBase,
createNavigationContainerRef,
} from '@react-navigation/native';
import FontAwesome5 from 'react-native-vector-icons/FontAwesome5'; import FontAwesome5 from 'react-native-vector-icons/FontAwesome5';
import { createBottomTabNavigator } from '@react-navigation/bottom-tabs'; import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
import { createNativeStackNavigator } from '@react-navigation/native-stack'; import { createNativeStackNavigator } from '@react-navigation/native-stack';
import { useTheme } from 'react-native-paper'; import { Snackbar, useTheme } from 'react-native-paper';
import { useSelector } from 'react-redux'; import { useDispatch, useSelector } from 'react-redux';
import { import {
Memes, Memes,
Tags, Tags,
@@ -20,13 +24,36 @@ import {
FloatingActionButton, FloatingActionButton,
HideableBottomNavigationBar, HideableBottomNavigationBar,
} from './components'; } from './components';
import { ROUTE, RootStackParamList } from './types'; import {
ROUTE,
RootStackParamList,
SharedItem,
sharedItemToAddMemeFile,
} from './types';
import { RootState } from './state'; import { RootState } from './state';
import ShareMenu from 'react-native-share-menu';
import { setSnackbarMessage } from './state/navigation';
import { StyleSheet } from 'react-native';
import { useKeyboard } from '@react-native-community/hooks';
const tabNavigatorStyles = StyleSheet.create({
snackbar: {
marginBottom: 90,
},
snackbarKeyboard: {
marginBottom: 10,
},
});
const TabNavigator = () => { const TabNavigator = () => {
const navVisible = useSelector( const navVisible = useSelector(
(state: RootState) => state.navigation.navVisible, (state: RootState) => state.navigation.navVisible,
); );
const snackbarMessage = useSelector(
(state: RootState) => state.navigation.snackbarMessage,
);
const dispatch = useDispatch();
const keyboardOpen = useKeyboard().keyboardShown;
const [route, setRoute] = React.useState(ROUTE.MEMES); const [route, setRoute] = React.useState(ROUTE.MEMES);
const TabNavigatorBase = createBottomTabNavigator(); const TabNavigatorBase = createBottomTabNavigator();
@@ -77,6 +104,22 @@ const TabNavigator = () => {
/> />
</TabNavigatorBase.Navigator> </TabNavigatorBase.Navigator>
<FloatingActionButton visible={navVisible && route !== ROUTE.SETTINGS} /> <FloatingActionButton visible={navVisible && route !== ROUTE.SETTINGS} />
<Snackbar
visible={!!snackbarMessage}
// eslint-disable-next-line unicorn/no-useless-undefined
onDismiss={() => dispatch(setSnackbarMessage(undefined))}
style={
keyboardOpen
? tabNavigatorStyles.snackbarKeyboard
: tabNavigatorStyles.snackbar
}
action={{
label: 'Dismiss',
// eslint-disable-next-line unicorn/no-useless-undefined
onPress: () => dispatch(setSnackbarMessage(undefined)),
}}>
{snackbarMessage}
</Snackbar>
</> </>
); );
}; };
@@ -84,10 +127,28 @@ const TabNavigator = () => {
const NavigationContainer = () => { const NavigationContainer = () => {
const theme = useTheme(); const theme = useTheme();
const navigationRef = createNavigationContainerRef<ParamListBase>();
const handleShare = useCallback(
(item: SharedItem | undefined) => {
if (!item) return;
const files = sharedItemToAddMemeFile(item);
navigationRef.current?.navigate(ROUTE.ADD_MEME, { files });
},
[navigationRef],
);
useEffect(() => {
ShareMenu.getInitialShare(handleShare);
const listener = ShareMenu.addNewShareListener(handleShare);
return () => listener.remove();
}, [handleShare]);
const StackNavigatorBase = createNativeStackNavigator<RootStackParamList>(); const StackNavigatorBase = createNativeStackNavigator<RootStackParamList>();
return ( return (
<NavigationContainerBase <NavigationContainerBase
ref={navigationRef}
theme={theme.dark ? darkNavigationTheme : lightNavigationTheme}> theme={theme.dark ? darkNavigationTheme : lightNavigationTheme}>
<StackNavigatorBase.Navigator <StackNavigatorBase.Navigator
screenOptions={{ screenOptions={{

View File

@@ -9,8 +9,12 @@ import { AndroidScoped, FileSystem } from 'react-native-file-access';
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
import { extension } from 'react-native-mime-types'; import { extension } from 'react-native-mime-types';
import { useDeviceOrientation } from '@react-native-community/hooks'; import { useDeviceOrientation } from '@react-native-community/hooks';
import { DocumentPickerResponse, pick } from 'react-native-document-picker'; import { pick } from 'react-native-document-picker';
import { ROUTE, RootStackParamList } from '../../types'; import {
documentPickerResponseToAddMemeFile,
ROUTE,
RootStackParamList,
} from '../../types';
import { Meme, Tag } from '../../database'; import { Meme, Tag } from '../../database';
import { RootState } from '../../state'; import { RootState } from '../../state';
import { import {
@@ -39,9 +43,7 @@ const AddMeme = ({
const isLastFile = index === files.current.length - 1; const isLastFile = index === files.current.length - 1;
const [memeUri, setMemeUri] = useState(file.current.uri); const [memeUri, setMemeUri] = useState(file.current.uri);
const [memeFilename, setMemeFilename] = useState( const [memeFilename, setMemeFilename] = useState(file.current.filename);
file.current.name ?? undefined,
);
const [memeError, setMemeError] = useState<Error>(); const [memeError, setMemeError] = useState<Error>();
const [memeTitle, setMemeTitle] = useState(validateMemeTitle('New Meme')); const [memeTitle, setMemeTitle] = useState(validateMemeTitle('New Meme'));
const [memeIsFavorite, setMemeIsFavorite] = useState(false); const [memeIsFavorite, setMemeIsFavorite] = useState(false);
@@ -92,7 +94,6 @@ const AddMeme = ({
const handleSave = useCallback(async () => { const handleSave = useCallback(async () => {
setIsSaving(true); setIsSaving(true);
await saveMeme(); await saveMeme();
setIsSaving(false);
goBack(); goBack();
}, [goBack, saveMeme]); }, [goBack, saveMeme]);
@@ -105,7 +106,7 @@ const AddMeme = ({
file.current = files.current[index + 1]; file.current = files.current[index + 1];
setMemeUri(file.current.uri); setMemeUri(file.current.uri);
setMemeFilename(file.current.name ?? undefined); setMemeFilename(file.current.filename);
setMemeTitle(validateMemeTitle('New Meme')); setMemeTitle(validateMemeTitle('New Meme'));
setMemeIsFavorite(false); setMemeIsFavorite(false);
setMemeTags(new Map<string, Tag>()); setMemeTags(new Map<string, Tag>());
@@ -117,14 +118,16 @@ const AddMeme = ({
setIsSavingAndAddingMore(false); setIsSavingAndAddingMore(false);
setIndex(0); setIndex(0);
files.current = (await pick({ const response = await pick({
type: allowedMimeTypes, type: allowedMimeTypes,
allowMultiSelection: true, allowMultiSelection: true,
}).catch(goBack)) as DocumentPickerResponse[]; }).catch(goBack);
if (!response) return;
files.current = documentPickerResponseToAddMemeFile(response);
file.current = files.current[0]; file.current = files.current[0];
setMemeUri(file.current.uri); setMemeUri(file.current.uri);
setMemeFilename(file.current.name ?? undefined); setMemeFilename(file.current.filename);
setMemeTitle(validateMemeTitle('New Meme')); setMemeTitle(validateMemeTitle('New Meme'));
setMemeIsFavorite(false); setMemeIsFavorite(false);
setMemeTags(new Map<string, Tag>()); setMemeTags(new Map<string, Tag>());

View File

@@ -91,14 +91,12 @@ const EditMeme = ({
meme.dateModified = new Date(); meme.dateModified = new Date();
}); });
setIsSaving(false);
goBack(); goBack();
}, [goBack, meme, memeTags, memeTitle.parsed, realm]); }, [goBack, meme, memeTags, memeTitle.parsed, realm]);
const handleDelete = useCallback(async () => { const handleDelete = useCallback(async () => {
setIsSaving(true); setIsSaving(true);
await deleteMeme(realm, storageUri, meme); await deleteMeme(realm, storageUri, meme);
setIsSaving(false);
goBack(); goBack();
}, [goBack, meme, realm, storageUri]); }, [goBack, meme, realm, storageUri]);

View File

@@ -59,8 +59,7 @@ const MemeView = ({
const { ids } = route.params; const { ids } = route.params;
const [index, setIndex] = useState(route.params.index); const [index, setIndex] = useState(route.params.index);
const [snackbarVisible, setSnackbarVisible] = useState(false); const [snackbarMessage, setSnackbarMessage] = useState<string>();
const [snackbarMessage, setSnackbarMessage] = useState('');
const flashListRef = useRef<FlashList<Meme>>(null); const flashListRef = useRef<FlashList<Meme>>(null);
@@ -68,8 +67,6 @@ const MemeView = ({
return collectionIn.filtered(multipleIdQuery(ids)); return collectionIn.filtered(multipleIdQuery(ids));
}); });
if (memes.length === 0) return <></>;
return ( return (
<> <>
<Appbar.Header style={memeViewStyles.header}> <Appbar.Header style={memeViewStyles.header}>
@@ -103,24 +100,17 @@ const MemeView = ({
<Appbar.Action <Appbar.Action
icon="share" icon="share"
onPress={() => { onPress={() => {
shareMeme(realm, storageUri, memes[index]).catch(() => { shareMeme(realm, storageUri, memes[index]).catch(() =>
setSnackbarMessage('Failed to share meme!'); setSnackbarMessage('Failed to share meme!'),
setSnackbarVisible(true); );
});
}} }}
/> />
<Appbar.Action <Appbar.Action
icon="content-copy" icon="content-copy"
onPress={async () => { onPress={async () => {
await copyMeme(realm, storageUri, memes[index]) await copyMeme(realm, storageUri, memes[index])
.then(() => { .then(() => setSnackbarMessage('Meme copied!'))
setSnackbarMessage('Meme copied!'); .catch(() => setSnackbarMessage('Failed to copy meme!'));
setSnackbarVisible(true);
})
.catch(() => {
setSnackbarMessage('Failed to copy meme!');
setSnackbarVisible(true);
});
}} }}
/> />
<Appbar.Action <Appbar.Action
@@ -132,25 +122,27 @@ const MemeView = ({
<Appbar.Action <Appbar.Action
icon="delete" icon="delete"
onPress={() => { onPress={() => {
void deleteMeme(realm, storageUri, memes[index]);
if (index === memes.length - 1) { if (index === memes.length - 1) {
setIndex(index - 1); setIndex(index - 1);
flashListRef.current?.scrollToIndex({ flashListRef.current?.scrollToIndex({
index: index - 1, index: index - 1,
}); });
} }
void deleteMeme(realm, storageUri, memes[index]);
if (memes.length === 1) navigation.goBack(); if (memes.length === 1) navigation.goBack();
}} }}
/> />
</Appbar> </Appbar>
<Portal> <Portal>
<Snackbar <Snackbar
visible={snackbarVisible} visible={!!snackbarMessage}
onDismiss={() => setSnackbarVisible(false)} // eslint-disable-next-line unicorn/no-useless-undefined
onDismiss={() => setSnackbarMessage(undefined)}
style={memeViewStyles.snackbar} style={memeViewStyles.snackbar}
action={{ action={{
label: 'Dismiss', label: 'Dismiss',
onPress: () => setSnackbarVisible(false), // eslint-disable-next-line unicorn/no-useless-undefined
onPress: () => setSnackbarMessage(undefined),
}}> }}>
{snackbarMessage} {snackbarMessage}
</Snackbar> </Snackbar>

View File

@@ -48,6 +48,9 @@ const Memes = () => {
const navVisisble = useSelector( const navVisisble = useSelector(
(state: RootState) => state.navigation.navVisible, (state: RootState) => state.navigation.navVisible,
); );
const autoFocus = useSelector(
(state: RootState) => state.settings.autoFocusMemesSearch,
);
const dispatch = useDispatch(); const dispatch = useDispatch();
const [flashListPadding, setFlashListPadding] = useState(0); const [flashListPadding, setFlashListPadding] = useState(0);
@@ -141,6 +144,7 @@ const Memes = () => {
<MemesHeader <MemesHeader
search={search} search={search}
setSearch={setSearch} setSearch={setSearch}
autoFocus={autoFocus}
onLayout={event => { onLayout={event => {
setFlashListPadding( setFlashListPadding(
event.nativeEvent.layout.height + event.nativeEvent.layout.height +

View File

@@ -5,7 +5,6 @@ import {
List, List,
Portal, Portal,
SegmentedButtons, SegmentedButtons,
Snackbar,
Switch, Switch,
Text, Text,
useTheme, useTheme,
@@ -14,9 +13,12 @@ import { useDispatch, useSelector } from 'react-redux';
import type {} from 'redux-thunk/extend-redux'; import type {} from 'redux-thunk/extend-redux';
import { import {
RootState, RootState,
setAutofocusMemesSearch,
setAutofocusTagsSearch,
setGridColumns, setGridColumns,
setMasonryColumns, setMasonryColumns,
setNoMedia, setNoMedia,
setSnackbarMessage,
} from '../state'; } from '../state';
import StorageLocationChangeDialog from '../components/storageLocationChangeDialog'; import StorageLocationChangeDialog from '../components/storageLocationChangeDialog';
import { useRealm } from '@realm/react'; import { useRealm } from '@realm/react';
@@ -27,9 +29,6 @@ const settingsStyles = StyleSheet.create({
scrollView: { scrollView: {
paddingHorizontal: '4%', paddingHorizontal: '4%',
}, },
snackbar: {
marginBottom: 90,
},
marginBottom: { marginBottom: {
marginBottom: 15, marginBottom: 15,
}, },
@@ -37,6 +36,12 @@ const settingsStyles = StyleSheet.create({
marginBottom: 15, marginBottom: 15,
paddingHorizontal: '2%', paddingHorizontal: '2%',
}, },
autoFocusSwitch: {
flexDirection: 'row',
justifyContent: 'space-between',
paddingHorizontal: '2%',
marginBottom: 15,
},
hideMediaSwitch: { hideMediaSwitch: {
flexDirection: 'row', flexDirection: 'row',
justifyContent: 'space-between', justifyContent: 'space-between',
@@ -47,6 +52,12 @@ const settingsStyles = StyleSheet.create({
const Settings = () => { const Settings = () => {
const { colors } = useTheme(); const { colors } = useTheme();
const noMedia = useSelector((state: RootState) => state.settings.noMedia); const noMedia = useSelector((state: RootState) => state.settings.noMedia);
const autoFocusMemesSearch = useSelector(
(state: RootState) => state.settings.autoFocusMemesSearch,
);
const autoFocusTagsSearch = useSelector(
(state: RootState) => state.settings.autoFocusTagsSearch,
);
const masonryColumns = useSelector( const masonryColumns = useSelector(
(state: RootState) => state.settings.masonryColumns, (state: RootState) => state.settings.masonryColumns,
); );
@@ -60,9 +71,6 @@ const Settings = () => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const realm = useRealm(); const realm = useRealm();
const [snackbarVisible, setSnackbarVisible] = useState(false);
const [snackbarMessage, setSnackbarMessage] = useState('');
const [ const [
storageLocationChangeDialogVisible, storageLocationChangeDialogVisible,
setStorageLocationChangeDialogVisible, setStorageLocationChangeDialogVisible,
@@ -83,8 +91,7 @@ const Settings = () => {
}); });
}); });
setSnackbarMessage('Meme metadata refreshed.'); dispatch(setSnackbarMessage('Meme metadata refreshed.'));
setSnackbarVisible(true);
}; };
return ( return (
@@ -96,6 +103,24 @@ const Settings = () => {
]}> ]}>
<List.Section> <List.Section>
<List.Subheader>Views</List.Subheader> <List.Subheader>Views</List.Subheader>
<View style={settingsStyles.autoFocusSwitch}>
<Text>Autofocus Memes Searchbar</Text>
<Switch
value={autoFocusMemesSearch}
onValueChange={value => {
void dispatch(setAutofocusMemesSearch(value));
}}
/>
</View>
<View style={settingsStyles.autoFocusSwitch}>
<Text>Autofocus Tags Searchbar</Text>
<Switch
value={autoFocusTagsSearch}
onValueChange={value => {
void dispatch(setAutofocusTagsSearch(value));
}}
/>
</View>
<Text style={settingsStyles.columnSegmentedButtons}> <Text style={settingsStyles.columnSegmentedButtons}>
Masonry Columns Masonry Columns
</Text> </Text>
@@ -158,24 +183,13 @@ const Settings = () => {
</List.Section> </List.Section>
</ScrollView> </ScrollView>
<Portal> <Portal>
<Portal> <StorageLocationChangeDialog
<StorageLocationChangeDialog visible={storageLocationChangeDialogVisible}
visible={storageLocationChangeDialogVisible} setVisible={setStorageLocationChangeDialogVisible}
setVisible={setStorageLocationChangeDialogVisible} setSnackbarMessage={message => {
setSnackbarVisible={setSnackbarVisible} dispatch(setSnackbarMessage(message));
setSnackbarMessage={setSnackbarMessage} }}
/> />
</Portal>
<Snackbar
visible={snackbarVisible}
onDismiss={() => setSnackbarVisible(false)}
style={settingsStyles.snackbar}
action={{
label: 'Dismiss',
onPress: () => setSnackbarVisible(false),
}}>
{snackbarMessage}
</Snackbar>
</Portal> </Portal>
</> </>
); );

View File

@@ -44,6 +44,9 @@ const Tags = () => {
const navVisisble = useSelector( const navVisisble = useSelector(
(state: RootState) => state.navigation.navVisible, (state: RootState) => state.navigation.navVisible,
); );
const autoFocus = useSelector(
(state: RootState) => state.settings.autoFocusTagsSearch,
);
const dispatch = useDispatch(); const dispatch = useDispatch();
const [flashListPadding, setFlashListPadding] = useState(0); const [flashListPadding, setFlashListPadding] = useState(0);
@@ -114,6 +117,7 @@ const Tags = () => {
<TagsHeader <TagsHeader
search={search} search={search}
setSearch={setSearch} setSearch={setSearch}
autoFocus={autoFocus}
onLayout={event => { onLayout={event => {
setFlashListPadding(event.nativeEvent.layout.height); setFlashListPadding(event.nativeEvent.layout.height);
}} }}

View File

@@ -54,6 +54,8 @@ export {
type SettingsState, type SettingsState,
setStorageUri, setStorageUri,
setNoMedia, setNoMedia,
setAutofocusMemesSearch,
setAutofocusTagsSearch,
setMasonryColumns, setMasonryColumns,
setGridColumns, setGridColumns,
validateSettings, validateSettings,
@@ -79,4 +81,5 @@ export {
type NavigationState, type NavigationState,
setNavVisible, setNavVisible,
toggleNavVisible, toggleNavVisible,
setSnackbarMessage,
} from './navigation'; } from './navigation';

View File

@@ -2,10 +2,12 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit';
interface NavigationState { interface NavigationState {
navVisible: boolean; navVisible: boolean;
snackbarMessage: string | undefined;
} }
const initialState: NavigationState = { const initialState: NavigationState = {
navVisible: true, navVisible: true,
snackbarMessage: undefined,
}; };
const navigationSlice = createSlice({ const navigationSlice = createSlice({
@@ -18,14 +20,19 @@ const navigationSlice = createSlice({
toggleNavVisible: state => { toggleNavVisible: state => {
state.navVisible = !state.navVisible; state.navVisible = !state.navVisible;
}, },
setSnackbarMessage: (state, action: PayloadAction<string | undefined>) => {
state.snackbarMessage = action.payload;
},
}, },
}); });
const { setNavVisible, toggleNavVisible } = navigationSlice.actions; const { setNavVisible, toggleNavVisible, setSnackbarMessage } =
navigationSlice.actions;
export { export {
type NavigationState, type NavigationState,
setNavVisible, setNavVisible,
toggleNavVisible, toggleNavVisible,
setSnackbarMessage,
}; };
export default navigationSlice.reducer; export default navigationSlice.reducer;

View File

@@ -11,6 +11,8 @@ import { RootState } from '.';
interface SettingsState { interface SettingsState {
storageUri: string | undefined; storageUri: string | undefined;
noMedia: boolean; noMedia: boolean;
autoFocusMemesSearch: boolean;
autoFocusTagsSearch: boolean;
masonryColumns: 1 | 2 | 3 | 4; masonryColumns: 1 | 2 | 3 | 4;
gridColumns: 1 | 2 | 3 | 4; gridColumns: 1 | 2 | 3 | 4;
} }
@@ -18,6 +20,8 @@ interface SettingsState {
const initialState: SettingsState = { const initialState: SettingsState = {
storageUri: undefined, storageUri: undefined,
noMedia: false, noMedia: false,
autoFocusMemesSearch: false,
autoFocusTagsSearch: false,
masonryColumns: 2, masonryColumns: 2,
gridColumns: 3, gridColumns: 3,
}; };
@@ -32,6 +36,12 @@ const settingsSlice = createSlice({
setNoMedia: (state, action: PayloadAction<boolean>) => { setNoMedia: (state, action: PayloadAction<boolean>) => {
state.noMedia = action.payload; state.noMedia = action.payload;
}, },
setAutofocusMemesSearch: (state, action: PayloadAction<boolean>) => {
state.autoFocusMemesSearch = action.payload;
},
setAutofocusTagsSearch: (state, action: PayloadAction<boolean>) => {
state.autoFocusTagsSearch = action.payload;
},
setMasonryColumns: (state, action: PayloadAction<1 | 2 | 3 | 4>) => { setMasonryColumns: (state, action: PayloadAction<1 | 2 | 3 | 4>) => {
state.masonryColumns = action.payload; state.masonryColumns = action.payload;
}, },
@@ -41,8 +51,14 @@ const settingsSlice = createSlice({
}, },
}); });
const { setStorageUri, setNoMedia, setMasonryColumns, setGridColumns } = const {
settingsSlice.actions; setStorageUri,
setNoMedia,
setAutofocusMemesSearch,
setAutofocusTagsSearch,
setMasonryColumns,
setGridColumns,
} = settingsSlice.actions;
const updateStorageUri = createAsyncThunk( const updateStorageUri = createAsyncThunk(
'settings/updateStorageUri', 'settings/updateStorageUri',
@@ -122,6 +138,8 @@ export {
type SettingsState, type SettingsState,
updateStorageUri as setStorageUri, updateStorageUri as setStorageUri,
updateNoMedia as setNoMedia, updateNoMedia as setNoMedia,
setAutofocusMemesSearch,
setAutofocusTagsSearch,
setMasonryColumns, setMasonryColumns,
setGridColumns, setGridColumns,
validateSettings, validateSettings,

View File

@@ -1,5 +1,11 @@
export { type Dimensions } from './dimensions'; export { type Dimensions } from './dimensions';
export { ROUTE, type RootStackParamList } from './route'; export {
ROUTE,
type RootStackParamList,
documentPickerResponseToAddMemeFile,
sharedItemToAddMemeFile,
} from './route';
export { type SharedItem } from './share';
export { export {
MEME_SORT, MEME_SORT,
memesSortQuery, memesSortQuery,

View File

@@ -1,4 +1,6 @@
import { DocumentPickerResponse } from 'react-native-document-picker'; import { DocumentPickerResponse } from 'react-native-document-picker';
import { getFilenameFromUri, guessMimeType } from '../utilities';
import { SharedItem } from './share';
enum ROUTE { enum ROUTE {
MAIN = 'Main', MAIN = 'Main',
@@ -17,8 +19,48 @@ interface MemeViewRouteParams {
index: number; index: number;
} }
interface AddMemeFile {
uri: string;
filename: string;
type?: string;
}
const documentPickerResponseToAddMemeFile = (
response: DocumentPickerResponse[],
): AddMemeFile[] => {
return response.map(item => {
const { uri, name, type } = item;
return {
uri,
filename: name ?? getFilenameFromUri(uri),
type: type ?? guessMimeType(uri),
};
});
};
const sharedItemToAddMemeFile = (item: SharedItem): AddMemeFile[] => {
const { data, mimeType } = item;
if (typeof data === 'string') {
return [
{
uri: data,
filename: getFilenameFromUri(data),
type: mimeType,
},
];
}
return data.map(uri => ({
uri,
filename: getFilenameFromUri(uri),
type: guessMimeType(uri),
}));
};
interface AddMemeRouteParams { interface AddMemeRouteParams {
files: DocumentPickerResponse[]; files: AddMemeFile[];
} }
interface EditMemeRouteParams { interface EditMemeRouteParams {
@@ -44,4 +86,9 @@ interface RootStackParamList {
[ROUTE.EDIT_TAG]: EditTagRouteParams; [ROUTE.EDIT_TAG]: EditTagRouteParams;
} }
export { ROUTE, type RootStackParamList }; export {
ROUTE,
type RootStackParamList,
documentPickerResponseToAddMemeFile,
sharedItemToAddMemeFile,
};

7
src/types/share.ts Normal file
View File

@@ -0,0 +1,7 @@
interface SharedItem {
data: string | string[];
mimeType: string;
extraData?: object;
}
export { type SharedItem };

View File

@@ -0,0 +1,11 @@
import Clipboard from '@react-native-clipboard/clipboard';
const clipboardHasContent = () => {
return Promise.all([Clipboard.hasString(), Clipboard.hasURI()]).then(
([hasString, hasURI]) => {
return hasString || hasURI;
},
);
};
export { clipboardHasContent };

View File

@@ -2,6 +2,7 @@ import { MEME_TYPE } from '../database';
const allowedImageMimeTypes = [ const allowedImageMimeTypes = [
'image/bmp', 'image/bmp',
'image/jpg',
'image/jpeg', 'image/jpeg',
'image/png', 'image/png',
'image/webp', 'image/webp',
@@ -14,6 +15,7 @@ const allowedMimeTypes = [...allowedImageMimeTypes, ...allowedGifMimeTypes];
const getMemeType = (mimeType: string): MEME_TYPE | undefined => { const getMemeType = (mimeType: string): MEME_TYPE | undefined => {
switch (mimeType) { switch (mimeType) {
case 'image/bmp': case 'image/bmp':
case 'image/jpg':
case 'image/jpeg': case 'image/jpeg':
case 'image/png': case 'image/png':
case 'image/webp': { case 'image/webp': {
@@ -25,9 +27,32 @@ const getMemeType = (mimeType: string): MEME_TYPE | undefined => {
} }
}; };
const guessMimeType = (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';
}
}
};
export { export {
allowedImageMimeTypes, allowedImageMimeTypes,
allowedGifMimeTypes, allowedGifMimeTypes,
allowedMimeTypes, allowedMimeTypes,
getMemeType, getMemeType,
guessMimeType,
}; };

View File

@@ -1,3 +1,4 @@
export { clipboardHasContent } from './clipboard';
export { export {
getContrastColor, getContrastColor,
isHexColor, isHexColor,
@@ -14,6 +15,7 @@ export {
allowedGifMimeTypes, allowedGifMimeTypes,
allowedMimeTypes, allowedMimeTypes,
getMemeType, getMemeType,
guessMimeType,
} from './filesystem'; } from './filesystem';
export { getSortIcon, getViewIcon } from './icon'; export { getSortIcon, getViewIcon } from './icon';
export { export {
@@ -26,6 +28,7 @@ export {
export { export {
isPermissionForPath, isPermissionForPath,
clearPermissions, clearPermissions,
getFilenameFromUri,
} from './permissions'; } from './permissions';
export { deleteTag } from './tag'; export { deleteTag } from './tag';
export { export {

View File

@@ -1,3 +1,4 @@
import { Util } from 'react-native-file-access';
import { import {
getPersistedUriPermissions, getPersistedUriPermissions,
releasePersistableUriPermission, releasePersistableUriPermission,
@@ -16,4 +17,8 @@ const clearPermissions = async (excepts: string[] = []) => {
}); });
}; };
export { isPermissionForPath, clearPermissions }; const getFilenameFromUri = (uri: string) => {
return Util.basename(uri.replaceAll('%2F', '/'));
};
export { isPermissionForPath, clearPermissions, getFilenameFromUri };