Kiosk v1 login

app/build.gradle

@@ -25,18 +25,11 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     compile 'com.android.support:appcompat-v7:24.+'
-    compile 'com.google.android.gms:play-services-maps:10.0.1'
-    compile 'com.google.android.gms:play-services:10.0.1'
     compile 'com.google.firebase:firebase-core:10.0.1'
     compile 'com.google.firebase:firebase-messaging:10.0.1'
     compile 'com.android.support:design:24.0.0'
-    compile 'com.synnapps:carouselview:0.0.10'
     compile 'com.android.support:cardview-v7:24.2.1'
     compile 'com.android.support:recyclerview-v7:24.2.1'
     compile 'com.squareup:otto:1.3.7'
-    compile 'com.squareup.okhttp3:okhttp:3.2.0'
-    compile 'noman.placesapi:placesAPI:1.1.3'
     testCompile 'junit:junit:4.12'
 }
-
-apply plugin: 'com.google.gms.google-services'

app/src/main/AndroidManifest.xml

@@ -2,11 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.bluehack.kiosk">
 
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
         android:name=".ApplicationLoader"
@@ -16,17 +13,9 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 
-        <!--google map-->
-        <meta-data
-            android:name="com.google.android.geo.API_KEY"
-            android:value="AIzaSyA7av6NBZ3U-CwHzYMPex2M96OWP1zQz4Y"/>
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
-
         <activity
-            android:name=".main.MainActivity"
-            android:label="@string/app_title"
+            android:name=".login.LoginActivity"
+            android:label="@string/app_name"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -36,34 +25,40 @@
         </activity>
 
         <activity
-            android:name=".store.StoreActivity"
-            android:label="@string/app_title"
+            android:name=".main.MainActivity"
+            android:label="@string/tool_bar_main"
             android:screenOrientation="portrait">
         </activity>
 
         <activity
+            android:name=".store.StoreActivity"
+            android:label="@string/tool_bar_store"
+            android:screenOrientation="portrait">
+        </activity>
+
+        <!--<activity
             android:name=".order.OrderActivity"
-            android:label="@string/app_title"
+            android:label="@string/tool_bar_order"
             android:screenOrientation="portrait">
         </activity>
 
         <activity
             android:name=".order_pay.OrderPayActivity"
-            android:label="@string/app_title"
+            android:label="@string/tool_bar_order"
             android:screenOrientation="portrait">
         </activity>
 
         <activity
             android:name=".order_option.OrderOptionActivity"
-            android:label="@string/app_title"
+            android:label="@string/tool_bar_order"
             android:screenOrientation="portrait">
         </activity>
 
         <activity
             android:name=".process.ProcessActivity"
-            android:label="@string/app_title"
+            android:label="@string/tool_bar_main"
             android:screenOrientation="portrait">
-        </activity>
+        </activity>-->
 
     </application>
 

app/src/main/java/net/bluehack/kiosk/ApplicationLoader.java

@@ -3,20 +3,21 @@
 import android.app.Application;
 import android.content.Context;
 
+import net.bluehack.kiosk.util.KioskPreference;
+
 import static net.bluehack.kiosk.util.Logger.makeLogTag;
 
 public class ApplicationLoader extends Application {
 
     private static String TAG = makeLogTag(ApplicationLoader.class);
 
-    private static Context instance;
+    private static volatile Context instance;
 
     @Override
     public void onCreate() {
         super.onCreate();
-        instance = this;
-
-
+        instance = getApplicationContext();
+        KioskPreference.getInstance().init(instance);
     }
 
     public static Context getContext() {

app/src/main/java/net/bluehack/kiosk/api/ApiClient.java

@@ -2,19 +2,26 @@
 
 import android.os.AsyncTask;
 import android.util.Log;
+import android.view.Menu;
+import android.widget.Toast;
 
 import com.amazonaws.mobileconnectors.apigateway.ApiClientFactory;
 
+import net.bluehack.kiosk.ApplicationLoader;
 import net.bluehack.kiosk.KioskAPIClient;
-import net.bluehack.kiosk.model.Menu;
+import net.bluehack.kiosk.api.net.NetworkManager;
+import net.bluehack.kiosk.model.LoginReq;
+import net.bluehack.kiosk.model.LoginRes;
 
+import static net.bluehack.kiosk.util.Logger.LOGD;
 import static net.bluehack.kiosk.util.Logger.makeLogTag;
 
 public class ApiClient {
     private static final String TAG = makeLogTag(ApiClient.class);
     private static ApiClient ourInstance = new ApiClient();
     private final ApiClientFactory factory;
     private final KioskAPIClient client;
+    private final static String headerToken = "temp";
 
     public static ApiClient getInstance() {
         return ourInstance;
@@ -33,7 +40,23 @@ public KioskAPIClient getClient() {
         return client;
     }
 
-    public void menuGet(final String query, final ApiResponseListener listener) {
+    public void usersLoginPost(final LoginReq loginReq, final ApiResponseListener listener) {
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... params) {
+
+                LoginRes output = null;
+                output = client.usersLoginPost(headerToken, loginReq);
+                LOGD("usersLoginPost:", String.valueOf(output.getResponseStatus()));
+
+                listener.onResponse(output);
+                return null;
+            }
+
+        }.execute();
+    }
+
+    /*public void menuGet(final String query, final ApiResponseListener listener) {
         new AsyncTask<Void, Void, Void>() {
             @Override
             protected Void doInBackground(Void... params) {
@@ -49,5 +72,5 @@ protected Void doInBackground(Void... params) {
             }
 
         }.execute();
-    }
+    }*/
 }

app/src/main/java/net/bluehack/kiosk/api/net/NetworkManager.java

@@ -0,0 +1,51 @@
+package net.bluehack.kiosk.api.net;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.widget.Toast;
+
+import net.bluehack.kiosk.ApplicationLoader;
+
+import static net.bluehack.kiosk.util.Logger.LOGD;
+import static net.bluehack.kiosk.util.Logger.LOGE;
+import static net.bluehack.kiosk.util.Logger.makeLogTag;
+
+public class NetworkManager {
+
+    private static final String TAG = makeLogTag(NetworkManager.class);
+    private static NetworkManager ourInstance = new NetworkManager();
+
+    public static NetworkManager getInstance() {
+        return ourInstance;
+    }
+
+    private NetworkManager() {
+    }
+
+    public static boolean isNetworkOnline() {
+        try {
+            ConnectivityManager cm = (ConnectivityManager) ApplicationLoader.getContext()
+                    .getSystemService(Context.CONNECTIVITY_SERVICE);
+            NetworkInfo netInfo = cm.getActiveNetworkInfo();
+            if (netInfo != null && (netInfo.isConnectedOrConnecting() || netInfo.isAvailable())) {
+                return true;
+            }
+
+            netInfo = cm.getNetworkInfo(ConnectivityManager.TYPE_MOBILE);
+
+            if (netInfo != null && netInfo.isConnectedOrConnecting()) {
+                return true;
+            } else {
+                netInfo = cm.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+                if (netInfo != null && netInfo.isConnectedOrConnecting()) {
+                    return true;
+                }
+            }
+        } catch (Exception e) {
+            LOGE(TAG, String.valueOf(e));
+            return true;
+        }
+        return false;
+    }
+}