Skip to content

Commit

Permalink
Merge branch 'release/v0.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
edipo2s committed Feb 11, 2017
2 parents eeb2a73 + 89a5058 commit 4be8722
Show file tree
Hide file tree
Showing 1,289 changed files with 4,782 additions and 996 deletions.
921 changes: 921 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ android {
ext {
anko_version = "0.9"
icePickVersion = "3.2.+"
okIOVersion = "1.10.+"
okHttpVersion = "3.4.+"
okIOVersion = "1.11.+"
okHttpVersion = "3.6.+"
playServicesVersion = prepareToRelease ? "10.0.1" : "9.8.0"
supportLibraryVersion = "25.1.0"
supportLibraryVersion = "25.1.1"
threetenabpVersion = "1.0.+"

testMockitoVersion = "2.1.+"
Expand Down Expand Up @@ -102,17 +102,17 @@ dependencies {
releaseCompile "com.google.firebase:firebase-crash:$playServicesVersion"

//Fabric
compile("com.crashlytics.sdk.android:answers:1.3.9") {
compile("com.crashlytics.sdk.android:answers:1.3.11") {
transitive = true
}
compile("com.crashlytics.sdk.android:crashlytics:2.6.2") {
compile("com.crashlytics.sdk.android:crashlytics:2.6.6") {
transitive = true
}

//Others
compile "com.mixpanel.android:mixpanel-android:4.9.2"
compile "com.mixpanel.android:mixpanel-android:4.9.3"
compile "com.jakewharton.threetenabp:threetenabp:$threetenabpVersion"
compile "com.jakewharton.timber:timber:4.3.1"
compile "com.jakewharton.timber:timber:4.5.1"
compile "org.greenrobot:eventbus:3.0.0"
compile "com.github.bumptech.glide:glide:3.7.0"
compile "com.github.bumptech.glide:okhttp3-integration:1.4.0@aar"
Expand All @@ -123,8 +123,8 @@ dependencies {
// compile "com.github.traex.rippleeffect:library:1.3"
compile "com.github.miguelbcr:TableFixHeaders-Wrapper:0.2.0"
compile "com.timehop.stickyheadersrecyclerview:library:0.4.3"
compile "jp.wasabeef:recyclerview-animators:2.2.4"
compile "com.kyleduo.switchbutton:library:1.4.4"
compile "jp.wasabeef:recyclerview-animators:2.2.4"
compile "org.jsoup:jsoup:1.10.1"

testCompile "junit:junit:4.12"
Expand Down
29 changes: 28 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
android:theme="@style/AppTheme"
android:fullBackupContent="@xml/backup_descriptor">

<activity
android:name=".ui.DashActivity"
android:screenOrientation="portrait"
Expand Down Expand Up @@ -55,6 +57,11 @@
android:name=".ui.seasons.PatchActivity"
android:screenOrientation="portrait"
android:theme="@style/AppThemeTransparent" />
<activity
android:name=".ui.arena.NewArenaActivity"
android:screenOrientation="portrait" />

<!-- Receivers -->

<receiver
android:name="com.mixpanel.android.mpmetrics.GCMReceiver"
Expand All @@ -67,6 +74,25 @@
</intent-filter>
</receiver>

<receiver
android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver"
android:permission="android.permission.INSTALL_PACKAGES"
android:enabled="true">
<intent-filter>
<action android:name="com.android.vending.INSTALL_REFERRER" />
</intent-filter>
</receiver>

<!-- Services -->

<service android:name=".ui.util.PushNotificationService">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT" />
</intent-filter>
</service>

<!-- Meta Data -->

<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
Expand All @@ -82,6 +108,7 @@
<meta-data
android:name="io.fabric.ApiKey"
android:value="e056905fcbc01f84ea9cad8acf63b74cb07f2506" />

</application>

</manifest>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/assets/Cards/Core/Agility/curse.png
Binary file not shown.
Binary file added app/src/main/assets/Cards/Core/Agility/curse.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/assets/Cards/Core/Agility/dunerogue.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/assets/Cards/Core/Agility/finishoff.png
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/assets/Cards/Core/Agility/giantbat.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Binary file removed app/src/main/assets/Cards/Core/Agility/ransack.png
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Binary file removed app/src/main/assets/Cards/Core/Agility/thievery.png
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Binary file removed app/src/main/assets/Cards/Core/Dual/ahnassi.png
Diff not rendered.
Binary file added app/src/main/assets/Cards/Core/Dual/ahnassi.webp
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Binary file removed app/src/main/assets/Cards/Core/Dual/ayrenn.png
Diff not rendered.
Binary file added app/src/main/assets/Cards/Core/Dual/ayrenn.webp
Binary file not shown.
Binary file removed app/src/main/assets/Cards/Core/Dual/edictofazura.png
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Binary file removed app/src/main/assets/Cards/Core/Dual/redbramman.png
Diff not rendered.
Binary file not shown.
Binary file removed app/src/main/assets/Cards/Core/Dual/riftthane.png
Diff not rendered.
Binary file not shown.
Binary file removed app/src/main/assets/Cards/Core/Dual/sadrasagent.png
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Binary file removed app/src/main/assets/Cards/Core/Dual/tyr.png
Diff not rendered.
Binary file added app/src/main/assets/Cards/Core/Dual/tyr.webp
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Diff not rendered.
Loading

0 comments on commit 4be8722

Please sign in to comment.