Skip to content

Commit 49ec9eb

Browse files
author
Paolo Rotolo
committed
Implement Smooch's live chat. Remove Instabug. Release 0.11.0.
1 parent a77a51b commit 49ec9eb

File tree

7 files changed

+17
-36
lines changed

7 files changed

+17
-36
lines changed

app/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ android {
3232
defaultConfig {
3333
minSdkVersion 16
3434
targetSdkVersion 23
35-
versionCode 18
36-
versionName '0.10.3'
35+
versionCode 19
36+
versionName '0.11.0'
3737

3838
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
3939
}
@@ -110,7 +110,6 @@ dependencies {
110110

111111

112112
// Other libraries
113-
compile 'com.instabug.library:instabugcompat:2.3.1'
114113
compile 'com.github.clans:fab:1.6.2'
115114
compile 'com.wdullaer:materialdatetimepicker:2.2.0'
116115
compile 'com.github.PhilJay:MPAndroidChart:v2.2.3'

app/src/main/java/org/glucosio/android/GlucosioApplication.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
import android.support.annotation.NonNull;
2727
import android.support.annotation.Nullable;
2828

29-
import com.instabug.library.IBGInvocationEvent;
30-
import com.instabug.library.Instabug;
31-
3229
import org.glucosio.android.analytics.Analytics;
3330
import org.glucosio.android.analytics.GoogleAnalytics;
3431
import org.glucosio.android.backup.Backup;
@@ -51,18 +48,6 @@ public void onCreate() {
5148
// Initialize Smooch
5249
Smooch.init(this, "dxopifgi0mylv4invg5lrb66r");
5350

54-
// Initialize Instabug
55-
56-
if (BuildConfig.DEBUG) {
57-
new Instabug.Builder(this, "b2226aa30fec24f6f4bed6ad68964e9b")
58-
.setInvocationEvent(IBGInvocationEvent.IBGInvocationEventShake)
59-
.build();
60-
} else {
61-
new Instabug.Builder(this, "820ee7db3118d03fd5f4249b5a73672e")
62-
.setInvocationEvent(IBGInvocationEvent.IBGInvocationEventShake)
63-
.build();
64-
}
65-
6651
// Get Dyslexia preference and adjust font
6752
SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
6853
boolean isDyslexicModeOn = sharedPref.getBoolean("pref_font_dyslexia", false);

app/src/main/java/org/glucosio/android/activity/AboutActivity.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,13 @@
2929
import android.support.v7.app.AppCompatActivity;
3030
import android.view.MenuItem;
3131

32-
import com.instabug.library.Instabug;
33-
3432
import org.glucosio.android.GlucosioApplication;
3533
import org.glucosio.android.R;
3634
import org.glucosio.android.analytics.Analytics;
3735

3836
import java.util.Locale;
3937

38+
import io.smooch.ui.ConversationActivity;
4039
import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper;
4140

4241
public class AboutActivity extends AppCompatActivity {
@@ -120,7 +119,7 @@ public boolean onPreferenceClick(Preference preference) {
120119
feedbackPref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
121120
@Override
122121
public boolean onPreferenceClick(Preference preference) {
123-
Instabug.invoke();
122+
ConversationActivity.show(getActivity());
124123

125124
return false;
126125
}

app/src/main/java/org/glucosio/android/activity/MainActivity.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import android.support.design.widget.TabLayout;
3737
import android.support.v4.view.ViewPager;
3838
import android.support.v7.app.AlertDialog;
39+
import android.support.v7.app.AppCompatActivity;
3940
import android.support.v7.widget.Toolbar;
4041
import android.util.Log;
4142
import android.view.View;
@@ -51,8 +52,6 @@
5152
import com.github.clans.fab.FloatingActionMenu;
5253
import com.google.android.gms.common.ConnectionResult;
5354
import com.google.android.gms.common.GooglePlayServicesUtil;
54-
import com.instabug.library.Instabug;
55-
import com.instabug.library.compat.InstabugAppCompatActivity;
5655
import com.mikepenz.materialdrawer.AccountHeaderBuilder;
5756
import com.mikepenz.materialdrawer.Drawer;
5857
import com.mikepenz.materialdrawer.DrawerBuilder;
@@ -71,10 +70,11 @@
7170

7271
import java.util.Calendar;
7372

73+
import io.smooch.ui.ConversationActivity;
7474
import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper;
7575

7676

77-
public class MainActivity extends InstabugAppCompatActivity implements DatePickerDialog.OnDateSetListener {
77+
public class MainActivity extends AppCompatActivity implements DatePickerDialog.OnDateSetListener {
7878

7979
private ExportPresenter exportPresenter;
8080
private RadioButton exportRangeButton;
@@ -359,8 +359,8 @@ public void onClick(DialogInterface dialog, int which) {
359359
} else if (which == 1) {
360360
// Report Feedback
361361
// Open Instabug
362-
Instabug.invoke();
363-
// ConversationActivity.show(mContext);
362+
// Instabug.invoke();
363+
ConversationActivity.show(mContext);
364364
} else {
365365
// Forum
366366
String url = "http://community.glucosio.org/";

app/src/main/java/org/glucosio/android/fragment/AssistantFragment.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
import android.widget.LinearLayout;
3737
import android.widget.TextView;
3838

39-
import com.instabug.library.Instabug;
40-
4139
import org.glucosio.android.ActionTip;
4240
import org.glucosio.android.R;
4341
import org.glucosio.android.activity.A1cCalculator;
@@ -48,6 +46,8 @@
4846

4947
import java.util.ArrayList;
5048

49+
import io.smooch.ui.ConversationActivity;
50+
5151
public class AssistantFragment extends Fragment {
5252

5353
SharedPreferences sharedPref;
@@ -237,8 +237,6 @@ public void startA1CCalculatorActivity() {
237237
}
238238

239239
public void openLiveChat() {
240-
// We're using Instabug for now until a fix for Smooch is available
241-
// ConversationActivity.show(getActivity());
242-
Instabug.invoke();
240+
ConversationActivity.show(getActivity());
243241
}
244242
}

app/src/main/res/values/strings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
<string name="preferences_about">About</string>
154154
<string translatable="false" name="preferences_experimental_title">Here be dragons :/</string>
155155
<string name="preferences_experimental">These features are experimental and may not fully work and are for early testing by users. Remember that you can shake your phone to send us feedback.</string>
156-
<string name="version" translatable="false">0.10.3 (Imli)</string>
156+
<string name="version" translatable="false">0.11.0 (Imli)</string>
157157
<string name="preferences_version">Version</string>
158158
<string name="preferences_terms">Terms of use</string>
159159
<string name="glucose_reading_type">Type</string>
@@ -228,7 +228,7 @@
228228

229229
<string-array name="assistant_actions" translatable="false">
230230
<item>@string/assistant_action_try</item>
231-
<item>@string/assistant_action_feedback</item>
231+
<item>@string/assistant_action_live_chat</item>
232232
<item>@string/assistant_action_reading</item>
233233
<item>@string/assistant_action_try</item>
234234
<item>@string/dialog_export_button</item>
@@ -252,7 +252,7 @@
252252
<string name="menu_support_error1">There isn\'t an email app installed. Please send a mail to [email protected]</string>
253253
<string-array name="menu_support_options" translatable="false">
254254
<item>@string/menu_support_email</item>
255-
<item>@string/action_feedback</item>
255+
<item>@string/menu_support_live</item>
256256
<item>@string/menu_support_forum</item>
257257
</string-array>
258258

wear/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ android {
2929
applicationId "org.glucosio.android"
3030
minSdkVersion 21
3131
targetSdkVersion 23
32-
versionCode 15
33-
versionName '0.10.3'
32+
versionCode 19
33+
versionName '0.11.0'
3434
}
3535
buildTypes {
3636
debug {

0 commit comments

Comments
 (0)