Skip to content

Commit 4be8722

Browse files
committed
Merge branch 'release/v0.4'
2 parents eeb2a73 + 89a5058 commit 4be8722

File tree

1,289 files changed

+4782
-996
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,289 files changed

+4782
-996
lines changed

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 921 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/profiles_settings.xml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/kotlinc.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ android {
5959
ext {
6060
anko_version = "0.9"
6161
icePickVersion = "3.2.+"
62-
okIOVersion = "1.10.+"
63-
okHttpVersion = "3.4.+"
62+
okIOVersion = "1.11.+"
63+
okHttpVersion = "3.6.+"
6464
playServicesVersion = prepareToRelease ? "10.0.1" : "9.8.0"
65-
supportLibraryVersion = "25.1.0"
65+
supportLibraryVersion = "25.1.1"
6666
threetenabpVersion = "1.0.+"
6767

6868
testMockitoVersion = "2.1.+"
@@ -102,17 +102,17 @@ dependencies {
102102
releaseCompile "com.google.firebase:firebase-crash:$playServicesVersion"
103103

104104
//Fabric
105-
compile("com.crashlytics.sdk.android:answers:1.3.9") {
105+
compile("com.crashlytics.sdk.android:answers:1.3.11") {
106106
transitive = true
107107
}
108-
compile("com.crashlytics.sdk.android:crashlytics:2.6.2") {
108+
compile("com.crashlytics.sdk.android:crashlytics:2.6.6") {
109109
transitive = true
110110
}
111111

112112
//Others
113-
compile "com.mixpanel.android:mixpanel-android:4.9.2"
113+
compile "com.mixpanel.android:mixpanel-android:4.9.3"
114114
compile "com.jakewharton.threetenabp:threetenabp:$threetenabpVersion"
115-
compile "com.jakewharton.timber:timber:4.3.1"
115+
compile "com.jakewharton.timber:timber:4.5.1"
116116
compile "org.greenrobot:eventbus:3.0.0"
117117
compile "com.github.bumptech.glide:glide:3.7.0"
118118
compile "com.github.bumptech.glide:okhttp3-integration:1.4.0@aar"
@@ -123,8 +123,8 @@ dependencies {
123123
// compile "com.github.traex.rippleeffect:library:1.3"
124124
compile "com.github.miguelbcr:TableFixHeaders-Wrapper:0.2.0"
125125
compile "com.timehop.stickyheadersrecyclerview:library:0.4.3"
126-
compile "jp.wasabeef:recyclerview-animators:2.2.4"
127126
compile "com.kyleduo.switchbutton:library:1.4.4"
127+
compile "jp.wasabeef:recyclerview-animators:2.2.4"
128128
compile "org.jsoup:jsoup:1.10.1"
129129

130130
testCompile "junit:junit:4.12"

app/src/main/AndroidManifest.xml

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
android:icon="@mipmap/ic_launcher"
2222
android:label="@string/app_name"
2323
android:supportsRtl="true"
24-
android:theme="@style/AppTheme">
24+
android:theme="@style/AppTheme"
25+
android:fullBackupContent="@xml/backup_descriptor">
26+
2527
<activity
2628
android:name=".ui.DashActivity"
2729
android:screenOrientation="portrait"
@@ -55,6 +57,11 @@
5557
android:name=".ui.seasons.PatchActivity"
5658
android:screenOrientation="portrait"
5759
android:theme="@style/AppThemeTransparent" />
60+
<activity
61+
android:name=".ui.arena.NewArenaActivity"
62+
android:screenOrientation="portrait" />
63+
64+
<!-- Receivers -->
5865

5966
<receiver
6067
android:name="com.mixpanel.android.mpmetrics.GCMReceiver"
@@ -67,6 +74,25 @@
6774
</intent-filter>
6875
</receiver>
6976

77+
<receiver
78+
android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver"
79+
android:permission="android.permission.INSTALL_PACKAGES"
80+
android:enabled="true">
81+
<intent-filter>
82+
<action android:name="com.android.vending.INSTALL_REFERRER" />
83+
</intent-filter>
84+
</receiver>
85+
86+
<!-- Services -->
87+
88+
<service android:name=".ui.util.PushNotificationService">
89+
<intent-filter>
90+
<action android:name="com.google.firebase.MESSAGING_EVENT" />
91+
</intent-filter>
92+
</service>
93+
94+
<!-- Meta Data -->
95+
7096
<meta-data
7197
android:name="com.google.android.gms.version"
7298
android:value="@integer/google_play_services_version" />
@@ -82,6 +108,7 @@
82108
<meta-data
83109
android:name="io.fabric.ApiKey"
84110
android:value="e056905fcbc01f84ea9cad8acf63b74cb07f2506" />
111+
85112
</application>
86113

87114
</manifest>
-73.8 KB
Binary file not shown.
29.2 KB
-73.6 KB
Binary file not shown.
31.7 KB
-76.1 KB
Binary file not shown.

0 commit comments

Comments
 (0)