Merge pull request #38 from charithag/master-uiux-improvements

Master uiux improvements

client/client/build.gradle

@@ -33,7 +33,7 @@ android {
         targetSdkVersion 25
         multiDexEnabled true
 
-        versionCode 331
+        versionCode 332
         versionName "3.1.17"
     }
     buildTypes {

client/client/src/main/AndroidManifest.xml

@@ -183,10 +183,6 @@
         <activity
             android:name=".AuthenticationErrorActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".NotifyActivity"
-            android:label="@string/title_activity_notify"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".activities.ServerConfigsActivity"
             android:windowSoftInputMode="stateVisible|adjustResize" />

client/client/src/main/java/org/wso2/iot/agent/activities/AlreadyRegisteredActivity.java

@@ -198,7 +198,7 @@ public void onClick(View v) {
 						110);
 			}
 		}
-		if (Build.VERSION.SDK_INT >= 19) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
 			try {
 				int locationSetting = Settings.Secure.getInt(context.getContentResolver(), Settings.Secure.LOCATION_MODE);
 				if (locationSetting == 0) {

client/client/src/main/java/org/wso2/iot/agent/activities/AuthenticationActivity.java

@@ -1021,9 +1021,7 @@ private void cancelEntry() {
 		Preference.putBoolean(context, Constants.PreferenceFlag.REGISTERED, false);
 		Preference.putString(context, Constants.PreferenceFlag.IP, null);
 
-		Intent intentIP = new Intent(AuthenticationActivity.this, ServerConfigsActivity.class);
-		intentIP.putExtra(getResources().getString(R.string.intent_extra_from_activity),
-		                  AuthenticationActivity.class.getSimpleName());
+		Intent intentIP = new Intent(AuthenticationActivity.this, SplashActivity.class);
 		intentIP.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
 		startActivity(intentIP);
 		finish();
@@ -1067,9 +1065,6 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
 				@Override
 				public void onClick(DialogInterface dialog,
 				                    int which) {
-//					etUsername.setText(Constants.EMPTY_STRING);
-//					etPassword.setText(Constants.EMPTY_STRING);
-//					etDomain.setText(Constants.EMPTY_STRING);
 					btnSignIn.setBackgroundResource(R.drawable.btn_orange);
 					btnSignIn.setTextColor(ContextCompat.getColor(AuthenticationActivity.this, R.color.white));
 					btnSignIn.setEnabled(true);

client/client/src/main/java/org/wso2/iot/agent/services/MessageProcessor.java

@@ -332,7 +332,7 @@ public void onReceiveAPIResult(Map<String, String> result, int requestCode) {
 					LocalNotification.stopPolling(context);
 					Preference.putBoolean(context, Constants.TOKEN_EXPIRED, true);
 					CommonUtils.displayNotification(context,
-							R.drawable.notification,
+							R.drawable.ic_error_outline_white_24dp,
 							context.getResources().getString(R.string.title_need_to_sign_in),
 							context.getResources().getString(R.string.msg_need_to_sign_in),
 							AuthenticationActivity.class,

client/client/src/main/java/org/wso2/iot/agent/services/NotificationService.java

@@ -131,7 +131,7 @@ public void showNotification(int operationId, String messageTitle, String messag
             PendingIntent dismiss = PendingIntent.getBroadcast(context, operationId, notification, PendingIntent.FLAG_ONE_SHOT);
             NotificationCompat.Builder mBuilder =
                     new NotificationCompat.Builder(context)
-                            .setSmallIcon(R.drawable.notification)
+                            .setSmallIcon(R.drawable.ic_notifications_white_24dp)
                             .setContentTitle(messageTitle)
                             .setContentText(messageText)
                             .setPriority(android.app.Notification.PRIORITY_MAX)
@@ -141,7 +141,7 @@ public void showNotification(int operationId, String messageTitle, String messag
                             .setOngoing(true)
                             .setOnlyAlertOnce(true)
                             .setTicker(context.getResources().getString(R.string.txt_notification))
-                            .addAction(R.drawable.notification, "Dismiss", dismiss);
+                            .addAction(R.drawable.dismiss, "Dismiss", dismiss);
 
             notifyManager.notify(operationId, mBuilder.build());
 

client/client/src/main/java/org/wso2/iot/agent/services/location/LocationService.java

@@ -32,10 +32,9 @@
 import android.provider.Settings;
 import android.support.v4.content.ContextCompat;
 import android.util.Log;
-import android.widget.Toast;
 
-import org.wso2.iot.agent.activities.WorkProfileSelectionActivity;
 import org.wso2.iot.agent.R;
+import org.wso2.iot.agent.activities.WorkProfileSelectionActivity;
 import org.wso2.iot.agent.utils.CommonUtils;
 import org.wso2.iot.agent.utils.Constants;
 
@@ -75,7 +74,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                         Settings.Secure.LOCATION_MODE);
                 if (locationSetting == 0) {
                     CommonUtils.displayNotification(context,
-                            R.drawable.notification,
+                            R.drawable.ic_warning_white_24dp,
                             context.getResources().getString(R.string.title_need_location),
                             context.getResources().getString(R.string.msg_need_location),
                             WorkProfileSelectionActivity.class,
@@ -86,7 +85,6 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                 Log.w(TAG, "Location setting is not available on this device");
             }
         } else {
-            Toast.makeText(context, R.string.msg_need_location, Toast.LENGTH_LONG).show();
             Log.w(TAG, "Location setting retrieval is not supported by API level "
                     + android.os.Build.VERSION.SDK_INT);
         }
@@ -236,7 +234,7 @@ public void onProviderDisabled(String provider) {
 
     private void displayPermissionMissingNotification() {
         CommonUtils.displayNotification(context,
-                R.drawable.notification,
+                R.drawable.ic_warning_white_24dp,
                 context.getResources().getString(R.string.title_need_permissions),
                 context.getResources().getString(R.string.msg_need_permissions),
                 WorkProfileSelectionActivity.class,