Merge branch 'Development' of github.com:amitshekhariitbhu/Android-Debug-Database into Development

# Conflicts:
#	debug-db/src/main/assets/debugDbHome/js/app.js
#	debug-db/src/main/java/com/amitshekhar/utils/DatabaseHelper.java

Author: Vinayaga Sundar

debug-db/src/main/assets/debugDbHome/css/custom.css

@@ -18,4 +18,41 @@
     background: #dff0d8 !important;
     color: #3c763d !important;
     font-weight: bold;
+}
+
+#snackbar {
+    visibility: hidden;
+    min-width: 250px;
+    margin-left: -125px;
+    background-color: #5cb85c;
+    color: #fff;
+    text-align: center;
+    border-radius: 2px;
+    padding: 16px;
+    position: fixed;
+    z-index: 1;
+    left: 50%;
+    bottom: 30px;
+    font-size: 17px;
+}
+
+#snackbar.show {
+    visibility: visible;
+    -webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s;
+    animation: fadein 0.5s, fadeout 0.5s 2.5s;
+}
+
+@-webkit-keyframes fadein {
+    from {bottom: 0; opacity: 0;}
+    to {bottom: 30px; opacity: 1;}
+}
+
+@keyframes fadein {
+    from {bottom: 0; opacity: 0;}
+    to {bottom: 30px; opacity: 1;}
+}
+
+@-webkit-keyframes fadeout {
+    from {bottom: 30px; opacity: 1;}
+    to {bottom: 0; opacity: 0;}
 }

debug-db/src/main/assets/debugDbHome/index.html

@@ -118,10 +118,11 @@
                 <label for="query">Query</label>
                 <input class="form-control" id="query">
             </div>
-            <button id="selected-db-info" type="button" onclick="downloadDb()" class="btn btn-info">Welcome</button>
-            <button id="success-info" type="button" class="btn btn-success display-none">Query Executed</button>
-            <button id="error-info" type="button" class="btn btn-danger display-none">Query Not Executed</button>
-            <button id="run-query" type="submit" onclick="queryFunction()" class="btn btn-primary pull-right disabled">Run
+            <button id="selected-db-info" type="button" onclick="downloadDb()" class="btn btn-info">
+                Welcome
+            </button>
+            <button id="run-query" type="submit" onclick="queryFunction()"
+                    class="btn btn-primary pull-right disabled">Run
                 Query
             </button>
         </div>
@@ -153,6 +154,8 @@
         </div>
     </div>
 
+    <div id="snackbar">Data Updated Successfully</div>
+
 </div>
 
 <script src="debugDbHome/js/app.js"></script>

debug-db/src/main/assets/debugDbHome/js/app.js

@@ -121,7 +121,12 @@ function openDatabaseAndGetTableList(db) {
 function inflateData(result){
 
    if(result.isSuccessful){
-      showSuccessInfo();
+
+      if(!result.isSelectQuery){
+         showSuccessInfo("Query Executed Successfully");
+         return;
+      }
+
       var columnHeader = result.tableInfos;
 
       // set function to return cell data for different usages like set, display, filter, search etc..
@@ -208,7 +213,11 @@ function inflateData(result){
        $(".dataTables_scrollHeadInner").css({"width":"100%"});
        $(".table ").css({"width":"100%"});
    }else{
-      showErrorInfo();
+      if(!result.isSelectQuery){
+         showSuccessInfo("Query Execution Failed");
+      }else {
+         showErrorInfo("Some Error Occurred");
+      }
    }
 
 }
@@ -242,6 +251,7 @@ function updateTableData(updatedData, callback) {
             if(response.isSuccessful){
                console.log("Data updated successfully");
                callback(true);
+               showSuccessInfo("Data Updated Successfully");
             } else {
                console.log("Data updated failed");
                callback(false);
@@ -289,17 +299,18 @@ function deleteTableData(deleteData, callback) {
     })
 }
 
-function showSuccessInfo(){
-    $("#success-info").show();
-    $("#error-info").hide();
+function showSuccessInfo(message){
+    var snackbar = document.getElementById("snackbar")
+    snackbar.className = "show";
+    snackbar.style.backgroundColor = "#5cb85c";
+    snackbar.innerHTML = message;
+    setTimeout(function(){ snackbar.className = snackbar.className.replace("show", ""); }, 2000);
 }
 
-function showErrorInfo(){
-    $("#success-info").hide();
-    $("#error-info").show();
+function showErrorInfo(message){
+    var snackbar = document.getElementById("snackbar")
+    snackbar.className = "show";
+    snackbar.style.backgroundColor = "#d9534f";
+    snackbar.innerHTML = message;
+    setTimeout(function(){ snackbar.className = snackbar.className.replace("show", ""); }, 2000);
 }
-
-function hideBothInfo(){
-    $("#success-info").hide();
-    $("#error-info").hide();
-}

debug-db/src/main/java/com/amitshekhar/model/TableDataResponse.java

@@ -32,6 +32,7 @@ public class TableDataResponse {
     public List<Object> rows;
     public String errorMessage;
     public boolean isEditable;
+    public boolean isSelectQuery;
 
     public static class TableInfo {
         public String title;

debug-db/src/main/java/com/amitshekhar/server/RequestHandler.java

@@ -222,7 +222,7 @@ private String executeQueryAndGetResponse(String route) {
                     TableDataResponse response = DatabaseHelper.getTableData(mDatabase, query, null);
                     data = mGson.toJson(response);
                 } else {
-                    Response response = DatabaseHelper.exec(mDatabase, query);
+                    TableDataResponse response = DatabaseHelper.exec(mDatabase, query);
                     data = mGson.toJson(response);
                 }
             }

debug-db/src/main/java/com/amitshekhar/utils/DatabaseHelper.java

@@ -63,7 +63,7 @@ public static Response getAllTableName(SQLiteDatabase database) {
     public static TableDataResponse getTableData(SQLiteDatabase db, String selectQuery, String tableName) {
 
         TableDataResponse tableData = new TableDataResponse();
-
+        tableData.isSelectQuery = true;
         if (tableName == null) {
             tableName = getTableName(selectQuery);
         }
@@ -240,7 +240,6 @@ public static UpdateRowResponse updateRow(SQLiteDatabase db, String tableName, L
     }
 
 
-
     public static UpdateRowResponse deleteRow(SQLiteDatabase db, String tableName, List<RowDataRequest> rowDataRequests) {
 
         UpdateRowResponse updateRowResponse = new UpdateRowResponse();
@@ -282,18 +281,20 @@ public static UpdateRowResponse deleteRow(SQLiteDatabase db, String tableName, L
     }
 
 
-    public static Response exec(SQLiteDatabase database, String sql) {
-        Response response = new Response();
+
+    public static TableDataResponse exec(SQLiteDatabase database, String sql) {
+        TableDataResponse tableDataResponse = new TableDataResponse();
+        tableDataResponse.isSelectQuery = false;
         try {
             database.execSQL(sql);
         } catch (Exception e) {
             e.printStackTrace();
-            response.isSuccessful = false;
-            response.error = e.getMessage();
-            return response;
+            tableDataResponse.isSuccessful = false;
+            tableDataResponse.errorMessage = e.getMessage();
+            return tableDataResponse;
         }
-        response.isSuccessful = true;
-        return response;
+        tableDataResponse.isSuccessful = true;
+        return tableDataResponse;
     }
 
     private static String getTableName(String selectQuery) {

debug-db/src/main/java/com/amitshekhar/utils/PrefHelper.java

@@ -88,6 +88,7 @@ public static TableDataResponse getAllPrefData(Context context, String tag) {
 
         TableDataResponse response = new TableDataResponse();
         response.isSuccessful = true;
+        response.isSelectQuery = true;
 
         TableDataResponse.TableInfo keyInfo = new TableDataResponse.TableInfo();
         keyInfo.isPrimary = true;