diff --git a/AnimeGo/android/app/build.gradle b/AnimeGo/android/app/build.gradle index c984eb5..81012eb 100644 --- a/AnimeGo/android/app/build.gradle +++ b/AnimeGo/android/app/build.gradle @@ -101,8 +101,8 @@ android { applicationId "com.yihengquan.gogoanime" minSdkVersion 16 targetSdkVersion 25 - versionCode 10 - versionName "1.0.778" + versionCode 11 + versionName "1.0.8" ndk { abiFilters "armeabi-v7a", "x86" } diff --git a/AnimeGo/android/app/src/main/assets/index.android.bundle.meta b/AnimeGo/android/app/src/main/assets/index.android.bundle.meta index af15f3e..3a9a1f9 100644 Binary files a/AnimeGo/android/app/src/main/assets/index.android.bundle.meta and b/AnimeGo/android/app/src/main/assets/index.android.bundle.meta differ diff --git a/AnimeGo/package-lock.json b/AnimeGo/package-lock.json index 8a4c01b..3c0bf4e 100644 --- a/AnimeGo/package-lock.json +++ b/AnimeGo/package-lock.json @@ -1,6 +1,6 @@ { "name": "AnimeGo", - "version": "1.0.778", + "version": "1.0.8", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -3066,6 +3066,795 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, + "fsevents": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz", + "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==", + "optional": true, + "requires": { + "nan": "2.10.0", + "node-pre-gyp": "0.6.39" + }, + "dependencies": { + "abbrev": { + "version": "1.1.0", + "bundled": true, + "optional": true + }, + "ajv": { + "version": "4.11.8", + "bundled": true, + "optional": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true + }, + "aproba": { + "version": "1.1.1", + "bundled": true, + "optional": true + }, + "are-we-there-yet": { + "version": "1.1.4", + "bundled": true, + "optional": true, + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.2.9" + } + }, + "asn1": { + "version": "0.2.3", + "bundled": true, + "optional": true + }, + "assert-plus": { + "version": "0.2.0", + "bundled": true, + "optional": true + }, + "asynckit": { + "version": "0.4.0", + "bundled": true, + "optional": true + }, + "aws-sign2": { + "version": "0.6.0", + "bundled": true, + "optional": true + }, + "aws4": { + "version": "1.6.0", + "bundled": true, + "optional": true + }, + "balanced-match": { + "version": "0.4.2", + "bundled": true + }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "bundled": true, + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } + }, + "block-stream": { + "version": "0.0.9", + "bundled": true, + "requires": { + "inherits": "2.0.3" + } + }, + "boom": { + "version": "2.10.1", + "bundled": true, + "requires": { + "hoek": "2.16.3" + } + }, + "brace-expansion": { + "version": "1.1.7", + "bundled": true, + "requires": { + "balanced-match": "0.4.2", + "concat-map": "0.0.1" + } + }, + "buffer-shims": { + "version": "1.0.0", + "bundled": true + }, + "caseless": { + "version": "0.12.0", + "bundled": true, + "optional": true + }, + "co": { + "version": "4.6.0", + "bundled": true, + "optional": true + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true + }, + "combined-stream": { + "version": "1.0.5", + "bundled": true, + "requires": { + "delayed-stream": "1.0.0" + } + }, + "concat-map": { + "version": "0.0.1", + "bundled": true + }, + "console-control-strings": { + "version": "1.1.0", + "bundled": true + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true + }, + "cryptiles": { + "version": "2.0.5", + "bundled": true, + "requires": { + "boom": "2.10.1" + } + }, + "dashdash": { + "version": "1.14.1", + "bundled": true, + "optional": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true, + "optional": true + } + } + }, + "debug": { + "version": "2.6.8", + "bundled": true, + "optional": true, + "requires": { + "ms": "2.0.0" + } + }, + "deep-extend": { + "version": "0.4.2", + "bundled": true, + "optional": true + }, + "delayed-stream": { + "version": "1.0.0", + "bundled": true + }, + "delegates": { + "version": "1.0.0", + "bundled": true, + "optional": true + }, + "detect-libc": { + "version": "1.0.2", + "bundled": true, + "optional": true + }, + "ecc-jsbn": { + "version": "0.1.1", + "bundled": true, + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "extend": { + "version": "3.0.1", + "bundled": true, + "optional": true + }, + "extsprintf": { + "version": "1.0.2", + "bundled": true + }, + "forever-agent": { + "version": "0.6.1", + "bundled": true, + "optional": true + }, + "form-data": { + "version": "2.1.4", + "bundled": true, + "optional": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.15" + } + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true + }, + "fstream": { + "version": "1.0.11", + "bundled": true, + "requires": { + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.1" + } + }, + "fstream-ignore": { + "version": "1.0.5", + "bundled": true, + "optional": true, + "requires": { + "fstream": "1.0.11", + "inherits": "2.0.3", + "minimatch": "3.0.4" + } + }, + "gauge": { + "version": "2.7.4", + "bundled": true, + "optional": true, + "requires": { + "aproba": "1.1.1", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + } + }, + "getpass": { + "version": "0.1.7", + "bundled": true, + "optional": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true, + "optional": true + } + } + }, + "glob": { + "version": "7.1.2", + "bundled": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "graceful-fs": { + "version": "4.1.11", + "bundled": true + }, + "har-schema": { + "version": "1.0.5", + "bundled": true, + "optional": true + }, + "har-validator": { + "version": "4.2.1", + "bundled": true, + "optional": true, + "requires": { + "ajv": "4.11.8", + "har-schema": "1.0.5" + } + }, + "has-unicode": { + "version": "2.0.1", + "bundled": true, + "optional": true + }, + "hawk": { + "version": "3.1.3", + "bundled": true, + "requires": { + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" + } + }, + "hoek": { + "version": "2.16.3", + "bundled": true + }, + "http-signature": { + "version": "1.1.1", + "bundled": true, + "optional": true, + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.0", + "sshpk": "1.13.0" + } + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true + }, + "ini": { + "version": "1.3.4", + "bundled": true, + "optional": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-typedarray": { + "version": "1.0.0", + "bundled": true, + "optional": true + }, + "isarray": { + "version": "1.0.0", + "bundled": true + }, + "isstream": { + "version": "0.1.2", + "bundled": true, + "optional": true + }, + "jodid25519": { + "version": "1.0.2", + "bundled": true, + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "jsbn": { + "version": "0.1.1", + "bundled": true, + "optional": true + }, + "json-schema": { + "version": "0.2.3", + "bundled": true, + "optional": true + }, + "json-stable-stringify": { + "version": "1.0.1", + "bundled": true, + "optional": true, + "requires": { + "jsonify": "0.0.0" + } + }, + "json-stringify-safe": { + "version": "5.0.1", + "bundled": true, + "optional": true + }, + "jsonify": { + "version": "0.0.0", + "bundled": true, + "optional": true + }, + "jsprim": { + "version": "1.4.0", + "bundled": true, + "optional": true, + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.0.2", + "json-schema": "0.2.3", + "verror": "1.3.6" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true, + "optional": true + } + } + }, + "mime-db": { + "version": "1.27.0", + "bundled": true + }, + "mime-types": { + "version": "2.1.15", + "bundled": true, + "requires": { + "mime-db": "1.27.0" + } + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "requires": { + "brace-expansion": "1.1.7" + } + }, + "minimist": { + "version": "0.0.8", + "bundled": true + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.0.0", + "bundled": true, + "optional": true + }, + "node-pre-gyp": { + "version": "0.6.39", + "bundled": true, + "optional": true, + "requires": { + "detect-libc": "1.0.2", + "hawk": "3.1.3", + "mkdirp": "0.5.1", + "nopt": "4.0.1", + "npmlog": "4.1.0", + "rc": "1.2.1", + "request": "2.81.0", + "rimraf": "2.6.1", + "semver": "5.3.0", + "tar": "2.2.1", + "tar-pack": "3.4.0" + } + }, + "nopt": { + "version": "4.0.1", + "bundled": true, + "optional": true, + "requires": { + "abbrev": "1.1.0", + "osenv": "0.1.4" + } + }, + "npmlog": { + "version": "4.1.0", + "bundled": true, + "optional": true, + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true + }, + "oauth-sign": { + "version": "0.8.2", + "bundled": true, + "optional": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true, + "optional": true + }, + "once": { + "version": "1.4.0", + "bundled": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true, + "optional": true + }, + "os-tmpdir": { + "version": "1.0.2", + "bundled": true, + "optional": true + }, + "osenv": { + "version": "0.1.4", + "bundled": true, + "optional": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true + }, + "performance-now": { + "version": "0.2.0", + "bundled": true, + "optional": true + }, + "process-nextick-args": { + "version": "1.0.7", + "bundled": true + }, + "punycode": { + "version": "1.4.1", + "bundled": true, + "optional": true + }, + "qs": { + "version": "6.4.0", + "bundled": true, + "optional": true + }, + "rc": { + "version": "1.2.1", + "bundled": true, + "optional": true, + "requires": { + "deep-extend": "0.4.2", + "ini": "1.3.4", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "bundled": true, + "optional": true + } + } + }, + "readable-stream": { + "version": "2.2.9", + "bundled": true, + "requires": { + "buffer-shims": "1.0.0", + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "string_decoder": "1.0.1", + "util-deprecate": "1.0.2" + } + }, + "request": { + "version": "2.81.0", + "bundled": true, + "optional": true, + "requires": { + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "4.2.1", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.15", + "oauth-sign": "0.8.2", + "performance-now": "0.2.0", + "qs": "6.4.0", + "safe-buffer": "5.0.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.2", + "tunnel-agent": "0.6.0", + "uuid": "3.0.1" + } + }, + "rimraf": { + "version": "2.6.1", + "bundled": true, + "requires": { + "glob": "7.1.2" + } + }, + "safe-buffer": { + "version": "5.0.1", + "bundled": true + }, + "semver": { + "version": "5.3.0", + "bundled": true, + "optional": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "optional": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true, + "optional": true + }, + "sntp": { + "version": "1.0.9", + "bundled": true, + "requires": { + "hoek": "2.16.3" + } + }, + "sshpk": { + "version": "1.13.0", + "bundled": true, + "optional": true, + "requires": { + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jodid25519": "1.0.2", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true, + "optional": true + } + } + }, + "string-width": { + "version": "1.0.2", + "bundled": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "string_decoder": { + "version": "1.0.1", + "bundled": true, + "requires": { + "safe-buffer": "5.0.1" + } + }, + "stringstream": { + "version": "0.0.5", + "bundled": true, + "optional": true + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "bundled": true, + "optional": true + }, + "tar": { + "version": "2.2.1", + "bundled": true, + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + } + }, + "tar-pack": { + "version": "3.4.0", + "bundled": true, + "optional": true, + "requires": { + "debug": "2.6.8", + "fstream": "1.0.11", + "fstream-ignore": "1.0.5", + "once": "1.4.0", + "readable-stream": "2.2.9", + "rimraf": "2.6.1", + "tar": "2.2.1", + "uid-number": "0.0.6" + } + }, + "tough-cookie": { + "version": "2.3.2", + "bundled": true, + "optional": true, + "requires": { + "punycode": "1.4.1" + } + }, + "tunnel-agent": { + "version": "0.6.0", + "bundled": true, + "optional": true, + "requires": { + "safe-buffer": "5.0.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "bundled": true, + "optional": true + }, + "uid-number": { + "version": "0.0.6", + "bundled": true, + "optional": true + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true + }, + "uuid": { + "version": "3.0.1", + "bundled": true, + "optional": true + }, + "verror": { + "version": "1.3.6", + "bundled": true, + "optional": true, + "requires": { + "extsprintf": "1.0.2" + } + }, + "wide-align": { + "version": "1.1.2", + "bundled": true, + "optional": true, + "requires": { + "string-width": "1.0.2" + } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true + } + } + }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -6381,6 +7170,12 @@ "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=" }, + "nan": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", + "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==", + "optional": true + }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -7235,6 +8030,14 @@ "react-navigation": "1.0.0-beta.22" } }, + "react-native-super-grid": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/react-native-super-grid/-/react-native-super-grid-2.1.0.tgz", + "integrity": "sha512-BdaqXNASPH0gpvcfVw9iFfbAGeGc4NEX05GuHHXDp0tVKJeQs6XeLNQeKpze8JmQ9ow8+7XHebzHGOj8WHMT5Q==", + "requires": { + "prop-types": "15.6.0" + } + }, "react-native-vector-icons": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/react-native-vector-icons/-/react-native-vector-icons-4.5.0.tgz", @@ -7788,6 +8591,7 @@ "anymatch": "1.3.2", "exec-sh": "0.2.1", "fb-watchman": "2.0.0", + "fsevents": "1.1.3", "minimatch": "3.0.4", "minimist": "1.2.0", "walker": "1.0.7", diff --git a/AnimeGo/package.json b/AnimeGo/package.json index 55d2c09..285899e 100644 --- a/AnimeGo/package.json +++ b/AnimeGo/package.json @@ -1,6 +1,6 @@ { "name": "AnimeGo", - "version": "1.0.778", + "version": "1.0.8", "private": true, "scripts": { "start": "node node_modules/react-native/local-cli/cli.js start", @@ -13,6 +13,7 @@ "react-native-action-button": "^2.8.4", "react-native-elements": "^0.19.0", "react-native-router-flux": "^4.0.0-beta.28", + "react-native-super-grid": "^2.1.0", "react-native-vector-icons": "^4.5.0", "react-native-windows": "^0.53.0-rc.1" }, diff --git a/AnimeGo/src/component/cell/AnimeCell.js b/AnimeGo/src/component/cell/AnimeCell.js index 828c772..b51d2bb 100644 --- a/AnimeGo/src/component/cell/AnimeCell.js +++ b/AnimeGo/src/component/cell/AnimeCell.js @@ -8,10 +8,9 @@ import { Actions } from 'react-native-router-flux'; class AnimeCell extends PureComponent { constructor(props) { super(); - const { data, width } = props; + const { data } = props; this.data = data; this.title = data.info.replace('Released: ', ''); - this.width = width; } render() { @@ -33,7 +32,7 @@ class AnimeCell extends PureComponent { if (global.dataSaver) return null; else { return ( - + ) } } diff --git a/AnimeGo/src/component/cell/AnimeCellStyles.js b/AnimeGo/src/component/cell/AnimeCellStyles.js index 2815775..02d9b4e 100644 --- a/AnimeGo/src/component/cell/AnimeCellStyles.js +++ b/AnimeGo/src/component/cell/AnimeCellStyles.js @@ -3,15 +3,15 @@ import { BlueColour } from '../../value'; export const styles = StyleSheet.create({ viewStyle: { - borderRadius: 4, flex: 1, - margin: 4, padding: 2, - elevation: 1, + flex: 1, height: 220, + margin: 4, padding: 4, alignItems: 'center', - justifyContent: 'center', + justifyContent: 'flex-start', }, titleStyle: { textAlign: 'center', fontWeight: 'bold', + fontSize: 11, color: 'black' }, episodeStyle: { @@ -20,7 +20,7 @@ export const styles = StyleSheet.create({ color: 'white', backgroundColor: BlueColour, padding: 2, margin: 2, fontSize: 12, - height: 24, width: '50%', + height: 24, width: '70%', borderRadius: 12, elevation: 1 } }) \ No newline at end of file diff --git a/AnimeGo/src/component/list/AnimeList.js b/AnimeGo/src/component/list/AnimeList.js index 02e6ae8..fb4b9aa 100644 --- a/AnimeGo/src/component/list/AnimeList.js +++ b/AnimeGo/src/component/list/AnimeList.js @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; -import { ActivityIndicator, Text, FlatList, Platform, View, Dimensions } from 'react-native'; -import { isPortrait, deviceHeight, deviceWidth } from '../../helper/DeviceDimensions'; +import { ActivityIndicator, Text, Platform, View, Dimensions } from 'react-native'; +import GridView from 'react-native-super-grid'; import AnimeLoader from '../../helper/core/AnimeLoader'; import AnimeCell from '../cell/AnimeCell'; import { LoadingIndicator, FabButton } from '../../component'; @@ -8,38 +8,28 @@ import { LoadingIndicator, FabButton } from '../../component'; class AnimeList extends PureComponent { constructor(props) { super(props); - this.currWidth = deviceWidth; this.state = { data: [], page: 1, hasMorePage: true, isRefreshing: false, url: props.AnimeUrl, - width: isPortrait() ? deviceWidth / 2 - 16 : deviceWidth / 4 - 16, - column: 0 }; } componentWillMount() { // Loading anime this.loadAnime(); - this.updateColumn(); - console.log(isPortrait(), deviceHeight, deviceWidth); - } - - animeKey = (item, index) => { - return item.link; } render() { - const { data, isRefreshing, column, width } = this.state; + const { data, isRefreshing } = this.state; if (data.length == 0) return else { return ( - - } - key={(isPortrait() ? 'p' + width : 'l' + width)} numColumns={column} refreshing={isRefreshing} - ListFooterComponent={this.renderFooterComponent} automaticallyAdjustContentInsets={false} + + } + refreshing={isRefreshing} ListFooterComponent={this.renderFooterComponent} automaticallyAdjustContentInsets={false} onRefresh={this.refreshAnime} onEndReached={this.loadAnime} onEndReachedThreshold={0.5} showsVerticalScrollIndicator={false} /> { this.renderFabButton() } @@ -53,18 +43,6 @@ class AnimeList extends PureComponent { else return null; } - updateColumn = () => { - const { width } = Dimensions.get('window'); - let cellWidth = isPortrait() ? width / 2 - 16 : width / 4 - 16; - console.log(cellWidth); - if (Platform.OS == 'windows') { - if (this.state.column == 0) this.setState({column: isPortrait() ? 2 : 4}) - if (Math.abs(this.currWidth - width) < 80) return; - this.currWidth = width; - this.setState({column: isPortrait() ? 2 : 4, width: cellWidth}) - } else this.setState({column: isPortrait() ? 2 : 4, width: cellWidth}); - } - refreshAnime = () => { this.setState({ data: [], diff --git a/AnimeGo/src/global.js b/AnimeGo/src/global.js index ef5a83b..1b506e7 100644 --- a/AnimeGo/src/global.js +++ b/AnimeGo/src/global.js @@ -2,3 +2,5 @@ global.dataSaver = false; global.hideDub = false; global.currSubCategory = ''; global.favList = []; + +global.domain = "https://www1.gogoanime.se"; \ No newline at end of file diff --git a/AnimeGo/src/helper/core/AnimeDetailLoader.js b/AnimeGo/src/helper/core/AnimeDetailLoader.js index f05ce3e..c58f36d 100755 --- a/AnimeGo/src/helper/core/AnimeDetailLoader.js +++ b/AnimeGo/src/helper/core/AnimeDetailLoader.js @@ -26,7 +26,7 @@ export default class AnimeDetailLoader { var animeName = info[3].rawText; var animeImage = info[1].attributes.src; var animeType = info[7].childNodes[2].attributes.title; - var animeTypeLink = MajorLink.MainURL + info[7].childNodes[2].attributes.href; + var animeTypeLink = global.domain + info[7].childNodes[2].attributes.href; var plot = 'No Information'; var animePlot = info[9].childNodes[1]; if (animePlot != null) plot = animePlot.rawText; diff --git a/AnimeGo/src/helper/core/AnimeLoader.js b/AnimeGo/src/helper/core/AnimeLoader.js index b937be6..1154722 100755 --- a/AnimeGo/src/helper/core/AnimeLoader.js +++ b/AnimeGo/src/helper/core/AnimeLoader.js @@ -21,7 +21,7 @@ export default class AnimeLoader { var items = root.childNodes; // For search when no reult has been found if (items["0"].rawText.includes('Sorry')) { - success([{name: this.url.replace(MajorLink.Search, '').replace('&page=', ''), info: 'Google', link: 'Error'}, 1]); + success([{name: this.url.replace(global.domain + MajorLink.Search, '').replace('&page=', ''), info: 'Google', link: 'Error'}, 1]); } var animeData = []; @@ -37,13 +37,13 @@ export default class AnimeLoader { if (anime.isWhitespace) continue; // console.log(anime); var animeImage = anime.querySelector('.img'); - var animeLink = MajorLink.MainURL + animeImage.childNodes[1].attributes.href; + var animeLink = global.domain + animeImage.childNodes[1].attributes.href; var animeName = anime.querySelector('.name').text; // To keep original entry numbers entryCount++; if (global.hideDub && animeName.includes('(Dub)')) continue; // Only for NewRelease, it is displaying episode. - var extraInformation = this.url == MajorLink.NewRelease ? anime.querySelector('.episode').text : anime.querySelector('.released').removeWhitespace().text; + var extraInformation = this.url == global.domain + MajorLink.NewRelease ? anime.querySelector('.episode').text : anime.querySelector('.released').removeWhitespace().text; if (extraInformation == '') extraInformation = '??'; var animeThumbnail = animeImage.childNodes[1].childNodes[1].attributes.src; animeData.push({name: animeName, info: extraInformation, link: animeLink, thumbnail: animeThumbnail}); diff --git a/AnimeGo/src/helper/core/AnimeSourceLoader.js b/AnimeGo/src/helper/core/AnimeSourceLoader.js index 2780182..e5ec42b 100755 --- a/AnimeGo/src/helper/core/AnimeSourceLoader.js +++ b/AnimeGo/src/helper/core/AnimeSourceLoader.js @@ -36,7 +36,7 @@ export default class AnimeSourceLoader { var animeInfo = root.querySelector('.anime-info'); if (animeInfo != null) { // Getting info link - animeInfoLink = MajorLink.MainURL + animeInfo.childNodes[3].attributes.href; + animeInfoLink = global.domain + animeInfo.childNodes[3].attributes.href; animeName = animeInfo.childNodes[3].attributes.title; // console.log(animeInfoLink, animeName); } @@ -63,8 +63,8 @@ export default class AnimeSourceLoader { if (nextPrev != null) { prev = nextPrev.childNodes[0].childNodes[1]; next = nextPrev.childNodes[2].childNodes[1]; - if (prev != null) prev = MajorLink.MainURL + prev.attributes.href; - if (next != null) next = MajorLink.MainURL + next.attributes.href; + if (prev != null) prev = global.domain + prev.attributes.href; + if (next != null) next = global.domain + next.attributes.href; } success([animeData, prev, next]); diff --git a/AnimeGo/src/helper/core/EpisodeLoader.js b/AnimeGo/src/helper/core/EpisodeLoader.js index 96f2867..261e630 100755 --- a/AnimeGo/src/helper/core/EpisodeLoader.js +++ b/AnimeGo/src/helper/core/EpisodeLoader.js @@ -13,7 +13,7 @@ export default class EpisodeLoader { loadEpisode() { return new Promise((success, failure) => { // Loading data here - var url = MajorLink.Episode + this.start + '&ep_end=' + this.end + '&id=' + this.id; + var url = global.domain + MajorLink.Episode + this.start + '&ep_end=' + this.end + '&id=' + this.id; // console.log(url); fetch(url) .then((html) => html.text()) @@ -37,7 +37,7 @@ export default class EpisodeLoader { // Just in case but ther should not be any empty entries if (episode.isWhitespace) continue; // It has an empty space for some reason... - var animeLink = MajorLink.MainURL + episode.childNodes["0"].attributes.href.replace(' ', ''); + var animeLink = global.domain + episode.childNodes["0"].attributes.href.replace(' ', ''); var episodeNumber = episode.childNodes["0"].childNodes[1].text.replace(' EP', ''); animeData.push({link: animeLink, number: episodeNumber}); diff --git a/AnimeGo/src/screen/GenreInfo.js b/AnimeGo/src/screen/GenreInfo.js index 7784781..51c1f0d 100644 --- a/AnimeGo/src/screen/GenreInfo.js +++ b/AnimeGo/src/screen/GenreInfo.js @@ -5,7 +5,7 @@ import { MajorLink } from '../value'; class GenreInfo extends Component { render() { return ( - + ); } } diff --git a/AnimeGo/src/screen/Movie.js b/AnimeGo/src/screen/Movie.js index c9f276c..393bc8c 100644 --- a/AnimeGo/src/screen/Movie.js +++ b/AnimeGo/src/screen/Movie.js @@ -5,7 +5,7 @@ import { MajorLink } from '../value'; class Movie extends Component { render() { return ( - + ) } } diff --git a/AnimeGo/src/screen/NewRelease.js b/AnimeGo/src/screen/NewRelease.js index c5c9587..e13e6bf 100644 --- a/AnimeGo/src/screen/NewRelease.js +++ b/AnimeGo/src/screen/NewRelease.js @@ -5,7 +5,7 @@ import { AnimeList } from '../component/'; class NewRelease extends Component { render() { return ( - + ) } } diff --git a/AnimeGo/src/screen/NewSeason.js b/AnimeGo/src/screen/NewSeason.js index bf89f3b..7877d0a 100644 --- a/AnimeGo/src/screen/NewSeason.js +++ b/AnimeGo/src/screen/NewSeason.js @@ -30,7 +30,7 @@ class NewSeason extends Component { case 11: case 12: season = 'fall'; break; } - let url = MajorLink.NewSeason + season + '-' + now.getFullYear() + '-anime&page='; + let url = global.domain + MajorLink.NewSeason + season + '-' + now.getFullYear() + '-anime&page='; console.log(url); return url; } diff --git a/AnimeGo/src/screen/Popular.js b/AnimeGo/src/screen/Popular.js index 96931ac..81dacd8 100644 --- a/AnimeGo/src/screen/Popular.js +++ b/AnimeGo/src/screen/Popular.js @@ -5,7 +5,7 @@ import { MajorLink } from '../value'; class Popular extends Component { render() { return ( - + ) } } diff --git a/AnimeGo/src/screen/SearchAnime.js b/AnimeGo/src/screen/SearchAnime.js index d7ec7ef..0e8906e 100644 --- a/AnimeGo/src/screen/SearchAnime.js +++ b/AnimeGo/src/screen/SearchAnime.js @@ -16,7 +16,7 @@ class SearchAnime extends Component { const { keyword } = this.state; if (keyword.length < 3) return null; else { - return