Skip to content

Commit b5d09de

Browse files
authored
Merge pull request #51 from BreakOutEvent/upgrade-react-native
Upgrade react native
2 parents 2063bc2 + 7a6b2de commit b5d09de

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

android/app/build.gradle

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,8 @@ android {
103103
applicationId "org.break_out.breakout"
104104
minSdkVersion rootProject.ext.minSdkVersion
105105
targetSdkVersion rootProject.ext.targetSdkVersion
106-
versionCode 52
107-
versionName "52"
108-
ndk {
109-
abiFilters "armeabi-v7a", "x86"
110-
}
106+
versionCode 54
107+
versionName "54"
111108
}
112109

113110
signingConfigs {
@@ -126,7 +123,7 @@ android {
126123
reset()
127124
enable enableSeparateBuildPerCPUArchitecture
128125
universalApk false // If true, also generate a universal APK
129-
include "armeabi-v7a", "x86"
126+
include "armeabi-v7a", "x86", "arm64-v8a", "x86-64"
130127
}
131128
}
132129
buildTypes {

app/components/map.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,23 @@ function getCityColor(team) {
9696
'Köln': '#6b5aac'
9797
};
9898

99-
return colorlist[team.event.city];
99+
return colorlist[team.event.city] ? colorlist[team.event.city] : stringColor(team.event.city);
100100
}
101101

102+
function stringColor(string) {
103+
var hash = 0;
104+
if (string.length === 0) return hash;
105+
for (var i = 0; i < string.length; i++) {
106+
hash = string.charCodeAt(i) + ((hash << 5) - hash);
107+
hash = hash & hash;
108+
}
109+
var color = '#';
110+
for (var j = 0; j < 3; j++) {
111+
var value = (hash >> (j * 8)) & 255;
112+
color += ('00' + value.toString(16)).substr(-2);
113+
}
114+
return color;
115+
}
102116

103117
function colorGradientByWeight(color1, color2, weight) {
104118
const w = weight * 2 - 1;

0 commit comments

Comments
 (0)