Skip to content

Commit 1214071

Browse files
stoyickerstoyicker
committed
Fixes Fabric integration
1 parent acb9ac5 commit 1214071

File tree

5 files changed

+103
-82
lines changed

5 files changed

+103
-82
lines changed

‎data/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,11 @@ dependencies {
5454
final Collection<String> providedDependencies = providedDataDependencies.values()
5555
final Collection<String> compileDependencies = compileDataDependencies.values()
5656
final Collection<String> aptDependencies = aptDataDependencies.values()
57-
final Collection<String> releaseCompileDataDependencies = releaseCompileDataDependencies.values()
5857
final Collection<String> testCompileDataDependencies = testCompileDataDependencies.values()
5958

6059
for (final String dependency : providedDependencies) provided dependency
6160
for (final String dependency : compileDependencies) compile dependency
6261
for (final String dependency : aptDependencies) apt dependency
63-
for (final String dependency : releaseCompileDataDependencies) releaseCompile dependency
6462
for (final String dependency : testCompileDataDependencies) testCompile dependency
63+
releaseCompile releaseCompileDataDependencies["crashlytics"]
6564
}

‎data/src/main/java/com/jorge/boats/xkcd/data/db/DatabaseStripe.java

+91-78
Original file line numberDiff line numberDiff line change
@@ -5,115 +5,128 @@
55
import com.raizlabs.android.dbflow.annotation.Table;
66
import com.raizlabs.android.dbflow.structure.BaseModel;
77

8-
@Table(database = XkcdDatabase.class) public class DatabaseStripe extends BaseModel {
8+
@Table(database = XkcdDatabase.class)
9+
public class DatabaseStripe extends BaseModel {
910

10-
public String getMonth() {
11-
return mMonth;
12-
}
11+
public String getMonth() {
12+
return mMonth;
13+
}
1314

14-
public void setMonth(String mMonth) {
15-
this.mMonth = mMonth;
16-
}
15+
public void setMonth(String mMonth) {
16+
this.mMonth = mMonth;
17+
}
1718

18-
public long getNum() {
19-
return mNum;
20-
}
19+
public long getNum() {
20+
return mNum;
21+
}
2122

22-
public void setNum(long mNum) {
23-
this.mNum = mNum;
24-
}
23+
public void setNum(long mNum) {
24+
this.mNum = mNum;
25+
}
2526

26-
public String getLink() {
27-
return mLink;
28-
}
27+
public String getLink() {
28+
return mLink;
29+
}
2930

30-
public void setLink(String mLink) {
31-
this.mLink = mLink;
32-
}
31+
public void setLink(String mLink) {
32+
this.mLink = mLink;
33+
}
3334

34-
public String getYear() {
35-
return mYear;
36-
}
35+
public String getYear() {
36+
return mYear;
37+
}
3738

38-
public void setYear(String mYear) {
39-
this.mYear = mYear;
40-
}
39+
public void setYear(String mYear) {
40+
this.mYear = mYear;
41+
}
4142

42-
public String getNews() {
43-
return mNews;
44-
}
43+
public String getNews() {
44+
return mNews;
45+
}
4546

46-
public void setNews(String mNews) {
47-
this.mNews = mNews;
48-
}
47+
public void setNews(String mNews) {
48+
this.mNews = mNews;
49+
}
4950

50-
public String getSafe_title() {
51-
return mSafe_title;
52-
}
51+
public String getSafe_title() {
52+
return mSafe_title;
53+
}
5354

54-
public void setSafe_title(String mSafe_title) {
55-
this.mSafe_title = mSafe_title;
56-
}
55+
public void setSafe_title(String mSafe_title) {
56+
this.mSafe_title = mSafe_title;
57+
}
5758

58-
public String getTranscript() {
59-
return mTranscript;
60-
}
59+
public String getTranscript() {
60+
return mTranscript;
61+
}
6162

62-
public void setTranscript(String mTranscript) {
63-
this.mTranscript = mTranscript;
64-
}
63+
public void setTranscript(String mTranscript) {
64+
this.mTranscript = mTranscript;
65+
}
6566

66-
public String getAlt() {
67-
return mAlt;
68-
}
67+
public String getAlt() {
68+
return mAlt;
69+
}
6970

70-
public void setAlt(String mAlt) {
71-
this.mAlt = mAlt;
72-
}
71+
public void setAlt(String mAlt) {
72+
this.mAlt = mAlt;
73+
}
7374

74-
public String getImg() {
75-
return mImg;
76-
}
75+
public String getImg() {
76+
return mImg;
77+
}
7778

78-
public void setImg(String mImg) {
79-
this.mImg = mImg;
80-
}
79+
public void setImg(String mImg) {
80+
this.mImg = mImg;
81+
}
8182

82-
public String getTitle() {
83-
return mTitle;
84-
}
83+
public String getTitle() {
84+
return mTitle;
85+
}
8586

86-
public void setTitle(String mTitle) {
87-
this.mTitle = mTitle;
88-
}
87+
public void setTitle(String mTitle) {
88+
this.mTitle = mTitle;
89+
}
8990

90-
public String getDay() {
91-
return mDay;
92-
}
91+
public String getDay() {
92+
return mDay;
93+
}
9394

94-
public void setDay(String mDay) {
95-
this.mDay = mDay;
96-
}
95+
public void setDay(String mDay) {
96+
this.mDay = mDay;
97+
}
9798

98-
@Column(name = "MONTH") String mMonth;
99+
@Column(name = "MONTH")
100+
String mMonth;
99101

100-
@Column(name = "NUM") @PrimaryKey long mNum;
102+
@Column(name = "NUM")
103+
@PrimaryKey
104+
long mNum;
101105

102-
@Column(name = "LINK") String mLink;
106+
@Column(name = "LINK")
107+
String mLink;
103108

104-
@Column(name = "YEAR") String mYear;
109+
@Column(name = "YEAR")
110+
String mYear;
105111

106-
@Column(name = "NEWS") String mNews;
112+
@Column(name = "NEWS")
113+
String mNews;
107114

108-
@Column(name = "SAFE_TITLE") String mSafe_title;
115+
@Column(name = "SAFE_TITLE")
116+
String mSafe_title;
109117

110-
@Column(name = "TRANSCRIPT") String mTranscript;
118+
@Column(name = "TRANSCRIPT")
119+
String mTranscript;
111120

112-
@Column(name = "ALT") String mAlt;
121+
@Column(name = "ALT")
122+
String mAlt;
113123

114-
@Column(name = "IMG") String mImg;
124+
@Column(name = "IMG")
125+
String mImg;
115126

116-
@Column(name = "TITLE") String mTitle;
127+
@Column(name = "TITLE")
128+
String mTitle;
117129

118-
@Column(name = "DAY") String mDay;
130+
@Column(name = "DAY")
131+
String mDay;
119132
}

‎presentation/src/main/java/com/jorge/boats/xkcd/view/stripe/StripeActivity.java

+6
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import android.widget.RelativeLayout;
2626

2727
import com.bumptech.glide.Glide;
28+
import com.crashlytics.android.answers.Answers;
29+
import com.crashlytics.android.answers.ShareEvent;
2830
import com.jorge.boats.xkcd.BuildConfig;
2931
import com.jorge.boats.xkcd.R;
3032
import com.jorge.boats.xkcd.data.P;
@@ -421,6 +423,10 @@ public void share() {
421423
intent.putExtra(Intent.EXTRA_SUBJECT, mShareableRenderedData[0]);
422424
intent.putExtra(Intent.EXTRA_TEXT, mShareableRenderedData[1]);
423425

426+
Answers.getInstance().logShare(new ShareEvent()
427+
.putContentId(mShareableRenderedData[2].toString())
428+
.putContentName(mShareableRenderedData[0].toString()));
429+
424430
startActivity(Intent.createChooser(intent, getString(R.string.action_share_title)));
425431
}
426432

‎presentation/src/release/AndroidManifest.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools"
23
package="com.jorge.boats.xkcd">
34

4-
<application>
5+
<application
6+
android:name=".ReleaseApplication"
7+
tools:replace="android:name">
58
<service
69
android:name=".task.UserRetentionSafeGcmTaskService"
710
android:exported="true"

‎presentation/src/release/java/com/jorge/boats/xkcd/ReleaseApplication.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ public void onCreate() {
1414
}
1515

1616
private void initializeCreepers() {
17-
Fabric.with(this, new Crashlytics());
17+
Fabric.with(new Fabric.Builder(this).kits(new Crashlytics()).build());
1818
}
1919
}

0 commit comments

Comments
 (0)