diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7e1cf21..86596b0 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -54,11 +54,11 @@ - - - - - + + + + + @@ -100,121 +100,11 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -1728,18 +1618,18 @@ @@ -1837,10 +1840,10 @@ - @@ -1983,38 +1986,6 @@ @@ -2146,7 +2103,7 @@ - + @@ -2469,71 +2426,71 @@ - - + + + + + - - - - - - - - + + + + + + + - - + + - - - - - - - + + + - - + + + + - - - - - + + - - - + + - + + + - - - + + + + + + + + + - - + + + + - - - - - - @@ -2625,6 +2582,17 @@ + + + + + + + + + + + @@ -2646,13 +2614,6 @@ - - - - - - - @@ -2688,37 +2649,37 @@ - - - - - + + - - - + + + + + + @@ -2728,43 +2689,42 @@ - - - - - - + + + - - + + + + + - @@ -2804,13 +2764,6 @@ - - - - - - - @@ -2883,102 +2836,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - - + + + + + + @@ -2995,15 +2898,15 @@ - - - + + + @@ -3020,26 +2923,26 @@ - - - - - - + + + + + + @@ -3049,7 +2952,6 @@ - @@ -3080,93 +2982,93 @@ - - - - + - + - - + + - + - - - + + + + + + + + + + - + - + - + - + - + + + + - + - - + + - + - + - - + - + - - - - + + - + - - - - - - - + + + diff --git a/app/app.iml b/app/app.iml index 290c56d..4fb790a 100644 --- a/app/app.iml +++ b/app/app.iml @@ -67,9 +67,7 @@ - - @@ -87,29 +85,28 @@ - - - - + + + + - - + - - + + + + + - - - - + \ No newline at end of file diff --git a/app/src/main/java/com/example/sfarmani/ucsctutor/MainActivity.java b/app/src/main/java/com/example/sfarmani/ucsctutor/MainActivity.java index abfea30..f60f1c7 100644 --- a/app/src/main/java/com/example/sfarmani/ucsctutor/MainActivity.java +++ b/app/src/main/java/com/example/sfarmani/ucsctutor/MainActivity.java @@ -32,13 +32,6 @@ protected void onCreate(Bundle savedInstanceState) { // Get current user data from Parse.com ParseUser currentUser = ParseUser.getCurrentUser(); - /* Code to generate dummy course list for testing purposes - Credentials test = new Credentials(); - test.addCourse("CMPS104", false); - test.addCourse("CMPS115", false); - test.addCourse("CMPE110", false); - test.sendToParse(); - */ if (currentUser != null) { if (!currentUser.getBoolean("emailVerified")) { Intent homeIntent = new Intent(MainActivity.this, EmailNotVerified.class); @@ -46,8 +39,6 @@ protected void onCreate(Bundle savedInstanceState) { finish(); } else{ - - Intent intent = new Intent(MainActivity.this, FragmentPagerSupport.class); startActivity(intent); serviceIntent = new Intent(MainActivity.this, SinchService.class); diff --git a/app/src/main/java/com/example/sfarmani/ucsctutor/MessagingActivity.java b/app/src/main/java/com/example/sfarmani/ucsctutor/MessagingActivity.java index 34b1cde..e0228a3 100644 --- a/app/src/main/java/com/example/sfarmani/ucsctutor/MessagingActivity.java +++ b/app/src/main/java/com/example/sfarmani/ucsctutor/MessagingActivity.java @@ -233,7 +233,7 @@ public void done(List messageList, com.parse.ParseException e) { if (messageList.size() == 0) { long start = System.currentTimeMillis(); Date timeDiff = new Date(start); // compensate for 1h in millis - SimpleDateFormat timeFormat = new SimpleDateFormat("MMM d, h:mma"); + SimpleDateFormat timeFormat = new SimpleDateFormat("M/d/yyyy, h:mm:s a"); String timestamp = timeFormat.format(timeDiff); writableMessage.addHeader("Sent", timestamp); messageAdapter.addMessage(writableMessage, MessageAdapter.DIRECTION_INCOMING); @@ -259,7 +259,7 @@ public void done(List messageList, com.parse.ParseException e) { if (messageList.size() == 0) { long start = System.currentTimeMillis(); Date timeDiff = new Date(start); // compensate for 1h in millis - SimpleDateFormat timeFormat = new SimpleDateFormat("MMM d, h:mma"); + SimpleDateFormat timeFormat = new SimpleDateFormat("M/d/yyyy, h:mm:s a"); String timestamp = timeFormat.format(timeDiff); writableMessage.addHeader("Sent", timestamp); diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml index fba8db8..207f4b7 100644 --- a/build/intermediates/dex-cache/cache.xml +++ b/build/intermediates/dex-cache/cache.xml @@ -1,2 +1,3 @@ + diff --git a/local.properties b/local.properties index 4a94fb4..a20ad5b 100644 --- a/local.properties +++ b/local.properties @@ -7,5 +7,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Tue Dec 01 15:28:57 PST 2015 -sdk.dir=/home/george/Android/Sdk +#Thu Dec 03 20:49:31 PST 2015 +sdk.dir=C\:\\Android\\sdk