Merged PR 15241: [Android] GraphNotificationsSample update to match iOS UI

Remove Log tab as CDPTraces.log can be overwhelming, good for demo but not for API sample

Android/samples/graphnotificationssample/app/src/main/java/com/microsoft/connecteddevices/graphnotifications/MainActivity.java

@@ -351,19 +351,22 @@ public class MainActivity extends AppCompatActivity {
                 readButton.setEnabled(false);
             }
 
+            final Button dismissButton = convertView.findViewById(R.id.notification_dismiss);
+            if (notification.getUserActionState() == UserNotificationUserActionState.NO_INTERACTION) {
+                dismissButton.setEnabled(true);
+                dismissButton.setOnClickListener(view -> {
+                    dismissButton.setEnabled(false);
+                    sNotificationsManager.dismiss(notification);
+                });
+            } else {
+                dismissButton.setEnabled(false);
+            }
+
             final Button deleteButton = convertView.findViewById(R.id.notification_delete);
             deleteButton.setOnClickListener(view -> {
                 sNotificationsManager.delete(notification);
             });
 
-            if (notification.getUserActionState() == UserNotificationUserActionState.NO_INTERACTION) {
-                convertView.setOnClickListener(view -> {
-                    sNotificationsManager.activate(notification);
-                });
-            } else {
-                convertView.setOnClickListener(null);
-            }
-
             return convertView;
         }
     }
@@ -392,82 +395,6 @@ public class MainActivity extends AppCompatActivity {
         }
     }
 
-    public static class LogFragment extends Fragment {
-        private View mRootView;
-        private TextView mTextView;
-        private File mLogFile;
-        private FileReader mReader;
-        private StringBuilder mLog = new StringBuilder();
-        boolean mStopReading = false;
-
-        public LogFragment() {}
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                                 Bundle savedInstanceState) {
-            mRootView = inflater.inflate(R.layout.fragment_log, container, false);
-            mTextView = mRootView.findViewById(R.id.log_text);
-            mLogFile = new File(getActivity().getApplicationContext().getFilesDir(), "CDPTraces.log");
-            try {
-                mReader = new FileReader(mLogFile);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-            }
-            startReading();
-            return mRootView;
-        }
-
-        void startReading() {
-            new Thread(() -> {
-                while (!mStopReading) {
-                    boolean stop = false;
-                    char[] buff = new char[2048];
-                    while (!stop) {
-                        int readResult = -1;
-                        try {
-                            readResult = mReader.read(buff, 0, 2048);
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                            stop = true;
-                        }
-
-                        if (readResult == -1) {
-                            stop = true;
-                        } else {
-                            mLog.append(buff, 0, readResult);
-                        }
-                    }
-
-                    updateText();
-
-                    try {
-                        Thread.sleep(1000);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }).start();
-        }
-
-        void updateText() {
-            if (getActivity() != null) {
-                getActivity().runOnUiThread(() -> {
-                    char[] endLog = new char[10000];
-                    int length = mLog.length();
-                    if (length > 10000) {
-                        mLog.getChars(length - 10000, length, endLog, 0);
-                    } else {
-                        mLog.getChars(0, length, endLog, 0);
-                    }
-                    mTextView.setText(new String(endLog));
-                    mRootView.invalidate();
-                });
-            } else {
-                mStopReading = true;
-            }
-        }
-    }
-
     /**
      * A {@link FragmentPagerAdapter} that returns a fragment corresponding to
      * one of the sections/tabs/pages.
@@ -475,7 +402,6 @@ public class MainActivity extends AppCompatActivity {
     class SectionsPagerAdapter extends FragmentPagerAdapter {
         private LoginFragment mLoginFragment;
         private NotificationsFragment mNotificationFragment;
-        private LogFragment mLogFragment;
 
         public SectionsPagerAdapter(FragmentManager fm) {
             super(fm);
@@ -497,12 +423,6 @@ public class MainActivity extends AppCompatActivity {
                     }
 
                     return mNotificationFragment;
-                case 2:
-                    if  (mLogFragment == null) {
-                        mLogFragment = new LogFragment();
-                    }
-
-                    return mLogFragment;
             }
 
             return null;
@@ -510,8 +430,8 @@ public class MainActivity extends AppCompatActivity {
 
         @Override
         public int getCount() {
-            // Show 3 total pages.
-            return 3;
+            // Show 2 total pages.
+            return 2;
         }
     }
 }

Android/samples/graphnotificationssample/app/src/main/res/layout/activity_main.xml

@@ -44,12 +44,6 @@
                 android:layout_height="wrap_content"
                 android:text="@string/tab_text_2" />
 
-            <android.support.design.widget.TabItem
-                android:id="@+id/tabItem3"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/tab_text_3" />
-
         </android.support.design.widget.TabLayout>
     </android.support.design.widget.AppBarLayout>
 

Android/samples/graphnotificationssample/app/src/main/res/layout/fragment_log.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fragment_log"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <TextView
-            android:id="@+id/log_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="" />
-    </ScrollView>
-</LinearLayout>

Android/samples/graphnotificationssample/app/src/main/res/layout/notifications_list_item.xml

@@ -37,6 +37,11 @@
             android:layout_height="wrap_content"
             android:text="@string/read"
             android:enabled="false"/>
+        <Button
+            android:id="@+id/notification_dismiss"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/dismiss" />
         <Button
             android:id="@+id/notification_delete"
             android:layout_width="wrap_content"

Android/samples/graphnotificationssample/app/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <resources>
-    <string name="app_name">Graph Notifications Sample App</string>
-    <string name="tab_text_1">Login</string>
+    <string name="app_name">Graph Notifications Sample</string>
+    <string name="tab_text_1">Accounts</string>
     <string name="tab_text_2">Notifications</string>
     <string name="tab_text_3">Log</string>
     <string name="action_refresh">Refresh</string>
@@ -9,5 +9,6 @@
     <string name="login_msa">Login with MSA</string>
     <string name="logout">Log Out</string>
     <string name="read">Mark Read</string>
+    <string name="dismiss">Dismiss</string>
     <string name="delete">Delete</string>
 </resources>