Merge pull request #390 from hummingbird-me/develop

[6.8] Merge develop into master
hummingbird-me · Sep 11, 2018 · 26b00ed · 26b00ed
2 parents 4d46607 + 858df5e
commit 26b00ed
Show file tree

Hide file tree

Showing 154 changed files with 1,562 additions and 9,330 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -118,7 +118,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 27
         versionCode 1
-        versionName "6.7"
+        versionName "6.8"
         multiDexEnabled true
         ndk {
             abiFilters "armeabi-v7a", "x86"

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="com.android.vending.BILLING" />
 
   <uses-sdk
       android:minSdkVersion="16"

diff --git a/android/app/src/main/assets/fonts/Octicons.ttf b/android/app/src/main/assets/fonts/Octicons.ttf
diff --git a/android/app/src/main/assets/fonts/Roboto.ttf b/android/app/src/main/assets/fonts/Roboto.ttf
diff --git a/android/app/src/main/assets/fonts/Roboto_medium.ttf b/android/app/src/main/assets/fonts/Roboto_medium.ttf
diff --git a/android/app/src/main/assets/fonts/SimpleLineIcons.ttf b/android/app/src/main/assets/fonts/SimpleLineIcons.ttf
diff --git a/android/app/src/main/assets/fonts/rubicon-icon-font.ttf b/android/app/src/main/assets/fonts/rubicon-icon-font.ttf
diff --git a/ios/kitsu_mobile.xcodeproj/project.pbxproj b/ios/kitsu_mobile.xcodeproj/project.pbxproj
diff --git a/ios/kitsu_mobile/Info.plist b/ios/kitsu_mobile/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.7</string>
+	<string>6.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

diff --git a/native-base-theme/components/Badge.js b/native-base-theme/components/Badge.js