Added Mars.

Added adaptive launcher icon for Android. Temporary fix for matches that return more than 10 players. Bumped version number.
odota · Mar 7, 2019 · 061eac1 · 061eac1
1 parent e3aed74
commit 061eac1
Show file tree

Hide file tree

Showing 41 changed files with 1,210 additions and 1,173 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -94,8 +94,8 @@ android {
         applicationId "com.opendota.mobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 15
-        versionName "1.2.0"
+        versionCode 16
+        versionName "1.2.1"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.opendota.mobile"
-    android:versionCode="15"
-    android:versionName="1.2.0">
+    android:versionCode="16"
+    android:versionName="1.2.1">
 
     <uses-permission android:name="android.permission.INTERNET" />
 

diff --git a/android/app/src/main/assets/index.android.bundle b/android/app/src/main/assets/index.android.bundle
diff --git a/android/app/src/main/ic_launcher-web.png b/android/app/src/main/ic_launcher-web.png
diff --git a/.../app/src/main/res/drawable-mdpi/app_assets_abilities_mars_arena_of_blood_lg.png b/.../app/src/main/res/drawable-mdpi/app_assets_abilities_mars_arena_of_blood_lg.png
diff --git a/android/app/src/main/res/drawable-mdpi/app_assets_abilities_mars_bulwark_lg.png b/android/app/src/main/res/drawable-mdpi/app_assets_abilities_mars_bulwark_lg.png
diff --git a/...oid/app/src/main/res/drawable-mdpi/app_assets_abilities_mars_gods_rebuke_lg.png b/...oid/app/src/main/res/drawable-mdpi/app_assets_abilities_mars_gods_rebuke_lg.png
diff --git a/android/app/src/main/res/drawable-mdpi/app_assets_abilities_mars_spear_lg.png b/android/app/src/main/res/drawable-mdpi/app_assets_abilities_mars_spear_lg.png
diff --git a/android/app/src/main/res/drawable-mdpi/app_assets_heroes_mars_full.png b/android/app/src/main/res/drawable-mdpi/app_assets_heroes_mars_full.png
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/values/ic_launcher_background.xml b/android/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#CFF2FD</color>
+</resources>
diff --git a/android/app/src/release/AndroidManifest.xml b/android/app/src/release/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.opendota.mobile"
-    android:versionCode="15"
-    android:versionName="1.2.0">
+    android:versionCode="16"
+    android:versionName="1.2.1">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission

diff --git a/app/assets/abilities/mars_arena_of_blood_lg.png b/app/assets/abilities/mars_arena_of_blood_lg.png
diff --git a/app/assets/abilities/mars_bulwark_lg.png b/app/assets/abilities/mars_bulwark_lg.png
diff --git a/app/assets/abilities/mars_gods_rebuke_lg.png b/app/assets/abilities/mars_gods_rebuke_lg.png
diff --git a/app/assets/abilities/mars_spear_lg.png b/app/assets/abilities/mars_spear_lg.png
diff --git a/app/assets/heroes/mars_full.png b/app/assets/heroes/mars_full.png
diff --git a/app/containers/MatchBenchmark.js b/app/containers/MatchBenchmark.js
@@ -85,7 +85,7 @@ class MatchBenchmark extends Component {
 
     generateProcessedPlayers(unprocessedPlayersList) {
         var processedPlayersList = [];
-        for (let i = 0; i < unprocessedPlayersList.length; i ++) {
+        for (let i = 0; i < 10; i ++) {
             var currentUnprocessedPlayer = unprocessedPlayersList[i];
 
             var processedPlayer = {};

diff --git a/app/containers/MatchLaning.js b/app/containers/MatchLaning.js
@@ -88,7 +88,7 @@ class MatchLaning extends Component {
 
     generateProcessedPlayers(unprocessedPlayersList) {
         var processedPlayersList = [];
-        for (let i = 0; i < unprocessedPlayersList.length; i ++) {
+        for (let i = 0; i < 10; i ++) {
             var currentUnprocessedPlayer = unprocessedPlayersList[i];
 
             var processedPlayer = {};

diff --git a/app/containers/MatchPerformance.js b/app/containers/MatchPerformance.js
@@ -95,7 +95,7 @@ class MatchPerformance extends Component {
 
     generateProcessedPlayers(unprocessedPlayersList) {
         var processedPlayersList = [];
-        for (let i = 0; i < unprocessedPlayersList.length; i ++) {
+        for (let i = 0; i < 10; i ++) {
             var currentUnprocessedPlayer = unprocessedPlayersList[i];
 
             var processedPlayer = {};

diff --git a/app/utils/getAbilityHigh.js b/app/utils/getAbilityHigh.js
@@ -856,6 +856,22 @@ export function getAbilityHigh(id) {
 		staticImage = require('../assets/talent_tree.png');
 	} else if (id == 6449) {
 		staticImage = require('../assets/talent_tree.png');
+	} else if (id == 6495) {
+		staticImage = require('../assets/abilities/mars_gods_rebuke_lg.png');
+	} else if (id == 6582) {
+		staticImage = require('../assets/abilities/mars_bulwark_lg.png');
+	} else if (id == 6583) {
+		staticImage = require('../assets/abilities/mars_spear_lg.png');
+	} else if (id == 6598) {
+		staticImage = require('../assets/abilities/mars_arena_of_blood_lg.png');
+	} else if (id == 6584) {
+		staticImage = require('../assets/talent_tree.png');
+	} else if (id == 6756) {
+		staticImage = require('../assets/talent_tree.png');
+	} else if (id == 6759) {
+		staticImage = require('../assets/talent_tree.png');
+	} else if (id == 6766) {
+		staticImage = require('../assets/talent_tree.png');
 	} else if (id == 6500) {
 		staticImage = require('../assets/talent_tree.png');
 	} else if (id == 6501) {

diff --git a/app/utils/getHeroImage.js b/app/utils/getHeroImage.js
@@ -232,6 +232,8 @@ export function getHeroImage(id) {
         staticImage = require('../assets/heroes/pangolier_full.png');
     } else if (id == 121) {
         staticImage = require('../assets/heroes/grimstroke_full.png');
+    } else if (id == 129) {
+        staticImage = require('../assets/heroes/mars_full.png');
     } else {
         staticImage = require('../assets/no-item.png');
     }

diff --git a/ios/OpenDota/Info.plist b/ios/OpenDota/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>1.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>15</string>
+	<string>16</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "OpenDota",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "private": true,
   "scripts": {
     "start": "react-native start",
@@ -17,7 +17,7 @@
     "postinstall": "sed -i.bak 's/ TabRouter/ tabRouter/g' ./node_modules/react-navigation/src/navigators/DrawerNavigator.js && sed -i.bak 's/ StackRouter/ stackRouter/g' ./node_modules/react-navigation/src/navigators/StackNavigator.js && sed -i.bak 's/ TabRouter/ tabRouter/g' ./node_modules/react-navigation/src/navigators/TabNavigator.js && sed -i.bak 's/ SwitchRouter/ switchRouter/g' ./node_modules/react-navigation/src/navigators/SwitchNavigator.js"
   },
   "dependencies": {
-    "dotaconstants": "6.15.0",
+    "dotaconstants": "6.16.0",
     "heatmap.js": "2.0.5",
     "lodash": "4.17.11",
     "moment": "2.24.0",

diff --git a/yarn.lock b/yarn.lock
@@ -2092,10 +2092,10 @@ dom-walk@^0.1.0:
   resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
   integrity sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=
 
-dotaconstants@6.15.0:
-  version "6.15.0"
-  resolved "https://registry.yarnpkg.com/dotaconstants/-/dotaconstants-6.15.0.tgz#13ade75078f5877d786b1bf1d1be8ed9a8ed3e5c"
-  integrity sha512-yVftPIGcgcFZu6OkSRSbObYIRu4QEIsiCErw79nexsxHQvnF1cpIOepgjCmIDvrxJnjyC5d6UflVWgQwbQh2zg==
+dotaconstants@6.16.0:
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/dotaconstants/-/dotaconstants-6.16.0.tgz#6d71b535eebd6b0726a99a86362baceb8fa129b0"
+  integrity sha512-Ln05TzqyK//1a7cPcI6D7gw+rF6EoabEhQxE7v/Au2NEUDk4VFAFi45ToYi3Ye86IVUW7wmQc5QNyaiV+AZAUA==
 
 ecc-jsbn@~0.1.1:
   version "0.1.2"