Skip to content

Commit 2fd645f

Browse files
committed
Merge branch 'release/v0.3'
2 parents 7f8a2b5 + f28d029 commit 2fd645f

File tree

180 files changed

+8166
-1318
lines changed

Some content is hidden

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

180 files changed

+8166
-1318
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ fabric.properties
9797

9898
# *.iml
9999
# modules.xml
100-
.idea/misc.xml
100+
.idea/misc.xml
101+
misc.xml
101102
# *.ipr
102103

103104

app/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ android {
2121
buildConfigField("boolean", "PREPARE_TO_RELEASE", "$prepareToRelease")
2222
buildConfigField("String", "MIXPANEL_TOKEN", '"eb99af1dad563cbaaf02f008b28e321f"')
2323
buildConfigField("String", "GCM_SENDER", '"597127048287"')
24+
multiDexEnabled true
2425
vectorDrawables.useSupportLibrary true
2526
}
2627
signingConfigs {
@@ -76,6 +77,7 @@ configurations.all {
7677
dependencies {
7778
compile fileTree(dir: 'libs', include: ['*.jar'])
7879
compile(name: 'clansFAB', ext: 'aar')
80+
compile(name: 'googleinapputil', ext: 'aar')
7981
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
8082
compile "org.jetbrains.anko:anko-common:$anko_version"
8183

@@ -117,7 +119,11 @@ dependencies {
117119

118120
compile "com.github.emanzanoaxa:RippleEffect:52ea2a0ab6"
119121
// compile "com.github.traex.rippleeffect:library:1.3"
122+
compile "com.github.miguelbcr:TableFixHeaders-Wrapper:0.2.0"
123+
compile "com.timehop.stickyheadersrecyclerview:library:0.4.3"
120124
compile "jp.wasabeef:recyclerview-animators:2.2.4"
125+
compile "com.kyleduo.switchbutton:library:1.4.4"
126+
compile "org.jsoup:jsoup:1.10.1"
121127

122128
testCompile "junit:junit:4.12"
123129
testCompile "com.jakewharton.threetenabp:threetenabp:$threetenabpVersion"

app/libs/googleinapputil.aar

45.6 KB
Binary file not shown.

app/proguard-rules.pro

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,9 @@
7070
-dontwarn com.mixpanel.**
7171
-keep class **.R$* {
7272
<fields>;
73+
}
74+
75+
## JSoup
76+
-keep public class org.jsoup.** {
77+
public *;
7378
}

app/src/debug/java/com/ediposouza/teslesgendstracker/util/MetricsManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import timber.log.Timber
88
/**
99
* Created by ediposouza on 08/12/16.
1010
*/
11-
@SuppressWarnings("unused")
11+
@Suppress("UNUSED_PARAMETER")
1212
object MetricsManager : MetricsConstants() {
1313

1414
fun initialize(context: Context) {

app/src/main/AndroidManifest.xml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
1212
<uses-permission android:name="android.permission.WAKE_LOCK" />
1313

14+
<uses-permission android:name="com.android.vending.BILLING" />
1415
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
1516
<uses-permission android:name="com.ediposouza.teslesgendstracker.permission.C2D_MESSAGE" />
1617

@@ -32,16 +33,24 @@
3233
</intent-filter>
3334
</activity>
3435
<activity
35-
android:name=".ui.CardActivity"
36+
android:name=".ui.cards.CardActivity"
3637
android:screenOrientation="portrait"
3738
android:theme="@style/AppThemeTransparent" />
3839
<activity
39-
android:name=".ui.DeckActivity"
40+
android:name=".ui.decks.DeckActivity"
4041
android:screenOrientation="portrait" />
4142
<activity
42-
android:name=".ui.decks.new.NewDeckActivity"
43+
android:name=".ui.decks.NewDeckActivity"
4344
android:screenOrientation="portrait"
4445
android:windowSoftInputMode="adjustPan" />
46+
<activity
47+
android:name=".ui.matches.MatchesStatisticsClassActivity"
48+
android:screenOrientation="portrait" />
49+
<activity
50+
android:name=".ui.matches.NewMatchesActivity"
51+
android:screenOrientation="portrait"
52+
android:theme="@style/AppThemeAccentEqualsPrimaryDark"
53+
android:windowSoftInputMode="adjustPan" />
4554

4655
<receiver
4756
android:name="com.mixpanel.android.mpmetrics.GCMReceiver"
190 KB
Loading
63.4 KB
Loading
187 KB
Loading
70.3 KB
Loading

0 commit comments

Comments
 (0)