- Do network request on app start to use InstabugNetworkLogs

- Remove Unused views
- Changing default locale to English
- Remove Deprecated API calls
- Updating SDK to latest version

Author: mzelzoghbi

app/build.gradle

@@ -49,13 +49,15 @@ dependencies {
     // TODO add the following 2 lines if you exclude io.reactivex from Instabug
 //    implementation 'io.reactivex:rxjava:1.0.13'
 //    implementation 'io.reactivex:rxandroid:1.0.1'
-    implementation('com.instabug.library:instabug:4.14.0') {
+    implementation('com.instabug.library:instabug:4.15.0') {
         // TODO uncomment this line to exclude RxJava from Instabug and use your own version
 //        exclude group: 'io.reactivex'
 
         // TODO uncomment next line if you're facing compilation issue in build.gradle about gms different versions
 //        exclude group: 'com.android.support'
     }
+    implementation 'petrov.kristiyan:colorpicker-library:1.1.8'
+
 
 
 }

app/src/main/AndroidManifest.xml

@@ -36,8 +36,8 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-        <activity android:name=".ui.activities.GoogleMapsActivity" />
+        <activity android:name=".ui.activities.SettingsActivity"
+            android:theme="@style/AppTheme.NoActionBar"/>
 
         <meta-data
             android:name="com.google.android.gms.version"
@@ -46,8 +46,6 @@
             android:name="com.google.android.geo.API_KEY"
             android:value="AIzaSyD1NsFNyD12H_4lzgzth7lUxUAbZzyKEL4" />
 
-        <activity android:name=".ui.activities.OpenGLActivity" />
-
         <receiver
             android:name="com.google.android.gms.gcm.GcmReceiver"
             android:exported="true"

app/src/main/java/com/example/instabug/SampleApplication.java

@@ -9,6 +9,7 @@
 import com.instabug.library.bugreporting.model.ReportCategory;
 import com.instabug.library.internal.module.InstabugLocale;
 import com.instabug.library.invocation.InstabugInvocationEvent;
+import com.instabug.library.ui.onboarding.WelcomeMessage;
 
 import java.util.ArrayList;
 import java.util.Locale;
@@ -21,26 +22,22 @@ public void onCreate() {
         MultiDex.install(this);
 
         //initialing instabug
-        new Instabug.Builder(this, "f501f761142981d54b1fdea93963a934")
+        new Instabug.Builder(this, "48ad905e141bc665d064945f423aa414")
                 .setInvocationEvent(InstabugInvocationEvent.SHAKE)
                 .build();
 
-        //adding some customizations
-        Instabug.setEmailFieldRequired(false);
         //Choosing instabug theme
         Instabug.setTheme(InstabugColorTheme.InstabugColorThemeLight);
         //Choosing type of attachments allowed
         //1. initial screenshot, 2. extra screenshot, 3. image from gallery, 4. voice note
         //5. screen record
-        Instabug.setAttachmentTypesEnabled(true, true, true, true, true);
-        //For setting instabug bug intro message enabled or disabled
-        Instabug.setIntroMessageEnabled(false);
+        Instabug.setWelcomeMessageState(WelcomeMessage.State.LIVE);
 
         // TODO the following are 3 acceptable ways to force Locale in Instabug (last one is the only 1 applied)
         Instabug.setLocale(new Locale(InstabugLocale.SIMPLIFIED_CHINESE.getCode(),
                 InstabugLocale.SIMPLIFIED_CHINESE.getCountry()));
         Instabug.setLocale(new Locale(InstabugLocale.FRENCH.getCode()));
-        Instabug.setLocale(Locale.GERMAN);
+        Instabug.setLocale(Locale.ENGLISH);
 
         //To show instabug debug logs if necessary
         Instabug.setDebugEnabled(true);
@@ -52,20 +49,6 @@ public void onCreate() {
 
         Instabug.setCustomTextPlaceHolders(placeHolder);
 
-        //Setting report categories
-        ArrayList<ReportCategory> reportCategories = new ArrayList<>();
-        reportCategories.add(
-                ReportCategory.getInstance().withLabel("Map").withIcon(android.R.drawable
-                        .ic_dialog_map));
-        reportCategories.add(ReportCategory.getInstance()
-                .withLabel("Alert")
-                .withIcon(android.R.drawable.ic_dialog_alert));
-        reportCategories.add(
-                ReportCategory.getInstance().withLabel("Mail").withIcon(android.R.drawable
-                        .ic_dialog_email));
-
-        Instabug.setReportCategories(reportCategories);
-
         //setting user attributes
         Instabug.setUserAttribute("USER_TYPE", "instabug user");
 

app/src/main/java/com/example/instabug/ui/activities/GoogleMapsActivity.java

@@ -29,6 +29,7 @@
 import com.instabug.library.invocation.InstabugInvocationMode;
 import com.instabug.library.logging.InstabugLog;
 import com.instabug.library.logging.InstabugNetworkLog;
+import com.instabug.library.ui.onboarding.WelcomeMessage;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -40,17 +41,9 @@
 import java.io.OutputStreamWriter;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.util.Set;
 
-public class MainActivity extends BaseActivity
-        implements NavigationView.OnNavigationItemSelectedListener {
-
-    DrawerLayout drawer;
-    NavigationView navigationView;
-    Spinner spinner;
-    ImageView headerImage;
-
-    private static String[] colorNames = {"Red", "Blue", "Green", "Yellow"};
-    private static int[] colors = {Color.RED, Color.BLUE, Color.GREEN, Color.YELLOW};
+public class MainActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -62,45 +55,10 @@ protected void onCreate(Bundle savedInstanceState) {
 
         registerGCM();
 
-        drawer = findViewById(R.id.drawer_layout);
-        navigationView = findViewById(R.id.nav_view);
-        spinner = findViewById(R.id.spinner);
-        headerImage = navigationView.getHeaderView(0).findViewById(R.id.headerImageView);
-        headerImage.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                onHeaderImageClicked();
-            }
-        });
-
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
-        drawer.setDrawerListener(toggle);
-        toggle.syncState();
-
-        navigationView.setNavigationItemSelectedListener(this);
-
-        if (savedInstanceState == null) {
-            navigationView.setCheckedItem(navigationView.getMenu().getItem(0).getItemId());
-        }
-
-        ArrayAdapter<String> dataAdapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, colorNames);
-        dataAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        spinner.setAdapter(dataAdapter);
-
-        spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                Instabug.setPrimaryColor(colors[position]);
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-
-            }
-        });
+        doNetworkRequest();
     }
 
     private void registerGCM() {
@@ -109,46 +67,16 @@ private void registerGCM() {
         startService(intent);
     }
 
-    public void onFeedbackFABClicked(View view) {
-        Instabug.invoke();
-    }
-
-    public void onShowIntroMessageClicked(View view) {
-        Instabug.showIntroMessage();
-    }
-
-    public void onFeedbackClicked(View view) {
-        Instabug.invoke(InstabugInvocationMode.NEW_FEEDBACK);
-    }
-
-    public void onBugReportClicked(View view) {
-        Instabug.invoke(InstabugInvocationMode.NEW_FEEDBACK);
-    }
-
-    public void onNewConversationClicked(View view) {
-        Instabug.invoke(InstabugInvocationMode.NEW_CHAT);
-    }
-
-    public void onConversationListClicked(View view) {
-        Instabug.invoke(InstabugInvocationMode.CHATS_LIST);
+    public void onShowLiveOnboardingMessageClicked(View view) {
+        Instabug.showWelcomeMessage(WelcomeMessage.State.LIVE);
     }
 
-    public void onNewMessageCountClicked(View view) {
-        Toast.makeText(this,
-                "Number of unread messages: " +
-                        String.valueOf(Instabug.getUnreadMessagesCount()), Toast.LENGTH_SHORT)
-                .show();
+    public void onShowBetaOnboardingMessageClicked(View view) {
+        Instabug.showWelcomeMessage(WelcomeMessage.State.BETA);
     }
 
-    public void onSendHandledExceptionClicked(View view) {
-        new AlertDialog.Builder(MainActivity.this)
-                .setMessage("Do you want to report a handled NullPointerException")
-                .setPositiveButton("Why not?", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        Instabug.reportException(new NullPointerException(), "Handled Exception");
-                    }
-                }).show();
+    public void onShowInstabugClicked(View view) {
+        Instabug.invoke();
     }
 
     public void onCrashTheAppClicked(View view) {
@@ -165,71 +93,29 @@ public void onClick(DialogInterface dialog, int which) {
                 .show();
     }
 
-    public void onDoNetworkRequestClicked(View view) {
-        new FetchMoviesData().execute();
-    }
-
-    public void onHeaderImageClicked() {
-        Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.instabug.com"));
-        startActivity(browserIntent);
+    public void showNPSSurvey(View view) {
+        Instabug.showSurvey("ulUaFocMCejDr3Ldd8VBaA");
     }
 
-    @Override
-    public void onBackPressed() {
-        if (drawer.isDrawerOpen(GravityCompat.START)) {
-            drawer.closeDrawer(GravityCompat.START);
-        } else {
-            super.onBackPressed();
-        }
+    public void showMultipleQuestionSurvey(View view) {
+        Instabug.showSurvey("AGI5OH47k3eEAIKj-yKDWA");
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        return true;
+    public void showFeatureRequests(View view) {
+        Instabug.showFeatureRequests();
     }
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        return super.onOptionsItemSelected(item);
+    public void onShowSettingsClicked(View view) {
+        startActivity(new Intent(this, SettingsActivity.class));
     }
 
-    @Override
-    public boolean onNavigationItemSelected(MenuItem item) {
-        int id = item.getItemId();
-        if (id == R.id.nav_home) {
-            AlertDialog alertDialog = new AlertDialog.Builder(this)
-                    .setMessage("Do you want to get a NullPointerException, because that's how " +
-                            "you get a NullPointerException :D")
-                    .setPositiveButton("Why not?", new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            throw new NullPointerException("Test issue in Instabug Sample app");
-                        }
-                    }).show();
-            Instabug.setDialog(alertDialog);
-        } else if (id == R.id.nav_maps) {
-            startActivity(new Intent(this, GoogleMapsActivity.class));
-        } else if (id == R.id.nav_openGl) {
-            startActivity(new Intent(this, OpenGLActivity.class));
-        } else if (id == R.id.nav_share) {
-            startActivity(Intent.createChooser(getShareIntent(), getResources().getString(R.string.share_to_friends)));
-        } else if (id == R.id.nav_about) {
-            Instabug.showIntroMessage();
-            // TODO click about to show dialog to test screenshot with dialogs
-            Toast.makeText(this, "Coming soon", Toast.LENGTH_SHORT).show();
-        }
-
-        DrawerLayout drawer = findViewById(R.id.drawer_layout);
-        drawer.closeDrawer(GravityCompat.START);
-        return true;
+    public void doNetworkRequest() {
+        new FetchMoviesData().execute();
     }
 
-    public Intent getShareIntent() {
-        String sharedText = "Check out this awesome sample app by @instabug\n\nhttps://github.com/Instabug/android-sample";
-        Intent shareIntent = new Intent(Intent.ACTION_SEND);
-        shareIntent.setType("text/plain");
-        shareIntent.putExtra(Intent.EXTRA_TEXT, sharedText);
-        return shareIntent;
+    public void onHeaderImageClicked() {
+        Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.instabug.com"));
+        startActivity(browserIntent);
     }
 
     private class FetchMoviesData extends AsyncTask<Void, Void, String> {
@@ -326,4 +212,5 @@ protected void onPostExecute(String s) {
             Log.d("Response", s + "");
         }
     }
+
 }