Skip to content

Commit 52a27e1

Browse files
committed
Merge branch 'release/v0.2'
2 parents 769fb1b + b2315b3 commit 52a27e1

File tree

535 files changed

+2960
-880
lines changed

Some content is hidden

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

535 files changed

+2960
-880
lines changed

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ apply plugin: 'io.fabric'
55

66
android {
77
compileSdkVersion 25
8-
buildToolsVersion "25.0.1"
8+
buildToolsVersion "25.0.2"
99
packagingOptions.excludes = ['META-INF/services/javax.annotation.processing.Processor',
1010
'META-INF/LICENSE.txt', 'META-INF/NOTICE.txt', 'META-INF/README.txt',
1111
'LICENSE.txt', 'NOTICE.txt', 'README.txt', '.readme']
1212
defaultConfig {
1313
applicationId "com.ediposouza.teslesgendstracker"
14-
minSdkVersion 21//16
14+
minSdkVersion prepareRelease ? 16 : 21
1515
targetSdkVersion 25
1616
versionCode appVersionCode
1717
versionName appVersionName
@@ -56,8 +56,8 @@ ext {
5656
icePickVersion = "3.2.+"
5757
okIOVersion = "1.10.+"
5858
okHttpVersion = "3.4.+"
59-
playServicesVersion = "9.8.0"//"10.0.1"
60-
supportLibraryVersion = "25.0.1"
59+
playServicesVersion = prepareRelease ? "10.0.1" : "9.8.0"
60+
supportLibraryVersion = "25.1.0"
6161
threetenabpVersion = "1.0.+"
6262

6363
testMockitoVersion = "2.1.+"

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

Lines changed: 0 additions & 44 deletions
This file was deleted.

app/src/debug/java/com/ediposouza/teslesgendstracker/LoggerManager.kt renamed to app/src/debug/java/com/ediposouza/teslesgendstracker/manager/LoggerManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.ediposouza.teslesgendstracker
1+
package com.ediposouza.teslesgendstracker.manager
22

33
import timber.log.Timber
44

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
package com.ediposouza.teslesgendstracker.manager
2+
3+
import android.content.Context
4+
import com.ediposouza.teslesgendstracker.MetricAction
5+
import com.ediposouza.teslesgendstracker.MetricScreen
6+
import com.ediposouza.teslesgendstracker.MetricsConstants
7+
import com.ediposouza.teslesgendstracker.data.Card
8+
import com.google.firebase.auth.FirebaseUser
9+
import timber.log.Timber
10+
11+
/**
12+
* Created by ediposouza on 08/12/16.
13+
*/
14+
@SuppressWarnings("unused")
15+
object MetricsManager : MetricsConstants() {
16+
17+
fun initialize(context: Context) {
18+
}
19+
20+
fun trackAction(action: MetricAction, vararg params: String) {
21+
Timber.d(if (params.isEmpty()) action.name else "${action.name} with params: ${params.toSet()}")
22+
}
23+
24+
fun trackScreen(screen: MetricScreen) {
25+
Timber.d(screen.name)
26+
}
27+
28+
fun trackSignUp() {
29+
Timber.d("SignUp")
30+
}
31+
32+
fun trackSignIn(user: FirebaseUser?, success: Boolean) {
33+
Timber.d("SignIn success: $success")
34+
}
35+
36+
fun trackSearch(searchTerm: String) {
37+
Timber.d("Search: $searchTerm")
38+
}
39+
40+
fun trackCardView(card: Card) {
41+
Timber.d("Card view: $card")
42+
}
43+
44+
}

app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
android:name=".ui.DeckActivity"
3232
android:screenOrientation="portrait" />
3333

34+
<activity
35+
android:name=".ui.decks.new.NewDeckActivity"
36+
android:screenOrientation="portrait" />
37+
3438
<meta-data
3539
android:name="com.google.android.gms.version"
3640
android:value="@integer/google_play_services_version" />

app/src/main/assets/Cards/Agility/anxileelinvader.png renamed to app/src/main/assets/Cards/Core/Agility/anxileelinvader.png

File renamed without changes.

app/src/main/assets/Cards/Agility/arenthiaswindler.png renamed to app/src/main/assets/Cards/Core/Agility/arenthiaswindler.png

File renamed without changes.

app/src/main/assets/Cards/Agility/arrowintheknee.png renamed to app/src/main/assets/Cards/Core/Agility/arrowintheknee.png

File renamed without changes.

app/src/main/assets/Cards/Agility/baandaribruiser.png renamed to app/src/main/assets/Cards/Core/Agility/baandaribruiser.png

File renamed without changes.

0 commit comments

Comments
 (0)