Add new icons, and move the old ones into the new place

diff --git a/assets/images/adaptive-icon.png b/assets/images/adaptive-icon.png
new file mode 100644 (file)
index 0000000..1bda276
Binary files /dev/null and b/assets/images/adaptive-icon.png differ

diff --git a/res/android/mdpi.png b/assets/images/favicon.png
similarity index 100%
rename from res/android/mdpi.png
rename to assets/images/favicon.png

diff --git a/res/android/hdpi.png b/assets/images/hdpi.png
similarity index 100%
rename from res/android/hdpi.png
rename to assets/images/hdpi.png

diff --git a/assets/images/icon.png b/assets/images/icon.png
new file mode 100644 (file)
index 0000000..92f6c1d
Binary files /dev/null and b/assets/images/icon.png differ

diff --git a/res/android/ldpi.png b/assets/images/ldpi.png
similarity index 100%
rename from res/android/ldpi.png
rename to assets/images/ldpi.png

diff --git a/assets/images/mdpi.png b/assets/images/mdpi.png
new file mode 100644 (file)
index 0000000..92f6c1d
Binary files /dev/null and b/assets/images/mdpi.png differ

diff --git a/assets/images/padaptive-icon.png b/assets/images/padaptive-icon.png
new file mode 100644 (file)
index 0000000..a3309a7
Binary files /dev/null and b/assets/images/padaptive-icon.png differ

diff --git a/assets/images/pfavicon.png b/assets/images/pfavicon.png
new file mode 100644 (file)
index 0000000..1d63d9c
Binary files /dev/null and b/assets/images/pfavicon.png differ

diff --git a/assets/images/phdpi.png b/assets/images/phdpi.png
new file mode 100644 (file)
index 0000000..f0c8c9c
Binary files /dev/null and b/assets/images/phdpi.png differ

diff --git a/assets/images/picon.png b/assets/images/picon.png
new file mode 100644 (file)
index 0000000..1d63d9c
Binary files /dev/null and b/assets/images/picon.png differ

diff --git a/assets/images/pldpi.png b/assets/images/pldpi.png
new file mode 100644 (file)
index 0000000..16c8819
Binary files /dev/null and b/assets/images/pldpi.png differ

diff --git a/assets/images/pmdpi.png b/assets/images/pmdpi.png
new file mode 100644 (file)
index 0000000..1d63d9c
Binary files /dev/null and b/assets/images/pmdpi.png differ

diff --git a/assets/images/psplash.png b/assets/images/psplash.png
new file mode 100644 (file)
index 0000000..1960c0a
Binary files /dev/null and b/assets/images/psplash.png differ

diff --git a/assets/images/pxhdpi.png b/assets/images/pxhdpi.png
new file mode 100644 (file)
index 0000000..3ee9378
Binary files /dev/null and b/assets/images/pxhdpi.png differ

diff --git a/assets/images/pxxhdpi.png b/assets/images/pxxhdpi.png
new file mode 100644 (file)
index 0000000..aeaa2a9
Binary files /dev/null and b/assets/images/pxxhdpi.png differ

diff --git a/assets/images/pxxxhdpi.png b/assets/images/pxxxhdpi.png
new file mode 100644 (file)
index 0000000..944f394
Binary files /dev/null and b/assets/images/pxxxhdpi.png differ

diff --git a/assets/images/splash.png b/assets/images/splash.png
new file mode 100644 (file)
index 0000000..4de8463
Binary files /dev/null and b/assets/images/splash.png differ

diff --git a/res/android/xhdpi.png b/assets/images/xhdpi.png
similarity index 100%
rename from res/android/xhdpi.png
rename to assets/images/xhdpi.png

diff --git a/res/android/xxhdpi.png b/assets/images/xxhdpi.png
similarity index 100%
rename from res/android/xxhdpi.png
rename to assets/images/xxhdpi.png

diff --git a/res/android/xxxhdpi.png b/assets/images/xxxhdpi.png
similarity index 100%
rename from res/android/xxxhdpi.png
rename to assets/images/xxxhdpi.png

diff --git a/package.json b/package.json
index a5a463cb267ad2a85060ac896fd17f80a31c8550..2030521f83fb48696d3fd6d19e951540db5b2267 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,51 +1,47 @@
 {
-  "name": "com.cordova.react",
+  "name": "org.marnanel.dwim",
   "displayName": "dwim",
-  "version": "1.0.0",
+  "version": "0.1.5",
   "description": "Dreamwidth client",
-  "main": "index.js",
+  "main": "node_modules/expo/AppEntry.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "start": "expo start",
+    "android": "expo start --android",
+    "ios": "expo start --ios",
+    "web": "expo start --web",
+    "eject": "expo eject",
+    "test": "jest --watchAll"
   },
-  "keywords": [
-    "ecosystem:cordova"
-  ],
-  "author": "Marnanel",
+  "author": "Marnanel Thurman",
   "license": "gpl-2.0",
-  "devDependencies": {
-    "@babel/core": "^7.16.0",
-    "@babel/preset-env": "^7.16.4",
-    "@babel/preset-react": "^7.16.0",
-    "babel-loader": "^8.2.3",
-    "cordova-android": "^9.1.0",
-    "cordova-browser": "^6.0.0",
-    "cordova-plugin-advanced-http": "^3.2.2",
-    "cordova-plugin-file": "^6.0.2",
-    "cordova-plugin-whitelist": "^1.3.4",
-    "webpack": "^5.64.4",
-    "webpack-cli": "^4.9.1",
-    "webpack-dev-server": "^4.6.0"
-  },
-  "cordova": {
-    "plugins": {
-      "cordova-plugin-whitelist": {},
-      "cordova-plugin-advanced-http": {
-        "ANDROIDBLACKLISTSECURESOCKETPROTOCOLS": "SSLv3,TLSv1"
-      }
-    },
-    "platforms": [
-      "browser",
-      "android"
-    ]
+  "jest": {
+    "preset": "jest-expo"
   },
   "dependencies": {
-    "cordova-jquery": "^0.1.6",
-    "process": "^0.11.10",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "tough-cookie": "^4.0.0",
-    "util": "^0.12.4",
-    "yargs": "^17.2.1",
-    "yargs-unparser": "^2.0.0"
+    "@expo/vector-icons": "^12.0.0",
+    "@react-navigation/bottom-tabs": "^6.0.5",
+    "@react-navigation/native": "^6.0.2",
+    "@react-navigation/native-stack": "^6.1.0",
+    "expo": "~43.0.2",
+    "expo-asset": "~8.4.3",
+    "expo-constants": "~12.1.3",
+    "expo-font": "~10.0.3",
+    "expo-linking": "~2.4.2",
+    "expo-splash-screen": "~0.13.5",
+    "expo-status-bar": "~1.1.0",
+    "expo-web-browser": "~10.0.3",
+    "react": "17.0.1",
+    "react-dom": "17.0.1",
+    "react-native": "0.64.3",
+    "react-native-safe-area-context": "3.3.2",
+    "react-native-screens": "~3.8.0",
+    "react-native-web": "0.17.1"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.12.9",
+    "@types/react": "~17.0.21",
+    "@types/react-native": "~0.64.12",
+    "jest-expo": "~43.0.0",
+    "typescript": "~4.3.5"
   }
 }